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

Re: NEW: polipo-0.9.8



On Wed, Aug 03, 2005 at 08:21:18PM +0200, Bernd Ahlers wrote:
> I've some small fixes:
> 
> - fmt -w 72 for pkg/DESCR
> - install sample files to /etc/polipo
> - different way to install the spool dir and the log file
>   (pkg_delete -c does its job now)

Thanks to everyone for the testing, comments, and patches.  And thanks
to Matthias K. for the privsep patches, too.

I have updated the port fixing several of the problems:
 - reformatted pkg/DESCR
 - config files install to SYSCONFDIR
 - fixed newuser, cache and logfile install in PLIST
 - cleanup in the Makefile and in pkg/

Attached is a patch against the original port and the new port itself.

thanks,
jon
diff -Nur polipo.orig/Makefile polipo/Makefile
--- polipo.orig/Makefile	Thu Jan 27 22:02:05 2005
+++ polipo/Makefile	Thu Aug  4 16:28:42 2005
@@ -18,15 +18,19 @@
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=        c
+NO_REGRESS=     Yes
 
 LOG_DIR=        /var
 SUBST_VARS=     LOG_DIR
 
 FAKE_FLAGS=     install_prefix="${WRKINST}"
 
+post-extract:
+	@perl -pi -e "s,\/usr\/local\/share\/polipo\/,${PREFIX}/share/polipo/," \
+	${WRKSRC}/polipo.man
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/polipo
-	${INSTALL_DATA} ${WRKBUILD}/*.sample ${PREFIX}/share/examples/polipo
-
+	${INSTALL_DATA} ${WRKSRC}/*.sample ${PREFIX}/share/examples/polipo
 
 .include <bsd.port.mk>
diff -Nur polipo.orig/patches/patch-Makefile polipo/patches/patch-Makefile
--- polipo.orig/patches/patch-Makefile	Thu Jan 27 22:02:05 2005
+++ polipo/patches/patch-Makefile	Thu Aug  4 16:28:42 2005
@@ -7,7 +7,7 @@
  INFODIR = $(PREFIX)/info
 -LOCAL_ROOT = /usr/share/polipo/www
 -DISK_CACHE_ROOT = /var/cache/polipo
-+LOCAL_ROOT = ${PREFIX}/share/polipo/
++LOCAL_ROOT = ${PREFIX}/share/polipo
 +DISK_CACHE_ROOT = /var/spool/polipo
  
  # CDEBUGFLAGS = -O
diff -Nur polipo.orig/pkg/DESCR polipo/pkg/DESCR
--- polipo.orig/pkg/DESCR	Thu Jan 27 22:02:05 2005
+++ polipo/pkg/DESCR	Thu Aug  4 16:28:42 2005
@@ -1,4 +1,4 @@
-Polipo is a small and fast caching web proxy (a web cache, an HTTP proxy)
-designed to be used by one person or a small group of people. I like to 
-think that is similar in spirit to WWWOFFLE, but the implementation 
-techniques are more like the ones ones used by Squid. 
+Polipo is a small and fast caching web proxy (a web cache, an HTTP
+proxy) designed to be used by one person or a small group of people. I
+like to think that is similar in spirit to WWWOFFLE, but the
+implementation techniques are more like the ones ones used by Squid.
diff -Nur polipo.orig/pkg/MESSAGE polipo/pkg/MESSAGE
--- polipo.orig/pkg/MESSAGE	Thu Jan 27 22:02:05 2005
+++ polipo/pkg/MESSAGE	Thu Aug  4 16:28:42 2005
@@ -2,14 +2,14 @@
 to that of the _polipo user and its login group.  The user and group
 of _polipo have been added by this package.
 
-Optional configuration files have been installed in 
-${PREFIX}/share/examples/polipo and should be placed in /etc/polipo/.
+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.
+via the ${SYSCONFDIR}/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 ${SYSCONFDIR}/rc.conf.local
diff -Nur polipo.orig/pkg/PLIST polipo/pkg/PLIST
--- polipo.orig/pkg/PLIST	Thu Jan 27 22:02:05 2005
+++ polipo/pkg/PLIST	Thu Aug  4 16:28:42 2005
@@ -5,8 +5,11 @@
 @info info/polipo.info
 @man man/man1/polipo.1
 share/examples/polipo/
+_(_at_)_sample ${SYSCONFDIR}/polipo/
 share/examples/polipo/config.sample
+_(_at_)_sample ${SYSCONFDIR}/polipo/config
 share/examples/polipo/forbidden.sample
+_(_at_)_sample ${SYSCONFDIR}/polipo/forbidden
 share/polipo/
 share/polipo/doc/
 share/polipo/doc/Access-control.html
@@ -63,11 +66,20 @@
 share/polipo/doc/Stopping.html
 share/polipo/doc/The-web.html
 share/polipo/doc/Tuning-POST-and-PUT.html
+share/polipo/doc/Tuning-the-HTTP-parser.html
 share/polipo/doc/Tunnelling-connections.html
 share/polipo/doc/Variable-index.html
 share/polipo/doc/WWWOFFLE.html
 share/polipo/doc/Web-interface.html
 share/polipo/doc/index.html
 share/polipo/index.html
-_(_at_)_exec install -o _polipo -g _polipo -m 600 /dev/null /var/log/polipo
-_(_at_)_exec install -d -o _polipo -g _polipo -m 700 /var/spool/polipo
+_(_at_)_mode 700
+_(_at_)_owner _polipo
+_(_at_)_group _polipo
+_(_at_)_sample /var/spool/polipo/
+_(_at_)_mode 600
+_(_at_)_sample /var/log/polipo
+_(_at_)_mode
+_(_at_)_owner
+_(_at_)_group
+_(_at_)_extraunexec rm -rf /var/spool/polipo/*
diff -Nur polipo.orig/pkg/UNMESSAGE polipo/pkg/UNMESSAGE
--- polipo.orig/pkg/UNMESSAGE	Thu Jan 27 22:02:05 2005
+++ polipo/pkg/UNMESSAGE	Wed Dec 31 21:00:00 1969
@@ -1,3 +0,0 @@
-
-You will need to remove the directory /var/spool/polipo and /etc/polipo 
-by hand to fully uninstall this package. 

Attachment: polipo-0.9.8.tgz
Description: application/tar-gz


Visit your host, monkey.org