Date: Wed, 15 May 2019 16:21:20 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501736 - in head/www/ufdbguard: . files Message-ID: <201905151621.x4FGLK9s003364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Wed May 15 16:21:19 2019 New Revision: 501736 URL: https://svnweb.freebsd.org/changeset/ports/501736 Log: www/ufdbguard: upgrade 1.34.1 -> 1.34.3 PR: 236222 Requested by: ncrogers@gmail.com Submitted by: timp87@gmail.com (maintainer) Relnotes: https://www.urlfilterdb.com/products/releases.html Added: head/www/ufdbguard/files/patch-src_mtserver_Makefile.in (contents, props changed) Deleted: head/www/ufdbguard/files/patch-src_ufdbchkport.c Modified: head/www/ufdbguard/Makefile head/www/ufdbguard/distinfo head/www/ufdbguard/files/patch-src_Makefile.in head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Modified: head/www/ufdbguard/Makefile ============================================================================== --- head/www/ufdbguard/Makefile Wed May 15 16:15:28 2019 (r501735) +++ head/www/ufdbguard/Makefile Wed May 15 16:21:19 2019 (r501736) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ufdbGuard -PORTVERSION= 1.34.1 +PORTVERSION= 1.34.3 CATEGORIES= www MASTER_SITES= SF/${PORTNAME:tl}/1.34 @@ -51,7 +51,7 @@ CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \ --with-ufdb-samplesdir=${EXAMPLESDIR} \ --with-ufdb-config=${ETCDIR} \ --with-ufdb-dbhome=${DBDIR} \ - --with-ufdb-images_dir=${EXAMPLESDIR}/images + --with-ufdb-imagesdir=${EXAMPLESDIR}/images MAKE_JOBS_UNSAFE= yes Modified: head/www/ufdbguard/distinfo ============================================================================== --- head/www/ufdbguard/distinfo Wed May 15 16:15:28 2019 (r501735) +++ head/www/ufdbguard/distinfo Wed May 15 16:21:19 2019 (r501736) @@ -1,3 +1,3 @@ TIMESTAMP = 1524648364 -SHA256 (ufdbGuard-1.34.1.tar.gz) = 14718ae4e809d0210db3bcd5f3ca3885362c4d0ad61ecedb602ce541caedeea7 -SIZE (ufdbGuard-1.34.1.tar.gz) = 1390870 +SHA256 (ufdbGuard-1.34.3.tar.gz) = d936793a9f876adf227ca7c53156250231acbe74faa659eafc4cf241c8fb967b +SIZE (ufdbGuard-1.34.3.tar.gz) = 1473818 Modified: head/www/ufdbguard/files/patch-src_Makefile.in ============================================================================== --- head/www/ufdbguard/files/patch-src_Makefile.in Wed May 15 16:15:28 2019 (r501735) +++ head/www/ufdbguard/files/patch-src_Makefile.in Wed May 15 16:21:19 2019 (r501736) @@ -22,20 +22,3 @@ install.debug:: -if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi -@@ -281,12 +281,12 @@ uninstall.bin:: - - install.mt:: - cd mtserver ; $(MAKE) -- $(INSTALL_PROGRAM) mtserver/ufdbguardd $(DESTDIR)$(bindir)/ufdbguardd -- $(INSTALL_PROGRAM) mtserver/ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient -- $(INSTALL_PROGRAM) mtserver/ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack -+ $(INSTALL_PROGRAM) ufdbguardd $(DESTDIR)$(bindir)/ufdbguardd -+ $(INSTALL_PROGRAM) ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient -+ $(INSTALL_PROGRAM) ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack - -@echo "ignore the next error from chown when building a package as non-root user" - -$(RM) $(DESTDIR)$(bindir)/ufdbsignal ; \ -- $(INSTALL_PROGRAM) mtserver/ufdbsignal $(DESTDIR)$(bindir)/ufdbsignal ; \ -+ $(INSTALL_PROGRAM) ufdbsignal $(DESTDIR)$(bindir)/ufdbsignal ; \ - chown root $(DESTDIR)$(bindir)/ufdbsignal ; \ - chmod +s $(DESTDIR)$(bindir)/ufdbsignal - Modified: head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in ============================================================================== --- head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Wed May 15 16:15:28 2019 (r501735) +++ head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Wed May 15 16:21:19 2019 (r501736) @@ -1,9 +1,13 @@ ---- src/install_etcfiles.sh.in.orig 2017-02-27 13:27:26 UTC +--- src/install_etcfiles.sh.in.orig 2019-02-27 23:03:09 UTC +++ src/install_etcfiles.sh.in -@@ -25,15 +25,6 @@ then - DESTDIR=${RPM_BUILD_ROOT:-} +@@ -22,19 +22,6 @@ else + DESTDIR="" fi +-# the installer must be root to install files under /etc and we check for this +-# but the exception is rpmbuild. When a package is made using rpmbuild, +-# it is comon practise to _NOT_ run the install as root. +-ID=`id -un` -if [ "$ID" != root -a $PKGNAME != ufdbGuard ] -then - echo @@ -13,12 +17,12 @@ - exit 1 -fi - - CFGDIR="$1" - if [ ! -d "$CFGDIR" ] - then -@@ -373,12 +364,10 @@ fix_piddir_permissions () { + OS="@ufdb_os_type@" + INITDIR="@ufdb_initdir@" +@@ -281,12 +268,10 @@ fix_piddir_permissions () { + case $OS in - freebsd) install_freebsd ;; openbsd) install_openbsd ;; @@ -29,20 +33,3 @@ esac -@@ -395,16 +384,3 @@ fi - # TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************ - - fix_piddir_permissions -- --# the addition of the ufdbguardd service to /etc/services is deiabled since --# ufdbguardd uses by default a named socket. --# SERVICE=`grep -E -e ufdbguardd $DESTDIR/etc/services` --# if [ "$SERVICE" = "" ] --# then --# ( --# echo "" --# echo "# for URLfilterDB daemon : " --# echo "ufdbguardd 3977/tcp" --# ) >> $DESTDIR/etc/services --# fi -- Added: head/www/ufdbguard/files/patch-src_mtserver_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/ufdbguard/files/patch-src_mtserver_Makefile.in Wed May 15 16:21:19 2019 (r501736) @@ -0,0 +1,11 @@ +--- src/mtserver/Makefile.in.orig 2019-05-13 08:40:47 UTC ++++ src/mtserver/Makefile.in +@@ -13,7 +13,7 @@ + + CC = @CC@ + CXX = @CXX@ +-CFLAGS = @CFLAGS@ -I. -I.. ++CFLAGS = @CFLAGS@ -D__BSD_VISIBLE=1 -I. -I.. + CXXFLAGS= @CXXFLAGS@ -I. -I.. + CPPFLAGS= @CPPFLAGS@ + LDFLAGS = @LDFLAGS@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905151621.x4FGLK9s003364>