Date: Thursday, April 23, 2015 @ 16:45:53
Author: giovanni
Revision: 237960
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tcpdump/repos/extra-i686/PKGBUILD
(from rev 237959, tcpdump/trunk/PKGBUILD)
tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch
(from rev 237959, tcpdump/trunk/tcpdump_duplicate_executable.patch)
tcpdump/repos/extra-x86_64/PKGBUILD
(from rev 237959, tcpdump/trunk/PKGBUILD)
tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch
(from rev 237959, tcpdump/trunk/tcpdump_duplicate_executable.patch)
Deleted:
tcpdump/repos/extra-i686/CVE-2015-3138.patch
tcpdump/repos/extra-i686/PKGBUILD
tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch
tcpdump/repos/extra-x86_64/CVE-2015-3138.patch
tcpdump/repos/extra-x86_64/PKGBUILD
tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch
-------------------------------------------------+
/PKGBUILD | 82 ++++++++++++++++++++++
/tcpdump_duplicate_executable.patch | 20 +++++
extra-i686/CVE-2015-3138.patch | 29 -------
extra-i686/PKGBUILD | 45 ------------
extra-i686/tcpdump_duplicate_executable.patch | 10 --
extra-x86_64/CVE-2015-3138.patch | 29 -------
extra-x86_64/PKGBUILD | 45 ------------
extra-x86_64/tcpdump_duplicate_executable.patch | 10 --
8 files changed, 102 insertions(+), 168 deletions(-)
Deleted: extra-i686/CVE-2015-3138.patch
===================================================================
--- extra-i686/CVE-2015-3138.patch 2015-04-23 14:45:43 UTC (rev 237959)
+++ extra-i686/CVE-2015-3138.patch 2015-04-23 14:45:53 UTC (rev 237960)
@@ -1,29 +0,0 @@
---- a/print-wb.c 2014-11-13 12:02:47.000000000 +0100
-+++ b/print-wb.c 2015-04-19 11:57:04.127876067 +0200
-@@ -202,7 +202,7 @@
- len -= sizeof(*io) * nid;
- io = (struct id_off *)(id + 1);
- cp = (char *)(io + nid);
-- if (!ND_TTEST2(cp, len)) {
-+ if (ND_TTEST2(cp, len)) {
- ND_PRINT((ndo, "\""));
- fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
- ND_PRINT((ndo, "\""));
-@@ -267,7 +267,7 @@
- }
- n = EXTRACT_32BITS(&prep->pp_n);
- ps = (const struct pgstate *)(prep + 1);
-- while (--n >= 0 && !ND_TTEST(*ps)) {
-+ while (--n >= 0 && ND_TTEST(*ps)) {
- const struct id_off *io, *ie;
- char c = '<';
-
-@@ -276,7 +276,7 @@
- ipaddr_string(ndo, &ps->page.p_sid),
- EXTRACT_32BITS(&ps->page.p_uid)));
- io = (struct id_off *)(ps + 1);
-- for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) {
-+ for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
- ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo,
&io->id),
- EXTRACT_32BITS(&io->off)));
- c = ',';
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-23 14:45:43 UTC (rev 237959)
+++ extra-i686/PKGBUILD 2015-04-23 14:45:53 UTC (rev 237960)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: dorphell <dorph...@archlinux.org>
-
-pkgname=tcpdump
-pkgver=4.7.3
-pkgrel=2
-pkgdesc="A tool for network monitoring and data acquisition"
-arch=('i686' 'x86_64')
-url="http://www.tcpdump.org";
-license=('BSD')
-depends=('libpcap' 'openssl')
-source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz";
- 'tcpdump_duplicate_executable.patch'
- 'CVE-2015-3138.patch')
-md5sums=('334a4761594b29f80793c1303f0f4acc'
- '01379e4a12a208ce951c6c2abe80300f'
- '4154b0811d56fb05c3839695923bf46c')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # do not install tcpdump-4.1.1 executable (FS#23346)
- patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
- # CVE-2015-3138
- patch -Np1 -i "${srcdir}/CVE-2015-3138.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --enable-ipv6
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- #install the license
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: tcpdump/repos/extra-i686/PKGBUILD (from rev 237959,
tcpdump/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-23 14:45:53 UTC (rev 237960)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: dorphell <dorph...@archlinux.org>
+
+pkgname=tcpdump
+pkgver=4.7.4
+pkgrel=1
+pkgdesc="A tool for network monitoring and data acquisition"
+arch=('i686' 'x86_64')
+url="http://www.tcpdump.org";
+license=('BSD')
+depends=('libpcap' 'openssl')
+source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz";
+ 'tcpdump_duplicate_executable.patch')
+md5sums=('58af728de36f499341918fc4b8e827c3'
+ '01379e4a12a208ce951c6c2abe80300f')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # do not install tcpdump-4.1.1 executable (FS#23346)
+ patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --enable-ipv6
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ #install the license
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/tcpdump_duplicate_executable.patch
===================================================================
--- extra-i686/tcpdump_duplicate_executable.patch 2015-04-23 14:45:43 UTC
(rev 237959)
+++ extra-i686/tcpdump_duplicate_executable.patch 2015-04-23 14:45:53 UTC
(rev 237960)
@@ -1,10 +0,0 @@
---- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100
-+++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200
-@@ -326,7 +326,6 @@
- [ -d $(DESTDIR)$(sbindir) ] || \
- (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
-- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat
${srcdir}/VERSION`
- [ -d $(DESTDIR)$(mandir)/man1 ] || \
- (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755
$(DESTDIR)$(mandir)/man1)
- $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
Copied: tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch (from rev
237959, tcpdump/trunk/tcpdump_duplicate_executable.patch)
===================================================================
--- extra-i686/tcpdump_duplicate_executable.patch
(rev 0)
+++ extra-i686/tcpdump_duplicate_executable.patch 2015-04-23 14:45:53 UTC
(rev 237960)
@@ -0,0 +1,10 @@
+--- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100
++++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200
+@@ -326,7 +326,6 @@
+ [ -d $(DESTDIR)$(sbindir) ] || \
+ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat
${srcdir}/VERSION`
+ [ -d $(DESTDIR)$(mandir)/man1 ] || \
+ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755
$(DESTDIR)$(mandir)/man1)
+ $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
Deleted: extra-x86_64/CVE-2015-3138.patch
===================================================================
--- extra-x86_64/CVE-2015-3138.patch 2015-04-23 14:45:43 UTC (rev 237959)
+++ extra-x86_64/CVE-2015-3138.patch 2015-04-23 14:45:53 UTC (rev 237960)
@@ -1,29 +0,0 @@
---- a/print-wb.c 2014-11-13 12:02:47.000000000 +0100
-+++ b/print-wb.c 2015-04-19 11:57:04.127876067 +0200
-@@ -202,7 +202,7 @@
- len -= sizeof(*io) * nid;
- io = (struct id_off *)(id + 1);
- cp = (char *)(io + nid);
-- if (!ND_TTEST2(cp, len)) {
-+ if (ND_TTEST2(cp, len)) {
- ND_PRINT((ndo, "\""));
- fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
- ND_PRINT((ndo, "\""));
-@@ -267,7 +267,7 @@
- }
- n = EXTRACT_32BITS(&prep->pp_n);
- ps = (const struct pgstate *)(prep + 1);
-- while (--n >= 0 && !ND_TTEST(*ps)) {
-+ while (--n >= 0 && ND_TTEST(*ps)) {
- const struct id_off *io, *ie;
- char c = '<';
-
-@@ -276,7 +276,7 @@
- ipaddr_string(ndo, &ps->page.p_sid),
- EXTRACT_32BITS(&ps->page.p_uid)));
- io = (struct id_off *)(ps + 1);
-- for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) {
-+ for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
- ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo,
&io->id),
- EXTRACT_32BITS(&io->off)));
- c = ',';
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-23 14:45:43 UTC (rev 237959)
+++ extra-x86_64/PKGBUILD 2015-04-23 14:45:53 UTC (rev 237960)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: dorphell <dorph...@archlinux.org>
-
-pkgname=tcpdump
-pkgver=4.7.3
-pkgrel=2
-pkgdesc="A tool for network monitoring and data acquisition"
-arch=('i686' 'x86_64')
-url="http://www.tcpdump.org";
-license=('BSD')
-depends=('libpcap' 'openssl')
-source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz";
- 'tcpdump_duplicate_executable.patch'
- 'CVE-2015-3138.patch')
-md5sums=('334a4761594b29f80793c1303f0f4acc'
- '01379e4a12a208ce951c6c2abe80300f'
- '4154b0811d56fb05c3839695923bf46c')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # do not install tcpdump-4.1.1 executable (FS#23346)
- patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
- # CVE-2015-3138
- patch -Np1 -i "${srcdir}/CVE-2015-3138.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --enable-ipv6
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- #install the license
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: tcpdump/repos/extra-x86_64/PKGBUILD (from rev 237959,
tcpdump/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-23 14:45:53 UTC (rev 237960)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: dorphell <dorph...@archlinux.org>
+
+pkgname=tcpdump
+pkgver=4.7.4
+pkgrel=1
+pkgdesc="A tool for network monitoring and data acquisition"
+arch=('i686' 'x86_64')
+url="http://www.tcpdump.org";
+license=('BSD')
+depends=('libpcap' 'openssl')
+source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz";
+ 'tcpdump_duplicate_executable.patch')
+md5sums=('58af728de36f499341918fc4b8e827c3'
+ '01379e4a12a208ce951c6c2abe80300f')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # do not install tcpdump-4.1.1 executable (FS#23346)
+ patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --enable-ipv6
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ #install the license
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/tcpdump_duplicate_executable.patch
===================================================================
--- extra-x86_64/tcpdump_duplicate_executable.patch 2015-04-23 14:45:43 UTC
(rev 237959)
+++ extra-x86_64/tcpdump_duplicate_executable.patch 2015-04-23 14:45:53 UTC
(rev 237960)
@@ -1,10 +0,0 @@
---- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100
-+++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200
-@@ -326,7 +326,6 @@
- [ -d $(DESTDIR)$(sbindir) ] || \
- (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
-- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat
${srcdir}/VERSION`
- [ -d $(DESTDIR)$(mandir)/man1 ] || \
- (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755
$(DESTDIR)$(mandir)/man1)
- $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
Copied: tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch (from rev
237959, tcpdump/trunk/tcpdump_duplicate_executable.patch)
===================================================================
--- extra-x86_64/tcpdump_duplicate_executable.patch
(rev 0)
+++ extra-x86_64/tcpdump_duplicate_executable.patch 2015-04-23 14:45:53 UTC
(rev 237960)
@@ -0,0 +1,10 @@
+--- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100
++++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200
+@@ -326,7 +326,6 @@
+ [ -d $(DESTDIR)$(sbindir) ] || \
+ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat
${srcdir}/VERSION`
+ [ -d $(DESTDIR)$(mandir)/man1 ] || \
+ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755
$(DESTDIR)$(mandir)/man1)
+ $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
