Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 May 2004 11:26:05 +0300
From:      Serge Negodyuck <petr@petrovich.kiev.ua>
To:        Mark Linimon <linimon@FreeBSD.org>
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/65983: update: ports/security/drweb
Message-ID:  <200405111126.05267.petr@petrovich.kiev.ua>
In-Reply-To: <200405101934.i4AJY858012548@freefall.freebsd.org>
References:  <200405101934.i4AJY858012548@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 10 May 2004 22:34, Mark Linimon wrote:
> Synopsis: update: ports/security/drweb
>
> State-Changed-From-To: open->feedback
> State-Changed-By: linimon
> State-Changed-When: Mon May 10 12:33:37 PDT 2004
> State-Changed-Why:
> When trying to install with the new size info, I get the following:
>
> fetch: ftp://ftp.drweb.ru/pub/unix/generic/drweb-4.31.4-freebsd4.tar.gz:
> size mismatch: expected 2136664, actual 2137387
>
> Can the submitter confirm this?
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=65983

Yes, distfile was re-rolled on drweb ftp server.
This new version of distfile does not require modification of patch-ab.

New version of patch for ports/security/drweb is below:



diff -ruN drweb/Makefile drweb.new/Makefile
--- drweb/Makefile	Thu Mar 25 21:28:30 2004
+++ drweb.new/Makefile	Tue May 11 11:09:31 2004
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=	4.31.3
-PORTREVISION=	1
+PORTVERSION=	4.31.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/ \
+MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/generic/ \
 		ftp://ftp.drweb.ru/pub/unix/archive/ \
 		ftp://ftp.drweb.ru/pub/unix/archive/${PORTNAME}-${PORTVERSION}/
 
@@ -44,32 +43,32 @@
 		${TAR} -xf - -C ${DRWEB_PREFIX}
 	${CHMOD} 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \
 		${DRWEB_PREFIX}/lib ${DRWEB_PREFIX}/updates
-	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drweb.key \
-		${DRWEB_PREFIX}/drweb.key-dist
-	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drwebd.key \
-		${DRWEB_PREFIX}/drwebd.key-dist
+	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drweb.key-distr \
+		${DRWEB_PREFIX}/drweb.key-distr
+	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drwebd.key-distr \
+		${DRWEB_PREFIX}/drwebd.key-distr
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
 		< ${WRKSRC}/usr/local/drweb/update/update.pl \
 		> ${DRWEB_PREFIX}/update/update.pl
 	${CHMOD} 750 ${DRWEB_PREFIX}/update/update.pl
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
 		< ${WRKSRC}/usr/local/etc/drweb/drweb32.ini \
-		> ${PREFIX}/drweb/drweb32.ini-dist
+		> ${PREFIX}/drweb/drweb32.ini-distr
 	${RM} -f ${PREFIX}/bin/drweb
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
 		< ${WRKSRC}/usr/local/etc/rc.d/00drwebd.sh \
 		> ${PREFIX}/etc/rc.d/00drwebd.sh
 	${CHMOD} 755 ${PREFIX}/etc/rc.d/00drwebd.sh
 	if [ ! -f ${PREFIX}/drweb/drweb32.ini ] ; then \
-		${CP} ${PREFIX}/drweb/drweb32.ini-dist \
+		${CP} ${PREFIX}/drweb/drweb32.ini-distr \
 		      ${PREFIX}/drweb/drweb32.ini; \
 	fi
 	if [ ! -f ${DRWEB_PREFIX}/drweb.key ] ; then \
-		${CP} ${DRWEB_PREFIX}/drweb.key-dist \
+		${CP} ${DRWEB_PREFIX}/drweb.key-distr \
 		      ${DRWEB_PREFIX}/drweb.key; \
 	fi
 	if [ ! -f ${DRWEB_PREFIX}/drwebd.key ] ; then \
