pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www There's no need for a privoxy-user prerequisite pa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/30f472cfc0f9
branches:  trunk
changeset: 481034:30f472cfc0f9
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Sep 24 14:08:36 2004 +0000

description:
There's no need for a privoxy-user prerequisite package.  The build of
privoxy actually doesn't require the userid to exist at all.  Simply whack
the validity checks from configure.in, move PKG_USERS/PKG_GROUPS to the
main privoxy package, and all works fine.

(Similar to the modifications originally needed for Mailman, but in that
case, the numeric user IDs were also embedded in the binaries.  Fortunately,
that is not the case here.)

diffstat:

 www/Makefile                 |   3 +-
 www/privoxy-user/DESCR       |   3 --
 www/privoxy-user/Makefile    |  28 -------------------
 www/privoxy-user/PLIST       |   2 -
 www/privoxy/Makefile         |   7 ++--
 www/privoxy/distinfo         |   3 +-
 www/privoxy/patches/patch-ac |  62 ++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 69 insertions(+), 39 deletions(-)

diffs (172 lines):

diff -r 662916e326df -r 30f472cfc0f9 www/Makefile
--- a/www/Makefile      Fri Sep 24 13:50:28 2004 +0000
+++ b/www/Makefile      Fri Sep 24 14:08:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.344 2004/09/19 04:08:17 markd Exp $
+# $NetBSD: Makefile,v 1.345 2004/09/24 14:08:36 tv Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -207,7 +207,6 @@
 SUBDIR+=       php4-apc
 SUBDIR+=       php4-curl
 SUBDIR+=       privoxy
-SUBDIR+=       privoxy-user
 SUBDIR+=       py-HTMLgen
 SUBDIR+=       py-curl
 SUBDIR+=       py-pcgi
