From 12f89213e7590313222115a5a818ed6954b83fa8 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 29 Oct 2010 13:53:35 +0000 Subject: [PATCH] update to 1.4.99.13, looks okay to phessler@ --- net/libbgpdump/Makefile | 18 +++---- net/libbgpdump/distinfo | 10 ++-- net/libbgpdump/patches/patch-Makefile_in | 27 ----------- net/libbgpdump/patches/patch-bgpdump_lib_c | 12 ++--- net/libbgpdump/patches/patch-cfile_tools_c | 56 +++++++++------------- net/libbgpdump/patches/patch-configure | 16 +++---- net/libbgpdump/pkg/PLIST | 5 +- 7 files changed, 52 insertions(+), 92 deletions(-) delete mode 100644 net/libbgpdump/patches/patch-Makefile_in diff --git a/net/libbgpdump/Makefile b/net/libbgpdump/Makefile index af29f5c2a7a..ed7a81bc7b3 100644 --- a/net/libbgpdump/Makefile +++ b/net/libbgpdump/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2010/09/08 14:08:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2010/10/29 13:53:35 sthen Exp $ COMMENT= library to analyze MRT-format BGP dump files -DISTNAME= libbgpdump-1.4.99.11 -REVISION= 1 +DISTNAME= libbgpdump-1.4.99.13 +EXTRACT_SUFX= .tgz SHARED_LIBS= bgpdump 0.0 @@ -15,8 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= without fee PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= http://www.ris.ripe.net/source/ \ - http://www.ris.ripe.net/source/OLD/ +MASTER_SITES= http://www.ris.ripe.net/source/bgpdump/ WANTLIB= bz2 c z LIB_DEPENDS= ::archivers/bzip2 @@ -28,14 +27,17 @@ MAKE_FLAGS+= LIBbgpdump_VERSION=${LIBbgpdump_VERSION} NO_REGRESS= Yes +pre-configure: + perl -pi -e s,libbgpdump\.so,libbgpdump.so.${LIBbgpdump_VERSION},g \ + ${WRKSRC}/Makefile.in + do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/bgpdump ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKBUILD}/testbgpdump ${PREFIX}/bin ${INSTALL_DATA} ${WRKBUILD}/libbgpdump.* ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/bgpdump*.h ${PREFIX}/include .include .if ${NO_SHARED_LIBS:MYes} -ALL_TARGET=libbgpdump.a testbgpdump bgpdump +ALL_TARGET=libbgpdump.a bgpdump .endif diff --git a/net/libbgpdump/distinfo b/net/libbgpdump/distinfo index ec81a3107e5..3cba721a75e 100644 --- a/net/libbgpdump/distinfo +++ b/net/libbgpdump/distinfo @@ -1,5 +1,5 @@ -MD5 (libbgpdump-1.4.99.11.tar.gz) = bdFBowDArkW4VTm6TdK5wQ== -RMD160 (libbgpdump-1.4.99.11.tar.gz) = VI9gO84lJf+k8G2OvdVYBTDNwGI= -SHA1 (libbgpdump-1.4.99.11.tar.gz) = ist/2dDG+GyK52BgP/uwxkilzwo= -SHA256 (libbgpdump-1.4.99.11.tar.gz) = 0yR5q5kVitStAyLQzIave4xTt12Aq+yhiWijmsVnZ4w= -SIZE (libbgpdump-1.4.99.11.tar.gz) = 82097 +MD5 (libbgpdump-1.4.99.13.tgz) = mJs2vHCKu16ZtqzrG7jAvQ== +RMD160 (libbgpdump-1.4.99.13.tgz) = csZbpSehjsLc9a+EW0dFeXdMpG4= +SHA1 (libbgpdump-1.4.99.13.tgz) = 7b3yExL4b6ANeXrLPnFkjANcmKM= +SHA256 (libbgpdump-1.4.99.13.tgz) = dVGihfpcCIWuxykOHzFuWJaLqrcKTzRn+PcIaNM4MR4= +SIZE (libbgpdump-1.4.99.13.tgz) = 84083 diff --git a/net/libbgpdump/patches/patch-Makefile_in b/net/libbgpdump/patches/patch-Makefile_in deleted file mode 100644 index b64a992532e..00000000000 --- a/net/libbgpdump/patches/patch-Makefile_in +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/08/17 19:48:36 sthen Exp $ ---- Makefile.in.orig Tue Aug 17 20:33:38 2010 -+++ Makefile.in Tue Aug 17 20:34:04 2010 -@@ -16,11 +16,11 @@ LIB_H = bgpdump.h bgpdump_attr.h bgpdump_formats.h bg - LIB_C = bgpdump_lib.c bgpdump_mstream.c cfile_tools.c - LIB_O = bgpdump_lib.o bgpdump_mstream.o cfile_tools.o - --all: libbgpdump.so libbgpdump.a testbgpdump bgpdump -+all: libbgpdump.so.${LIBbgpdump_VERSION} libbgpdump.a testbgpdump bgpdump - --libbgpdump.so: $(LIB_H) $(LIB_C) Makefile -+libbgpdump.so.${LIBbgpdump_VERSION}: $(LIB_H) $(LIB_C) Makefile - $(COMPILE) -fPIC -c $(LIB_C) -- $(COMPILE) $(LDFLAGS) -o libbgpdump.so $(LIB_O) $(SYS_LIBS) -+ $(COMPILE) $(LDFLAGS) -o libbgpdump.so.${LIBbgpdump_VERSION} $(LIB_O) $(SYS_LIBS) - - libbgpdump.a: $(LIB_H) $(LIB_C) $(LIB_O) Makefile - $(AR) r libbgpdump.a $(LIB_O) -@@ -33,7 +33,7 @@ bgpdump: bgpdump.c $(LIB_H) $(LIB_C) Makefile - $(COMPILE) -o bgpdump bgpdump.c libbgpdump.a $(SYS_LIBS) - - clean: -- rm -f libbgpdump.so libbgpdump.a testbgpdump bgpdump *.o -+ rm -f libbgpdump.so.${LIBbgpdump_VERSION} libbgpdump.a testbgpdump bgpdump *.o - - distclean: clean - rm -rf config.log config.status *.dSYM core *.core autom4te.cache bgpdump-config.h Makefile diff --git a/net/libbgpdump/patches/patch-bgpdump_lib_c b/net/libbgpdump/patches/patch-bgpdump_lib_c index 1ad27c2de7a..c60109e2eae 100644 --- a/net/libbgpdump/patches/patch-bgpdump_lib_c +++ b/net/libbgpdump/patches/patch-bgpdump_lib_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-bgpdump_lib_c,v 1.1 2010/08/22 11:48:50 phessler Exp $ ---- bgpdump_lib.c.orig Wed Aug 18 12:35:45 2010 -+++ bgpdump_lib.c Wed Aug 18 12:36:13 2010 -@@ -56,6 +56,7 @@ Original Author: Dan Ardelean (dan@ripe.net) +$OpenBSD: patch-bgpdump_lib_c,v 1.2 2010/10/29 13:53:35 sthen Exp $ +--- bgpdump_lib.c.orig Thu Sep 23 13:06:19 2010 ++++ bgpdump_lib.c Fri Oct 29 14:35:34 2010 +@@ -42,6 +42,7 @@ this license is included with libbgpdump. #include - void bgpdump_free_attr(struct attr *attr); -+void bgpdump_free_mp_info(struct mp_info *info); + void bgpdump_free_attr(attributes_t *attr); ++static void bgpdump_free_mp_info(struct mp_info *info); static int process_mrtd_table_dump(struct mstream *s,BGPDUMP_ENTRY *entry); static int process_mrtd_table_dump_v2(struct mstream *s,BGPDUMP_ENTRY *entry); static int process_mrtd_table_dump_v2_peer_index_table(struct mstream *s,BGPDUMP_ENTRY *entry); diff --git a/net/libbgpdump/patches/patch-cfile_tools_c b/net/libbgpdump/patches/patch-cfile_tools_c index 84b57381736..649b17e7cc9 100644 --- a/net/libbgpdump/patches/patch-cfile_tools_c +++ b/net/libbgpdump/patches/patch-cfile_tools_c @@ -1,37 +1,25 @@ -$OpenBSD: patch-cfile_tools_c,v 1.2 2010/09/08 14:08:10 sthen Exp $ +$OpenBSD: patch-cfile_tools_c,v 1.3 2010/10/29 13:53:35 sthen Exp $ Use after free ---- cfile_tools.c.orig Wed Nov 25 12:42:53 2009 -+++ cfile_tools.c Wed Sep 8 15:05:25 2010 -@@ -196,8 +196,8 @@ int cfr_close(CFRFILE *stream) { - case 1: // uncompressed - { - retval = fclose((FILE *)(stream->data1)); -- free(stream); - stream->error1 = retval; -+ free(stream); - return(retval); - } - break; -@@ -218,8 +218,8 @@ int cfr_close(CFRFILE *stream) { - return(-1); - } - retval = fclose((FILE *)(stream->data1)); -- free(stream); - stream->error1 = retval; -+ free(stream); - return(retval); - } - break; -@@ -229,9 +229,9 @@ int cfr_close(CFRFILE *stream) { - { - if(stream->data2!=NULL) { - retval=gzclose(stream->data2); -- free(stream); - } - stream->error2 = retval; -+ free(stream); - return(retval); - } - break; +--- cfile_tools.c.orig Wed Sep 22 13:39:02 2010 ++++ cfile_tools.c Fri Oct 29 14:30:49 2010 +@@ -466,16 +466,16 @@ char * cfr_strerror(CFRFILE *stream) { + "%s: %s", + msg, + _cfr_compressor_strerror(stream->format, stream->error2)); +- free(msg); + msg = msg2; ++ free(msg); + } + if (stream->format == 3) { + asprintf(&msg2, + "%s: %s", + msg, + gzerror((gzFile*)(stream->data2), &(stream->error2))); +- free(msg); + msg = msg2; ++ free(msg); + } + snprintf(res, 120, "%s", msg); + res[119] = 0; diff --git a/net/libbgpdump/patches/patch-configure b/net/libbgpdump/patches/patch-configure index 2106b0311a6..a6a86a6710a 100644 --- a/net/libbgpdump/patches/patch-configure +++ b/net/libbgpdump/patches/patch-configure @@ -1,15 +1,15 @@ -$OpenBSD: patch-configure,v 1.1 2010/08/22 11:49:55 phessler Exp $ +$OpenBSD: patch-configure,v 1.2 2010/10/29 13:53:35 sthen Exp $ Don't hardcode -O3 ---- configure.orig Wed Nov 25 13:42:53 2009 -+++ configure Wed Aug 18 12:21:15 2010 -@@ -1788,7 +1788,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- configure.orig Thu Oct 21 10:51:02 2010 ++++ configure Fri Oct 29 14:30:05 2010 +@@ -1688,7 +1688,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers bgpdump-config.h" --CFLAGS="$CFLAGS -Wall -Wcast-align -Wsystem-headers -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -O3" -+CFLAGS="$CFLAGS -Wall -Wcast-align -Wsystem-headers -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter " +-CFLAGS="$CFLAGS -g -O3 -Wall" ++CFLAGS="$CFLAGS -Wall" + CFLAGS="$CFLAGS -Wsystem-headers -Wno-format-y2k -Wno-sign-compare -Wcast-align" + CFLAGS="$CFLAGS -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wswitch -Wshadow" - # Checks for programs. - ac_ext=c diff --git a/net/libbgpdump/pkg/PLIST b/net/libbgpdump/pkg/PLIST index db85184ca57..f0bf032d48d 100644 --- a/net/libbgpdump/pkg/PLIST +++ b/net/libbgpdump/pkg/PLIST @@ -1,12 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.2 2010/09/08 14:08:10 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.3 2010/10/29 13:53:35 sthen Exp $ %%SHARED%% @bin bin/bgpdump -@bin bin/testbgpdump include/bgpdump-config.h -include/bgpdump.h include/bgpdump_attr.h include/bgpdump_formats.h include/bgpdump_lib.h include/bgpdump_mstream.h -include/cfile_tools.h lib/libbgpdump.a