From f91644ae2ef0d983496285264a3f3537a4cea536 Mon Sep 17 00:00:00 2001
From: Michael Lippautz <michael.lippautz@gmail.com>
Date: Mon, 15 Mar 2010 13:38:32 +0100
Subject: unrar, unrar-native: Bump to version 3.9.9

* Fixes CVE name CVE-2007-0855
* Remove old recipe, because it neither used current staging, nor native
  extension
---
 recipes/unrar/files/makefile.unix.patch | 21 +++++++++++++++++++++
 recipes/unrar/unrar-native_3.4.3.bb     | 14 --------------
 recipes/unrar/unrar.inc                 |  7 -------
 recipes/unrar/unrar_3.4.3.bb            |  6 ------
 recipes/unrar/unrar_3.9.9.bb            | 23 +++++++++++++++++++++++
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 recipes/unrar/files/makefile.unix.patch
 delete mode 100644 recipes/unrar/unrar-native_3.4.3.bb
 delete mode 100644 recipes/unrar/unrar.inc
 delete mode 100644 recipes/unrar/unrar_3.4.3.bb
 create mode 100644 recipes/unrar/unrar_3.9.9.bb

diff --git a/recipes/unrar/files/makefile.unix.patch b/recipes/unrar/files/makefile.unix.patch
new file mode 100644
index 0000000000..ce72351d4b
--- /dev/null
+++ b/recipes/unrar/files/makefile.unix.patch
@@ -0,0 +1,21 @@
+--- a/makefile.unix	2009-05-03 07:18:45.000000000 +0200
++++ b/makefile.unix	2010-03-15 13:31:31.000000000 +0100
+@@ -9,8 +9,8 @@
+ #CXX=g++
+ #CXXFLAGS=-O2
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-STRIP=strip
+-DESTDIR=/usr
++#STRIP=strip
++#DESTDIR=/usr
+ 
+ # Linux using LCC
+ #CXX=lcc
+@@ -136,6 +136,7 @@
+ 	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
++			install -d $(DESTDIR)/bin
+ 			install unrar $(DESTDIR)/bin
+ 
+ uninstall-unrar:
diff --git a/recipes/unrar/unrar-native_3.4.3.bb b/recipes/unrar/unrar-native_3.4.3.bb
deleted file mode 100644
index 4b87691e89..0000000000
--- a/recipes/unrar/unrar-native_3.4.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require unrar.inc
-inherit native
-
-do_stage() {
-    install unrar ${STAGING_BINDIR}
-}
-
-do_package() {
-    :
-}
-
-do_install() {
-    :
-}
diff --git a/recipes/unrar/unrar.inc b/recipes/unrar/unrar.inc
deleted file mode 100644
index 4887ac9fb2..0000000000
--- a/recipes/unrar/unrar.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz"
-S = "${WORKDIR}/unrar"
-
-do_compile() {
-    oe_runmake -f makefile.unix
-}
-
diff --git a/recipes/unrar/unrar_3.4.3.bb b/recipes/unrar/unrar_3.4.3.bb
deleted file mode 100644
index 39d81990e2..0000000000
--- a/recipes/unrar/unrar_3.4.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require unrar.inc
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 unrar ${D}${bindir}
-}
diff --git a/recipes/unrar/unrar_3.9.9.bb b/recipes/unrar/unrar_3.9.9.bb
new file mode 100644
index 0000000000..21e1f23d53
--- /dev/null
+++ b/recipes/unrar/unrar_3.9.9.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "RAR archivers"
+HOMEPAGE = "http://www.rarlab.com/"
+PR = "r0"
+
+SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz;name=unrar \
+		file://makefile.unix.patch;patch=1"
+SRC_URI[unrar.md5sum] = "4271fc8710d299341c969666492b305c"
+SRC_URI[unrar.sha256sum] = "460d4c014f5aaaa9b1c810dca180f07e155678b322169e20f4e51c616fa0e7ff"
+
+S = "${WORKDIR}/unrar"
+
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"
+
+EXTRA_OEMAKE = "-f makefile.unix DESTDIR=${D}${exec_prefix}"
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake install 
+}
-- 
cgit v1.2.3