diff options
| -rw-r--r-- | net-proxy/ziproxy/ChangeLog | 10 | ||||
| -rw-r--r-- | net-proxy/ziproxy/files/ziproxy-2.4.confd | 18 | ||||
| -rw-r--r-- | net-proxy/ziproxy/files/ziproxy-2.4.initd | 26 | ||||
| -rw-r--r-- | net-proxy/ziproxy/files/ziproxy.confd (renamed from net-proxy/ziproxy/files/ziproxy-2.5.confd) | 0 | ||||
| -rw-r--r-- | net-proxy/ziproxy/files/ziproxy.initd (renamed from net-proxy/ziproxy/files/ziproxy-2.5.initd) | 12 | ||||
| -rw-r--r-- | net-proxy/ziproxy/ziproxy-2.5.1.ebuild | 6 | ||||
| -rw-r--r-- | net-proxy/ziproxy/ziproxy-2.5.2.ebuild (renamed from net-proxy/ziproxy/ziproxy-2.4.3.ebuild) | 16 |
7 files changed, 26 insertions, 62 deletions
diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog index 5727e6af4b49..93bd826b7f75 100644 --- a/net-proxy/ziproxy/ChangeLog +++ b/net-proxy/ziproxy/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-proxy/ziproxy # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.17 2008/03/16 23:36:30 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.18 2008/07/08 19:07:08 mrness Exp $ + +*ziproxy-2.5.2 (08 Jul 2008) + + 08 Jul 2008; Alin Năstac <mrness@gentoo.org> -files/ziproxy-2.4.confd, + -files/ziproxy-2.4.initd, -files/ziproxy-2.5.confd, + -files/ziproxy-2.5.initd, +files/ziproxy.confd, +files/ziproxy.initd, + -ziproxy-2.4.3.ebuild, ziproxy-2.5.1.ebuild, +ziproxy-2.5.2.ebuild: + Remove old version. Version bump. Fix init script (#231005). 16 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org> -files/ziproxy-2.3.0.diff, -files/ziproxy-2.3.confd, diff --git a/net-proxy/ziproxy/files/ziproxy-2.4.confd b/net-proxy/ziproxy/files/ziproxy-2.4.confd deleted file mode 100644 index 793b8c666739..000000000000 --- a/net-proxy/ziproxy/files/ziproxy-2.4.confd +++ /dev/null @@ -1,18 +0,0 @@ -# configuraton file for /etc/init.d/ziproxy -# -# you can symlink /etc/init.d/ziproxy to a different name -# and then copy this config to a new file with the same name -# as the symlinked init-script to run multiple instances of -# ziproxy. You have to change the location for CONFIG then -# of course... ;-) - -# Full path to ziproxy.conf file (instead of default one). -# -#CONFIG="/etc/ziproxy.conf" - -# Limit incoming connections only from the specified address(es). -# This option has the same meaning, but higher precedence as -# "OnlyFrom=" option in configuration file. Uncomment it -# if you want to set it. -# -#ONLYFROM="<IP.address or hostname>" diff --git a/net-proxy/ziproxy/files/ziproxy-2.4.initd b/net-proxy/ziproxy/files/ziproxy-2.4.initd deleted file mode 100644 index 7d9cd0371ad2..000000000000 --- a/net-proxy/ziproxy/files/ziproxy-2.4.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy-2.4.initd,v 1.1 2007/11/18 02:08:16 sbriesen Exp $ - -depend() { - need net -} - -start() { - local OPT="-d" - ebegin "Starting ${myservice}" - - [ -n "${CONFIG}" ] && OPT="${OPT} -c ${CONFIG}" - [ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}" - - start-stop-daemon --quiet --start --pidfile /var/run/${myservice}.pid \ - --chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} > /var/run/${myservice}.pid - eend $? -} - -stop() { - ebegin "Stopping ziproxy" - start-stop-daemon --stop --quiet --pidfile /var/run/${myservice}.pid - eend $? -} diff --git a/net-proxy/ziproxy/files/ziproxy-2.5.confd b/net-proxy/ziproxy/files/ziproxy.confd index 9a4a12137c6a..9a4a12137c6a 100644 --- a/net-proxy/ziproxy/files/ziproxy-2.5.confd +++ b/net-proxy/ziproxy/files/ziproxy.confd diff --git a/net-proxy/ziproxy/files/ziproxy-2.5.initd b/net-proxy/ziproxy/files/ziproxy.initd index fd3424d7f09a..a4b04a831de5 100644 --- a/net-proxy/ziproxy/files/ziproxy-2.5.initd +++ b/net-proxy/ziproxy/files/ziproxy.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy-2.5.initd,v 1.1 2008/03/16 23:34:41 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy.initd,v 1.4 2008/07/08 19:07:09 mrness Exp $ depend() { need net @@ -9,18 +9,18 @@ depend() { start() { local OPT="-d" - ebegin "Starting ${myservice}" + ebegin "Starting ${SVCNAME}" [ -n "${CONFIG}" ] && OPT="${OPT} -c ${CONFIG}" [ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}" - start-stop-daemon --quiet --start --pidfile /var/run/${myservice}.pid \ - --chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} > /var/run/${myservice}.pid + start-stop-daemon --quiet --start --pidfile /var/run/${SVCNAME}.pid \ + --chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} > /var/run/${SVCNAME}.pid eend $? } stop() { - ebegin "Stopping ziproxy" - start-stop-daemon --stop --quiet --pidfile /var/run/${myservice}.pid + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid eend $? } diff --git a/net-proxy/ziproxy/ziproxy-2.5.1.ebuild b/net-proxy/ziproxy/ziproxy-2.5.1.ebuild index 439909e5f7c1..184bde14d8fe 100644 --- a/net-proxy/ziproxy/ziproxy-2.5.1.ebuild +++ b/net-proxy/ziproxy/ziproxy-2.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.1.ebuild,v 1.1 2008/03/16 23:34:41 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.1.ebuild,v 1.2 2008/07/08 19:07:08 mrness Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -59,8 +59,8 @@ src_install() { newbin stats.awk ${PN}_stats.awk dobin src/tools/ziproxy_genhtml_stats.sh - newinitd "${FILESDIR}/${PN}-${PV%.*}.initd" ${PN} - newconfd "${FILESDIR}/${PN}-${PV%.*}.confd" ${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} dodoc ChangeLog CREDITS README README.tools use jpeg2k && dodoc JPEG2000.txt diff --git a/net-proxy/ziproxy/ziproxy-2.4.3.ebuild b/net-proxy/ziproxy/ziproxy-2.5.2.ebuild index 29dc10e20b82..f354c95a27db 100644 --- a/net-proxy/ziproxy/ziproxy-2.4.3.ebuild +++ b/net-proxy/ziproxy/ziproxy-2.5.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.4.3.ebuild,v 1.1 2007/12/30 13:17:34 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.2.ebuild,v 1.1 2008/07/08 19:07:08 mrness Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -34,8 +34,8 @@ src_unpack() { cd "${S}" # fix sample config file - sed -i -e "s:/usr/local/ziproxy/\(ziproxy.passwd\):/etc/\1:g" \ - -e "s:/var/ziproxy/:/var/lib/ziproxy/:g" etc/ziproxy.conf + sed -i -e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \ + etc/ziproxy/ziproxy.conf # fix sample xinetd config sed -i -e "s:/usr/bin/:/usr/sbin/:g" \ @@ -44,7 +44,7 @@ src_unpack() { } src_compile() { - local myconf="--enable-shared-confuse --with-cfgfile=/etc/ziproxy.conf" # --enable-testprogs + local myconf="--with-cfgfile=/etc/ziproxy/ziproxy.conf" # --enable-testprogs use jpeg2k && myconf="${myconf} --with-jasper" # use_with doesn't work econf ${myconf} || die "econf failed" emake || die "emake failed" @@ -59,14 +59,14 @@ src_install() { newbin stats.awk ${PN}_stats.awk dobin src/tools/ziproxy_genhtml_stats.sh - newinitd "${FILESDIR}/${PN}-${PV%.*}.initd" ${PN} - newconfd "${FILESDIR}/${PN}-${PV%.*}.confd" ${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} dodoc ChangeLog CREDITS README README.tools use jpeg2k && dodoc JPEG2000.txt insinto /etc - doins etc/ziproxy.conf + doins -r etc/ziproxy insinto /var/lib/ziproxy/error doins var/ziproxy/error/*.html |