From 9632d77679f9f67e66b66de02f61a2190bd4e6f3 Mon Sep 17 00:00:00 2001 From: mef Date: Tue, 2 Jul 2013 16:35:13 +0000 Subject: pkgsrc: Bump 0.7.2 to 0.7.5 Following line in Makefile removed. NOT_FOR_PLATFORM= DragonFly-*-* Following line in Makefile Added. BUILD_DEFS+= VARBASE All the patches (for trying to add DragonFly) are removed, now DragonFly is supported. ChangeLog of upstream: 0.7.5 [2013-06-22 13:57:31 +0200]: - [2169efb] tokenizer: input buffer was too small (Vincent Bernat) - [6712d3e] packaging: update packaging (Vincent Bernat) 0.7.4 [2013-06-22 12:15:47 +0200]: - [1381217] bpf: on OpenBSD, invert the filter direction (Vincent Bernat) - [96b97fa] NEWS: add an entry for the use of `setproctitle()` (Vincent Bernat) - [f0d2157] compat: declare `setproctitle()` as a printf function (Vincent Bernat) - [19ce813] debian: build-depends on libbssd-dev (Vincent Bernat) - [e7103af] lldpd: when no `setproctitle()` available, don't count neighbors (Vincent Bernat) - [480f1c6] lldpd: count number of chassis to get number of neighbors (Vincent Bernat) - [25eb187] lldpd: don't call `lldpd_count_neighbors()` too many times (Vincent Bernat) - [66879d4] build: use libbsd if available, also use `setproctitle()` (Vincent Bernat) - [3f70e11] lldpcli: `configure system platform` to override platform description (Vincent Bernat) - [decaec0] lldpcli: `configure system description` to override chassis description (Vincent Bernat) - [994b337] lldpcli: split `conf.c` into `conf-system.c` and `conf-lldp.c`. (Vincent Bernat) - [48d0a4b] lldpcli: `configure system interface pattern` instead of `configure lldp iface-pattern` (Vincent Bernat) - [a3e0896] libevent: use GitHub git tree (Vincent Bernat) - [c11e397] debian: sync packaging with official Debian package (Vincent Bernat) - [e39f079] libevent: switch to patches-2.0 branch to get the appropriate automake fix (Vincent Bernat) - [8677ddc] git: ignore test-driver, generated by recent automake versions (Vincent Bernat) - [bea0d76] Fixed some boundary conditions in code that cleans remote ports on ttl expiry. (Roopa Prabhu) - [5aeda65] liblldpctl: fix infinite loop when user is reading fixed chunks (Pradosh Mohapatra) - [d823429] marshal: fix alignment issue when unserializing (Vincent Bernat) - [bea7031] log: fix memory leak when using a log handler (Vincent Bernat) - [a8da186] marshal: don't declare serialize/unserialize helper for string (Vincent Bernat) - [02cf035] lldpd: fix an alignment (non-)issue (Vincent Bernat) - [bd8a886] lldpcli: don't use an hack to pass the writer to watch callback (Vincent Bernat) - [985a4cb] marshal: provide type-specific serialization/unserialization functions (Vincent Bernat) - [aba549a] client: fix a memory leak when changing lldpd configuration (Vincent Bernat) - [93afd29] ctl: fix a memory leak when cleaning control socket (Vincent Bernat) - [e681c85] client: trigger interface refresh when updating interface pattern (Vincent Bernat) - [e26a25c] lib: fix a memory leak when modifying interface pattern (Vincent Bernat) - [0093777] lldpcli: document "configure lldp iface-pattern" in manual page (Vincent Bernat) - [7e516f1] lldpctl.h: document possibility to write iface-pattern (Vincent Bernat) - [346a0f6] lldpcli: Add support to set iface-pattern (roopa) - [0728cb8] sonmp: allow SONMP unittests to work without a global config (Vincent Bernat) - [ea481e3] man: document tx-hold (Vincent Bernat) - [cb5f739] man: tx-interval cannot be set per port (Vincent Bernat) - [c10302a] lldpd: Add tx_hold (roopa) - [5920dbf] lldpcli: don't rely on `fgetln()` providing a NULL-terminated string (Vincent Bernat) - [655145c] lldpcli: don't free input line (Vincent Bernat) - [d1dc456] lib: keep space for new values in `lldpctl_key_t` (Vincent Bernat) - [40116b4] debian: synchronize packaging with Debian (Vincent Bernat) - [e91ca9d] release: prepare 0.7.3 (Vincent Bernat) 0.7.3 [2013-05-09 00:05:36 +0200]: - [a1728b7] NEWS: add a word about Solaris support (Vincent Bernat) - [b1a8985] solaris: less intrusive way to get CMSG_* macros (Vincent Bernat) - [815b799] solaris: assume that IP forwarding is disabled (Vincent Bernat) - [c3e340b] solaris: preliminary support (Vincent Bernat) - [d0787f4] NEWS: add an entry about LLDP-MED fast start. (Vincent Bernat) - [486a613] lldpcli: allow to enable/disable fast-start and set delay (Vincent Bernat) - [d6d42d5] lldpd: enable fast start by default (Vincent Bernat) - [be511d0] lldpd: make fast start work only when receiving LLDP-MED LLDPDU (Vincent Bernat) - [b9de0ca] lldpd: fast start support (roopa) - [7ba4a18] configure: use `AC_PROG_EGREP` to find a suitable `grep -E` (Vincent Bernat) - [ae5cae0] lib: use uint8_t instead of u_int8_t (Vincent Bernat) - [91e0280] configure: display configured OS (Vincent Bernat) - [885aa4f] lldpcli: complete the manual page with the syntax of "show statistics" (Vincent Bernat) - [d947819] lldpcli: summary of statistics is done on provided ports only (Vincent Bernat) - [048ed9d] lldpcli: fix two warnings introduced by the previous commit (Vincent Bernat) - [adcb76f] NEWS: add an entry for "show statistics summary" command (Vincent Bernat) - [5331eb2] lldpcli: global stats command (roopa) - [1b3eea3] os: add support for DragonFly BSD (Vincent Bernat) - [de461f1] netlink: fix IP address discovery (Vincent Bernat) - [3fc1a10] lldpcli: fix typo in the man page for setting altitude (Vincent Bernat) - [45a83f3] bsd: don't report a warning when no media information is present (Vincent Bernat) --- net/lldpd/Makefile | 7 ++- net/lldpd/distinfo | 16 ++----- net/lldpd/patches/patch-config.h.in | 16 ------- net/lldpd/patches/patch-configure | 51 ---------------------- net/lldpd/patches/patch-m4_os.m4 | 14 ------ net/lldpd/patches/patch-src_daemon_Makefile.am | 18 -------- net/lldpd/patches/patch-src_daemon_Makefile.in | 26 ----------- .../patches/patch-src_daemon_interfaces-bsd.c | 35 --------------- net/lldpd/patches/patch-src_daemon_lldpd.c | 23 ---------- net/lldpd/patches/patch-src_daemon_priv.c | 31 ------------- 10 files changed, 7 insertions(+), 230 deletions(-) delete mode 100644 net/lldpd/patches/patch-config.h.in delete mode 100644 net/lldpd/patches/patch-configure delete mode 100644 net/lldpd/patches/patch-m4_os.m4 delete mode 100644 net/lldpd/patches/patch-src_daemon_Makefile.am delete mode 100644 net/lldpd/patches/patch-src_daemon_Makefile.in delete mode 100644 net/lldpd/patches/patch-src_daemon_interfaces-bsd.c delete mode 100644 net/lldpd/patches/patch-src_daemon_lldpd.c delete mode 100644 net/lldpd/patches/patch-src_daemon_priv.c (limited to 'net') diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile index 45267917e98..b4f50933711 100644 --- a/net/lldpd/Makefile +++ b/net/lldpd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2013/05/09 05:42:53 mef Exp $ +# $NetBSD: Makefile,v 1.4 2013/07/02 16:35:13 mef Exp $ -DISTNAME= lldpd-0.7.2 +DISTNAME= lldpd-0.7.5 CATEGORIES= net MASTER_SITES= http://media.luffy.cx/files/lldpd/ @@ -12,14 +12,13 @@ LICENSE= isc # if available. To avoid this, use `--without-readline` as a configure # option. -NOT_FOR_PLATFORM= DragonFly-*-* - PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes USE_TOOLS+= pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-privsep-chroot=${PKG_HOME._lldpd} +BUILD_DEFS+= VARBASE RCD_SCRIPTS= lldpd PKG_GROUPS= _lldpd diff --git a/net/lldpd/distinfo b/net/lldpd/distinfo index 1f97a2c43c1..06ab4e7988e 100644 --- a/net/lldpd/distinfo +++ b/net/lldpd/distinfo @@ -1,13 +1,5 @@ -$NetBSD: distinfo,v 1.3 2013/05/09 06:55:56 mef Exp $ +$NetBSD: distinfo,v 1.4 2013/07/02 16:35:13 mef Exp $ -SHA1 (lldpd-0.7.2.tar.gz) = 2c2f9e41ec7accd78a48cd80361cebb3e24ce261 -RMD160 (lldpd-0.7.2.tar.gz) = ec018def05aed186b3e60cbfda67f9bc52750475 -Size (lldpd-0.7.2.tar.gz) = 1415698 bytes -SHA1 (patch-config.h.in) = 703dfd083d845b982baba58a7e5ac220fea14450 -SHA1 (patch-configure) = eda1e6a9df484a0b31e168b0ef69b9936afed613 -SHA1 (patch-m4_os.m4) = 57e8b6dd6b8d7882dcabe33c75e43c72855ff1a3 -SHA1 (patch-src_daemon_Makefile.am) = cda573199373a5ab1db5bce0345a8e195a85b122 -SHA1 (patch-src_daemon_Makefile.in) = 469546d6a9c429fc9712f4a7eb389ad7b0a76ac1 -SHA1 (patch-src_daemon_interfaces-bsd.c) = cc8c9882d6b2f3146cd3d01e68bf9037913eae3b -SHA1 (patch-src_daemon_lldpd.c) = 1cf700e4cd6849449734f1435bb94f125b98ec3b -SHA1 (patch-src_daemon_priv.c) = 25daafd24f6eceea02b201fbd2cf324f0ff21379 +SHA1 (lldpd-0.7.5.tar.gz) = a186228fbc41d474aefa6253aeb3e46d0cc73ce7 +RMD160 (lldpd-0.7.5.tar.gz) = b3d561143b5c8773de04a0b1509faa200c5595d9 +Size (lldpd-0.7.5.tar.gz) = 1445473 bytes diff --git a/net/lldpd/patches/patch-config.h.in b/net/lldpd/patches/patch-config.h.in deleted file mode 100644 index 462e99a0c96..00000000000 --- a/net/lldpd/patches/patch-config.h.in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-config.h.in,v 1.1 2013/05/09 05:42:53 mef Exp $ - -Add DragonFly support. This is generated by autoheader 2.69 - ---- config.h.in.orig 2013-05-09 13:46:10.955989000 +0900 -+++ config.h.in 2013-05-09 13:48:31.000000000 +0900 -@@ -126,6 +126,9 @@ - /* Define if libc defines __progname */ - #undef HAVE___PROGNAME - -+/* Host operating system is DragonFly */ -+#undef HOST_OS_DRAGONFLY -+ - /* Host operating system is FreeBSD */ - #undef HOST_OS_FREEBSD - diff --git a/net/lldpd/patches/patch-configure b/net/lldpd/patches/patch-configure deleted file mode 100644 index b2bec00e387..00000000000 --- a/net/lldpd/patches/patch-configure +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2013/05/09 05:42:53 mef Exp $ - -Add DragonFly support. This is generated by autoconf 2.69. - ---- configure.orig 2013-05-09 12:22:10.768547000 +0900 -+++ configure 2013-05-09 12:22:16.538636000 +0900 -@@ -668,6 +668,8 @@ PKG_CONFIG - LIBOBJS - HOST_OS_OSX_FALSE - HOST_OS_OSX_TRUE -+HOST_OS_DRAGONFLY_FALSE -+HOST_OS_DRAGONFLY_TRUE - HOST_OS_NETBSD_FALSE - HOST_OS_NETBSD_TRUE - HOST_OS_OPENBSD_FALSE -@@ -19472,6 +19474,24 @@ else - fi - - case $host_os in -+ dragonfly*) -+ os="DragonFly" -+ -+cat >>confdefs.h <<_ACEOF -+#define HOST_OS_DRAGONFLY 1 -+_ACEOF -+ -+ ;; -+ esac -+ if test x"$os" = x"DragonFly"; then -+ HOST_OS_DRAGONFLY_TRUE= -+ HOST_OS_DRAGONFLY_FALSE='#' -+else -+ HOST_OS_DRAGONFLY_TRUE='#' -+ HOST_OS_DRAGONFLY_FALSE= -+fi -+ -+ case $host_os in - darwin*) - os="Mac OS X" - -@@ -21821,6 +21841,10 @@ if test -z "${HOST_OS_NETBSD_TRUE}" && t - as_fn_error $? "conditional \"HOST_OS_NETBSD\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${HOST_OS_DRAGONFLY_TRUE}" && test -z "${HOST_OS_DRAGONFLY_FALSE}"; then -+ as_fn_error $? "conditional \"HOST_OS_DRAGONFLY\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${HOST_OS_OSX_TRUE}" && test -z "${HOST_OS_OSX_FALSE}"; then - as_fn_error $? "conditional \"HOST_OS_OSX\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/net/lldpd/patches/patch-m4_os.m4 b/net/lldpd/patches/patch-m4_os.m4 deleted file mode 100644 index 77450bfbaed..00000000000 --- a/net/lldpd/patches/patch-m4_os.m4 +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-m4_os.m4,v 1.1 2013/05/09 05:42:53 mef Exp $ - -Add DragonFly support. Run autoconf if changed. - ---- m4/os.m4.orig 2013-05-09 12:19:37.356190000 +0900 -+++ m4/os.m4 2013-05-09 12:20:17.026800000 +0900 -@@ -21,6 +21,7 @@ AC_DEFUN([lldp_CHECK_OS], [ - lldp_DEFINE_OS(freebsd*|kfreebsd*, FreeBSD, FREEBSD) - lldp_DEFINE_OS(openbsd*, OpenBSD, OPENBSD) - lldp_DEFINE_OS(netbsd*, NetBSD, NETBSD) -+ lldp_DEFINE_OS(dragonfly*, DragonFly, DRAGONFLY) - lldp_DEFINE_OS(darwin*, [Mac OS X], OSX) - - if test x"$os" = x; then diff --git a/net/lldpd/patches/patch-src_daemon_Makefile.am b/net/lldpd/patches/patch-src_daemon_Makefile.am deleted file mode 100644 index fe904cfaabd..00000000000 --- a/net/lldpd/patches/patch-src_daemon_Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_daemon_Makefile.am,v 1.1 2013/05/09 06:55:57 mef Exp $ - -Add DragonFly support. - ---- src/daemon/Makefile.am.orig 2013-04-13 17:18:24.000000000 +0900 -+++ src/daemon/Makefile.am 2013-05-09 14:47:09.802207000 +0900 -@@ -43,6 +43,11 @@ liblldpd_la_SOURCES += \ - interfaces-bsd.c \ - dmi-dummy.c - endif -+if HOST_OS_DRAGONFLY -+liblldpd_la_SOURCES += \ -+ interfaces-bsd.c \ -+ dmi-dummy.c -+endif - if HOST_OS_OSX - liblldpd_la_SOURCES += \ - interfaces-bsd.c \ diff --git a/net/lldpd/patches/patch-src_daemon_Makefile.in b/net/lldpd/patches/patch-src_daemon_Makefile.in deleted file mode 100644 index b263b12becd..00000000000 --- a/net/lldpd/patches/patch-src_daemon_Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_daemon_Makefile.in,v 1.1 2013/05/09 06:55:57 mef Exp $ - -Add DragonFly support. - ---- src/daemon/Makefile.in.orig 2013-04-20 10:06:23.000000000 +0900 -+++ src/daemon/Makefile.in 2013-05-09 14:53:36.188143000 +0900 -@@ -70,6 +70,10 @@ sbin_PROGRAMS = lldpd$(EXEEXT) - @HOST_OS_NETBSD_TRUE@ interfaces-bsd.c \ - @HOST_OS_NETBSD_TRUE@ dmi-dummy.c - -+@HOST_OS_DRAGONFLY_TRUE@am__append_4 = \ -+@HOST_OS_DRAGONFLY_TRUE@ interfaces-bsd.c \ -+@HOST_OS_DRAGONFLY_TRUE@ dmi-dummy.c -+ - @HOST_OS_OSX_TRUE@am__append_5 = \ - @HOST_OS_OSX_TRUE@ interfaces-bsd.c \ - @HOST_OS_OSX_TRUE@ dmi-osx.c -@@ -121,6 +125,8 @@ am__liblldpd_la_SOURCES_DIST = frame.h f - @HOST_OS_OPENBSD_TRUE@ liblldpd_la-dmi-openbsd.lo - @HOST_OS_NETBSD_TRUE@am__objects_4 = liblldpd_la-interfaces-bsd.lo \ - @HOST_OS_NETBSD_TRUE@ liblldpd_la-dmi-dummy.lo -+@HOST_OS_DRAGONFLY_TRUE@am__objects_4 = liblldpd_la-interfaces-bsd.lo \ -+@HOST_OS_DRAGONFLY_TRUE@ liblldpd_la-dmi-dummy.lo - @HOST_OS_OSX_TRUE@am__objects_5 = liblldpd_la-interfaces-bsd.lo \ - @HOST_OS_OSX_TRUE@ liblldpd_la-dmi-osx.lo - @USE_SNMP_TRUE@am__objects_6 = liblldpd_la-agent.lo \ diff --git a/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c b/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c deleted file mode 100644 index ce83b645869..00000000000 --- a/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-src_daemon_interfaces-bsd.c,v 1.1 2013/05/09 06:55:57 mef Exp $ - -Add DragonFly support -(net/agr/if_agrioctl.h is missing, to be added). - ---- src/daemon/interfaces-bsd.c~ 2013-04-13 17:18:24.000000000 +0900 -+++ src/daemon/interfaces-bsd.c 2013-05-09 15:08:27.911845000 +0900 -@@ -39,6 +39,9 @@ - # include - # include - # include -+#elif defined HOST_OS_DRAGONFLY -+# include -+# include - #elif defined HOST_OS_OSX - # include - # include -@@ -74,7 +77,7 @@ - .ifbic_req = req - }; - --#if defined HOST_OS_FREEBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX -+#if defined HOST_OS_FREEBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX || defined HOST_OS_DRAGONFLY - struct ifdrv ifd = { - .ifd_cmd = BRDGGIFS, - .ifd_len = sizeof(bifc), -@@ -163,7 +166,7 @@ - slave->upper = master; - } - master->type |= IFACE_BOND_T; --#elif defined HOST_OS_NETBSD -+#elif defined HOST_OS_NETBSD || defined HOST_OS_DRAGONFLY - /* No max, we consider a maximum of 24 ports */ - char buf[sizeof(struct agrportinfo)*24] = {}; - size_t buflen = sizeof(buf); diff --git a/net/lldpd/patches/patch-src_daemon_lldpd.c b/net/lldpd/patches/patch-src_daemon_lldpd.c deleted file mode 100644 index 8782e341b06..00000000000 --- a/net/lldpd/patches/patch-src_daemon_lldpd.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_daemon_lldpd.c,v 1.1 2013/05/09 05:42:53 mef Exp $ - -Add DragonFly support. - ---- src/daemon/lldpd.c~ 2013-04-13 17:21:43.000000000 +0900 -+++ src/daemon/lldpd.c 2013-05-09 13:53:17.252539000 +0900 -@@ -40,6 +40,7 @@ - #if defined HOST_OS_FREEBSD || \ - defined HOST_OS_OPENBSD || \ - defined HOST_OS_NETBSD || \ -+ defined HOST_OS_DRAGONFLY || \ - defined HOST_OS_OSX - # include - # include -@@ -873,7 +874,7 @@ lldpd_forwarding_enabled(void) - rc = 1; - close(f); - } --#elif defined HOST_OS_FREEBSD || defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX -+#elif defined HOST_OS_FREEBSD || defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX || defined HOST_OS_DRAGONFLY - int n, mib[4] = { - CTL_NET, - PF_INET, diff --git a/net/lldpd/patches/patch-src_daemon_priv.c b/net/lldpd/patches/patch-src_daemon_priv.c deleted file mode 100644 index 7dc14848737..00000000000 --- a/net/lldpd/patches/patch-src_daemon_priv.c +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_daemon_priv.c,v 1.1 2013/05/09 05:42:53 mef Exp $ - -Add DragonFly support. - ---- src/daemon/priv.c.orig 2013-05-09 12:26:14.352290000 +0900 -+++ src/daemon/priv.c 2013-05-09 12:27:54.003821000 +0900 -@@ -42,6 +42,7 @@ - #endif - #if defined HOST_OS_FREEBSD || \ - HOST_OS_NETBSD || \ -+ HOST_OS_DRAGONFLY || \ - HOST_OS_OPENBSD || \ - HOST_OS_OSX - # include -@@ -406,6 +407,7 @@ asroot_iface_init() - #elif defined HOST_OS_FREEBSD || \ - defined HOST_OS_OPENBSD || \ - defined HOST_OS_NETBSD || \ -+ defined HOST_OS_DRAGONFLY || \ - defined HOST_OS_OSX - int n = 0; - int enable, required; -@@ -538,7 +540,7 @@ asroot_iface_multicast() - dlp->sdl_alen = ETHER_ADDR_LEN; - dlp->sdl_slen = 0; - must_read(remote, LLADDR(dlp), ETHER_ADDR_LEN); --#elif defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD -+#elif defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD || defined HOST_OS_DRAGONFLY - struct sockaddr *sap = (struct sockaddr *)&ifr.ifr_addr; - sap->sa_len = sizeof(struct sockaddr); - sap->sa_family = AF_UNSPEC; -- cgit v1.2.3