Package: icecast2
Version: 2.3.1-5
Severity: normal
Tags: patch
Hi,
Attached is the diff for my icecast2 2.3.1-5.1 NMU during the current
BSP which I'll upload to delayed-0.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u icecast2-2.3.1/debian/icecast2.postrm icecast2-2.3.1/debian/icecast2.postrm
--- icecast2-2.3.1/debian/icecast2.postrm
+++ icecast2-2.3.1/debian/icecast2.postrm
@@ -8,12 +8,16 @@
rm -rf /var/log/icecast2
if id icecast2 >/dev/null 2>&1; then
- deluser icecast2
+ if [ -x /usr/sbin/deluser ]; then
+ /usr/sbin/deluser icecast2
+ fi
fi
# Remove group only if empty
if getent group icecast | awk -F: ' { print $4 } ' | egrep -cq '^$'; then
- groupdel icecast || echo "Error occured removing group icecast, please do it manually."
+ if [ -x /usr/sbin/groupdel ]; then
+ /usr/sbin/groupdel icecast || echo "Error occured removing group icecast, please do it manually."
+ fi
fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff -u icecast2-2.3.1/debian/changelog icecast2-2.3.1/debian/changelog
--- icecast2-2.3.1/debian/changelog
+++ icecast2-2.3.1/debian/changelog
@@ -1,3 +1,11 @@
+icecast2 (2.3.1-5.1) unstable; urgency=high
+
+ * Non-maintainer upload during BSP.
+ * Fix unconditional use of passwd package in postrm (Closes: #416771).
+ * Fix FTBFS due to use of obsolete curl API (Closes: #423778).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 19 May 2007 14:45:18 +0200
+
icecast2 (2.3.1-5) unstable; urgency=low
* Add patch to syncronize with upstream SVN as of 20060620 (r11419).
only in patch2:
unchanged:
--- icecast2-2.3.1.orig/src/auth_url.c
+++ icecast2-2.3.1/src/auth_url.c
@@ -518,7 +518,9 @@
curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle);
curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L);
+#ifdef CURLOPT_PASSWDFUNCTION
curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass);
+#endif
curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]);
if (url_info->username && url_info->password)
