Hi,

a try to update polipo:

- patch-config.sample to be more clear that it is dir in
  /var/log
- rcscript
- removing MESSAGE, I think it's useless with rcscript

jirib


diff -ruNp -x CVS /usr/ports/www/polipo/patches/patch-config_sample 
polipo/patches/patch-config_sample
--- /usr/ports/www/polipo/patches/patch-config_sample   Tue Oct 26 17:29:24 2010
+++ polipo/patches/patch-config_sample  Mon Nov  1 23:53:56 2010
@@ -1,14 +1,14 @@
-$OpenBSD: patch-config_sample,v 1.1 2010/10/26 15:29:24 kili Exp $
+$OpenBSD$
 --- config.sample.orig Mon Feb  1 00:13:20 2010
-+++ config.sample      Tue Oct 26 16:52:27 2010
++++ config.sample      Mon Nov  1 23:41:14 2010
 @@ -11,6 +11,13 @@
  ### Basic configuration
  ### *******************
  
 +# Comment to let polipo log to /var/log/polipo. You'll have to
-+# create an initially empty log file owned by the _polipo user in
++# create an initially empty log directory owned by the _polipo user in
 +# this case, for example by running
-+# install -m 640 -o _polipo /dev/null /var/log/polipo
++# install -D -m 750 -o _polipo /var/log/polipo
 +logSyslog = true
 +logFacility = daemon
 +
diff -ruNp -x CVS /usr/ports/www/polipo/pkg/MESSAGE polipo/pkg/MESSAGE
--- /usr/ports/www/polipo/pkg/MESSAGE   Sat Aug  6 23:21:53 2005
+++ polipo/pkg/MESSAGE  Thu Jan  1 01:00:00 1970
@@ -1,15 +0,0 @@
-When run as the root user, the polipo daemon will drop privileges to
-that of the _polipo user and its login group.
-
-Some sample configuration files have been installed in
-${SYSCONFDIR}/polipo.
-
-Additionally, you may wish to start polipo at system start-up time via
-the /etc/rc.local script.
-
-if [ X"${polipo}" == X"YES" -a -x ${PREFIX}/bin/polipo ]; then
-        echo -n ' polipo'
-        ${PREFIX}/bin/polipo daemonise=yes
-fi
-
-and adding "polipo=YES" to /etc/rc.conf.local
diff -ruNp -x CVS /usr/ports/www/polipo/pkg/PLIST polipo/pkg/PLIST
--- /usr/ports/www/polipo/pkg/PLIST     Sun Feb  3 16:06:48 2008
+++ polipo/pkg/PLIST    Mon Nov  1 23:53:56 2010
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2008/02/03 15:06:48 kili Exp $
 @newgroup _polipo:548
 @newuser _polipo:548:_polipo:daemon:Polipo Account:/nonexistent:/sbin/nologin
-bin/polipo
+...@bin bin/polipo
 @info info/polipo.info
 @man man/man1/polipo.1
 share/doc/polipo/
@@ -88,3 +88,4 @@ share/examples/polipo/forbidden.sample
 @sample /var/polipo/
 @sample /var/polipo/cache/
 @extraunexec rm -rf /var/polipo/*
+...@rcscript ${RCDIR}/polipo
diff -ruNp -x CVS /usr/ports/www/polipo/pkg/polipo.rc polipo/pkg/polipo.rc
--- /usr/ports/www/polipo/pkg/polipo.rc Thu Jan  1 01:00:00 1970
+++ polipo/pkg/polipo.rc        Mon Nov  1 23:53:56 2010
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $OpenBSD:
+
+. /etc/rc.d/rc.subr
+
+daemon="/usr/local/bin/polipo"
+daemon_flags="daemonise=yes"
+
+rc_cmd $1

Reply via email to