Package: acidbase
Version: 1.2.5-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my acidbase 1.2.5-1.1 NMU.
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/changelog
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/changelog
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/changelog 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/changelog 2006-09-26
12:59:57.000000000 +0200
@@ -1,3 +1,11 @@
+acidbase (1.2.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make config and postrm scripts check for the existence of dbconfig-common
+ before attempting to use it. (Closes: #388219)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Tue, 26 Sep 2006 12:59:07 +0200
+
acidbase (1.2.5-1) unstable; urgency=high
* New upstream release, wich includes the following security improvements:
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/config
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/config
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/config 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/config 2006-09-26
12:59:57.000000000 +0200
@@ -7,8 +7,11 @@
dbc_dbtypes="mysql, pgsql"
dbc_dbuser="snort"
dbc_dbname="snort"
-. /usr/share/dbconfig-common/dpkg/config
-dbc_go acidbase $@
+
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+ . /usr/share/dbconfig-common/dpkg/config
+ dbc_go acidbase $@
+fi
db_input medium "acidbase/webserver" || true
db_text high "acidbase/base_advisory" || true
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/postrm
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/postrm
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/postrm 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/postrm 2006-09-26
12:59:57.000000000 +0200
@@ -5,8 +5,11 @@
# source dbconfig-common stuff
dbc_dbtypes="mysql, pgsql"
-. /usr/share/dbconfig-common/dpkg/postrm
-dbc_go acidbase $@
+
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+ . /usr/share/dbconfig-common/dpkg/postrm
+ dbc_go acidbase $@
+fi
if [ "$1" = "purge" ]; then
rm -f /etc/acidbase/database.php*
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/cs.po
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/cs.po
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/cs.po 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/cs.po 2006-09-26
12:59:57.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: acidbase\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-02-07 15:19+0100\n"
+"POT-Creation-Date: 2006-09-26 12:59+0200\n"
"PO-Revision-Date: 2006-01-12 08:30:26+0100\n"
"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
"Language-Team: Czech <[EMAIL PROTECTED]>\n"
@@ -17,21 +17,21 @@
#. Type: select
#. Choices
-#: ../templates:3
+#: ../templates:1001
#, fuzzy
msgid "Apache, Apache2, Apache-SSL, All, None"
msgstr "Apache, Apache2, Apache-SSL, Oba, Všechny, Žádný"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
#, fuzzy
msgid "Version(s) of Apache to configure automatically:"
msgstr "Který webový server se má nastavit automaticky?"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"BASE requires a few things to be set up in your web server configuration."
msgstr ""
@@ -40,7 +40,7 @@
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
#, fuzzy
msgid ""
"The Debian packaged version can usually automatically configure apache by "
@@ -57,13 +57,13 @@
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid "NOTE: Manual configuration required"
msgstr "Poznámka: vyžadováno ruční nastavení"
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid ""
"You will need to go to http://localhost/acidbase first to force the database "
"modifications for BASE."
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/es.po
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/es.po
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/es.po 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/es.po 2006-09-26
12:59:57.000000000 +0200
@@ -31,7 +31,7 @@
msgstr ""
"Project-Id-Version: acidbase debconf 1.2.1-3\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-02-07 15:19+0100\n"
+"POT-Creation-Date: 2006-09-26 12:59+0200\n"
"PO-Revision-Date: 2006-03-05 20:04+0100\n"
"Last-Translator: David Gil <[EMAIL PROTECTED]>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -41,19 +41,19 @@
#. Type: select
#. Choices
-#: ../templates:3
+#: ../templates:1001
msgid "Apache, Apache2, Apache-SSL, All, None"
msgstr "Apache, Apache2, Apache-SSL, Todos, Ninguno"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid "Version(s) of Apache to configure automatically:"
msgstr "Versi�n/es de Apache a configurar autom�ticamente:"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"BASE requires a few things to be set up in your web server configuration."
msgstr ""
@@ -61,24 +61,30 @@
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"The Debian packaged version can usually automatically configure apache by "
"dropping a symlink into the /etc/APACHE-SERVER/conf.d directory. Select "
"\"None\" if you aren't running apache or you would prefer to set up the web "
"server yourself. If you select a version to configure, all configuration "
"changes will also be removed when the package is purged."
-msgstr "Normalmente, la versi�n del paquete Debian puede configurar
autom�ticamente apache creando un enlace simb�lico en el directorio
/etc/SERVIDOR-APACHE/conf.d. Responda �Ninguno� si usted no est� usando apache
o si prefiere configurar el servidor web por usted mismo. Si indica una versi�n
a configurar en respuesta a esta pregunta, se eliminar�n los cambios que se
realicen cuando se purge el paquete."
+msgstr ""
+"Normalmente, la versi�n del paquete Debian puede configurar autom�ticamente "
+"apache creando un enlace simb�lico en el directorio /etc/SERVIDOR-APACHE/"
+"conf.d. Responda �Ninguno� si usted no est� usando apache o si prefiere "
+"configurar el servidor web por usted mismo. Si indica una versi�n a "
+"configurar en respuesta a esta pregunta, se eliminar�n los cambios que se "
+"realicen cuando se purge el paquete."
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid "NOTE: Manual configuration required"
msgstr "NOTA: Es necesario actualizar manualmente la configuraci�n."
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid ""
"You will need to go to http://localhost/acidbase first to force the database "
"modifications for BASE."
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/fr.po
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/fr.po
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/fr.po 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/fr.po 2006-09-26
12:59:57.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: acidbase 1.2.2-1\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-02-07 15:19+0100\n"
+"POT-Creation-Date: 2006-09-26 12:59+0200\n"
"PO-Revision-Date: 2006-04-26 14:52+0100\n"
"Last-Translator: Steve Petruzzello <[EMAIL PROTECTED]>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -18,19 +18,19 @@
#. Type: select
#. Choices
-#: ../templates:3
+#: ../templates:1001
msgid "Apache, Apache2, Apache-SSL, All, None"
msgstr "Apache, Apache2, Apache-SSL, Tous, Aucune"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid "Version(s) of Apache to configure automatically:"
msgstr "Version(s) d'Apache � configurer automatiquement�:"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"BASE requires a few things to be set up in your web server configuration."
msgstr ""
@@ -39,7 +39,7 @@
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"The Debian packaged version can usually automatically configure apache by "
"dropping a symlink into the /etc/APACHE-SERVER/conf.d directory. Select "
@@ -56,13 +56,13 @@
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid "NOTE: Manual configuration required"
msgstr "NOTE�: intervention manuelle indispensable"
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid ""
"You will need to go to http://localhost/acidbase first to force the database "
"modifications for BASE."
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/pt.po
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/pt.po
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/pt.po 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/pt.po 2006-09-26
12:59:57.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: acidbase 1.2.1-4\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-02-07 15:19+0100\n"
+"POT-Creation-Date: 2006-09-26 12:59+0200\n"
"PO-Revision-Date: 2006-01-21 23:19+0000\n"
"Last-Translator: Carlos Lisboa <[EMAIL PROTECTED]>\n"
"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
@@ -18,14 +18,14 @@
#. Type: select
#. Choices
-#: ../templates:3
+#: ../templates:1001
#, fuzzy
msgid "Apache, Apache2, Apache-SSL, All, None"
msgstr "Apache, Apache2, Apache-SSL, Ambos, Todos, Nenhum"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
#, fuzzy
msgid "Version(s) of Apache to configure automatically:"
msgstr ""
@@ -33,7 +33,7 @@
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"BASE requires a few things to be set up in your web server configuration."
msgstr ""
@@ -42,7 +42,7 @@
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
#, fuzzy
msgid ""
"The Debian packaged version can usually automatically configure apache by "
@@ -59,13 +59,13 @@
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid "NOTE: Manual configuration required"
msgstr "NOTA: É necessária configuração manual"
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid ""
"You will need to go to http://localhost/acidbase first to force the database "
"modifications for BASE."
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/sv.po
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/sv.po
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/sv.po 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/sv.po 2006-09-26
12:59:57.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: acidbase 1.2.1-4\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-02-07 15:19+0100\n"
+"POT-Creation-Date: 2006-09-26 12:59+0200\n"
"PO-Revision-Date: 2006-01-19 16:16+0100\n"
"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
@@ -17,21 +17,21 @@
#. Type: select
#. Choices
-#: ../templates:3
+#: ../templates:1001
#, fuzzy
msgid "Apache, Apache2, Apache-SSL, All, None"
msgstr "Apache, Apache2, Apache-SSL, B�da, Alla, Ingen"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
#, fuzzy
msgid "Version(s) of Apache to configure automatically:"
msgstr "Vilken webbserver vill du konfigurera om automatiskt?"
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"BASE requires a few things to be set up in your web server configuration."
msgstr ""
@@ -39,7 +39,7 @@
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
#, fuzzy
msgid ""
"The Debian packaged version can usually automatically configure apache by "
@@ -56,13 +56,13 @@
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid "NOTE: Manual configuration required"
msgstr "NOTERA: Manuell konfiguration kr�vs"
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid ""
"You will need to go to http://localhost/acidbase first to force the database "
"modifications for BASE."
diff -Nru /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/templates.pot
/tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/templates.pot
--- /tmp/cIMxIHKqBE/acidbase-1.2.5/debian/po/templates.pot 2006-09-26
12:59:57.000000000 +0200
+++ /tmp/O8LyYS9TLy/acidbase-1.2.5/debian/po/templates.pot 2006-09-26
12:59:57.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-02-07 15:19+0100\n"
+"POT-Creation-Date: 2006-09-26 12:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -18,26 +18,26 @@
#. Type: select
#. Choices
-#: ../templates:3
+#: ../templates:1001
msgid "Apache, Apache2, Apache-SSL, All, None"
msgstr ""
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid "Version(s) of Apache to configure automatically:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"BASE requires a few things to be set up in your web server configuration."
msgstr ""
#. Type: select
#. Description
-#: ../templates:5
+#: ../templates:1002
msgid ""
"The Debian packaged version can usually automatically configure apache by "
"dropping a symlink into the /etc/APACHE-SERVER/conf.d directory. Select "
@@ -48,13 +48,13 @@
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid "NOTE: Manual configuration required"
msgstr ""
#. Type: note
#. Description
-#: ../templates:16
+#: ../templates:2001
msgid ""
"You will need to go to http://localhost/acidbase first to force the database "
"modifications for BASE."
