Package: aiccu
Version: 20070115
Tags: patch
Followup-For: Bug #407026
Hi Jeroen !
I agree with your bugreport and it is a pity that no aiccu will be
available in Etch. I have reviewed the package as it is in the source
and I have attached a patch with a few changes. You can see them in
the changelog.
* we do not need to depend on awk since awk is in essential
(therefore, already installed on every Debian system)
* you do not need to depend on libgnutls since it is the job of shlibs
to do so
* I have added time-deamon to the recommends. My system is running
openntpd for example. ntp does not provide time-deamon, therefore,
I have left it in the list.
* I have removed the LICENSE file and replaced it by the copyright file
* Debconf prompts need to end either by "?" or by ":"
* They can now be translated in other languages
* Some developers do not like useless dh_ in rules file
* Symlinks on correct runlevels are now done (without using
dh_installinit since init is not provided in the debian directory).
Moreover, aiccu is started on install and restarted on upgrade.
This may be a bit dangerous (if the upgrade is done via the tunnel,
but this is better to run the latest version in case of security
update). A better way like may be implemented later (like what is
done with OpenVPN).
The package is now lintian-ok. There is still a glitch in debconf that
asks the tunnel broker each time.
There is one thing that does not appear in the patch : you should
remove the execution bit of aiccu.conf.
I am not a developer, so I cannot push the package into Debian. We
need to find a developer that will upload it to Debian as NMU.
Handling MIA is qa job. I have put them in copy. They may eventually
orphan the package so that another developer can take it over (without
NUMing it).
After uploading the package to unstable, we need to ask the release
team an exception to allow it to go in Etch. I think this is a bit
late for this, but we may try.
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.20-rc4-neo.3
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Versions of packages aiccu depends on:
ii debconf 1.5.11 Debian configuration management sy
ii iproute 20061002-3 Professional tools to control the
ii iputils-ping 3:20020927-4 Tools to test the reachability of
ii iputils-tracepath 3:20020927-4 Tools to trace the network path to
ii libc6 2.3.6.ds1-10 GNU C Library: Shared libraries
ii libgnutls13 1.4.4-3 the GNU TLS library - runtime libr
ii lsb-base 3.1-22 Linux Standard Base 3.1 init scrip
Versions of packages aiccu recommends:
ii ntpdate 1:4.2.2.p4+dfsg-1 client for setting system time fro
ii openntpd [time-daemon] 3.9p1-3 OpenBSD NTP daemon
-- debconf information excluded
diff -Naur aiccu/debian/aiccu.postinst aiccu-new/debian/aiccu.postinst
--- aiccu/debian/aiccu.postinst 2007-01-15 13:31:18.000000000 +0100
+++ aiccu-new/debian/aiccu.postinst 2007-01-20 09:28:07.000000000 +0100
@@ -106,3 +106,12 @@
# Just in case, make sure the permissions are perfect and dandy
chmod 600 $CONFIGFILE
+# Install /etc/rc*.d symlinks
+update-rc.d aiccu start 41 S . stop 34 S . > /dev/null
+if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d aiccu restart || true
+else
+ /etc/init.d/aiccu restart || true
+fi
+
+#DEBHELPER#
diff -Naur aiccu/debian/aiccu.postrm aiccu-new/debian/aiccu.postrm
--- aiccu/debian/aiccu.postrm 1970-01-01 01:00:00.000000000 +0100
+++ aiccu-new/debian/aiccu.postrm 2007-01-20 09:03:43.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+case "$1" in
+ purge)
+ update-rc.d aiccu remove > /dev/null
+ ;;
+esac
diff -Naur aiccu/debian/changelog aiccu-new/debian/changelog
--- aiccu/debian/changelog 2007-01-15 16:56:21.000000000 +0100
+++ aiccu-new/debian/changelog 2007-01-20 09:23:29.000000000 +0100
@@ -1,3 +1,18 @@
+aiccu (20070115-0.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Remove depends on awk
+ * Remove explicit depends on libgnutls
+ * Add recommends on time-daemon
+ * Add copyright file and removes license file
+ * Fix prompts for debconf
+ * Removing useless dh_ from rules script
+ * Start aiccu after networking
+ * Start aiccu on postinst
+ * Support of po-debconf
+
+ -- Vincent Bernat <[EMAIL PROTECTED]> Sat, 20 Jan 2007 08:57:30 +0100
+
aiccu (20070115) stable; urgency=medium
* Fixup in Debian init script (based on original patch by Bernhard Schmidt).
* Change in redirections so that errors don't show in debconf menu's etc.
diff -Naur aiccu/debian/control aiccu-new/debian/control
--- aiccu/debian/control 2007-01-11 12:47:34.000000000 +0100
+++ aiccu-new/debian/control 2007-01-20 09:14:57.000000000 +0100
@@ -2,13 +2,13 @@
Section: net
Priority: optional
Maintainer: SixXS Staff <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), libgnutls-dev
+Build-Depends: debhelper (>> 3.0.0), libgnutls-dev, po-debconf
Standards-Version: 3.7.2
Package: aiccu
Architecture: any
-Depends: ${shlibs:Depends}, iputils-ping, iputils-tracepath, iproute, debconf,
lsb-base (>= 1.3-9ubuntu2), gawk | awk, libgnutls13
-Recommends: ntpdate | ntp
+Depends: ${shlibs:Depends}, iputils-ping, iputils-tracepath, iproute, debconf,
lsb-base (>= 1.3-9ubuntu2)
+Recommends: ntpdate | ntp | time-daemon
Description: SixXS Automatic IPv6 Connectivity Client Utility
This client automatically gives one IPv6 connectivity
without having to manually configure interfaces etc.
diff -Naur aiccu/debian/copyright aiccu-new/debian/copyright
--- aiccu/debian/copyright 1970-01-01 01:00:00.000000000 +0100
+++ aiccu-new/debian/copyright 2007-01-20 08:29:28.000000000 +0100
@@ -0,0 +1,34 @@
+This is aiccu, written and maintained by Jeroen Massar <[EMAIL PROTECTED]>
+on Sun, 29 Aug 2004.
+
+This package was downloaded from
+ http://www.sixxs.net/tools/aiccu/
+
+Copyright Holder: SixXS Staff <[EMAIL PROTECTED]>
+
+License:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+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.
+3. Neither the name of SixXS nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior permission.
+
+THIS SOFTWARE IS PROVIDED BY SIXXS AND CONTRIBUTORS ``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 SIXXS OR CONTRIBUTORS 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.
+
diff -Naur aiccu/debian/docs aiccu-new/debian/docs
--- aiccu/debian/docs 2005-04-10 23:42:29.000000000 +0200
+++ aiccu-new/debian/docs 2007-01-20 08:23:22.000000000 +0100
@@ -1,3 +1,2 @@
doc/README
-doc/LICENSE
doc/HOWTO
diff -Naur aiccu/debian/po/POTFILES.in aiccu-new/debian/po/POTFILES.in
--- aiccu/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
+++ aiccu-new/debian/po/POTFILES.in 2007-01-20 09:12:17.000000000 +0100
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff -Naur aiccu/debian/po/templates.pot aiccu-new/debian/po/templates.pot
--- aiccu/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100
+++ aiccu-new/debian/po/templates.pot 2007-01-20 09:15:22.000000000 +0100
@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <[EMAIL PROTECTED]>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2007-01-20 09:15+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
+"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"To successfully connect, you must have a valid username. This is the same as "
+"the handle you use to log into the website."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../templates:2001
+msgid "Password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../templates:2001
+msgid ""
+"To successfully connect, you must have a valid password. This is the same "
+"password you use to log into the website."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:3001
+msgid "Tunnel Broker:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:3001
+msgid "Select the Tunnel Broker you would like to use."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:4001
+msgid "Tunnel Name:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:4001
+msgid ""
+"If you have more than one tunnel configured in your account, you must "
+"specify which tunnel should be activated."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Recheck authentication details?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid ""
+"You most likely have given bad authentication details. Try to login through "
+"the website of the Tunnel Broker or contact them to ask about problems."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:6001
+msgid "No Tunnel Brokers available"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:6001
+msgid ""
+"No Tunnel Brokers could be retrieved from DNS (_aiccu + _aiccu.sixxs.net) "
+"this most likely indicates a DNS configuration problem."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:7001
+msgid "No tunnels available"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:7001
+msgid ""
+"You currently have no tunnels available. Please go to the SixXS website at "
+"http://www.sixxs.net/ to request a tunnel for your account."
+msgstr ""
diff -Naur aiccu/debian/rules aiccu-new/debian/rules
--- aiccu/debian/rules 2006-08-06 18:07:13.000000000 +0200
+++ aiccu-new/debian/rules 2007-01-20 08:51:01.000000000 +0100
@@ -42,6 +42,7 @@
# Add here commands to install the package into debian/aiccu
$(MAKE) DESTDIR=`pwd`/debian/aiccu install
+ -rm debian/aiccu/usr/share/doc/aiccu/LICENSE
# Build architecture-independent files here.
binary-indep: build install
@@ -54,24 +55,13 @@
dh_installdebconf
dh_installdocs
dh_installexamples doc/aiccu.conf
- dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
- dh_installinit -- defaults 16 80
- dh_installcron
dh_installman
- dh_installinfo
-# dh_undocumented
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
diff -Naur aiccu/debian/templates aiccu-new/debian/templates
--- aiccu/debian/templates 2006-08-06 15:11:42.000000000 +0200
+++ aiccu-new/debian/templates 2007-01-20 09:14:32.000000000 +0100
@@ -1,43 +1,43 @@
Template: aiccu/username
Type: string
Default:
-Description: Username
+_Description: Username:
To successfully connect, you must have a valid username. This is
the same as the handle you use to log into the website.
Template: aiccu/password
Type: password
-Description: Password
+_Description: Password:
To successfully connect, you must have a valid password. This is
the same password you use to log into the website.
Template: aiccu/brokername
Type: select
Choices: ${brokers}
-Description: Tunnel Broker
+_Description: Tunnel Broker:
Select the Tunnel Broker you would like to use.
Template: aiccu/tunnelname
Type: select
Choices: ${tunnels}
-Description: Tunnel Name
+_Description: Tunnel Name:
If you have more than one tunnel configured in your account, you must
specify which tunnel should be activated.
Template: aiccu/badauth
Type: boolean
-Description: Recheck authentication details?
+_Description: Recheck authentication details?
You most likely have given bad authentication details. Try to login through
the website of the Tunnel Broker or contact them to ask about problems.
Template: aiccu/nobrokers
Type: note
-Description: No Tunnel Brokers available
+_Description: No Tunnel Brokers available
No Tunnel Brokers could be retrieved from DNS (_aiccu + _aiccu.sixxs.net)
this most likely indicates a DNS configuration problem.
Template: aiccu/notunnels
Type: note
-Description: No tunnels available
+_Description: No tunnels available
You currently have no tunnels available. Please go to the SixXS website
at http://www.sixxs.net/ to request a tunnel for your account.
diff -Naur aiccu/doc/aiccu.init.debian aiccu-new/doc/aiccu.init.debian
--- aiccu/doc/aiccu.init.debian 2006-08-06 20:22:28.000000000 +0200
+++ aiccu-new/doc/aiccu.init.debian 2007-01-20 09:09:44.000000000 +0100
@@ -4,6 +4,19 @@
#
# Jeroen Massar <[EMAIL PROTECTED]>
+### BEGIN INIT INFO
+# Provides: aiccu
+# Required-Start: $time $network
+# Required-Stop: $network
+# Should-Start: $local_fs
+# Should-Stop: $local_fs
+# Default-Start: S
+# Default-Stop: 0 1 6
+# Short-Description: SixXS Automatic IPv6 Connectivity Client Utility
+# Description: Automatically gives one IPv6 connectivity without
+# having to manually configure interfaces etc.
+### END INIT INFO
+
PATH=/sbin:/bin:/usr/sbin:/usr/bin
NAME=aiccu
DAEMON=/usr/sbin/${NAME}
