Hi, The just uploaded darkstat revision fix the RC bug #500070 The changes are keep minimal, just to the init.d script and other minor fixes; debdiff is attached.
Cheers. -- Rene Mauricio Mayorga | jabber: [EMAIL PROTECTED] http://rmayorga.org | -------------------------------------------------- 08B6 58AB A691 DD56 C30B 8D37 8040 19FA A209 C305
diff -Nru --exclude po darkstat-3.0.708/debian/changelog
darkstat-3.0.708/debian/changelog
--- darkstat-3.0.708/debian/changelog 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/changelog 2008-10-07 20:04:55.000000000 -0600
@@ -1,3 +1,27 @@
+darkstat (3.0.708-2) unstable; urgency=low
+
+ * fix workaround to --import/--export at init script
+ this prevent darkstat.db being replaced. Closes: #500070
+ * remove debconf note about the init script inclussion
+ * remove checks for 2.5-1 versions
+ * debian/copyright
+ + Add 2-clause BSD license for tree.h and host_sort.c
+ and remove the note for /usr/share/common-licenses/BSD
+ + add conv.c, actc.c err.c, err.h, str.c and str.h copyright stanza
+ * debian/init.d
+ + Set Conf variables to empty string before sourcing init.cfg
+ * debian/postint
+ + only remove DB when version is lt 3.0.707-1
+ * debian/templates remove upgrade-note
+ * debian/rules
+ + made build-stamp depends on configure-stamp not configure
+ + made install-stamp depends on build-stamp not build
+ + use DESTDIR instead prefix at install-stamp target
+ * debian/README.Debian - point to the correct section on the
+ reference to the manpage
+
+ -- Rene Mayorga <[EMAIL PROTECTED]> Wed, 24 Sep 2008 10:46:42 -0600
+
darkstat (3.0.708-1) unstable; urgency=low
* New upstream release
diff -Nru --exclude po darkstat-3.0.708/debian/config
darkstat-3.0.708/debian/config
--- darkstat-3.0.708/debian/config 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/config 2008-10-07 20:04:55.000000000 -0600
@@ -4,19 +4,6 @@
. /usr/share/debconf/confmodule
if [ "$1" = "configure" -a "$2" != "" ]; then
- for note in init_script-2.3-2
- do
- ver=${note#*-}
- if dpkg --compare-versions "$2" lt "$ver"; then
- db_input medium "darkstat/upgrade-note/$note" || true
- fi
- done
-
- if dpkg --compare-versions "$2" lt "2.5-1"; then
- if dpkg --compare-versions "$2" gt "2.3-1"; then
- db_input medium "darkstat/upgrade-question/db_purge-2.5-1" || true
- fi
- fi
if dpkg --compare-versions "$2" lt "3.0.707-1" ; then
db_input medium "darkstat/upgrade-question/db_purge-2.5-1" || true
fi
diff -Nru --exclude po darkstat-3.0.708/debian/copyright
darkstat-3.0.708/debian/copyright
--- darkstat-3.0.708/debian/copyright 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/copyright 2008-10-07 20:04:55.000000000 -0600
@@ -29,18 +29,24 @@
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- On Debian GNU/Linux systems, the complete text of the BSD
- License can be found in `/usr/share/common-licenses/BSD'.
-
-
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
stylecss.h, style.css:
Copyright (c) 2006 Ben Stewart
Copyright (c) 2007 Emil Mikullic
- You may use, modify and redistribute this file under the terms of the\n"
+ You may use, modify and redistribute this file under the terms of the"
GNU General Public License version 2.
On Debian GNU/Linux systems, the complete text of the GNU General
@@ -52,16 +58,22 @@
Copyright (c) 2006 Ben Stewart
- You may use, modify and redistribute this file under the terms of the\n"
+ You may use, modify and redistribute this file under the terms of the"
GNU General Public License version 2.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License version 2. can be found in
`/usr/share/common-licenses/GPL-2'.
+queue.h:
+ Copyright (c) 1991, 1993 The Regents of the University of California. All
rights reserved.
+
+ this File use the 3-clause BSD license
+ This full text for this license can be found on Debian GNU/Linux systems at:
+ '/usr/share/common-licenses/BSD'
-queue.h, host_sort.c:
+host_sort.c:
Copyright (c) 1991, 1993
The Regents of the University of California. All rights reserved.
@@ -75,8 +87,16 @@
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- On Debian GNU/Linux systems, the complete text of the BSD
- License can be found in `/usr/share/common-licenses/BSD'.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -96,3 +116,36 @@
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+acct.c:
+
+ Copyright (c) 2001-2008 Emil Mikulic.
+
+ Permission to use, copy, modify, and distribute this file for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+conv.c, err.c, err.h, str.c, str.h
+
+ Copyright (c) 2001-2007 Emil Mikulic.
+
+ Permission to use, copy, modify, and distribute this file for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
diff -Nru --exclude po darkstat-3.0.708/debian/init.d
darkstat-3.0.708/debian/init.d
--- darkstat-3.0.708/debian/init.d 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/init.d 2008-10-07 20:04:55.000000000 -0600
@@ -23,22 +23,24 @@
test -f $INIT || exit 0
+INTERFACE=""
+PORT=""
+BINDIP=""
+LOCAL=""
+DNS=""
+DB="--import darkstat.db --export darkstat.db"
+
. $INIT
-if [ "$START_DARKSTAT" != "no" ] ; then
- START_DARKSTAT=yes
+if [ "$START_DARKSTAT" = "no" ] ; then
+ exit 0
fi
-test "$START_DARKSTAT" = yes || exit 0
+test "$START_DARKSTAT" = "yes" || exit 0
case "$1" in
start)
- echo -n "Starting $DESC: $NAME"
- if [ -f /var/lib/darkstat/darkstat.db ]; then
- DB="--import darkstat.db"
- else
- DB="--export darkstat.db"
- fi
+ echo -n "Starting $DESC : $NAME "
if start-stop-daemon --start --quiet -b --exec $DAEMON -- \
$INTERFACE \
$PORT \
@@ -56,7 +58,7 @@
fi
;;
stop)
- echo -n "Stopping $DESC: $NAME"
+ echo -n "Stopping $DESC : $NAME "
if start-stop-daemon --quiet --oknodo --stop --name $NAME --pidfile $PIDFILE
--retry 30; then
rm -f $PIDFILE
echo "."
@@ -65,21 +67,16 @@
fi
;;
restart | force-reload)
- echo -n "Restarting $DESC: $NAME"
+ echo -n "Restarting $DESC : $NAME "
if start-stop-daemon --stop --oknodo --name $NAME --pidfile $PIDFILE --retry
30; then
rm -f $PIDFILE
echo "stoped."
else
- echo "$DESC:$NAME is not running"
+ echo "$DESC : $NAME is not running"
rm -f $PIDFILE
fi
sleep 1
- if [ -f /var/lib/darkstat/darkstat.db ]; then
- DB="--import darkstat.db"
- else
- DB="--export darkstat.db"
- fi
- start-stop-daemon --start --quiet --exec $DAEMON -- \
+ start-stop-daemon --start --quiet -b --exec $DAEMON -- \
$INTERFACE \
$PORT \
--chroot $DIR \
@@ -93,11 +90,6 @@
echo "."
;;
debug-run)
- if [ -f /var/lib/darkstat/darkstat.db ]; then
- DB="--import darkstat.db"
- else
- DB="--export darkstat.db"
- fi
echo "$0: Initiating debug run of darkstat..."
echo "$0: darkstat will be run in verbose mode, all output to forced to"
echo "$0: stdout. This is not enough to debug failures that only"
diff -Nru --exclude po darkstat-3.0.708/debian/postinst
darkstat-3.0.708/debian/postinst
--- darkstat-3.0.708/debian/postinst 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/postinst 2008-10-07 20:04:55.000000000 -0600
@@ -8,21 +8,7 @@
case "$1" in
configure)
if [ "$2" != "" ]; then
- if dpkg --compare-versions "$2" lt "2.5-1"; then
- # last darkstat package considered was version < 2.5-1
- # so we have to remove /var/lib/darkstat/darkstat.db
- # If the user answer "No" at the debconf question db_purge-2.5-1
- # we don't come here
- dbfile="/var/lib/darkstat/darkstat.db"
- if [ -f $dbfile ]; then
- echo -n "Removing darkstat database file $dbfile..."
- rm -f $dbfile
- echo "done."
- fi
- fi
if dpkg --compare-versions "$2" lt "3.0.707-1"; then
- # last darkstat package considered was version < 2.6-15
- # so we have to remove /var/lib/darkstat/darkstat.db
# If the user answer "No" at the debconf question db_purge-2.5-1
# we don't come here
dbfile="/var/lib/darkstat/darkstat.db"
diff -Nru --exclude po darkstat-3.0.708/debian/README.Debian
darkstat-3.0.708/debian/README.Debian
--- darkstat-3.0.708/debian/README.Debian 2008-10-07 20:04:55.000000000
-0600
+++ darkstat-3.0.708/debian/README.Debian 2008-10-07 20:04:55.000000000
-0600
@@ -14,7 +14,7 @@
Since version 3.0.707, the darkstat package has change some major options
including the feature to run in a chroot jail, the chroot dir can
be specified at compilation time or can be set with the proper option,
-see darkstat(3); at Debian the choot is set to /var/lib/darkstat.
+see darkstat(8); at Debian the choot is set to /var/lib/darkstat.
DATABASE COMPATIBILITY
diff -Nru --exclude po darkstat-3.0.708/debian/rules
darkstat-3.0.708/debian/rules
--- darkstat-3.0.708/debian/rules 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/rules 2008-10-07 20:04:55.000000000 -0600
@@ -3,16 +3,9 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g
include /usr/share/quilt/quilt.make
-#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-# CFLAGS += -O0
-#else
-# # NDEBUG is a darkstat define that turn on inlining when defined
-# CFLAGS += -O2 -DNDEBUG
-#endif
-
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
@@ -22,7 +15,7 @@
build: configure-stamp build-stamp
-build-stamp: configure
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch $@
@@ -38,12 +31,12 @@
debconf-updatepo
install: install-stamp
-install-stamp: build
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install prefix=$(CURDIR)/debian/darkstat/usr
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/darkstat
install -m 644 debian/init.cfg $(CURDIR)/debian/darkstat/etc/darkstat
install -m 644 $(CURDIR)/darkstat.1 $(CURDIR)/darkstat.8
touch $@
diff -Nru --exclude po darkstat-3.0.708/debian/templates
darkstat-3.0.708/debian/templates
--- darkstat-3.0.708/debian/templates 2008-10-07 20:04:55.000000000 -0600
+++ darkstat-3.0.708/debian/templates 2008-10-07 20:04:55.000000000 -0600
@@ -1,12 +1,3 @@
-Template: darkstat/upgrade-note/init_script-2.3-2
-Type: note
-_Description: New init script
- The darkstat package is now featuring a init.d script to manage darkstat
- start/stop actions.
- .
- Please put your settings in /etc/darkstat/init.cfg and read
- /usr/share/doc/darkstat/README.Debian for more information.
-
Template: darkstat/upgrade-question/db_purge-2.5-1
Type: boolean
Default: true
signature.asc
Description: Digital signature
