zip 2.32: Add version 2.32. Version 2.31 has been removed from the source

site due to buffer overrun vulnerabilities. Closes bugs #1136, #1137.

diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb
new file mode 100644 (file)
index 0000000..7cd0261
--- /dev/null
+++ b/packages/zip/zip-native_2.32.bb
@@ -0,0 +1,9 @@
+SECTION = "console/utils"
+inherit native
+include zip_${PV}.bb
+S = "${WORKDIR}/zip-${PV}"
+
+do_stage() {
+       install -d ${STAGING_BINDIR}
+       install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
+}

diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc
new file mode 100644 (file)
index 0000000..b66b4b2
--- /dev/null
+++ b/packages/zip/zip.inc
@@ -0,0 +1,16 @@
+SECTION = "console/utils"
+SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+LICENSE = "Info-ZIP"
+EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
+               'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
+               'BINFLAGS=0755' 'INSTALL_D=install -d'"
+
+do_compile() {
+       oe_runmake -f unix/Makefile generic
+}
+
+do_install() {
+       oe_runmake -f unix/Makefile prefix=${D}${prefix} \
+                  BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
+                  install
+}

diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb
index 6c588a5..d10bb43 100644 (file)
--- a/packages/zip/zip_2.31.bb
+++ b/packages/zip/zip_2.31.bb
@@ -1,17 +1,2 @@
-SECTION = "console/utils"
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz"
-LICENSE = "Info-ZIP"
-EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
-               'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
-               'BINFLAGS=0755' 'INSTALL_D=install -d'"
-
-do_compile() {
-       oe_runmake -f unix/Makefile generic
-}
-
-do_install() {
-       oe_runmake -f unix/Makefile prefix=${D}${prefix} \
-                  BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
-                  install
-}
-
+include zip.inc
+PR="r0"

diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb
new file mode 100644 (file)
index 0000000..d10bb43
--- /dev/null
+++ b/packages/zip/zip_2.32.bb
@@ -0,0 +1,2 @@
+include zip.inc
+PR="r0"