On Sun, Mar 04, 2007 at 03:07:17PM +0100, Aurelien Jarno wrote:
> I haven't got any news on this long standing bug. If you are lacking
> some time, I propose a NMU.
Hi,
I have uploaded an NMU to fix this bug to DELAYED/7. You will find the
diff attached.
Bye,
Aurelien
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
diff -u osiris-4.2.0/debian/changelog osiris-4.2.0/debian/changelog
--- osiris-4.2.0/debian/changelog
+++ osiris-4.2.0/debian/changelog
@@ -1,3 +1,11 @@
+osiris (4.2.0-2.1) unstable; urgency=low
+
+ * Porter NMU.
+ * Add support for GNU/k*BSD in install/install.sh.in.
+ * Update config.guess and config.sub (closes: #306790).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 11 Mar 2007 21:17:07 +0100
+
osiris (4.2.0-2) unstable; urgency=high
* Applied patch by Ulf Harnhammar to fix arbitrary code execution and
diff -u osiris-4.2.0/debian/rules osiris-4.2.0/debian/rules
--- osiris-4.2.0/debian/rules
+++ osiris-4.2.0/debian/rules
@@ -25,6 +25,10 @@
configure: configure-stamp
configure-stamp:
dh_testdir
+ cp -f /usr/share/misc/config.guess src/db-4.2.52/dist
+ cp -f /usr/share/misc/config.sub src/db-4.2.52/dist
+ cp -f /usr/share/misc/config.guess .
+ cp -f /usr/share/misc/config.sub .
CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -55,10 +59,8 @@
-rm -f src/install/osiris
-rm -f src/install/osirisd
-rm -f src/install/osirismd
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ rm -f src/db-4.2.52/dist/config.guess src/db-4.2.52/dist/config.sub
+ rm -f config.guess config.sub
dh_clean
install: build
diff -u osiris-4.2.0/debian/control osiris-4.2.0/debian/control
--- osiris-4.2.0/debian/control
+++ osiris-4.2.0/debian/control
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Jamie Wilkinson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), libssl-dev
+Build-Depends: debhelper (>> 4.0.0), libssl-dev, autotools-dev
Standards-Version: 3.6.2
Package: osiris
only in patch2:
unchanged:
--- osiris-4.2.0.orig/src/install/install.sh.in
+++ osiris-4.2.0/src/install/install.sh.in
@@ -60,7 +60,7 @@
echo "==> creating user and group (${USERNAME}, ${GROUP})."
case `uname -s` in
-Linux|OpenBSD)
+Linux|OpenBSD|GNU/k*BSD)
# Add group, must be first.
if ! /usr/sbin/groupadd ${GROUP}; then
@@ -201,7 +201,7 @@
echo "==> using existing Osiris user."
else
case `uname -s` in
- Linux|*BSD|SunOS*|AIX*)
+ Linux|*BSD|SunOS*|AIX*|GNU/k*BSD)
create_user_and_group ${AGENT_USER} ${AGENT_GROUP} ${OSIRIS_DIR}
;;
Darwin)
@@ -218,7 +218,7 @@
echo "==> using existing Osiris management console user."
else
case `uname -s` in
- Linux|*BSD|SunOS*|AIX*)
+ Linux|*BSD|SunOS*|AIX*|GNU/k*BSD)
create_user_and_group ${MD_USER} ${MD_GROUP} ${OSIRISMD_DIR}
;;
@@ -345,7 +345,7 @@
USERNAME=$1
case `uname -s` in
-Linux)
+Linux|GNU/k*BSD)
getent passwd "${USERNAME}" > /dev/null 2>&1
RC=$?
@@ -735,7 +735,7 @@
case `uname -s` in
-Linux)
+Linux|GNU/k*BSD)
echo ${RC_DESC}
