package/network/privoxy/makefile.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../privoxy/makefile.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 install config files so that a user can use this as template
  17 - Sebastian Czech <t2_@arcor.de>
  18
  19 --- privoxy-3.0.3-stable/GNUmakefile.in.orig    2004-01-31 02:15:33.000000000 +0100
  20 +++ privoxy-3.0.3-stable/GNUmakefile.in 2005-03-28 15:21:00.420358736 +0200
  21 @@ -1090,7 +1090,7 @@
  22         @test -n "$(STRIP)" &&\
  23         $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
  24         $(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST)
  25 -       $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
  26 +       $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST)
  27
  28         @# Install the DOCS and man page. install-sh only does one file at a time.
  29         -@if [ $(check_doc) = 0 ]; then \
  30 @@ -1144,38 +1144,10 @@
  31         @# FIXME: group/user validation is overly convoluted.
  32         @# If superuser install ... we require a minimum of group ownership
  33         @# of those files the daemon writes to, to be non-root owned.
  34 -       @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
  35 -               if [ x$(USER) = x ] || [ $(USER) = root ]; then \
  36 -                       if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
  37 -                               if [ "`$(ID) privoxy`" ] && \
  38 -                                       $(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/dev/null; then \
  39 -                                       $(ECHO) "Warning: Setting group owner to privoxy";\
  40 -                                       GROUP_T=privoxy ;\
  41 -                               else \
  42 -                                       $(ECHO)  "******************************************************************" ;\
  43 -                                       $(ECHO)  " WARNING! WARNING! installing config files as root!" ;\
  44 -                                       $(ECHO)  " It is strongly recommended to run $(PROGRAM) as a non-root user," ;\
  45 -                                       $(ECHO)  " and to install the config files as that user and/or group!" ;\
  46 -                                       $(ECHO)  " Please read INSTALL, and create a privoxy user and group!" ;\
  47 -                                       $(ECHO)  "*******************************************************************" ;\
  48 -                                       exit 1 ;\
  49 -                               fi ;\
  50 -                       else \
  51 -                               GROUP_T=$(GROUP) ;\
  52 -                       fi ;\
  53 -                       INSTALL_CONF="$(INSTALL_R) -g $$GROUP_T " ;\
  54 -               else \
  55 -                       $(ECHO) "Superuser install, installing config files as $(USER):$(GROUP_T)" ;\
  56 -                       INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
  57 -                       GROUP_T=$(GROUP_T) ;\
  58 -               fi ;\
  59 -       else \
  60 -               if [ ! "`id $(USER)`" = "`id`" ] ;then \
  61 -                       $(ECHO) "** WARNING ** current install user different from configured user!!" ;\
  62 -                       $(ECHO) "Edit may fail." ;\
  63 -               fi ;\
  64 -               INSTALL_CONF="$(INSTALL_R)" ;\
  65 -       fi ;\
  66 +
  67 +       INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
  68 +       GROUP_T=$(GROUP_T) ;\
  69 +
  70         $(ECHO) Installing configuration files to $(CONF_DEST);\
  71         for i in $(CONFIGS); do \
  72                 if [ -s "$(CONF_DEST)/$$i" ] ; then \