Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Sep 2008 19:58:16 +0400 (MSD)
From:      Demin Alexander <support@spectrum.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/127026: Update: security/drweb-sendmail: fix the MASTER_SITES urls and update to rcNG script
Message-ID:  <200809011558.m81FwGR7041659@support.spectrum.ru>
Resent-Message-ID: <200809011600.m81G0GXP099062@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         127026
>Category:       ports
>Synopsis:       Update: security/drweb-sendmail: fix the MASTER_SITES urls and update to rcNG script
>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:   Mon Sep 01 16:00:16 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Demin Alexander
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
Group of companies Spectrum JSC
>Environment:
System: FreeBSD support.spectrum.ru 6.3-STABLE FreeBSD 6.3-STABLE #26: Thu Aug 21 15:38:58 MSD 2008 oldman@support.spectrum.ru:/usr/obj/usr/src/sys/MYGENERIC i386


	
>Description:
	1. Fix the MASTER_SITES urls
	2. Update to rcNG script (script files/drweb-smf.sh.in is added)
>How-To-Repeat:
	
>Fix:

	

--- drweb-sendmail-4.33_4_up_to_4.33_5 begins here ---
diff -ruN drweb-sendmail/Makefile drweb-sendmail-4.33_5/Makefile
--- drweb-sendmail/Makefile	2008-09-01 17:16:25.000000000 +0400
+++ drweb-sendmail-4.33_5/Makefile	2008-09-01 18:41:45.000000000 +0400
@@ -7,12 +7,10 @@
 
 PORTNAME=	drweb-sendmail
 PORTVERSION=	4.33
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security mail
-MASTER_SITES=	ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/61/:f61 \
-		ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/55/:f55 \
-		ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/411/:f411 \
-		http://freebsd.spectrum.ru/distfiles/drweb/:f61,f55,f411
+MASTER_SITES=	ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/60/:f61 \
+		http://freebsd.spectrum.ru/distfiles/drweb/:f61
 DIST_SUBDIR=	drweb
 
 MAINTAINER=	support@spectrum.ru
@@ -22,15 +20,15 @@
 
 IA32_BINARY_PORT=	yes
 NO_BUILD=		yes
+USE_RC_SUBR=            drweb-smf.sh
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 601000
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd61
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:f61
+DISTNAME=       ${PORTNAME}-${PORTVERSION}-freebsd61
+DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}:f61
 .else
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd55
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:f55
+IGNORE=         "Sorry, port is not supported of FreeBSD version < 6.1"
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -67,13 +65,6 @@
 .endif
 .endfor
 .endfor
-	${SED} -e s#___T_FILTER_PATH___#${INST_PREFIX}/drweb-smf#g \
-		-e s#___T_FILTER_UNIX___#yes#g \
-		-e s#___T_FILTER_SOCKET___#no#g \
-		-e s#___T_FILTER_PARAMS___##g \
-		< ${WRKSRC}${LOCALBASE}/drweb/doc/sendmail/template.initscript > \
-		${PREFIX}/etc/rc.d/002.drweb-smf.sh
-	${CHMOD} 750 ${PREFIX}/etc/rc.d/002.drweb-smf.sh
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN drweb-sendmail/files/drweb-smf.sh.in drweb-sendmail-4.33_5/files/drweb-smf.sh.in
--- drweb-sendmail/files/drweb-smf.sh.in	1970-01-01 03:00:00.000000000 +0300
+++ drweb-sendmail-4.33_5/files/drweb-smf.sh.in	2008-09-01 18:33:59.000000000 +0400
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# PROVIDE: drweb_smf
+# REQUIRE: DAEMON drwebd
+# BEFORE: mail
+
+. %%RC_SUBR%%
+
+name="drweb_smf"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${drweb_smf_enable="NO"}
+: ${drweb_smf_procname="%%PREFIX%%/drweb/drweb-smf"}
+
+command=$drweb_smf_procname
+
+run_rc_command "$1"
diff -ruN drweb-sendmail/pkg-plist drweb-sendmail-4.33_5/pkg-plist
--- drweb-sendmail/pkg-plist	2005-11-10 00:00:00.000000000 +0300
+++ drweb-sendmail-4.33_5/pkg-plist	2008-09-01 19:30:47.000000000 +0400
@@ -1,6 +1,6 @@
-@unexec if [ -e /var/drweb/run/drweb-smf.skt ] ; then %D/etc/rc.d/002.drweb-smf.sh stop ; fi
+@unexec if [ -e /var/drweb/run/drweb-smf.skt ] ; then %D/etc/rc.d/drweb-smf stop ; fi
 drweb/drweb-smf
-etc/rc.d/002.drweb-smf.sh
+etc/rc.d/drweb-smf
 @unexec if [ -f %D/etc/drweb/addresses.conf ] && cmp -s %D/etc/drweb/addresses.conf %D/etc/drweb/addresses.conf-distr; then rm -f %D/etc/drweb/addresses.conf; fi
 etc/drweb/addresses.conf-distr
 @exec if [ ! -f %D/etc/drweb/addresses.conf ] ; then cp -p %D/%F %B/addresses.conf; fi
--- drweb-sendmail-4.33_4_up_to_4.33_5 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



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