diff -r 662916e326df -r 30f472cfc0f9 www/privoxy-user/DESCR
--- a/www/privoxy-user/DESCR    Fri Sep 24 13:50:28 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-This is a pre-req package which ensures the existance of the privoxy user
-which is required for privoxy to build (and therefore must exist pre-build for
-the privoxy package itself).
diff -r 662916e326df -r 30f472cfc0f9 www/privoxy-user/Makefile
--- a/www/privoxy-user/Makefile Fri Sep 24 13:50:28 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:00 grant Exp $
-
-DISTNAME=      privoxy-user-3.0.2
-CATEGORIES=    www
-MASTER_SITES=   # empty
-DISTFILES=      # empty
-
-MAINTAINER=    jmc%NetBSD.org@localhost
-HOMEPAGE=      # empty
-COMMENT=       Pre-req package for privoxy to setup user needed for build/use
-
-USE_PKGINSTALL=        yes
-
-EXTRACT_ONLY=  # empty
-NO_CHECKSUM=   yes
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
-
-PRIVOXY_USER?=          privoxy
-PRIVOXY_GROUP?=         privoxy
-
-USE_PKGINSTALL=         YES
-PKG_GROUPS=             ${PRIVOXY_GROUP}
-PKG_USERS=              ${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user
-
-do-install:    # empty
-
-.include "../../mk/bsd.pkg.mk"
diff -r 662916e326df -r 30f472cfc0f9 www/privoxy-user/PLIST
--- a/www/privoxy-user/PLIST    Fri Sep 24 13:50:28 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2003/06/23 16:38:41 jmc Exp $
-@comment this plist intentionally left empty
diff -r 662916e326df -r 30f472cfc0f9 www/privoxy/Makefile
--- a/www/privoxy/Makefile      Fri Sep 24 13:50:28 2004 +0000
+++ b/www/privoxy/Makefile      Fri Sep 24 14:08:36 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/09/22 16:09:57 kim Exp $
+# $NetBSD: Makefile,v 1.10 2004/09/24 14:08:36 tv Exp $
 #
 
 DISTNAME=      ${PKGNAME_NOREV}-stable-src
 PKGNAME=       privoxy-3.0.3
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
@@ -10,8 +11,6 @@
 HOMEPAGE=      http://www.privoxy.org/
 COMMENT=       Web proxy with advanced filtering capabilities
 
-DEPENDS+=       privoxy-user>=3.0.2:../../www/privoxy-user
-
 .include "../../mk/bsd.prefs.mk"
 
 PRIVOXY_USER?=         privoxy
@@ -22,6 +21,8 @@
 
 USE_PKGINSTALL=                YES
 RCD_SCRIPTS=           privoxy
+PKG_GROUPS=            ${PRIVOXY_GROUP}
+PKG_USERS=             ${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user
 
 EGDIR=                 ${PREFIX}/share/examples/privoxy
 
diff -r 662916e326df -r 30f472cfc0f9 www/privoxy/distinfo
--- a/www/privoxy/distinfo      Fri Sep 24 13:50:28 2004 +0000
+++ b/www/privoxy/distinfo      Fri Sep 24 14:08:36 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/09/22 16:09:57 kim Exp $
+$NetBSD: distinfo,v 1.3 2004/09/24 14:08:36 tv Exp $
 
 SHA1 (privoxy-3.0.3-stable-src.tar.gz) = 8aa5ad21a819c0cd5e5f3aadf24e9fb0d813bdaa
 Size (privoxy-3.0.3-stable-src.tar.gz) = 1561072 bytes
 SHA1 (patch-aa) = 2bdc980df283f14ac8694f04b07e6d499d46c5c1
 SHA1 (patch-ab) = 548d11ad83cef96c311cb0453cb149b71577631e
+SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
diff -r 662916e326df -r 30f472cfc0f9 www/privoxy/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/privoxy/patches/patch-ac      Fri Sep 24 14:08:36 2004 +0000
@@ -0,0 +1,62 @@
+$NetBSD: patch-ac,v 1.1 2004/09/24 14:08:36 tv Exp $
+
+--- configure.in.orig  2004-01-30 04:26:03.000000000 -0500
++++ configure.in
+@@ -563,29 +563,12 @@ if test "$EMXOS2" = yes; then
+ 
+ else
+ 
+-  $ID privoxy >/dev/null 2>/dev/null
+-  if test $? -ne 0 ; then
+-   AC_MSG_WARN(There is no user 'privoxy' on this system)
+-  fi
+   AC_MSG_CHECKING([for user])
+   AC_ARG_WITH(user,
+         [  --with-user=privoxy          Set user under which privoxy will run],
+         [
+-                if test "x$withval" != "xyes"; then
+-                  if test $ID = no ; then
+-                    AC_MSG_ERROR(There is no 'id' program on this system)
+-                  else
+                     AC_MSG_RESULT($with_user)
+-                    $ID $with_user 2>/dev/null >/dev/null
+-                    if test $? -eq 0 ; then
+                       USER=$with_user;
+-                    else
+-                      AC_MSG_ERROR(There is no user '$with_user' on this system)
+-                    fi
+-                  fi
+-                  else
+-                   AC_MSG_ERROR(We need a user if you give me this parameter)
+-                fi
+         ],
+         [
+           if test $ID = no ; then
+@@ -602,27 +585,8 @@ else
+   AC_ARG_WITH(group,
+         [  --with-group=privoxy         Set group for privoxy],
+         [ 
+-                if test "x$withval" != "xyes"; then
+-                  if test $BGROUPS = no ; then
+-                    AC_MSG_ERROR(There is no 'groups' program on this system)
+-                  else
+                     AC_MSG_RESULT($with_group)
+-                    $BGROUPS $USER >/dev/null
+-                    if test $? -eq 0 ; then
+-                    # FIXME: this fails if valid group, but not first group
+-                    # listed.
+-                      if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
+-                        AC_MSG_ERROR(The given value '$withval' does not match group entry)
+-                      else
+                         GROUP=$with_group;
+-                      fi
+-                    else
+-                      AC_MSG_ERROR(There is no group entry for user '$USER')
+-                    fi
+-                  fi
+-                else
+-                   AC_MSG_ERROR(We need a group if you give me this parameter)
+-                fi
+         ],
+         [
+           if test $BGROUPS = no ; then



Home | Main Index | Thread Index | Old Index