From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 11 06:10:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EA8616A41B for ; Sun, 11 Jun 2006 06:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9278F43D46 for ; Sun, 11 Jun 2006 06:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5B6AEg5086949 for ; Sun, 11 Jun 2006 06:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5B6AEHY086948; Sun, 11 Jun 2006 06:10:14 GMT (envelope-from gnats) Resent-Date: Sun, 11 Jun 2006 06:10:14 GMT Resent-Message-Id: <200606110610.k5B6AEHY086948@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Elisey O. Savateev" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4525416A41B for ; Sun, 11 Jun 2006 06:08:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA33843D46 for ; Sun, 11 Jun 2006 06:08:31 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k5B68VTM085638 for ; Sun, 11 Jun 2006 06:08:31 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k5B68V2m085637; Sun, 11 Jun 2006 06:08:31 GMT (envelope-from nobody) Message-Id: <200606110608.k5B68V2m085637@www.freebsd.org> Date: Sun, 11 Jun 2006 06:08:31 GMT From: "Elisey O. Savateev" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/98797: [PATCH] www/c-icap: update to 030606 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jun 2006 06:10:15 -0000 >Number: 98797 >Category: ports >Synopsis: [PATCH] www/c-icap: update to 030606 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 11 06:10:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Elisey O. Savateev >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: FreeBSD beastie 6.1-STABLE FreeBSD 6.1-STABLE #20: Sun Jun 4 21:19:04 YEKST >Description: - Update to 030606 - Minor changes in c_icap.sh and pkg-plist - Contains /usr/ports/UPDATING diff >How-To-Repeat: >Fix: --- c-icap-030606,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/c-icap/Makefile /usr/home/bio3k/my_proj/ports/c-icap/c-icap/Makefile --- /usr/ports/www/c-icap/Makefile Fri Mar 31 07:42:38 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/Makefile Sat Jun 10 22:09:43 2006 @@ -2,12 +2,12 @@ # Date created: 30 January 2006 # Whom: Elisey Savateev # -# $FreeBSD: ports/www/c-icap/Makefile,v 1.2 2006/03/30 16:11:03 sem Exp $ +# $FreeBSD$ # PORTNAME= c-icap -PORTVERSION= 220505 -PORTREVISION= 1 +PORTVERSION= 030606 +PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://bio3k.softboard.ru/uploads/arch/ @@ -26,7 +26,9 @@ SUB_FILES= pkg-install pkg-deinstall -OPTIONS= CLAMAV "With srv_clamav service" on +OPTIONS= CLAMAV "Build with srv_clamav service" on \ + LARGE_FILES "Enable large files support" off \ + IPV6 "Enable IPv6 support" off # PERL "With Perl support" off .include @@ -52,6 +54,18 @@ .else PLIST_SUB+= CLAMAV="@comment " CONFIGURE_ARGS+= --without-clamav +.endif + +.if defined(WITH_LARGE_FILES) +CONFIGURE_ARGS+= --enable-large-files +.else +CONFIGURE_ARGS+= --disable-large-files +.endif + +.if defined(WITH_IPV6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 .endif post-extract: diff -ruN --exclude=CVS /usr/ports/www/c-icap/distinfo /usr/home/bio3k/my_proj/ports/c-icap/c-icap/distinfo --- /usr/ports/www/c-icap/distinfo Mon Mar 27 12:40:18 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/distinfo Sat Jun 10 16:57:40 2006 @@ -1,3 +1,3 @@ -MD5 (c_icap-220505.tar.gz) = acccc6a1c4dcae057b5cf5f90fa72fab -SHA256 (c_icap-220505.tar.gz) = cfd83fc0ffaadfa098af1884c296999a51fcee06cebd95fe848b4c4766817ad6 -SIZE (c_icap-220505.tar.gz) = 394175 +MD5 (c_icap-030606.tar.gz) = 539625e3bc95340043761b0c70a98f57 +SHA256 (c_icap-030606.tar.gz) = 554bb95d1d9e26960e8091c7db9796282fd9c116177dc6d6d6cc585dd4a7de3c +SIZE (c_icap-030606.tar.gz) = 413457 diff -ruN --exclude=CVS /usr/ports/www/c-icap/files/c_icap.sh.in /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/c_icap.sh.in --- /usr/ports/www/c-icap/files/c_icap.sh.in Mon Mar 27 12:40:18 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/c_icap.sh.in Sat Jun 10 18:18:45 2006 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/www/c-icap/files/c_icap.sh.in,v 1.1 2006/03/27 06:40:18 sem Exp $ +# $FreeBSD$ # # PROVIDE: c-icap @@ -19,14 +19,17 @@ name="c_icap" rcvar=`set_rcvar` -command="%%PREFIX%%/bin/c-icap" +command="%%PREFIX%%/bin/c-icap" +pidfile="/var/run/c-icap.pid" required_dirs="/var/tmp" required_files="%%PREFIX%%/etc/c-icap.conf" -stop_postcmd="rm -f /var/run/c-icap.pid" -# set default -c_icap_enable=${c_icap_enable:-"NO"} +stop_postcmd="rm -f $pidfile" +# read settings, set default values load_rc_config "$name" +: ${c_icap_enable="NO"} +: ${c_icap_flags=""} + run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/www/c-icap/files/patch-Makefile.in /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/patch-Makefile.in --- /usr/ports/www/c-icap/files/patch-Makefile.in Mon Mar 27 12:40:18 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/patch-Makefile.in Sat Jun 10 17:31:59 2006 @@ -1,5 +1,5 @@ ---- Makefile.in.bak Fri Feb 3 13:14:20 2006 -+++ Makefile.in Fri Feb 3 13:16:43 2006 +--- Makefile.in.bak Sat Jun 10 17:27:22 2006 ++++ Makefile.in Sat Jun 10 17:31:14 2006 @@ -44,7 +44,7 @@ icap-stretch$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \ @@ -18,27 +18,27 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(pkgincludedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -313,8 +313,8 @@ +@@ -321,8 +321,8 @@ ALL_INCS = $(INCS:%.h=include/%.h) pkginclude_HEADERS = $(ALL_INCS) -sysconf_DATA = c-icap.conf c-icap.magic --EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf c_icap_dll.mak c-icap.conf.in c-icap.magic c_icap.mak c_icap.def contrib/get_file.pl \ +-EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf c_icap_dll.mak c-icap.conf.in c-icap.magic c_icap.mak c_icap.def \ +sysconf_DATA = c-icap.conf.default c-icap.magic.default -+EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf.default c_icap_dll.mak c-icap.conf.default.in c-icap.magic.default c_icap.mak c_icap.def contrib/get_file.pl \ ++EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf.default c_icap_dll.mak c-icap.conf.default.in c-icap.magic.default c_icap.mak c_icap.def \ + contrib/get_file.pl contrib/convert_old_magic.pl \ winnt_server.c os/win32/dll_entry.c os/win32/makefile.w32 os/win32/net_io.c os/win32/proc_mutex.c\ os/win32/shared_mem.c os/win32/threads.c os/win32/utilfunc.c - -@@ -373,7 +373,7 @@ +@@ -382,7 +382,7 @@ distclean-hdr: -rm -f config.h stamp-h1 -c-icap.conf: $(top_builddir)/config.status $(srcdir)/c-icap.conf.in -+c-icap.conf: $(top_builddir)/config.status $(srcdir)/c-icap.conf.default.in ++c-icap.conf.default: $(top_builddir)/config.status $(srcdir)/c-icap.conf.default.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) -@@ -1484,7 +1484,7 @@ +@@ -1518,7 +1518,7 @@ info-am: @@ -47,7 +47,7 @@ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \ install-sysconfDATA -@@ -1530,7 +1530,7 @@ +@@ -1564,7 +1564,7 @@ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ @@ -56,7 +56,7 @@ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-pkgincludeHEADERS \ install-strip install-sysconfDATA installcheck installcheck-am \ -@@ -1544,8 +1544,6 @@ +@@ -1578,8 +1578,6 @@ uninstall-sysconfDATA diff -ruN --exclude=CVS /usr/ports/www/c-icap/files/patch-configure /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/patch-configure --- /usr/ports/www/c-icap/files/patch-configure Mon Mar 27 12:40:18 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/patch-configure Sat Jun 10 17:34:59 2006 @@ -1,15 +1,15 @@ ---- configure.bak Thu Feb 2 10:46:33 2006 -+++ configure Thu Feb 2 10:47:13 2006 -@@ -20614,7 +20614,7 @@ +--- configure.bak Sat Jun 10 17:33:25 2006 ++++ configure Sat Jun 10 17:34:38 2006 +@@ -21574,7 +21574,7 @@ fi -- ac_config_files="$ac_config_files Makefile c-icap.conf services/Makefile services/echo/Makefile services/sguard/Makefile services/clamav/Makefile modules/Makefile" -+ ac_config_files="$ac_config_files Makefile c-icap.conf.default services/Makefile services/echo/Makefile services/sguard/Makefile services/clamav/Makefile modules/Makefile" +- ac_config_files="$ac_config_files Makefile c-icap.conf services/Makefile services/echo/Makefile services/url_check/Makefile services/clamav/Makefile modules/Makefile" ++ ac_config_files="$ac_config_files Makefile c-icap.conf.default services/Makefile services/echo/Makefile services/url_check/Makefile services/clamav/Makefile modules/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -@@ -21200,7 +21200,7 @@ +@@ -22160,7 +22160,7 @@ case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -17,4 +17,4 @@ + "c-icap.conf.default" ) CONFIG_FILES="$CONFIG_FILES c-icap.conf.default" ;; "services/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/Makefile" ;; "services/echo/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/echo/Makefile" ;; - "services/sguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/sguard/Makefile" ;; + "services/url_check/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/url_check/Makefile" ;; diff -ruN --exclude=CVS /usr/ports/www/c-icap/files/pkg-install.in /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/pkg-install.in --- /usr/ports/www/c-icap/files/pkg-install.in Fri Mar 31 07:42:38 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/files/pkg-install.in Wed Mar 29 08:59:33 2006 @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: ports/www/c-icap/files/pkg-install.in,v 1.2 2006/03/30 16:11:03 sem Exp $ +# $FreeBSD$ CICAP_USER=cicap CICAP_GROUP=cicap diff -ruN --exclude=CVS /usr/ports/www/c-icap/pkg-plist /usr/home/bio3k/my_proj/ports/c-icap/c-icap/pkg-plist --- /usr/ports/www/c-icap/pkg-plist Fri Mar 31 07:42:38 2006 +++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/pkg-plist Sat Jun 10 19:02:46 2006 @@ -1,4 +1,4 @@ -@comment $FreeBSD: ports/www/c-icap/pkg-plist,v 1.2 2006/03/30 16:11:03 sem Exp $ +@comment $FreeBSD$ bin/c-icap bin/icap-client bin/icap-stretch @@ -8,7 +8,7 @@ @unexec if cmp -s %D/etc/c-icap.magic %D/etc/c-icap.magic.default; then rm -f %D/etc/c-icap.magic; fi etc/c-icap.magic.default @exec [ -f %B/c-icap.magic ] || cp -p %%PREFIX%%/%F %B/c-icap.magic -@unexec if [ -f /var/run/c-icap.pid ]; then %D/etc/rc.d/c_icap stop; fi +@unexec [ ! -f /var/run/c-icap.pid ] || %D/etc/rc.d/c_icap stop include/c_icap/access.h include/c_icap/body.h include/c_icap/c-icap.h @@ -37,18 +37,16 @@ lib/c_icap/srv_echo.a lib/c_icap/srv_echo.la lib/c_icap/srv_echo.so -lib/c_icap/srv_sguard.a -lib/c_icap/srv_sguard.la -lib/c_icap/srv_sguard.so lib/c_icap/sys_logger.a lib/c_icap/sys_logger.la lib/c_icap/sys_logger.so +lib/c_icap/srv_url_check.a +lib/c_icap/srv_url_check.so +lib/c_icap/srv_url_check.la @dirrm lib/c_icap lib/libicapapi.a lib/libicapapi.la lib/libicapapi.so.0 lib/libicapapi.so @cwd / -var/log/c_icap/access.log -var/log/c_icap/server.log -@dirrm var/log/c_icap +@dirrmtry var/log/c_icap --- c-icap-030606,1.patch ends here --- --- UPDATING.patch begins here --- --- /usr/ports/UPDATING Fri Jun 9 08:26:38 2006 +++ UPDATING.new Sun Jun 11 11:56:34 2006 @@ -6,6 +6,14 @@ time you update your ports collection, before attempting any port upgrades. +20060611: + AFFECTS: users of www/c-icap + AUTHOR: b3k@mail.ru + + The format of file c-icap.magic has changed. If you use your own + c-icap.magic file remember to convert it to the new format. It can be done + using the convert_old_magic.pl script located in the contrib directory. + 20060605: AFFECTS: users of net/kdenetwork3 AUTHOR: kde@FreeBSD.org --- UPDATING.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: