chiark - git - mdw - termux-packages/blob - packages/privoxy/GNUmakefile.in.patch

   1 --- ../../build/privoxy/cache/privoxy-3.0.24-stable/GNUmakefile.in      2015-12-27 13:50:57.000000000 +0100
   2 +++ ./GNUmakefile.in    2016-09-13 23:30:12.518162391 +0200
   3 @@ -471,8 +471,8 @@
   4         mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
   5         nsgmls ../privoxy-man-page.sgml  | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
   6         perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' $(MAN_PAGE) ;\
   7 -       perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \
   8 -       perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \
   9 +       perl -pi.bak -e "s/\[ /\[/g;s/\\\\['a]/g;s/�/\\\\['e]/g" $(MAN_PAGE); \
  10 +       perl -pi.bak -e "s/\\\\[:o]/g" $(MAN_PAGE); \
  11         perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \
  12         perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(MAN_PAGE); \
  13         perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(MAN_PAGE); \
  14 @@ -872,41 +872,41 @@
  15                 $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
  16         done
  17
  18 -       @# FIXME: group/user validation is overly convoluted.
  19 -       @# If superuser install ... we require a minimum of group ownership
  20 -       @# of those files the daemon writes to, to be non-root owned.
  21 -       @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
  22 -               if [ x$(USER) = x ] || [ $(USER) = root ]; then \
  23 -                       if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
  24 -                               if [ "`$(ID) privoxy`" ] && \
  25 -                                       $(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/dev/null; then \
  26 -                                       $(ECHO) "Warning: Setting group owner to privoxy";\
  27 -                                       GROUP_T=privoxy ;\
  28 -                               else \
  29 -                                       $(ECHO)  "******************************************************************" ;\
  30 -                                       $(ECHO)  " WARNING! WARNING! installing config files as root!" ;\
  31 -                                       $(ECHO)  " It is strongly recommended to run $(PROGRAM) as a non-root user," ;\
  32 -                                       $(ECHO)  " and to install the config files as that user and/or group!" ;\
  33 -                                       $(ECHO)  " Please read INSTALL, and create a privoxy user and group!" ;\
  34 -                                       $(ECHO)  "*******************************************************************" ;\
  35 -                                       exit 1 ;\
  36 -                               fi ;\
  37 -                       else \
  38 -                               GROUP_T=$(GROUP) ;\
  39 -                       fi ;\
  40 -                       INSTALL_CONF="$(INSTALL_R) -g $$GROUP_T " ;\
  41 -               else \
  42 -                       $(ECHO) "Superuser install, installing config files as $(USER):$(GROUP_T)" ;\
  43 -                       INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
  44 -                       GROUP_T=$(GROUP_T) ;\
  45 -               fi ;\
  46 -       else \
  47 -               if [ ! "`id $(USER)`" = "`id`" ] ;then \
  48 -                       $(ECHO) "** WARNING ** current install user different from configured user!!" ;\
  49 -                       $(ECHO) "Edit may fail." ;\
  50 -               fi ;\
  51 -               INSTALL_CONF="$(INSTALL_R)" ;\
  52 -       fi ;\
  53 +#      @# FIXME: group/user validation is overly convoluted.
  54 +#      @# If superuser install ... we require a minimum of group ownership
  55 +#      @# of those files the daemon writes to, to be non-root owned.
  56 +#      @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
  57 +#              if [ x$(USER) = x ] || [ $(USER) = root ]; then \
  58 +#                      if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
  59 +#                              if [ "`$(ID) privoxy`" ] && \
  60 +#                                      $(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/dev/null; then \
  61 +#                                      $(ECHO) "Warning: Setting group owner to privoxy";\
  62 +#                                      GROUP_T=privoxy ;\
  63 +#                              else \
  64 +#                                      $(ECHO)  "******************************************************************" ;\
  65 +#                                      $(ECHO)  " WARNING! WARNING! installing config files as root!" ;\
  66 +#                                      $(ECHO)  " It is strongly recommended to run $(PROGRAM) as a non-root user," ;\
  67 +#                                      $(ECHO)  " and to install the config files as that user and/or group!" ;\
  68 +#                                      $(ECHO)  " Please read INSTALL, and create a privoxy user and group!" ;\
  69 +#                                      $(ECHO)  "*******************************************************************" ;\
  70 +#                                      exit 1 ;\
  71 +#                              fi ;\
  72 +#                      else \
  73 +#                              GROUP_T=$(GROUP) ;\
  74 +#                      fi ;\
  75 +#                      INSTALL_CONF="$(INSTALL_R) -g $$GROUP_T " ;\
  76 +#              else \
  77 +#                      $(ECHO) "Superuser install, installing config files as $(USER):$(GROUP_T)" ;\
  78 +#                      INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
  79 +#                      GROUP_T=$(GROUP_T) ;\
  80 +#              fi ;\
  81 +#      else \
  82 +#              if [ ! "`id $(USER)`" = "`id`" ] ;then \
  83 +#                      $(ECHO) "** WARNING ** current install user different from configured user!!" ;\
  84 +#                      $(ECHO) "Edit may fail." ;\
  85 +#              fi ;\
  86 +#              INSTALL_CONF="$(INSTALL_R)" ;\
  87 +#      fi ;\
  88         $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
  89         for i in $(CONFIGS); do \
  90                 if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \