Bug#494265: Possible patch
Hi,
On Tue, Aug 12, 2008 at 01:45:52AM +0200, Tomasz Mrugalski wrote:
It would be great. I have prepared those new packages with your patch:
http://klub.com.pl/dhcpv6/debian/
Can you sponsor them? Since only client uses ucf, there's no need to
reupload other packages.
It does not work that way, you have to upload all packages if you bump
the source package's version.
I had a look at the diff between the old and new package, and there
are some changes there besides the one fixing the bug. And these
changes look pretty intrusive (you are changing configure parameters),
so I'm pretty sure that release team will not grant a freeze exception
in this case. Please keep the change to a minimum, only fixing the RC
bug, that will greatly improve chances for the fixed version to get
into testing in time.
Cheers.
--
Jurij Smakov [EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC
diff -aur dibbler-0.7.1-1/debian/changelog dibbler-0.7.1-2/debian/changelog
--- dibbler-0.7.1-1/debian/changelog 2008-08-12 13:39:55.0 +0100
+++ dibbler-0.7.1-2/debian/changelog 2008-08-12 13:40:06.0 +0100
@@ -1,3 +1,9 @@
+dibbler (0.7.1-2) unstable; urgency=low
+
+ * ucf is now used properly (closes: #494265)
+
+ -- Tomasz Mrugalski [EMAIL PROTECTED] Tue, 12 Aug 2008 00:52:36 +0200
+
dibbler (0.7.1-1) unstable; urgency=low
* New upstream release (0.7.0 was never fully released)
diff -aur dibbler-0.7.1-1/debian/dibbler-client.postinst dibbler-0.7.1-2/debian/dibbler-client.postinst
--- dibbler-0.7.1-1/debian/dibbler-client.postinst 2008-08-12 13:39:55.0 +0100
+++ dibbler-0.7.1-2/debian/dibbler-client.postinst 2008-08-12 13:40:06.0 +0100
@@ -94,10 +94,10 @@
echo ${CONFFILE_NEW}
done
-db_stop
-
# register this config
-test -f /usr/bin/ucf ucf ${CONFFILE_NEW} ${CONFFILE} /dev/tty
+test -x /usr/bin/ucf ucf ${CONFFILE_NEW} ${CONFFILE}
+
+db_stop
# Start service if necessary
if [ $START == true ]; then
Only in dibbler-0.7.1-2/debian: dibbler-relay.postrm
Only in dibbler-0.7.1-2/debian: dibbler-relay.prerm
Only in dibbler-0.7.1-2/debian: patches
diff -aur dibbler-0.7.1-1/Makefile dibbler-0.7.1-2/Makefile
--- dibbler-0.7.1-1/Makefile 2008-08-12 13:39:55.0 +0100
+++ dibbler-0.7.1-2/Makefile 2008-06-29 18:35:05.0 +0100
@@ -163,11 +163,12 @@
libposlib: poslib-configure
@echo [MAKE ] /poslib/poslib
$(MAKE) -C $(PREFIX)/poslib poslib.log
+ rm -f $(POSLIB)/*.so*
poslib-configure:
@echo [CONFIG ] /poslib/
cd $(PREFIX)/poslib; test -e config.h || \
- ./configure --disable-shared --host=$(CHOST) --build=$(CBUILD) configure-poslib.log;
+ ./configure --host=$(CHOST) --build=$(CBUILD) configure-poslib.log;
relaylibs: includes
@for dir in $(RELSUBDIRS); do \
diff -aur dibbler-0.7.1-1/Makefile.inc dibbler-0.7.1-2/Makefile.inc
--- dibbler-0.7.1-1/Makefile.inc 2008-08-12 13:39:55.0 +0100
+++ dibbler-0.7.1-2/Makefile.inc 2008-06-22 17:32:04.0 +0100
@@ -67,8 +67,7 @@
#XMLLIBS = `pkg-config libxml-2.0 --libs`
# === do not modify anything below ===
-SILENTMAKE = -s
-MAKEFLAGS += $(SILENTMAKE)
+MAKEFLAGS += -s
VERSION = `$(TOPDIR)/test/xtract_version`
INST_WORKDIR = $(DESTDIR)'/var/lib/dibbler'
INST_MANDIR = $(DESTDIR)'/usr/local/man'
Bug#494265: Possible patch
Well, it doesn't install without some changes. So there's no point in including it in Lenny unless that's fixed. Rick On Aug 12, 2008, at 8:49 AM, Jurij Smakov wrote: Hi, On Tue, Aug 12, 2008 at 01:45:52AM +0200, Tomasz Mrugalski wrote: It would be great. I have prepared those new packages with your patch: http://klub.com.pl/dhcpv6/debian/ Can you sponsor them? Since only client uses ucf, there's no need to reupload other packages. It does not work that way, you have to upload all packages if you bump the source package's version. I had a look at the diff between the old and new package, and there are some changes there besides the one fixing the bug. And these changes look pretty intrusive (you are changing configure parameters), so I'm pretty sure that release team will not grant a freeze exception in this case. Please keep the change to a minimum, only fixing the RC bug, that will greatly improve chances for the fixed version to get into testing in time. Cheers. -- Jurij Smakov [EMAIL PROTECTED] Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CCdibbler-0.7.1-1to2.patch -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494265: Possible patch
On Tue, 12 Aug 2008 somebody known as Jurij Smakov wrote: Can you sponsor them? Since only client uses ucf, there's no need to reupload other packages. It does not work that way, you have to upload all packages if you bump the source package's version. Ok. So I've prepared all packages. Thanks for the clarification. I had a look at the diff between the old and new package, and there are some changes there besides the one fixing the bug. And these changes look pretty intrusive (you are changing configure parameters), so I'm pretty sure that release team will not grant a freeze exception in this case. Please keep the change to a minimum, only fixing the RC bug, that will greatly improve chances for the fixed version to get into testing in time. Ok, here's fixed version: http://klub.com.pl/dhcpv6/debian/0.7.1-2-fixed/ Last time I took the debian/ directory from my CVS tree. There may have been some other changes, hence the difference you've found. Obviously that was bad approach. This time I took the diff that is part of Lenny: http://ftp.de.debian.org/debian/pool/main/d/dibbler/dibbler_0.7.1-1.diff.gz then applied your patch and modified debian/changelog file. Besides that, there are no other changes. Jurij, can you take a look? By the way: What version should this package have? Previous try to prepare 0.7.1-2 failed, but it never got public. This attempt should be named 0.7.1-3 or still 0.7.1-2? Note to self: Do not try to release anything after 1:30am on workdays (weekends are ok). Regards, -- Tomasz Mrugalski, | Him not my excellent grammar to criticize I told. | thomson(at)klub(dot)com(dot)pl | angry Yoda | -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494265: Possible patch
On Tue, Aug 12, 2008 at 10:26:00PM +0200, Tomasz Mrugalski wrote: On Tue, 12 Aug 2008 somebody known as Jurij Smakov wrote: Can you sponsor them? Since only client uses ucf, there's no need to reupload other packages. It does not work that way, you have to upload all packages if you bump the source package's version. Ok. So I've prepared all packages. Thanks for the clarification. I had a look at the diff between the old and new package, and there are some changes there besides the one fixing the bug. And these changes look pretty intrusive (you are changing configure parameters), so I'm pretty sure that release team will not grant a freeze exception in this case. Please keep the change to a minimum, only fixing the RC bug, that will greatly improve chances for the fixed version to get into testing in time. Ok, here's fixed version: http://klub.com.pl/dhcpv6/debian/0.7.1-2-fixed/ Last time I took the debian/ directory from my CVS tree. There may have been some other changes, hence the difference you've found. Obviously that was bad approach. This time I took the diff that is part of Lenny: http://ftp.de.debian.org/debian/pool/main/d/dibbler/dibbler_0.7.1-1.diff.gz then applied your patch and modified debian/changelog file. Besides that, there are no other changes. Jurij, can you take a look? Sure, I have just uploaded it. The version number should be -2, since we never ended up uploading the previously prepared one. I've done only one change to the package: removed one space after '--' symbols in your changelog entry, lintian was complaining about it. Please wait for 10 days, then ask [EMAIL PROTECTED] for a freeze exception to get the fixed package into testing. Cheers. -- Jurij Smakov [EMAIL PROTECTED] Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494265: Possible patch
Hi,
The line invoking ucf in the postinst looks like that:
test -f /usr/bin/ucf ucf ${CONFFILE_NEW} ${CONFFILE} /dev/tty
Now, I don't know why you would want to get it read from /dev/tty, as
far as I can tell, ucf does not read anything from stdin, so this is
pretty redundant. However, once I removed this redirect, it was still
hanging. Eventually I traced the problem to the fact that ucf uses
debconf, I can't fully understand what's happening there, but it
turned out that moving db_stop, placing it *after* ucf invocation
fixes the problem. I guess that once we stop debconf in the script
(with db_stop) and then ucf tries to start it up again, something goes
wrong with file descriptors. The candidate patch which fixes the issue
is attached, however I'm reluctant to declare it a proper fix without
understanding what's really going on, hence I'm not tagging it.
Cheers.
--
Jurij Smakov [EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC
--- dibbler-0.7.1.orig/debian/dibbler-client.postinst 2008-08-11 02:35:02.0 +0100
+++ dibbler-0.7.1/debian/dibbler-client.postinst 2008-08-11 02:38:18.0 +0100
@@ -94,10 +94,10 @@
echo ${CONFFILE_NEW}
done
-db_stop
-
# register this config
-test -f /usr/bin/ucf ucf ${CONFFILE_NEW} ${CONFFILE} /dev/tty
+test -x /usr/bin/ucf ucf ${CONFFILE_NEW} ${CONFFILE}
+
+db_stop
# Start service if necessary
if [ $START == true ]; then
Bug#494265: Possible patch
On Mon, 11 Aug 2008 somebody known as Jurij Smakov wrote:
Hi,
The line invoking ucf in the postinst looks like that:
test -f /usr/bin/ucf ucf ${CONFFILE_NEW} ${CONFFILE} /dev/tty
Now, I don't know why you would want to get it read from /dev/tty, as
far as I can tell, ucf does not read anything from stdin, so this is
pretty redundant. However, once I removed this redirect, it was still
hanging. Eventually I traced the problem to the fact that ucf uses
debconf, I can't fully understand what's happening there, but it
turned out that moving db_stop, placing it *after* ucf invocation
fixes the problem. I guess that once we stop debconf in the script
(with db_stop) and then ucf tries to start it up again, something goes
wrong with file descriptors. The candidate patch which fixes the issue
is attached, however I'm reluctant to declare it a proper fix without
understanding what's really going on, hence I'm not tagging it.
Thanks for investigating this issue. Although I'm maintainer of this
package, my defconf and ucf understanding is rather limited (I'm upstream
author, so I eneded up as maintainer of bunch of other packages: for
Gentoo, OpenWRT etc).
Whould it be possible to get rid of the ucf completely?
dibbler-client.postinst could generate new version (and rename
old one) without any ucf invocation. As I understand it, the only
flaw would be that this backed up file would not be marked as config. file
for dibbler-client.
Regards,
--
Tomasz Mrugalski, | We all know Linux is great...it does|
thomson(at)klub(dot)com(dot)pl | infinite loops in 5 seconds. |
| Linus Torvalds |
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494265: Possible patch
On Mon, Aug 11, 2008 at 04:09:25PM +0200, Tomasz Mrugalski wrote: Thanks for investigating this issue. Although I'm maintainer of this package, my defconf and ucf understanding is rather limited (I'm upstream author, so I eneded up as maintainer of bunch of other packages: for Gentoo, OpenWRT etc). Whould it be possible to get rid of the ucf completely? dibbler-client.postinst could generate new version (and rename old one) without any ucf invocation. As I understand it, the only flaw would be that this backed up file would not be marked as config. file for dibbler-client. No, you definitely want to use ucf, because if you will ever change the default config file created by the package, and the existing config file will have local modification, ucf will prompt user to choose what (s)he wants to do: install the new version or keep the existing version. I've asked Joey Hess (debconf author) about it, and he said that if you have db_stop before invoking ucf, then ucf will not be able to start debconf after that, and that will cause a hang we see. Please go ahead and prepare a new release using my patch, and I can sponsor it, if needed. Cheers. -- Jurij Smakov [EMAIL PROTECTED] Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494265: Possible patch
On Mon, 11 Aug 2008 somebody known as Jurij Smakov wrote: I've asked Joey Hess (debconf author) about it, and he said that if you have db_stop before invoking ucf, then ucf will not be able to start debconf after that, and that will cause a hang we see. Please go ahead and prepare a new release using my patch, and I can sponsor it, if needed. It would be great. I have prepared those new packages with your patch: http://klub.com.pl/dhcpv6/debian/ Can you sponsor them? Since only client uses ucf, there's no need to reupload other packages. Thanks again for your support and patches. Regards, -- Tomasz Mrugalski, | We all know Linux is great...it does| thomson(at)klub(dot)com(dot)pl | infinite loops in 5 seconds. | | Linus Torvalds | -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
