|
|
|
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
|
#
|
|
|
|
|
# Filename: package/.../privoxy/makefile.patch
|
|
|
|
|
# Copyright (C) 2011 The OpenSDE Project
|
|
|
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
|
|
|
#
|
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
|
|
#
|
|
|
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
|
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
|
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
|
|
|
# of the GNU General Public License as published by the Free Software
|
|
|
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
|
|
|
# version.
|
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
|
|
|
|
1.) do not run `install strip` because our install-wrapper doesn't like it
|
|
|
|
|
2.) install config files so that a user can use this as template
|
|
|
|
|
- Sebastian Czech <t2_@arcor.de>
|
|
|
|
|
|
|
|
|
|
--- privoxy-3.0.17-stable/GNUmakefile.in.orig 2010-02-20 13:53:30.000000000 +0100
|
|
|
|
|
+++ privoxy-3.0.17-stable/GNUmakefile.in 2011-05-12 09:17:07.732002068 +0200
|
|
|
|
|
@@ -807,7 +807,7 @@
|
|
|
|
|
@test -n "$(STRIP)" &&\
|
|
|
|
|
$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
|
|
|
|
|
$(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
|
|
|
|
|
- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
|
|
|
|
|
+ $(INSTALL) $(INSTALL_P) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
|
|
|
|
|
|
|
|
|
|
@# Install the DOCS and man page. install-sh only does one file at a time.
|
|
|
|
|
@# FIXME: only handles jpegs.
|
|
|
|
|
@@ -868,38 +868,10 @@
|
|
|
|
|
@# FIXME: group/user validation is overly convoluted.
|
|
|
|
|
@# If superuser install ... we require a minimum of group ownership
|
|
|
|
|
@# of those files the daemon writes to, to be non-root owned.
|
|
|
|
|
- @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
|
|
|
|
|
- if [ x$(USER) = x ] || [ $(USER) = root ]; then \
|
|
|
|
|
- if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
|
|
|
|
|
- if [ "`$(ID) privoxy`" ] && \
|
|
|
|
|
- $(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/dev/null; then \
|
|
|
|
|
- $(ECHO) "Warning: Setting group owner to privoxy";\
|
|
|
|
|
- GROUP_T=privoxy ;\
|
|
|
|
|
- else \
|
|
|
|
|
- $(ECHO) "******************************************************************" ;\
|
|
|
|
|
- $(ECHO) " WARNING! WARNING! installing config files as root!" ;\
|
|
|
|
|
- $(ECHO) " It is strongly recommended to run $(PROGRAM) as a non-root user," ;\
|
|
|
|
|
- $(ECHO) " and to install the config files as that user and/or group!" ;\
|
|
|
|
|
- $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\
|
|
|
|
|
- $(ECHO) "*******************************************************************" ;\
|
|
|
|
|
- exit 1 ;\
|
|
|
|
|
- fi ;\
|
|
|
|
|
- else \
|
|
|
|
|
- GROUP_T=$(GROUP) ;\
|
|
|
|
|
- fi ;\
|
|
|
|
|
- INSTALL_CONF="$(INSTALL_R) -g $$GROUP_T " ;\
|
|
|
|
|
- else \
|
|
|
|
|
- $(ECHO) "Superuser install, installing config files as $(USER):$(GROUP_T)" ;\
|
|
|
|
|
- INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
|
|
|
|
|
- GROUP_T=$(GROUP_T) ;\
|
|
|
|
|
- fi ;\
|
|
|
|
|
- else \
|
|
|
|
|
- if [ ! "`id $(USER)`" = "`id`" ] ;then \
|
|
|
|
|
- $(ECHO) "** WARNING ** current install user different from configured user!!" ;\
|
|
|
|
|
- $(ECHO) "Edit may fail." ;\
|
|
|
|
|
- fi ;\
|
|
|
|
|
- INSTALL_CONF="$(INSTALL_R)" ;\
|
|
|
|
|
- fi ;\
|
|
|
|
|
+
|
|
|
|
|
+ INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
|
|
|
|
|
+ GROUP_T=$(GROUP_T) ;\
|
|
|
|
|
+
|
|
|
|
|
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
|
|
|
|
|
for i in $(CONFIGS); do \
|
|
|
|
|
if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
|
