summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2006-07-04 03:27:25 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-04 03:27:25 +0000
commit32fb77d1adfb5d733794f5da446f6262fd4e0b12 (patch)
treecaf243b1a2f21fd14792044777fe4a377c841242
parente9d6aaf75c32baf067a682a6ddb36bebfe447fd1 (diff)
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.
-rw-r--r--packages/zip/zip-native_2.32.bb9
-rw-r--r--packages/zip/zip.inc16
-rw-r--r--packages/zip/zip_2.31.bb19
-rw-r--r--packages/zip/zip_2.32.bb2
4 files changed, 29 insertions, 17 deletions
diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb
new file mode 100644
index 0000000000..7cd0261827
--- /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
index 0000000000..b66b4b217f
--- /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 6c588a55e5..d10bb4312e 100644
--- 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
index 0000000000..d10bb4312e
--- /dev/null
+++ b/packages/zip/zip_2.32.bb
@@ -0,0 +1,2 @@
+include zip.inc
+PR="r0"