Date: Wed, 27 Feb 2013 11:14:30 +0900 From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176462: [maintainer] mail/opendkim update to 2.8.0 Message-ID: <867glu8pvd.wl%umq@ueo.co.jp> Resent-Message-ID: <201302270220.r1R2K1cW039619@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176462 >Category: ports >Synopsis: [maintainer] mail/opendkim update to 2.8.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 27 02:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Hirohisa Yamaguchi >Release: FreeBSD 8.3-RELEASE-p3 amd64 >Organization: <organization of PR author (multiple lines)> >Environment: System: FreeBSD **** 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: The new version of mail/opendkim 2.8.0 is available. Release-announcement: http://lists.opendkim.org/archive/opendkim/announce/2013/02/0041.html >How-To-Repeat: N/A >Fix: The patch follows: Index: mail/opendkim/Makefile =================================================================== --- mail/opendkim/Makefile (revision 312948) +++ mail/opendkim/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= opendkim -PORTVERSION= 2.7.4 -PORTREVISION= 1 +PORTVERSION= 2.8.0 CATEGORIES= mail security MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} \ @@ -155,6 +154,17 @@ PLIST_SUB+= LUA="@comment " .endif +pre-configure: + ${REINPLACE_CMD} -e '/PKG_CONFIG/s/lua5/lua-5/' \ + ${WRKSRC}/configure + +post-patch: +.if ${PORT_OPTIONS:MLCOV} + ${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/ + ${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/opendkim/tests/ + ${FIND} ${WRKSRC} -type f -name \*-helper.sh -exec ${CHMOD} 755 {} + +.endif + post-install: .if ! ${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER} @${STRIP_CMD} ${PREFIX}/sbin/opendkim Index: mail/opendkim/distinfo =================================================================== --- mail/opendkim/distinfo (revision 312948) +++ mail/opendkim/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.7.4.tar.gz) = fa66f7ca52dd3fa94cd869e8fe9e8f849ab83d6a32a8d4ed3cf18b06b4584e76 -SIZE (opendkim-2.7.4.tar.gz) = 1158496 +SHA256 (opendkim-2.8.0.tar.gz) = a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c +SIZE (opendkim-2.8.0.tar.gz) = 1175377 Index: mail/opendkim/files/patch-opendkim__tests__Makefile.in =================================================================== --- mail/opendkim/files/patch-opendkim__tests__Makefile.in (revision 0) +++ mail/opendkim/files/patch-opendkim__tests__Makefile.in (working copy) @@ -0,0 +1,36 @@ +--- ./opendkim/tests/Makefile.in.orig 2013-02-26 06:06:06.000000000 +0900 ++++ ./opendkim/tests/Makefile.in 2013-02-26 19:58:50.000000000 +0900 +@@ -98,8 +98,10 @@ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' + am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' + am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ +@@ -778,14 +780,16 @@ + @LCOV_TRUE@description.txt: $(check_SCRIPTS) + @LCOV_TRUE@ rm -f $@ + @LCOV_TRUE@ for test in $? ; do \ +-@LCOV_TRUE@ testname=$${test/t-}; \ +-@LCOV_TRUE@ testname=$${testname//-/_}; \ ++@LCOV_TRUE@ testname=$${test#t-}; \ ++@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \ + @LCOV_TRUE@ grep ^# $$test | tail -n 1 | \ +-@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\n\t\1\n/g" >> $@; \ ++@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\ ++@LCOV_TRUE@ \1\ ++@LCOV_TRUE@/g" >> $@; \ + @LCOV_TRUE@ done + + @LCOV_TRUE@description.html: description.txt +-@LCOV_TRUE@ gendesc --output $@ $< ++@LCOV_TRUE@ gendesc --output $@ $? + + @LCOV_TRUE@maintainer-clean-local: + @LCOV_TRUE@ -rm -rf lcov/[^C]* Index: mail/opendkim/files/lcov-helper.sh =================================================================== --- mail/opendkim/files/lcov-helper.sh (revision 0) +++ mail/opendkim/files/lcov-helper.sh (working copy) @@ -0,0 +1,9 @@ +#! /bin/sh +$1 +x=$? +# keep consistant with Makefile.am +testname=${1#./t-} +testname=$(echo ${testname} | sed -e 's/-/_/g') +lcov --capture --directory .. --output-file $1.info --test-name ${testname} --quiet +lcov --remove $1.info '/usr/include/*' --output-file $1.info --quiet & +exit $x Index: mail/opendkim/files/patch-libopendkim__tests__Makefile.in =================================================================== --- mail/opendkim/files/patch-libopendkim__tests__Makefile.in (revision 0) +++ mail/opendkim/files/patch-libopendkim__tests__Makefile.in (working copy) @@ -0,0 +1,77 @@ +--- ./libopendkim/tests/Makefile.in.orig 2013-02-26 06:06:04.000000000 +0900 ++++ ./libopendkim/tests/Makefile.in 2013-02-26 19:58:50.000000000 +0900 +@@ -106,7 +106,7 @@ + t-test149$(EXEEXT) t-test150$(EXEEXT) t-test151$(EXEEXT) \ + t-test152$(EXEEXT) t-test153$(EXEEXT) t-signperf$(EXEEXT) \ + t-verifyperf$(EXEEXT) $(am__EXEEXT_1) t-cleanup$(EXEEXT) +-@ALL_SYMBOLS_TRUE@am__append_6 = t-test49 t-test113 t-test118 ++@ALL_SYMBOLS_TRUE@am__append_6 = t-test113 t-test118 + @GCOV_ONLY_TRUE@am__append_7 = *.gcov *.gcno *.gcda *.bb *.bbg *.da .gcov-files + @LCOV_TRUE@am__append_8 = *.info .prepare-lcov .info-files *.gcno *.gcda + @GPROF_TRUE@am__append_9 = *.prof gmon.out *.gmon +@@ -124,7 +124,7 @@ + CONFIG_HEADER = $(top_builddir)/build-config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +-@ALL_SYMBOLS_TRUE@am__EXEEXT_1 = t-test49$(EXEEXT) t-test113$(EXEEXT) \ ++@ALL_SYMBOLS_TRUE@am__EXEEXT_1 = t-test113$(EXEEXT) \ + @ALL_SYMBOLS_TRUE@ t-test118$(EXEEXT) + am_t_cleanup_OBJECTS = t-cleanup.$(OBJEXT) + t_cleanup_OBJECTS = $(am_t_cleanup_OBJECTS) +@@ -952,7 +952,7 @@ + $(t_test39_SOURCES) $(t_test40_SOURCES) $(t_test41_SOURCES) \ + $(t_test42_SOURCES) $(t_test43_SOURCES) $(t_test44_SOURCES) \ + $(t_test45_SOURCES) $(t_test46_SOURCES) $(t_test47_SOURCES) \ +- $(t_test48_SOURCES) $(t_test49_SOURCES) $(t_test50_SOURCES) \ ++ $(t_test48_SOURCES) $(t_test50_SOURCES) \ + $(t_test51_SOURCES) $(t_test52_SOURCES) $(t_test53_SOURCES) \ + $(t_test54_SOURCES) $(t_test55_SOURCES) $(t_test56_SOURCES) \ + $(t_test57_SOURCES) $(t_test58_SOURCES) $(t_test59_SOURCES) \ +@@ -1006,7 +1006,7 @@ + $(t_test39_SOURCES) $(t_test40_SOURCES) $(t_test41_SOURCES) \ + $(t_test42_SOURCES) $(t_test43_SOURCES) $(t_test44_SOURCES) \ + $(t_test45_SOURCES) $(t_test46_SOURCES) $(t_test47_SOURCES) \ +- $(t_test48_SOURCES) $(t_test49_SOURCES) $(t_test50_SOURCES) \ ++ $(t_test48_SOURCES) $(t_test50_SOURCES) \ + $(t_test51_SOURCES) $(t_test52_SOURCES) $(t_test53_SOURCES) \ + $(t_test54_SOURCES) $(t_test55_SOURCES) $(t_test56_SOURCES) \ + $(t_test57_SOURCES) $(t_test58_SOURCES) $(t_test59_SOURCES) \ +@@ -1049,8 +1049,10 @@ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' + am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' + am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ +@@ -2782,16 +2784,19 @@ + @LCOV_TRUE@description.txt: $(check_PROGRAMS) $(check_SCRIPTS) + @LCOV_TRUE@ rm -f $@ + @LCOV_TRUE@ for i in $(check_PROGRAMS); do \ +-@LCOV_TRUE@ testname=$${i/t-}; \ +-@LCOV_TRUE@ testname=$${testname//-/_}; \ ++@LCOV_TRUE@ testname=$${i#t-}; \ ++@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \ + @LCOV_TRUE@ fgrep '***' $$i.c | tail -n 1 | \ +-@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\n.*/\t\1\n/g' ) >> $@; \ ++@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\ ++@LCOV_TRUE@.*/ \1\ ++@LCOV_TRUE@/g' ) >> $@; \ + @LCOV_TRUE@ done + @LCOV_TRUE@ for i in $(check_SCRIPTS); do \ +-@LCOV_TRUE@ testname=$${i/t-}; \ +-@LCOV_TRUE@ testname=$${testname//-/_}; \ ++@LCOV_TRUE@ testname=$${i#t-}; \ ++@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \ + @LCOV_TRUE@ grep '^#' $$i | tail -n 1 | \ +-@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/\t\1\n/g' ) >> $@; \ ++@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/ \1\ ++@LCOV_TRUE@/g' ) >> $@; \ + @LCOV_TRUE@ done + + @LCOV_TRUE@description.html: description.txt Index: mail/opendkim/Makefile.options =================================================================== --- mail/opendkim/Makefile.options (revision 312948) +++ mail/opendkim/Makefile.options (working copy) @@ -11,7 +11,7 @@ OPTIONS_GROUP+= FFR OPTIONS_GROUP_FFR= ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \ DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \ - DKIM_REPUTATION ERLANG IDENTITY_HEADER \ + DKIM_REPUTATION ERLANG IDENTITY_HEADER LCOV \ LDAP_CACHING POSTGRES_RECONNECT_HACK \ RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \ REPUTATION RESIGN SENDER_MACRO SOCKETDB \ @@ -27,6 +27,7 @@ DKIM_REPUTATION_DESC= DKIM reputation check (experimental) ERLANG_DESC= Support for Erlang datasets IDENTITY_HEADER_DESC= Special header to set identity +LCOV_DESC= Profiling with LCOV LDAP_CACHING_DESC= LDAP query piggybacking and caching POSTGRES_RECONNECT_HACK_DESC= PostgreSQL connection error detection bug hack RATE_LIMIT_DESC= DKIM based rate limiting support Index: mail/opendkim/Makefile.features =================================================================== --- mail/opendkim/Makefile.features (revision 312948) +++ mail/opendkim/Makefile.features (working copy) @@ -60,6 +60,15 @@ CONFIGURE_ARGS+= --enable-identity_header .endif +.if ${PORT_OPTIONS:MLCOV} +BROKEN= Does not install +BUILD_DEPENDS+= lcov:${PORTSDIR}/devel/lcov \ + ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD +CONFIGURE_ARGS+= --with-lcov +.else +CONFIGURE_ARGS+= --without-lcov +.endif + .if ${PORT_OPTIONS:MLDAP_CACHING} WITH_OPENLDAP= yes CONFIGURE_ARGS+= --enable-ldap_caching @@ -94,7 +103,7 @@ CONFIGURE_ARGS+= --enable-reprrd MAN8+= opendkim-reprrdimport.8 PLIST_SUB+= REPRRD="" -BUILD_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool +BUILD_DEPENDS+= rrdtool>=0:${PORTSDIR}/databases/rrdtool .else CONFIGURE_ARGS+= --disable-reprrd PLIST_SUB+= REPRRD="@comment " Index: mail/opendkim/pkg-plist =================================================================== --- mail/opendkim/pkg-plist (revision 312948) +++ mail/opendkim/pkg-plist (working copy) @@ -18,7 +18,7 @@ lib/libopendkim.a lib/libopendkim.la lib/libopendkim.so -lib/libopendkim.so.8 +lib/libopendkim.so.9 %%RBL%%lib/librbl.a %%RBL%%lib/librbl.la %%RBL%%lib/librbl.so >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?867glu8pvd.wl%umq>