Index: head/www/ufdbguard/Makefile =================================================================== --- head/www/ufdbguard/Makefile (revision 501735) +++ head/www/ufdbguard/Makefile (revision 501736) @@ -1,72 +1,72 @@ # Created by: Pavel Timofeev # $FreeBSD$ PORTNAME= ufdbGuard -PORTVERSION= 1.34.1 +PORTVERSION= 1.34.3 CATEGORIES= www MASTER_SITES= SF/${PORTNAME:tl}/1.34 MAINTAINER= timp87@gmail.com COMMENT= URL filter for the Squid web proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= perl5 shebangfix ssl SHEBANG_FILES= samples/URLblocked.cgi GNU_CONFIGURE= yes USE_RC_SUBR= ufdbguardd USERS= ufdb GROUPS= ${USERS} RUNDIR= /var/run/${PORTNAME} DBDIR= /var/db/${PORTNAME} LOGDIR= /var/log/${PORTNAME} PLIST_SUB= USERS=${USERS} \ GROUPS=${GROUPS} \ RUNDIR=${RUNDIR} \ DBDIR=${DBDIR} \ LOGDIR=${LOGDIR} SUB_LIST= PORTNAME=${PORTNAME} \ USERS=${USERS} \ RUNDIR=${RUNDIR} \ DBDIR=${DBDIR} SUB_FILES= pkg-message CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \ --with-ssl-lib=${OPENSSLLIB} \ --with-ssl-inc=${OPENSSLINC} \ --with-bz2=/usr \ --with-bz2-lib=/usr/lib \ --with-bz2-inc=/usr/include \ --with-ufdb-user=root \ --with-ufdb-mandir=${MANPREFIX}/man \ --with-ufdb-logdir=${LOGDIR} \ --with-ufdb-piddir=${RUNDIR} \ --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 OPTIONS_DEFINE= UNIXSOCKETS EXAMPLES UNIXSOCKETS_CONFIGURE_WITH= unix-sockets UNIXSOCKETS_DESC= Unix sockets support post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \ ${STAGEDIR}${PREFIX}/bin/ufdbgclient \ ${STAGEDIR}${PREFIX}/bin/ufdbsignal \ ${STAGEDIR}${PREFIX}/bin/ufdbGenTable \ ${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \ ${STAGEDIR}${PREFIX}/bin/ufdbhttpd .include Index: head/www/ufdbguard/distinfo =================================================================== --- head/www/ufdbguard/distinfo (revision 501735) +++ head/www/ufdbguard/distinfo (revision 501736) @@ -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 Index: head/www/ufdbguard/files/patch-src_ufdbchkport.c =================================================================== --- head/www/ufdbguard/files/patch-src_ufdbchkport.c (revision 501735) +++ head/www/ufdbguard/files/patch-src_ufdbchkport.c (nonexistent) @@ -1,56 +0,0 @@ ---- src/ufdbchkport.c.orig 2019-02-08 07:02:37 UTC -+++ src/ufdbchkport.c -@@ -84,7 +84,7 @@ static volatile int tls_inited = 0; - static pthread_mutex_t init_mutex = UFDB_STATIC_MUTEX_INIT; - static SSL_CTX * ssl_ctx = NULL; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER - static int num_static_ssl_locks = 0; - static pthread_mutex_t * crypto_mutexes = NULL; - #endif -@@ -895,7 +895,7 @@ void UFDBsetTunnelCheckMethod( int method ) - } - - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER - static void ufdb_pthread_locking_callback( - int mode, - int type, -@@ -945,7 +945,7 @@ static void ufdb_pthread_locking_callback( - #endif - - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER - static unsigned long ufdb_pthread_id_callback( void ) - { - unsigned long id = (unsigned long) pthread_self(); -@@ -955,7 +955,7 @@ static unsigned long ufdb_pthread_id_callback( void ) - #endif - - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER - - typedef struct CRYPTO_dynlock_value { - pthread_mutex_t lock; -@@ -1245,7 +1245,7 @@ int UFDBinitHTTPSchecker( void ) - ENGINE_load_builtin_engines(); - CONF_modules_load( NULL, NULL, 0 ); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER - { - int i; - CRYPTO_set_id_callback( ufdb_pthread_id_callback ); -@@ -2444,7 +2444,7 @@ GCC_NO_INLINE int UFDBopenssl_connect( - saved_errno = errno; - state = SSL_get_state( *ssl ); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER - if (ret > 0 && state == SSL_ST_OK) - #else - if (ret > 0 && state == TLS_ST_OK) Property changes on: head/www/ufdbguard/files/patch-src_ufdbchkport.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/ufdbguard/files/patch-src_Makefile.in =================================================================== --- head/www/ufdbguard/files/patch-src_Makefile.in (revision 501735) +++ head/www/ufdbguard/files/patch-src_Makefile.in (revision 501736) @@ -1,41 +1,24 @@ --- src/Makefile.in.orig 2019-02-04 19:45:45 UTC +++ src/Makefile.in @@ -227,7 +227,7 @@ install.bin: ufdbGenTable ufdbAnalyse ufdbhttpd create $(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls $(INSTALL_PROGRAM) ufdb_top_users.pl $(DESTDIR)$(bindir)/ufdb_top_users @if [ -f ufdbpeek ] ; then $(INSTALL_PROGRAM) ufdbpeek $(DESTDIR)$(bindir)/ufdbpeek ; fi - @if [ -f $(DESTDIR)$(cfgdir)/ufdbGuard.conf ] ; then echo "$(DESTDIR)$(cfgdir)/ufdbGuard.conf already exists." ; else $(INSTALL_DATA) ufdbGuard.conf $(DESTDIR)$(cfgdir)/ufdbGuard.conf ; fi + @if [ -f $(DESTDIR)$(cfgdir)/ufdbGuard.conf ] ; then echo "$(DESTDIR)$(cfgdir)/ufdbGuard.conf already exists." ; else $(INSTALL_DATA) ufdbGuard.conf $(DESTDIR)$(cfgdir)/ufdbGuard.conf.sample ; fi install.pid:: if [ $(piddir) != /var/tmp ] ; then $(INSTALL) -d $(DESTDIR)$(piddir) ; fi @@ -239,10 +239,10 @@ install.update:: install.security:: echo "Installing SSL root certificates" - $(INSTALL_DATA) security/cacerts $(DESTDIR)$(dbhome)/security/cacerts + $(INSTALL_DATA) security/cacerts $(DESTDIR)$(dbhome)/security/cacerts.sample install.etc:: - sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir) $(DESTDIR)$(syscfgfile) + sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir) 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 - Index: head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in =================================================================== --- head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in (revision 501735) +++ head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in (revision 501736) @@ -1,48 +1,35 @@ ---- 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 - echo "*** You must be root but you appear to be $ID. ***" - echo "The ufdb startup script cannot be installed..." - echo - 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 ;; linux_systemd) install_linux_systemd ;; smoothwall) install_smoothwall ;; solaris_smf) install_solaris_smf ;; - *) install_unix ;; 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 -- Index: head/www/ufdbguard/files/patch-src_mtserver_Makefile.in =================================================================== --- head/www/ufdbguard/files/patch-src_mtserver_Makefile.in (nonexistent) +++ head/www/ufdbguard/files/patch-src_mtserver_Makefile.in (revision 501736) @@ -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@ Property changes on: head/www/ufdbguard/files/patch-src_mtserver_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property