Date: Mon, 22 Feb 2010 14:15:10 +0100 From: Bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/144211: [MAINTAINER] mail/prayer: update to 1.3.2 Message-ID: <cf16b@galway.lan> Resent-Message-ID: <201002221320.o1MDK1iE056772@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144211 >Category: ports >Synopsis: [MAINTAINER] mail/prayer: update to 1.3.2 >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 Feb 22 13:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Bapt >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD galway.lan 8.0-STABLE FreeBSD 8.0-STABLE #3: Sun Jan 10 20:39:38 CET 2010 >Description: - Update to 1.3.2 Use USERS/GROUPS in Makefile instead of pkg-install Removed file(s): - pkg-install Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- prayer-1.3.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/mail/prayer.orig/Makefile /usr/ports/mail/prayer/Makefile --- /usr/ports/mail/prayer.orig/Makefile 2009-09-16 18:33:55.000000000 +0200 +++ /usr/ports/mail/prayer/Makefile 2010-02-22 14:13:34.827533291 +0100 @@ -6,8 +6,7 @@ # PORTNAME= prayer -PORTVERSION= 1.3.1 -PORTREVISION= 2 +PORTVERSION= 1.3.2 CATEGORIES= mail www MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/ @@ -32,6 +31,9 @@ OPTIONS= SESSIONCACHE "Activate Session Cache" On +USERS= _prayer +GROUPS= prayer + MAN5= prayer.cf.5 MAN8= prayer-session.8 prayer-ssl-prune.8 prayer.8 @@ -63,7 +65,6 @@ pre-install: @${MKDIR} ${PREFIX}/etc/prayer - @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL post-install: .if !defined(NOPORTDOCS) diff -ruN --exclude=CVS /usr/ports/mail/prayer.orig/distinfo /usr/ports/mail/prayer/distinfo --- /usr/ports/mail/prayer.orig/distinfo 2009-03-16 16:28:22.000000000 +0100 +++ /usr/ports/mail/prayer/distinfo 2010-02-22 13:42:59.665516266 +0100 @@ -1,3 +1,3 @@ -MD5 (prayer-1.3.1.tar.gz) = 5b124c7ac901e3425cc12884de39d6b3 -SHA256 (prayer-1.3.1.tar.gz) = 77b2791973eda7831c72bf22a1177e5bea024c3e1b238677be43763a38cdd651 -SIZE (prayer-1.3.1.tar.gz) = 706034 +MD5 (prayer-1.3.2.tar.gz) = 4762d3eede64770f0f5f654cceef09f6 +SHA256 (prayer-1.3.2.tar.gz) = 78d6011fd49ca6c085b6e4c44759e6b246a82b859dd3f2e5a45d4775b45ae528 +SIZE (prayer-1.3.2.tar.gz) = 748315 diff -ruN --exclude=CVS /usr/ports/mail/prayer.orig/files/patch-Config /usr/ports/mail/prayer/files/patch-Config --- /usr/ports/mail/prayer.orig/files/patch-Config 2009-03-16 16:28:23.000000000 +0100 +++ /usr/ports/mail/prayer/files/patch-Config 2010-02-22 14:01:43.183243279 +0100 @@ -1,5 +1,5 @@ ---- Config.orig 2009-03-16 00:51:45.000000000 +0800 -+++ Config 2009-03-16 00:52:23.000000000 +0800 +--- Config.orig 2010-02-22 13:43:01.247512371 +0100 ++++ Config 2010-02-22 13:47:49.048414822 +0100 @@ -27,31 +27,31 @@ ############################################################################ @@ -11,10 +11,9 @@ # Location of install program (GNU install or compatible required) INSTALL = install --# Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in) + # Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in) -ifdef CPPFLAGS - BASECFLAGS = $(CPPFLAGS) -+# Base Compiler options for GCC (use PORTCFLAGS and LDFLAGS if passed in) +ifdef PORTCFLAGS + BASECFLAGS = $(PORTCFLAGS) else @@ -32,8 +31,8 @@ endif # Minimal libraries needed by Linux --BASE_LIBS = -lcrypt -+# BASE_LIBS = -lcrypt +-BASE_LIBS = -lcrypt -lutil ++#BASE_LIBS = -lcrypt -lutil # FreeBSD needs some extra libraries: -# BASE_LIBS = -lcrypt -liconv -lutil +BASE_LIBS = -lcrypt -liconv -lutil @@ -104,13 +103,13 @@ RO_USER = root RO_GROUP = prayer -@@ -181,8 +183,8 @@ +@@ -181,6 +183,6 @@ PRIVATE_FILE = 0640 # Location of configuration files and binaries -PRAYER_CONFIG_FILE = ${PREFIX}/etc/prayer.cf -+PRAYER_CONFIG_FILE = %%PREFIX%%/etc/prayer/prayer.cf -BIN_DIR = ${PREFIX}/sbin -+BIN_DIR = %%PREFIX%%/sbin -ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf ++PRAYER_CONFIG_FILE = %%PREFIX%%/etc/prayer/prayer.cf ++BIN_DIR = %%PREFIX%%/sbin +ACCOUNTD_CONFIG_FILE = %%PREFIX%%/etc/prayer/accountd.cf diff -ruN --exclude=CVS /usr/ports/mail/prayer.orig/pkg-install /usr/ports/mail/prayer/pkg-install --- /usr/ports/mail/prayer.orig/pkg-install 2009-03-16 16:28:22.000000000 +0100 +++ /usr/ports/mail/prayer/pkg-install 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/sbin - -USER=_prayer -GROUP=prayer -UID=917 -GID=917 - -case $2 in - PRE-INSTALL) - if pw group show "$GROUP" 2>/dev/null;then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd "${GROUP}" -g ${GID};then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s /sbin/nologin -L daemon -d /nonexistent -c "Prayer Account" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; -esac --- prayer-1.3.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cf16b>