-		${CP} ${DRWEB_PREFIX}/drwebd.key-dist \
+		${CP} ${DRWEB_PREFIX}/drwebd.key-distr \
 		      ${DRWEB_PREFIX}/drwebd.key; \
 	fi
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
diff -ruN drweb/distinfo drweb.new/distinfo
--- drweb/distinfo	Thu Mar 25 00:04:13 2004
+++ drweb.new/distinfo	Tue May 11 11:09:31 2004
@@ -1,4 +1,2 @@
-MD5 (drweb-4.31.3-freebsd4.tar.gz) = 1c6d87efe66fd6bc0bf8aaeb4d4e9b53
-SIZE (drweb-4.31.3-freebsd4.tar.gz) = 2045333
-MD5 (drweb-4.31.3-freebsd5.tar.gz) = 8e87bcd9f53b254ce736ea5c2dd498c3
-SIZE (drweb-4.31.3-freebsd5.tar.gz) = 2350075
+MD5 (drweb-4.31.4-freebsd4.tar.gz) = 5732d40413ac4af4f38148d1260210d5
+SIZE (drweb-4.31.4-freebsd4.tar.gz) = 2137387
diff -ruN drweb/pkg-install drweb.new/pkg-install
--- drweb/pkg-install	Thu Mar 25 21:28:30 2004
+++ drweb.new/pkg-install	Tue May 11 11:09:31 2004
@@ -36,6 +36,7 @@
 
 if ! grep -q "^!${USER}" /etc/syslog.conf; then
   echo "You may also add this lines to your /etc/syslog.conf:"
+  echo "!drwebd"
   echo "*.*             /var/log/drwebd.log"
   echo ""
 fi
diff -ruN drweb/pkg-plist drweb.new/pkg-plist
--- drweb/pkg-plist	Thu Mar 25 21:28:30 2004
+++ drweb.new/pkg-plist	Tue May 11 11:09:31 2004
@@ -3,6 +3,17 @@
 drweb/ChangeLog
 drweb/README
 drweb/README.RUS
+drweb/bases/drw43112.vdb
+drweb/bases/drw43111.vdb
+drweb/bases/drw43110.vdb
+drweb/bases/drw43109.vdb
+drweb/bases/drw43108.vdb
+drweb/bases/drw43107.vdb
+drweb/bases/drw43106.vdb
+drweb/bases/drw43105.vdb
+drweb/bases/drw43104.vdb
+drweb/bases/drw43103.vdb
+drweb/bases/drw43102.vdb
 drweb/bases/drw43101.vdb
 drweb/bases/drwebase.vdb
 drweb/doc/readme.daemon
@@ -11,15 +22,15 @@
 drweb/doc/readme.scanner
 drweb/doc/readme.scanner.rus
 drweb/drweb
-@unexec if [ -f %D/drweb/drweb.key ] && cmp -s %D/drweb/drweb.key %D/drweb/drweb.key-dist; then rm -f %D/drweb/drweb.key; fi
-drweb/drweb.key-dist
+@unexec if [ -f %D/drweb/drweb.key ] && cmp -s %D/drweb/drweb.key %D/drweb/drweb.key-distr; then rm -f %D/drweb/drweb.key; fi
+drweb/drweb.key-distr
 @exec if [ ! -f %D/drweb/drweb.key ] ; then cp -p %D/%F %B/drweb.key; fi
-@unexec if [ -f %D/drweb/drweb32.ini ] && cmp -s %D/drweb/drweb32.ini %D/drweb/drweb32.ini-dist; then rm -f %D/drweb/drweb32.ini; fi
-drweb/drweb32.ini-dist
+@unexec if [ -f %D/drweb/drweb32.ini ] && cmp -s %D/drweb/drweb32.ini %D/drweb/drweb32.ini-distr; then rm -f %D/drweb/drweb32.ini; fi
+drweb/drweb32.ini-distr
 @exec if [ ! -f %D/drweb/drweb32.ini ] ; then cp -p %D/%F %B/drweb32.ini; fi
 drweb/drwebd
-@unexec if [ -f %D/drweb/drwebd.key ] && cmp -s %D/drweb/drwebd.key %D/drweb/drwebd.key-dist; then rm -f %D/drweb/drwebd.key; fi
-drweb/drwebd.key-dist
+@unexec if [ -f %D/drweb/drwebd.key ] && cmp -s %D/drweb/drwebd.key %D/drweb/drwebd.key-distr; then rm -f %D/drweb/drwebd.key; fi
+drweb/drwebd.key-distr
 @exec if [ ! -f %D/drweb/drwebd.key ] ; then cp -p %D/%F %B/drwebd.key; fi
 drweb/drwebdc
 drweb/lib/drweb32.dll



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405111126.05267.petr>