Re: Patch for fixing keystone rc bug #687311 : permission to upload in SID?
Thomas Goirand z...@debian.org writes: Thanks for reviewing the patch, and spotting the leftover set -x in the postinst which I missed switching off after my tests. On 09/26/2012 02:59 AM, Julien Cristau wrote: Normally the config script doesn't touch configuration files, it reads the current configuration if it exists, updates the values in debconf, then asks the user if necessary. The postinst then writes the actual config. Is this a must, a should, or your own packaging habits? Is it completely forbidden to do how I did? config can run during preinst, so you generally should not do anything that manipulates the file system during config since you can't be guaranteed that the package is unpacked or that any of its dependencies are available. See debconf-devel(7): The config script should not need to modify the filesystem at all. It just examines the state of the system, and asks questions, and debconf stores the answers to be acted on later by the postinst script. Conversely, the postinst script should almost never use debconf to ask questions, but should instead act on the answers to questions asked by the config script. I'm not sure that I would say completely forbidden, but it's something to avoid unless there's some overriding requirement for config to work that way. -- Russ Allbery (r...@debian.org) http://www.eyrie.org/~eagle/ -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87fw65i9il@windlord.stanford.edu
Re: Squeeze point release (6.0.6)
On Mon, September 17, 2012 15:58, Philipp Kern wrote: ok, given the replies, let's settle on this: On Fri, Sep 07, 2012 at 09:43:03PM +0200, Philipp Kern wrote: * Sep 29/30: ok from RT side OK, so we need to update ia32-libs again, now that all changes are in. The other two ia32-libs-* do not require an update in this release. Attached is the proposed changelog entry. Let me know when I can upload. Cheers, Thijs ia32-libs Description: Binary data
Re: Squeeze point release (6.0.6)
Hi, On Wed, Sep 26, 2012 at 09:17:53AM +0200, Thijs Kinkhorst wrote: OK, so we need to update ia32-libs again, now that all changes are in. The other two ia32-libs-* do not require an update in this release. Attached is the proposed changelog entry. Let me know when I can upload. ok, please upload as soon as possible (i.e. today). Thanks Philipp Kern signature.asc Description: Digital signature
Bug#687526: reminder: unblock (pre-approval) slbackup 0.0.12-4
Dear Release Team, any news on my unblock request (pre-approval) of slbackup 0.0.12-4? Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb pgp15GzogRcbV.pgp Description: Digitale PGP-Unterschrift
Bug#688244: marked as done (unblock: beanstalkd/1.7-1)
Your message dated Wed, 26 Sep 2012 12:22:10 +0200 with message-id 20120926102210.GJ31592@mobee and subject line not an issue anymore, upstream will port 1.4.6 to libevent 2.0 (see #687402) has caused the Debian Bug report #688244, regarding unblock: beanstalkd/1.7-1 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 688244: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688244 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Hi, The beanstalkd version in testing (1.4.6) is FTBFS (#687402) since libevent was upgraded from 1.4 to 2.0. Meanwhile beanstalkd 1.5 was released and dropped the libevent dependency all together, but didn't make it to testing in time for the freeze because of failing tests (which have been fixed post-freeze). Since upstream has dropped libevent as a dependency, they're not interested in porting beanstalkd 1.4.6 to libevent 2.0, so the release team is called to choose between: - drop beanstalkd in wheezy - grant an exception to unblock beanstalkd 1.7 (1.6 1.7 were bug-fixing releases; 1.7-1 is in sid and builds fine on all arches) I understand that there's no excuse for not having seen this coming before the long-announced freeze date, so I won't argue against the first option. Having said that, beanstalkd is a leaf package with a small popcon. Thanks, sez ps. I've opted to spare you the debdiff for obvious reasons: 137 files changed, 6436 insertions(+), 16240 deletions(-) ---End Message--- ---BeginMessage--- -- Every great idea is worthless without someone to do the work. --Neil Williams---End Message---
Re: Squeeze point release (6.0.6)
On Wed, September 26, 2012 11:02, Philipp Kern wrote: Hi, On Wed, Sep 26, 2012 at 09:17:53AM +0200, Thijs Kinkhorst wrote: OK, so we need to update ia32-libs again, now that all changes are in. The other two ia32-libs-* do not require an update in this release. Attached is the proposed changelog entry. Let me know when I can upload. ok, please upload as soon as possible (i.e. today). Thanks - uploaded. Cheers, Thijs -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5e348fbaa972dbe939a850e9acd2ac34.squir...@aphrodite.kinkhorst.nl
Re: Bug#688804: m4 can accidentally link to libsigsegv
Hi. [ Cc: debian-release for advice ]. I have received this report which is really two different bugs: A) The initial one reported by Igor: Building m4 creates a package linked with libsigsegv or not depending on the environment. This should never happen in a Debian package and that's why we have Build-Depends, Build-Conflicts and so on. A Debian package, when built, should always create the same .deb. B) The real fix by Eric: m4 should really be linked against libsigsegv. Release managers: Is it too late in the freeze to fix B? (The patch would be very small, it would be a matter of adding a Build-Depends). In case it is too late: May I fix bug A in wheezy at least? (In this case the .deb would not change in functionality, but the build process would never create a different .deb by accident). Thanks. -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.deb.2.02.1209261124450.19...@cantor.unex.es
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please approve the following changes for package libxvmc
As we are not going to get libxvmc turned to multi-arch for wheezy (see
#640499) I'm now trying another approach with minimal changes to the
libxvmc package:
Can we add a new package
Package: libxvmc1-i386
Section: libs
Priority: extra
Architecture: i386
Multi-arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 Video extension library (alternate i386 package)
that ships another copy of the libraries in /usr/lib/i386-linux-gnu/
To avoid installing libxvmc1-i386:i386 and libxvmc1:i386 at the same
time and have two copies of the same library available, I'm adding
Package: libxvmc1
Conflicts: libxvmc1-i386 [i386]
and to avoid picking up a dependency on libxvmc1-i386 by accident, its
shlibs file points to libxvmc1.
I added a lintian-overrides file, but that is not being installed as I
wanted to avoid changing anything in debian/rules.
Note that this new package does not ship the conffile as it is expected
to be only installed along libxvmc1:amd64 which comes with the conffile.
(This dependency can't be expressed by package relationships.)
This will keep the existing non-multiarch libxvmc1 unchanged, the build
system is untouched, nothing will start to use the alternate copy
package accidently. For libgl1-nvidia-glx:i386 to actually pick up this
alternate library, we need to add a shlibs.local file (in
nvidia-graphics-drivers) with
libXvMC 1 libxvmc1 | libxvmc1-i386 [i386]
I chose to add the extra package to the libxvmc source package as that
will avoid forking (and therefore code duplication) and getting libxvmc1
and libxvmc1-i386 out of sync. Even with a second copy in the a binary
package in the archive, there is no overhead in case a security update
for libxvmc should be neccessary.
Judging by the number of bug reports, it is really important for our
users to restore the ability to run 32-bit OpenGL applications on a
amd64 system and get accelleration by the non-free nvidia driver.
That was working in squeeze and will be considered as a serious
regression if this is not getting fixed in some way for wheezy.
See e.g. #685054, #686033, #676723, #688714
I'll be happy to assist getting a proper multi-arch libxvmc into jessie
and to clean up this temporary package that we need for wheezy.
Andreas
diffstat for libxvmc_1.0.7-1 libxvmc_1.0.7-1.1
debian/libxvmc1-i386.install |2 ++
debian/libxvmc1-i386.lintian-overrides |4
debian/libxvmc1-i386.shlibs|2 ++
libxvmc-1.0.7/debian/changelog | 12
libxvmc-1.0.7/debian/control | 26 ++
5 files changed, 46 insertions(+)
diff -u libxvmc-1.0.7/debian/control libxvmc-1.0.7/debian/control
--- libxvmc-1.0.7/debian/control
+++ libxvmc-1.0.7/debian/control
@@ -22,6 +22,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Conflicts: libxvmc1-i386 [i386]
Description: X11 Video extension library
libXvMC provides an X Window System client interface to the
XVideo-MotionCompensation extension to the X protocol.
@@ -37,6 +38,31 @@
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXvMC
+Package: libxvmc1-i386
+Section: libs
+Priority: extra
+Architecture: i386
+Multi-arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Description: X11 Video extension library (alternate i386 package)
+ libXvMC provides an X Window System client interface to the
+ XVideo-MotionCompensation extension to the X protocol.
+ .
+ The XVideo-MotionCompensation extension allows for further accelerated drawing
+ of videos. Video data may be sent at earlier stages of the decoding pipeline
+ than raw YUV data. At the moment, driver support for XvMC is poor to
+ non-existent.
+ .
+ More information about X.Org can be found at:
+ URL:http://www.X.org
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXvMC
+ .
+ This is a multiarchified package intended to be co-installable with
+ libxvmc1:amd64.
+
Package: libxvmc1-dbg
Section: debug
Architecture: any
diff -u libxvmc-1.0.7/debian/changelog libxvmc-1.0.7/debian/changelog
--- libxvmc-1.0.7/debian/changelog
+++ libxvmc-1.0.7/debian/changelog
@@ -1,3 +1,15 @@
+libxvmc (2:1.0.7-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Add libxvmc1-i386 package, a partially multiarchified package that is
+co-installable with libxvmc1:amd64. Works around missing multiarch
+support, see #640499. Let libxvmc1:i386 conflict with this new package.
+The .shlibs points to libxvmc1 instead of libxvmc1-i386 to avoid
+accidentally adding a dependency on this
Re: Squeeze point release (6.0.6)
On 26.09.2012 11:53, Thijs Kinkhorst wrote: On Wed, September 26, 2012 11:02, Philipp Kern wrote: On Wed, Sep 26, 2012 at 09:17:53AM +0200, Thijs Kinkhorst wrote: OK, so we need to update ia32-libs again, now that all changes are in. The other two ia32-libs-* do not require an update in this release. Attached is the proposed changelog entry. Let me know when I can upload. ok, please upload as soon as possible (i.e. today). Thanks - uploaded. Thanks for the quick turnaround; flagged for acceptance. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e3e6cea9818f2979de5f1f680638b...@mail.adsl.funky-badger.org
libpri and hardening flags [was: Re: Bug#688765: FTBFS if built twice in a row]
Dear Release Team, On Wed, Sep 26, 2012 at 01:43:32AM +0200, Tzafrir Cohen wrote: On Tue, Sep 25, 2012 at 03:36:47PM +0200, Helmut Grohne wrote: Source: libpri Version: 1.4.12-2 Severity: serious Justification: fails to build from source The upstream Makefile creates a version.c which is not removed during (make) clean. Thus the second attempt to build the package fails with a message from dpkg-source saying that local changes (to version.c) were detected and the build is aborted. Since the package uses dh, the fix is as simple as: echo version.c debian/clean Applied, thanks for the report. While rebuilding to fix this, I noticed the lintian notice regarding hardening flags. The package use a custom Makefile, which was easy enough to fix. It is a library that is used in a PSTN module of the Asterisk telephony server and thus is network facing for a liberal definition of network (the N in PSTN[1]). Note that libss7 is likely to be similar: both a similar build system and a similar relation to the network. So, should I go ahead and include this fix as well? [1] http://en.wikipedia.org/wiki/PSTN -- Tzafrir Cohen icq#16849755 jabber:tzafrir.co...@xorcom.com +972-50-7952406 mailto:tzafrir.co...@xorcom.com http://www.xorcom.com iax:gu...@local.xorcom.com/tzafrir -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120926122023.gg18...@xorcom.com
NEW changes in stable-new
Processing changes file: ia32-libs_20120926_amd64.changes ACCEPT -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tgqy6-0008nt...@franck.debian.org
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
In case anyone is interested in a .dsc: http://mentors.debian.net/debian/pool/main/libx/libxvmc/libxvmc_1.0.7-1.1.dsc Andreas -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5062facc.8070...@abeckmann.de
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
Hi, As we are not going to get libxvmc turned to multi-arch for wheezy (see #640499) I'm now trying another approach with minimal changes to the libxvmc package: Related to this, there's also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687373 Kind regards, Ralf -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5062fcae.2000...@ralfj.de
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On 26.09.2012 14:01, Ralf Jung wrote: As we are not going to get libxvmc turned to multi-arch for wheezy (see #640499) I'm now trying another approach with minimal changes to the libxvmc package: Related to this, there's also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687373 Not so much related, as a proposed alternative, afaics? The maintainers appear to have made their opinion quite clear in #640499 on the originally suggested approach, however... Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/0947b3549bddd46fb9f43a5e556cf...@mail.adsl.funky-badger.org
Closing in for d-i wheezy beta 3
Hi, FWIW I've prepared a few packages to unblock for d-i beta 3: # only/mostly l10n: unblock apt-setup/1:0.72 unblock-udeb apt-setup/1:0.72 unblock arcboot-installer/1.18 unblock-udeb arcboot-installer/1.18 unblock flash-kernel/3.3 unblock-udeb flash-kernel/3.3 unblock network-console/1.39 unblock-udeb network-console/1.39 unblock nobootloader/1.36 unblock-udeb nobootloader/1.36 unblock partman-prep/24 unblock-udeb partman-prep/24 unblock prep-installer/0.17 unblock-udeb prep-installer/0.17 unblock quik-installer/0.0.30 unblock-udeb quik-installer/0.0.30 unblock sibyl-installer/1.24 unblock-udeb sibyl-installer/1.24 unblock silo-installer/1.23 unblock-udeb silo-installer/1.23 unblock yaboot-installer/1.1.23 unblock-udeb yaboot-installer/1.1.23 # heavier changes: unblock brltty/4.4-5 unblock-udeb brltty/4.4-5 unblock cdebconf/0.175 unblock-udeb cdebconf/0.175 unblock lowmem/1.36 unblock-udeb lowmem/1.36 unblock os-prober/1.56 unblock-udeb os-prober/1.56 unblock rootskel-gtk/1.26 unblock-udeb rootskel-gtk/1.26 I've added those to my hints file, and will be processing more packages showing up on the testing-summary page shortly. (In particular packages matching partman-*.) On the EFI side, Steve has finished merging things into the d-i source package, and into the debian-cd build infrastructure, so we should be reaching our target (freeze this week-end) nicely. On a different note, I'll probably urgent a bunch of d-i packages, along with other newly-xz-compressed packages, so that we can perform some out-of-crontab weekly build tomorrow-ish to see how it goes. Mraw, KiBi. signature.asc Description: Digital signature
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On 2012-09-26 15:20, Adam D. Barratt wrote: Not so much related, as a proposed alternative, afaics? The maintainers appear to have made their opinion quite clear in #640499 on the originally suggested approach, however... Therefore I'm now investigating a different approach ... Andreas -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/50630410.3060...@abeckmann.de
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
Hi, As we are not going to get libxvmc turned to multi-arch for wheezy (see #640499) I'm now trying another approach with minimal changes to the libxvmc package: Related to this, there's also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687373 Not so much related, as a proposed alternative, afaics? The maintainers appear to have made their opinion quite clear in #640499 on the originally suggested approach, however... You mean http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640499#66 ? He didn't say he's opposed to the patch, just that the release team might not let it through. The release team didn't reply (or I missed it?). libcap2 multiarchification was let in though (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684647), and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681717 looks like a similar case which has not yet been decided on (multiarchification needed to prevent regression from Squeeze for a large usergroup - even larger than this one, which only affects users of the proprietary NVidia driver). Kind regards, Ralf -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/506303fa.7060...@ralfj.de
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On 26.09.2012 14:32, Ralf Jung wrote: As we are not going to get libxvmc turned to multi-arch for wheezy (see #640499) I'm now trying another approach with minimal changes to the libxvmc package: Related to this, there's also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687373 Not so much related, as a proposed alternative, afaics? The maintainers appear to have made their opinion quite clear in #640499 on the originally suggested approach, however... You mean http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640499#66 ? No, I meant http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640499#149 He didn't say he's opposed to the patch, just that the release team might not let it through. The release team didn't reply (or I missed it?). libcap2 multiarchification was let in though (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684647), and I'm aware of that. :-) (see the release team members involved in that discussion). That's also a different situation; libcap2 is required to allow us to get rid of the monolithic ia32-libs. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e5dbdbdc4dfe0d608eef1eded134a...@mail.adsl.funky-badger.org
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
Hi, Not so much related, as a proposed alternative, afaics? The maintainers appear to have made their opinion quite clear in #640499 on the originally suggested approach, however... You mean http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640499#66 ? No, I meant http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640499#149 Ah, that one. I must have missed a release manager saying that then - I don't know your names ;-) He didn't say he's opposed to the patch, just that the release team might not let it through. The release team didn't reply (or I missed it?). libcap2 multiarchification was let in though (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684647), and I'm aware of that. :-) (see the release team members involved in that discussion). Oh, saw that name already... ;-) That's also a different situation; libcap2 is required to allow us to get rid of the monolithic ia32-libs. Essentially, this is the case here, too: Getting git of libgl1-nvidia-glx-ia32, as it depended on ia32-libs (and, as reported by Andreas [1], can't be built with the multiarchified ia32-libs). So removing ia32-libs is the cause for this breakage. libxvmc was not part of ia32-libs so libgl1-nvidia-glx-ia32 lacked that dependency, but now that we must use libgl1-nvidia-glx:i386 and the proper automatically generated dependencies are used for all architectures, libxvmc is needed in a foreign-arch version as well, in one way or another. Kind regards, Ralf [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684871#27 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/506309b5.5010...@ralfj.de
Removing block-udeb gtk+3.0?
Hi,
since gtk+3.0 again appeared on my testing summary page (packages of
interest as far as unblock{,-udeb}'s are concerned), I'm wondering
whether it shouldn't just get its block-udeb removed?
I haven't heard yet of plans to port d-i to gtk3, and that wouldn't
happen during the wheezy release cycle anyway, so removing that
block-udeb would spare some questions/brain cycles on the -boot/-release
side when considering unblock{,-udeb}'s. Don't you think?
Mraw,
KiBi.
signature.asc
Description: Digital signature
Bug#681107: unblock: qscintilla2/2.6.2-1
On Friday, August 31, 2012 09:38:25 PM Adam D. Barratt wrote: Excluding the documentation and renaming the directory back results in quite a sane diff. Please feel free to upload to unstable; let's see how that goes. [10:54:07] ScottK adsb: re your poke r.e. #681107 - It's made it to ten days old now. Is that sufficient for Please feel free to upload to unstable; let's see how that goes.? [10:54:42] adsb ScottK: sounds reasonable. do we need any rebuilds to go with the new version? [10:55:12] ScottK adsb: We should not. AFAIK it's ABI compatible. [10:55:25] ScottK (it was certainly intended by upstream to be so) [10:55:50] KiBi (what a nice change from our usual lot..) [10:57:46] adsb ScottK: cool. could you follow up to the bug please? should really be doing $dayjob stuff atm :) [10:57:56] ScottK Sure. [10:58:00] adsb ta Scott K signature.asc Description: This is a digitally signed message part.
Bug#688874: unblock: nova/2012.1.1-10
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Please unblock package nova, it's just a debconf translation update (that will make Spanish a step closer to be complete on Wheezy). unblock nova/2012.1.1-10 Thanks in advance, regards. David -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5-trunk-amd64 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash diff -Nru nova-2012.1.1/debian/changelog nova-2012.1.1/debian/changelog --- nova-2012.1.1/debian/changelog 2012-09-03 07:51:08.0 -0400 +++ nova-2012.1.1/debian/changelog 2012-09-16 03:01:27.0 -0400 @@ -1,3 +1,10 @@ +nova (2012.1.1-10) unstable; urgency=low + + * Fixes capitalization in debian/po/es.po (Nova vs nova) (Closes: #687000). + * Fixes some spaces in debian/po/zh_CN.po. + + -- Thomas Goirand z...@debian.org Wed, 12 Sep 2012 07:23:36 + + nova (2012.1.1-9) unstable; urgency=low [ Thomas Goirand ] diff -Nru nova-2012.1.1/debian/po/es.po nova-2012.1.1/debian/po/es.po --- nova-2012.1.1/debian/po/es.po 2012-09-03 07:51:08.0 -0400 +++ nova-2012.1.1/debian/po/es.po 2012-09-16 03:01:27.0 -0400 @@ -42,7 +42,6 @@ #. Type: boolean #. Description #: ../nova-common.templates:2001 -#| msgid Start nova services at boot? msgid Start nova services at boot? msgstr ¿Desea iniciar los servicios de nova en el arranque del sistema? @@ -50,26 +49,26 @@ #. Description #: ../nova-common.templates:2001 msgid -Please choose whether you want to start nova services when the machine is +Please choose whether you want to start Nova services when the machine is booted up. msgstr -Elija si desea iniciar los servicios de nova cuando la máquina está +Elija si desea iniciar los servicios de Nova cuando la máquina está arrancando. #. Type: boolean #. Description #: ../nova-common.templates:3001 -msgid Set up a database for nova? -msgstr ¿Desea configurar una base de datos para nova? +msgid Set up a database for Nova? +msgstr ¿Desea configurar una base de datos para Nova? #. Type: boolean #. Description #: ../nova-common.templates:3001 msgid -No database has been set up for nova to use. If you want to set one up now, +No database has been set up for Nova to use. If you want to set one up now, please make sure you have all needed information: msgstr -No se ha configurado ninguna base de datos para utilizar con nova. Si desea +No se ha configurado ninguna base de datos para utilizar con Nova. Si desea configurar una ahora, asegúrese de que tiene toda la información necesaria: #. Type: boolean @@ -90,10 +89,10 @@ #. Description #: ../nova-common.templates:3001 msgid -If you don't choose this option, no database will be set up and nova will +If you don't choose this option, no database will be set up and Nova will use regular SQLite support. msgstr -Si no elige esta opción, no se configurará ninguna base de datos y nova\n +Si no elige esta opción, no se configurará ninguna base de datos y Nova utilizará SQLite #. Type: boolean @@ -116,11 +115,11 @@ #. Description #: ../nova-compute-xen.templates:2001 msgid -nova Compute Xen needs to know the address of the server running XenAPI. You +Nova Compute Xen needs to know the address of the server running XenAPI. You can enter an IP address, or a fully qualified domain name if it resolves correctly. msgstr -nova Compute Xen necesita saber la dirección del servidor que ejecuta +Nova Compute Xen necesita saber la dirección del servidor que ejecuta XenAPI. Puede introducir una dirección IP o un nombre de dominio completo si se resuelve correctamente. diff -Nru nova-2012.1.1/debian/po/zh_CN.po nova-2012.1.1/debian/po/zh_CN.po --- nova-2012.1.1/debian/po/zh_CN.po 2012-09-03 07:51:08.0 -0400 +++ nova-2012.1.1/debian/po/zh_CN.po 2012-09-16 03:01:27.0 -0400 @@ -49,7 +49,7 @@ * a username and password to access the database;\n * the type of database management software you want to use. msgstr - * 数据库服务器的主机名 （需要这台主机的TCP链接）；\n + * 数据库服务器的主机名（需要这台主机的TCP链接）；\n * 访问这个数据库的用户名及密码；\n * 你希望使用的数据库管理软件的类型。 @@ -63,7 +63,7 @@ #. Description #: ../nova-common.templates:3001 msgid You can change this setting later on by running \dpkg-reconfigure -plow nova-common\. -msgstr 您可以通过运行\dpkg-reconfigure-plow nova-common\ 命令来修改配置。 +msgstr 您可以通过运行\dpkg-reconfigure -plow nova-common\ 命令来修改配置。 #. Type: string #. Description
Bug#688876: unblock: mathematica-fonts/15
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Please unblock package mathematica-fonts, it fixes an important issue via unstable (#686260: allow for translation of all user-visible messages), with a review of all descriptions, update most existing translations (including the eight aiming for being complete in Wheezy) and add a new one. The attach debdiff spare you the POT and PO files. unblock mathematica-fonts/15 Thanks in advance, regards. David -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5-trunk-amd64 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash diff -Nru --exclude po mathematica-fonts-14/debian/changelog mathematica-fonts-15/debian/changelog --- mathematica-fonts-14/debian/changelog 2012-07-13 00:51:15.0 -0400 +++ mathematica-fonts-15/debian/changelog 2012-09-24 20:29:44.0 -0400 @@ -1,3 +1,27 @@ +mathematica-fonts (15) unstable; urgency=low + + * This version was completely owing to the contribution of David Prévot +taffit AT debian.org. Thanks to David. + * Review templates and package description by the debian-l10n-english team. +(Closes: #686260) + + [ Debconf translations ] + * Czech, Martin Šín. (Closes: #687260) + * Russian, Yuri Kozlov. (Closes: #687318) + * Portuguese, Américo Monteiro. (Closes: #687499) + * Polish, Michał Kułach. (Closes: #687552) + * Italian, Beatrice Torracca. (Closes: #687762) + * Danish, Joe Hansen. (Closes: #687832) + * German, Martin Eberhard Schauer. (Closes: #688035) + * French, David Prévot. (Closes: #688152) + * Arabic, Ossama M. Khayat. + * Japanese, victory. + * Vietnamese, Nguyễn Vũ Hưng. + * Swedish, Martin Bagge. (Closes: #688418) + * Spanish, Rafael Ernesto Rivas. + + -- Atsuhito KOHDA ko...@debian.org Fri, 07 Sep 2012 17:59:30 -0400 + mathematica-fonts (14) unstable; urgency=low * Fixed packaging: create directories for the fonts with debian/dirs diff -Nru --exclude po mathematica-fonts-14/debian/control mathematica-fonts-15/debian/control --- mathematica-fonts-14/debian/control 2009-12-28 06:36:28.0 -0400 +++ mathematica-fonts-15/debian/control 2012-09-24 20:22:53.0 -0400 @@ -12,13 +12,13 @@ Provides: ttf-mathematica4.1 Conflicts: ttf-mathematica4.1 ( 9) Replaces: ttf-mathematica4.1 ( 9) -Description: Installer of Mathematica fonts - This package downloads Mathematica fonts through an internet - and installs them, because the license prohibits distribution of - the fonts. NOTE the fonts might be removed from a web site so it - might happen that you failed to download the fonts. +Description: installer for Mathematica fonts + This package downloads Mathematica fonts from http://support.wolfram.com/ + and installs them, because the license prohibits their distribution. + Please note that it may fail if the web site no longer offers them for + download. . - This package will install only AFM, TTF and Type1 at present. + This package will currently only install AFM, TTF, and Type1 fonts. Package: ttf-mathematica4.1 Architecture: all diff -Nru --exclude po mathematica-fonts-14/debian/templates mathematica-fonts-15/debian/templates --- mathematica-fonts-14/debian/templates 2009-06-23 18:44:44.0 -0400 +++ mathematica-fonts-15/debian/templates 2012-09-24 20:22:53.0 -0400 @@ -1,11 +1,20 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-engl...@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: mathematica-fonts/http_proxy Type: string _Description: HTTP proxy to use: If you need to use a proxy server, please enter it here (example: http://192.168.0.1:8080). This will cause the font file to be - downloaded using your proxy. + downloaded through the proxy. . - Leave this option blank if you don't use a proxy server. + Leave this field blank if you don't use a proxy server. Template: mathematica-fonts/license Type: note @@ -14,7 +23,7 @@ # This debconf note displays the original license of fonts # The license terms themselves are not translatable, which explains # that translators do not see them in the PO files -Description: License for Mathematica fonts +_Description: License for Mathematica fonts Read this agreement carefully before proceeding. It is an agreement between Wolfram Research, Inc. (WRI) and you. Acceptance of its terms creates a binding contract between you and WRI. By downloading the fonts
NEW changes in stable-new
Processing changes file: ia32-libs_20120926_ia64.changes ACCEPT -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tgtan-0006om...@franck.debian.org
Bug#688877: unblock: vavoom/1.33-4
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package vavoom
package vavoom is a free engine for doom gamedata
it recomends freedom which is a free doom-like gamedata
freedom depends on boom-engine virtual package, which is provided by
prboom (another doom engine)
so installing vavoom 1.33-3 you will be pulling freedom and another
engine (prboom) this version fix that
now vavoom provides boom-engine so when you install it you will get an
engine an gamedata
diff -Nru vavoom-1.33/debian/changelog vavoom-1.33/debian/changelog
--- vavoom-1.33/debian/changelog2012-06-05 05:09:43.0 +0100
+++ vavoom-1.33/debian/changelog2012-09-22 06:03:12.0 +0100
@@ -1,3 +1,9 @@
+vavoom (1.33-4) unstable; urgency=low
+
+ * Add Provides: boom-engine (Closes: #683766).
+
+ -- gustavo panizzo g...@zumbi.com.ar Sat, 22 Sep 2012 01:19:39 -0300
+
vavoom (1.33-3) unstable; urgency=low
* libpng migration fixes (Closes: #662531).
diff -Nru vavoom-1.33/debian/control vavoom-1.33/debian/control
--- vavoom-1.33/debian/control 2012-05-30 16:29:49.0 +0100
+++ vavoom-1.33/debian/control 2012-09-22 06:08:42.0 +0100
@@ -21,7 +21,7 @@
Vcs-Git: git://anonscm.debian.org/pkg-games/vavoom.git
Package: vavoom
-Provides: doom-engine, heretic-engine
+Provides: doom-engine, heretic-engine, boom-engine
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: freedoom | doom-wad | heretic-wad | game-data-packager | boom-wad
unblock vavoom/1.33-4
-- System Information:
Debian Release: 6.0.4
APT prefers stable-updates
APT policy: (900, 'stable-updates'), (900, 'testing'), (800, 'stable'), (300,
'unstable'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64
Kernel: Linux 3.5-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/20120926154519.6105.71098.reportbug@localhost.localdomain
Re: Removing block-udeb gtk+3.0?
On 26.09.2012 16:10, Cyril Brulebois wrote:
Hi,
since gtk+3.0 again appeared on my testing summary page (packages of
interest as far as unblock{,-udeb}'s are concerned), I'm wondering
whether it shouldn't just get its block-udeb removed?
I haven't heard yet of plans to port d-i to gtk3, and that wouldn't
happen during the wheezy release cycle anyway, so removing that
block-udeb would spare some questions/brain cycles on the -boot/-release
side when considering unblock{,-udeb}'s. Don't you think?
Makes sense, imo.
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
signature.asc
Description: OpenPGP digital signature
Bug#688881: unblock: openjpeg/1.3+dfsg-4.1+deb7u1
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
I've prepared a tpu security upload for openjpeg (attached).
Ok to upload?
Cheers,
Moritz
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Naur openjpeg-1.3+dfsg.orig/debian/changelog openjpeg-1.3+dfsg/debian/changelog
--- openjpeg-1.3+dfsg.orig/debian/changelog 2012-09-23 08:01:25.0 +0200
+++ openjpeg-1.3+dfsg/debian/changelog 2012-09-23 08:04:39.697773699 +0200
@@ -1,3 +1,10 @@
+openjpeg (1.3+dfsg-4.1+deb7u1) testing-proposed-updates; urgency=medium
+
+ * Fix CVE-2012-3358 (Closes: #681075)
+ * Fix CVE-2012-3535 (Closes: #685970)
+
+ -- Moritz Mühlenhoff j...@debian.org Mon, 24 Sep 2012 23:02:44 +0200
+
openjpeg (1.3+dfsg-4.1) unstable; urgency=high
* Non-maintainer upload by the Security Team.
diff -Naur openjpeg-1.3+dfsg.orig/debian/patches/00list openjpeg-1.3+dfsg/debian/patches/00list
--- openjpeg-1.3+dfsg.orig/debian/patches/00list 2012-09-23 08:01:25.0 +0200
+++ openjpeg-1.3+dfsg/debian/patches/00list 2012-09-23 08:02:26.061768619 +0200
@@ -2,3 +2,5 @@
31_use_system_tiff_headers.dpatch
32_fix_FTBFS_on_alpha.dpatch
33_avoid_memory_overrun.dpatch
+CVE-2012-3358.dpatch
+CVE-2012-3535.dpatch
diff -Naur openjpeg-1.3+dfsg.orig/debian/patches/CVE-2012-3358.dpatch openjpeg-1.3+dfsg/debian/patches/CVE-2012-3358.dpatch
--- openjpeg-1.3+dfsg.orig/debian/patches/CVE-2012-3358.dpatch 1970-01-01 01:00:00.0 +0100
+++ openjpeg-1.3+dfsg/debian/patches/CVE-2012-3358.dpatch 2012-09-23 08:01:59.353768078 +0200
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cve-2012-3358.dpatch by Michael Gilbert mgilb...@debian.org
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix buffer overflow in JPEG2000 file handling.
+## DP: https://bugzilla.redhat.com/show_bug.cgi?id=835767
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' openjpeg-1.3+dfsg~/libopenjpeg/j2k.c openjpeg-1.3+dfsg/libopenjpeg/j2k.c
+--- openjpeg-1.3+dfsg~/libopenjpeg/j2k.c 2012-07-11 16:04:38.0 -0400
openjpeg-1.3+dfsg/libopenjpeg/j2k.c 2012-07-11 16:06:07.0 -0400
+@@ -1282,7 +1282,7 @@
+ static int backup_tileno = 0;
+
+ /* tileno is negative or larger than the number of tiles!!! */
+- if ((tileno 0) || (tileno (cp-tw * cp-th))) {
++ if ((tileno 0) || (tileno = (cp-tw * cp-th))) {
+ opj_event_msg(j2k-cinfo, EVT_ERROR,
+ JPWL: bad tile number (%d out of a maximum of %d)\n,
+ tileno, (cp-tw * cp-th));
+@@ -1299,8 +1299,18 @@
+
+ /* keep your private count of tiles */
+ backup_tileno++;
+- };
++ }
++ else
+ #endif /* USE_JPWL */
++ {
++ /* tileno is negative or larger than the number of tiles!!! */
++ if ((tileno 0) || (tileno = (cp-tw * cp-th))) {
++ opj_event_msg(j2k-cinfo, EVT_ERROR,
++JPWL: bad tile number (%d out of a maximum of %d)\n,
++tileno, (cp-tw * cp-th));
++ return;
++ }
++ }
+
+ if (cp-tileno_size == 0) {
+ cp-tileno[cp-tileno_size] = tileno;
+@@ -1338,8 +1348,18 @@
+ totlen);
+ }
+
+- };
++ }
++ else
+ #endif /* USE_JPWL */
++ {
++ /* totlen is negative or larger than the bytes left!!! */
++ if ((totlen 0) || (totlen (cio_numbytesleft(cio) + 8))) {
++ opj_event_msg(j2k-cinfo, EVT_ERROR,
++JPWL: bad tile byte size (%d bytes against %d bytes left)\n,
++totlen, cio_numbytesleft(cio) + 8);
++ return;
++ }
++ }
+
+ if (!totlen)
+ totlen = cio_numbytesleft(cio) + 8;
diff -Naur openjpeg-1.3+dfsg.orig/debian/patches/CVE-2012-3535.dpatch openjpeg-1.3+dfsg/debian/patches/CVE-2012-3535.dpatch
--- openjpeg-1.3+dfsg.orig/debian/patches/CVE-2012-3535.dpatch 1970-01-01 01:00:00.0 +0100
+++ openjpeg-1.3+dfsg/debian/patches/CVE-2012-3535.dpatch 2012-09-23 08:01:59.353768078 +0200
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2012-3535
+
+@DPATCH@
+diff -Naur openjpeg-1.3+dfsg.orig/libopenjpeg/j2k.c openjpeg-1.3+dfsg/libopenjpeg/j2k.c
+--- openjpeg-1.3+dfsg.orig/libopenjpeg/j2k.c 2008-03-10 09:50:35.0 +0100
openjpeg-1.3+dfsg/libopenjpeg/j2k.c 2012-09-23 07:57:01.381756231 +0200
+@@ -720,6 +720,13 @@
+ j2k-state |= J2K_STATE_ERR;
+ }
+
++ if( tccp-numresolutions J2K_MAXRLVLS ) {
++ opj_event_msg(j2k-cinfo, EVT_ERROR, Error decoding component %d.\nThe number of resolutions is too big: %d vs max= %d. Truncating.\n\n,
++ compno, tccp-numresolutions, J2K_MAXRLVLS);
++ j2k-state |= J2K_STATE_ERR;
++ tccp-numresolutions = J2K_MAXRLVLS;
++ }
++
+ tccp-cblkw = cio_read(cio, 1) + 2; /* SPcox (E) */
+ tccp-cblkh = cio_read(cio, 1) + 2; /* SPcox (F) */
+
Bug#688887: unblock: fcitx/1:4.2.4.1-7
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
This is the follow up improvement of the fix intended for RC bug
#684245. This patch avoids all situations that may be encountered to
trigger the bug in gnumeric, fix for that bug has been submitted and
applied to gnumeric upstream repository. More information can be found
at http://bugs.debian.org/687729 and
https://bugzilla.gnome.org/show_bug.cgi?id=684511
unblock: fcitx/1:4.2.4.1-7
diff -Nru fcitx-4.2.4.1/debian/changelog fcitx-4.2.4.1/debian/changelog
--- fcitx-4.2.4.1/debian/changelog 2012-09-15 19:51:00.0 +
+++ fcitx-4.2.4.1/debian/changelog 2012-09-26 16:23:05.0 +
@@ -1,3 +1,10 @@
+fcitx (1:4.2.4.1-7) unstable; urgency=low
+
+ * improve 0009-gnumeric_cursor_keys_edit.patch to fix bug
+completely.
+
+ -- YunQiang Su wzss...@gmail.com Wed, 26 Sep 2012 22:08:29 +0800
+
fcitx (1:4.2.4.1-6) unstable; urgency=low
* add gbp.conf for wheezy
diff -Nru fcitx-4.2.4.1/debian/patches/0009-gnumeric_cursor_keys_edit.patch
fcitx-4.2.4.1/debian/patches/0009-gnumeric_cursor_keys_edit.patch
--- fcitx-4.2.4.1/debian/patches/0009-gnumeric_cursor_keys_edit.patch
2012-09-15
18:40:35.0 +
+++ fcitx-4.2.4.1/debian/patches/0009-gnumeric_cursor_keys_edit.patch
2012-09-26
16:23:05.0 +
@@ -1,8 +1,8 @@
-diff --git a/src/frontend/ipc/ipc.c b/src/frontend/ipc/ipc.c
-index 1d57567..67261fe 100644
a/src/frontend/ipc/ipc.c
-+++ b/src/frontend/ipc/ipc.c
-@@ -43,6 +43,7 @@ typedef struct _FcitxIPCIC {
+Index: fcitx/src/frontend/ipc/ipc.c
+===
+--- fcitx.orig/src/frontend/ipc/ipc.c 2012-09-26 22:01:16.354865405 +0800
fcitx/src/frontend/ipc/ipc.c 2012-09-26 22:02:26.979215609 +0800
+@@ -43,6 +43,7 @@
char* surroundingText;
unsigned int anchor;
unsigned int cursor;
@@ -10,7 +10,7 @@
} FcitxIPCIC;
typedef struct _FcitxIPCFrontend {
-@@ -349,6 +350,7 @@ void IPCCreateIC(void* arg, FcitxInputContext*
context, void* priv)
+@@ -349,6 +350,7 @@
ipcic-id = ipc-maxid;
ipc-maxid ++;
@@ -18,7 +18,7 @@
sprintf(ipcic-path, FCITX_IC_DBUS_PATH, ipcic-id);
uint32_t arg1, arg2, arg3, arg4;
-@@ -930,6 +932,23 @@ static void IPCICSetCursorRect(FcitxIPCFrontend*
ipc, FcitxInputContext* ic, int
+@@ -930,6 +932,23 @@
void IPCUpdatePreedit(void* arg, FcitxInputContext* ic)
{
@@ -42,3 +42,56 @@
if (ic-contextCaps CAPACITY_FORMATTED_PREEDIT) {
FcitxIPCFrontend* ipc = (FcitxIPCFrontend*) arg;
dbus_uint32_t serial = 0; // unique number to associate
replies with requests
+Index: fcitx/data/script/fcitx-configtool
+===
+--- fcitx.orig/data/script/fcitx-configtool2012-09-26 22:01:57.235068121
+0800
fcitx/data/script/fcitx-configtool 2012-09-26 22:03:16.283460099 +0800
+@@ -32,7 +32,7 @@
+ exec $command kcm_fcitx
+ fi
+ else
+-run_gtk $1
++run_gtk3 $1
+ fi
+ }
+
+Index: fcitx/src/frontend/gtk2/fcitximcontext.c
+===
+--- fcitx.orig/src/frontend/gtk2/fcitximcontext.c 2012-09-26
22:01:57.235068121 +0800
fcitx/src/frontend/gtk2/fcitximcontext.c 2012-09-26
22:03:16.287460117 +0800
+@@ -465,7 +465,7 @@
+
+ /* set_cursor_location_internal() will get origin from X server,
+ * it blocks UI. So delay it to idle callback. */
+-g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
++gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
+ (GSourceFunc) _set_cursor_location_internal,
+ g_object_ref(fcitxcontext),
+ (GDestroyNotify) g_object_unref);
+@@ -584,8 +584,6 @@
+ /* do nothing */
+ }
+ }
+-
+-g_signal_emit(context, _signal_preedit_changed_id, 0);
+ }
+
+ static void
+@@ -695,8 +693,6 @@
+ /* do nothing */
+ }
+ }
+-
+-g_signal_emit(context, _signal_preedit_changed_id, 0);
+ }
+
+ ///
+@@ -727,7 +723,7 @@
+
+ /* set_cursor_location_internal() will get origin from X server,
+ * it blocks UI. So delay it to idle callback. */
+-g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
++gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
+ (GSourceFunc) _set_cursor_location_internal,
+ g_object_ref(fcitxcontext),
+ (GDestroyNotify) g_object_unref);
--
Regards,
Aron Xu
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/CAMr=8w5tB7-H=ea_1eE_n-O=3mgzb7lf8++t2d+3smwaxks...@mail.gmail.com
Re: Closing in for d-i wheezy beta 3
Cyril Brulebois k...@debian.org (26/09/2012): FWIW I've prepared a few packages to unblock for d-i beta 3: […] Here's another round. I uploaded some of them, merging somebody else's work (hello Steve). grub2 could welcome another pair of eyes. All of them are on my hints file. ## mostly l10n unblock partman-base/159 unblock-udeb partman-base/159 unblock partman-basicfilesystems/75 unblock-udeb partman-basicfilesystems/75 unblock partman-ext2r0/1.25 unblock-udeb partman-ext2r0/1.25 unblock partman-nbd/0.15 unblock-udeb partman-nbd/0.15 unblock partman-newworld/28 unblock-udeb partman-newworld/28 unblock partman-target/79 unblock-udeb partman-target/79 unblock partman-zfs/21 unblock-udeb partman-zfs/21 ## heaviers changes # update mirror list: unblock choose-mirror/2.41 unblock-udeb choose-mirror/2.41 # needs to wait for udev: unblock dmraid/1.0.0.rc16-4.2 unblock-udeb dmraid/1.0.0.rc16-4.2 # EFI support: unblock efi-reader/0.11 unblock-udeb efi-reader/0.11 # EFI support: unblock grub-installer/1.79 unblock-udeb grub-installer/1.79 # XXX: second look appreciated # xz compression + 4 RC bug fixes unblock grub2/1.99-23 unblock-udeb grub2/1.99-23 # single bugfix for pf crash, no-op for d-i: unblock kfreebsd-9/9.0-6 unblock-udeb kfreebsd-9/9.0-6 # XXX: KiBi-uploaded # EFI support unblock libdebian-installer/0.84 unblock-udeb libdebian-installer/0.84 # XXX: KiBi-uploaded # EFI support unblock lilo-installer/1.39 unblock-udeb lilo-installer/1.39 # plenty of encoding fun: unblock localechooser/2.47 unblock-udeb localechooser/2.47 # fix support for partitioned md devices: unblock parted/2.3-11 unblock-udeb parted/2.3-11 # XXX: KiBi-uploaded # EFI support unblock partman-auto/104 unblock-udeb partman-auto/104 # XXX: KiBi-uploaded # EFI support unblock partman-efi/27 unblock-udeb partman-efi/27 # XXX: KiBi-uploaded # EFI support unblock partman-partitioning/88 unblock-udeb partman-partitioning/88 # (Shift-)F10 + Gnome unblock xkeyboard-config/2.5.1-2.1 unblock-udeb xkeyboard-config/2.5.1-2.1 On a different note, I'll probably urgent a bunch of d-i packages, along with other newly-xz-compressed packages, so that we can perform some out-of-crontab weekly build tomorrow-ish to see how it goes. I'll be doing that in a few minutes, excluding the above packages for now, in case anyone comes up with any comments. Mraw, KiBi. signature.asc Description: Digital signature
Re: Patch for fixing keystone rc bug #687311 : permission to upload in SID?
On Wed, Sep 26, 2012 at 13:47:21 +0800, Thomas Goirand wrote:
On 09/26/2012 02:59 AM, Julien Cristau wrote:
Normally the config script doesn't touch configuration files, it reads
the current configuration if it exists, updates the values in debconf,
then asks the user if necessary. The postinst then writes the actual
config.
Is this a must, a should, or your own packaging habits? Is it
completely forbidden to do how I did?
at least the cp /usr/share/doc/keystone/keystone.conf.sample
${KEY_CONF} can't be done in config because the package is not yet
unpacked at that stage, you only have the Essential set.
Cheers,
Julien
signature.asc
Description: Digital signature
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On Wed, Sep 26, 2012 at 14:06:33 +0200, Andreas Beckmann wrote:
Can we add a new package
Package: libxvmc1-i386
Section: libs
Priority: extra
Architecture: i386
Multi-arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 Video extension library (alternate i386 package)
that ships another copy of the libraries in /usr/lib/i386-linux-gnu/
Absolutely not. This is madness.
Cheers,
Julien
signature.asc
Description: Digital signature
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On Wed, Sep 26, 2012 at 15:57:09 +0200, Ralf Jung wrote: Essentially, this is the case here, too: Getting git of libgl1-nvidia-glx-ia32, as it depended on ia32-libs (and, as reported by Andreas [1], can't be built with the multiarchified ia32-libs). So removing ia32-libs is the cause for this breakage. libxvmc was not part of ia32-libs so libgl1-nvidia-glx-ia32 lacked that dependency, but now that we must use libgl1-nvidia-glx:i386 and the proper automatically generated dependencies are used for all architectures, libxvmc is needed in a foreign-arch version as well, in one way or another. If libgl1-nvidia-glx-ia32 used to not need libxvmc, why can't libgl1-nvidia-glx:i386 also be made to not need libxvmc? Cheers, Julien signature.asc Description: Digital signature
Re: Closing in for d-i wheezy beta 3
On Wed, 2012-09-26 at 19:11 +0200, Cyril Brulebois wrote: # XXX: second look appreciated # xz compression + 4 RC bug fixes unblock grub2/1.99-23 unblock-udeb grub2/1.99-23 Looks sane enough to me. # single bugfix for pf crash, no-op for d-i: unblock kfreebsd-9/9.0-6 unblock-udeb kfreebsd-9/9.0-6 Also already unblocked. ;-) Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1348684262.21938.2.ca...@jacala.jungle.funky-badger.org
Re: Removing block-udeb gtk+3.0?
On Wed, 2012-09-26 at 16:10 +0200, Cyril Brulebois wrote:
since gtk+3.0 again appeared on my testing summary page (packages of
interest as far as unblock{,-udeb}'s are concerned), I'm wondering
whether it shouldn't just get its block-udeb removed?
For the record; done.
Regards,
Adm
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/1348684432.21938.3.ca...@jacala.jungle.funky-badger.org
Bug#681717: unblock: openjpeg/1.3+dfsg-4.4
On Sun, Jul 15, 2012 at 17:43:54 -0400, Michael Gilbert wrote: Package: release.debian.org User: release.debian@packages.debian.org Usertags: unblock Severity: normal Please unblock package openjpeg The unstable version enables multiarch and fixes a security issue. Is there a particular reason this library needs to be multiarched in wheezy? As in what multiarch-relevant package depends on it? Cheers, Julien signature.asc Description: Digital signature
Bug#681717: unblock: openjpeg/1.3+dfsg-4.4
On Wed, Sep 19, 2012 at 01:27:15 -0400, Michael Gilbert wrote: On Thu, Aug 16, 2012 at 5:18 AM, Jon Severinsson wrote: Release note that this bug blocks sound from working in wine and other i386 applications on amd64 in wheezy for many configurations (including mine). That is because libopenjpeg2 is required by libavcodec53 which is required by libasound2-plugins, which I need in both amd64 and i386 flavours to get sound to work in both 64 and 32 bit applications. Trying this one more time since I would really like the wine sound situation to be of high quality with the wheezy release. Attached is a patch (diffed against testing) that reverts back to debhelper 5 but otherwise retains the multiarch conversion, which is needed to resolve said sound situation. I know this is late, and its been late, but multiarch openjpeg has been in unstable for over 60 days without issue related to multiarch. So, in my opinion its far less risky than it may seem. But anyway I certainly respect alternative viewpoints. Anyway, the patch attached is for review and I will not upload without pre-approval. This approach looks ok to me. I'm guessing it needs an additional patch for CVE-2012-3535 though. One thing I don't understand is the comment about the -dbg package in the changelog. Care to explain what the problem is? Cheers, Julien signature.asc Description: Digital signature
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On 2012-09-26 20:13, Julien Cristau wrote: If libgl1-nvidia-glx-ia32 used to not need libxvmc, why can't libgl1-nvidia-glx:i386 also be made to not need libxvmc? Good question ... nvidia-graphics-drivers (256.53-1) experimental; urgency=low [ Andreas Beckmann ] * Add libxvmc1 to Build-Depends. -- Russ Allbery r...@debian.org Sat, 18 Sep 2010 15:07:19 -0700 That was the first upload targeting squeeze+1, upstream started to link libXvMCNVIDIA.so.1 with libXvMC.so.1 Since libXvMC.so.1 was not available in ia32-libs, no 32-bit version of libXvMCNVIDIA.so.1 was included in libgl1-nvidia-glx-ia32. Would you approve a package split of libgl1-nvidia-glx into libgl1-nvidia-glx and libxvmcnvidia1 that moves the problematic library to another package. libgl1-nvidia-glx would drop the dependency on libxvmc1 and become multiarch co-installable. libxvmcnvidia1:i386 would not be multiarch coinstallable due to lack of multiarch libxvmc1, but that library is not needed that much - and nobody has missed it in the old -ia32 package. Perhaps libXvMCNVIDIA.so.1 has never been in a -ia32 package from the beginning of time ... but I never noticed :-) And since we need a trip through NEW anyway for this change, could we add some more transitional helper packages for smoothing the -ia32 to :i386 transition? In #687506 Ralf has analyzed that we could turn the virtual *-i386 packages into real packages that are only build on :i386 and are marked as M-A: foreign, that way they could be Recommended from the transitional -ia32:amd64 packages. Andreas -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5063506c.9050...@abeckmann.de
Bug#681717: unblock: openjpeg/1.3+dfsg-4.4
On Wed, Sep 26, 2012 at 20:46:08 +0200, Julien Cristau wrote: On Sun, Jul 15, 2012 at 17:43:54 -0400, Michael Gilbert wrote: Package: release.debian.org User: release.debian@packages.debian.org Usertags: unblock Severity: normal Please unblock package openjpeg The unstable version enables multiarch and fixes a security issue. Is there a particular reason this library needs to be multiarched in wheezy? As in what multiarch-relevant package depends on it? Sorry for the noise, I found the other part of the report. (Do I hate it when a conversation is broken up into multiple threads? Why yes, yes I do!) Cheers, Julien signature.asc Description: Digital signature
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On Wed, Sep 26, 2012 at 14:06:33 +0200, Andreas Beckmann wrote: As we are not going to get libxvmc turned to multi-arch for wheezy (see #640499) To be clear, I'm not doing multiarch libxvmc myself, but if you or somebody else want to do that in a NMU I won't stop you. Cheers, Julien signature.asc Description: Digital signature
Bug#688881: unblock: openjpeg/1.3+dfsg-4.1+deb7u1
On Wed, Sep 26, 2012 at 18:11:46 +0200, Moritz Muehlenhoff wrote: Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock I've prepared a tpu security upload for openjpeg (attached). Ok to upload? I followed up to the unblock bug about the sid version. If we don't get that sorted soon then a tpu upload would be fine. Probably best to get the second CVE fixed in sid first in any case. Cheers, Julien signature.asc Description: Digital signature
Bug#688861: freeze exception: libxvmc/1.0.7-1.1 - adding a libxvmc1-i386:i386 package
On 2012-09-26 21:08, Julien Cristau wrote: On Wed, Sep 26, 2012 at 14:06:33 +0200, Andreas Beckmann wrote: As we are not going to get libxvmc turned to multi-arch for wheezy (see #640499) To be clear, I'm not doing multiarch libxvmc myself, but if you or somebody else want to do that in a NMU I won't stop you. As I understood KiBi's last response on #640499 (and getting no response at all on #687373), it's too late to get this change into wheezy. And getting this fixed for wheezy some way or another is my priority for now, so I started to look at alternative solutions. And thanks to you asking the right question, I see a solution that needs some larger changes, but is restricted to stuff in non-free. But I'll take a look again into the libxvmc multiarch part for jessie. Andreas -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/50635657.9060...@abeckmann.de
Re: Closing in for d-i wheezy beta 3
Adam D. Barratt a...@adam-barratt.org.uk (26/09/2012): # xz compression + 4 RC bug fixes unblock grub2/1.99-23 unblock-udeb grub2/1.99-23 Looks sane enough to me. Great. Thanks for checking, I've urgented all packages I've mentioned accordingly. Steve, if britney runs fine tonight, we should be on good track for a weekly build somewhen tomorrow. Mraw, KiBi. signature.asc Description: Digital signature
NEW changes in stable-new
Processing changes file: tiff_3.9.4-5+squeeze5_amd64.changes REJECT -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tgxl2-gn...@franck.debian.org
Processed: Re: Bug#684355: unblock: autofs/5.0.6-3
Processing control commands: retitle -1 unblock: autofs/5.0.7-1 Bug #684355 [release.debian.org] unblock: autofs/5.0.6-3 Changed Bug title to 'unblock: autofs/5.0.7-1' from 'unblock: autofs/5.0.6-3' -- 684355: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684355 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.b684355.134868898717853.transcr...@bugs.debian.org
Bug#684355: unblock: autofs/5.0.6-3
Control: retitle -1 unblock: autofs/5.0.7-1 Please unblock package autofs There are a few relatively small changes fixing some bugs and making the package more accurate. Also, per request from the previous maintainer, debian/control is changed to list new maintainer address - this is important change by its own. I uploaded the package into unstable, adding a few more changes on the way - manpage hyphen fix and usage of hardening flags. The new debdiff is attached. We reviewed remaining upstream changes between 5.0.6 and 5.0.7 releases (debian 5.0.6-2+ package was based on a middle of 5.0.7 upstream release) and realized that all changes in 5.0.7 and even PAST 5.0.7 are bugfixes, and many are important as well. So we went on and packaged upstream release 5.0.7 plus almost all past-5.0.7 changes from upstream git. Since the amount of bugs in autofs is really huge, any bugfixing is important, that's why we decided to package 5.0.7 to start with. Complete debdiff between 5.0.6-2 which is currently in wheezy and proposed 5.0.7-1 is large: 72 files changed, 3611 insertions(+), 7322 deletions(-) but this is because we initially included half of the upstream git changes past 5.0.6, debian/patches/autofs-5.0.6-upstream-git.patch, which was 6015 lines long, and with all that now is within various files in orig.tar.gz. Actual differences between upstream 5.0.7 and debian 5.0.6+ is this: 31 files changed, 744 insertions(+), 574 deletions(-) this since commit 09d4edb2469f9415f6ca33760d83b3c85b517de7, autofs-5.0.6 - fix libtirpc name clash: http://git.kernel.org/?p=linux/storage/autofs/autofs.git;a=shortlog in there, basically, all changes between 2012-06-28 (by Leonardo Chiquitto) and up to release_5_0_7 tag. We also included 4 out of 5 fixes past 5.0.7 in there - omitting a larger, ipv6-related change fix ipv6 proximity calculation, which has some breaking potential. Here's the changelog since 5.0.6-2 (wheezy) version: autofs (5.0.7-1) unstable; urgency=low * new upstream (5.0.7) release. It brings the following changes: - fixed remount deadlock, and several other locking fixes - fixed umount recovery for busy direct mounts - removed old code (mount-move which was fixed in 5.0.6-4 #686438) - fix hosts lookup module to be more robust - implemented abilty to re-read indirect maps on the fly (sighup) - fixes for nfs handling to be more robust - several fixes for multi-mount entries - several fixes for NFSv4 mounts (Closes: #675798) and a few more small/misc fixes. This is all-bugfix changes, making the code more robust and less buggy. * removed --disable-mount-move configure option, not needed anymore. * removed autofs-5.0.6-upstream-git.patch. * refreshed manpages-hyphen.patch. * added selected fixes from upstream git, up to upstream/master commit 9872cdbf9f1588174121e6ffe6f7509cde2d98e9: - 0001-autofs-5.0.7-fix-nobind-sun-escaped-map-entries.patch (Closes: #678408) - 0002-autofs-5.0.7-fix-use-cache-entry-after-free-mistake.patch - 0004-autofs-5.0.7-fix-parse-buffer-initialization.patch - 0005-autofs-5.0.7-fix-typo-in-automount-8.patch * added remove-kernel-mount.nfs-version-check.patch to stop automount from checking for very old mount.nfs or kernel. The check isn't necessary (that's pre-squeeze versions, so not even versioned Breaks are needed anymore), but it is also harmful, since automount spawns mount.nfs at startup and confuses upstart and systemd who start tracking wrong process. The patch just removes these checks assuming we always use recent enough versions. (Closes: #678555) -- Michael Tokarev m...@tls.msk.ru Wed, 26 Sep 2012 21:15:05 +0400 autofs (5.0.6-4) unstable; urgency=low * configure with --disable-mount-move -- upstream even removed the code in question for 5.0.7 release (Closes: #686438) * remove autofs5.postrm in autofs.postinst to cope with old maintscript removing our configfiles. See comments in autofs.postinst for more details (Closes: #686146) * added allow-nsswitch.conf-to-not-contain-automount-lines.patch (submitted to upstream too) to stop automount from complaining when nsswitch.conf does not mention autofs (which is almost every install anyway). (Closes: #682266, #602090) -- Michael Tokarev m...@tls.msk.ru Sat, 22 Sep 2012 13:07:46 +0400 autofs (5.0.6-3) unstable; urgency=low [Michael Tokarev] * almost completely rewrote the startup script, make it cleaner, consistent and actually returning proper exit codes. Removed $ constructs too, dash apparently does not understand these. (Closes: #677520, #683936) * transfer ownership of ucf-conffiles forcibly only if they're owned by autofs5, not by any other package. * run ucf --purge in postrm only if it is installed, and in the right order too (Closes: #685468) * added filagdir.patch - fix a typo in configure.in which prevents from
Bug#684355: unblock: autofs/5.0.6-3
On 26.09.2012 23:49, Michael Tokarev wrote:
[]
Debdiff between wheezy and sid version will be sent in a separate
email, since it is large. The same but without upstream changes
(which are easily visible in the git tree referenced above) and
the removal of half-5.0.7 upstream diff from debian/patches is
below. The diffstat for this short version:
16 files changed, 489 insertions(+), 86 deletions(-)
And ofcource I forgot to add the debdiff. Attached now.
/mjt
diff -Nru autofs-5.0.6/debian/autofs.init autofs-5.0.7/debian/autofs.init
--- autofs-5.0.6/debian/autofs.init 2012-06-01 16:12:48.0 +0400
+++ autofs-5.0.7/debian/autofs.init 2012-06-07 23:41:38.0 +0400
@@ -1,7 +1,5 @@
#! /bin/sh
#
-# rc file for automount using a Sun-style master map.
-#
### BEGIN INIT INFO
# Provides: autofs
@@ -17,11 +15,10 @@
# Location of the automount daemon and the init directory
#
-DAEMON=/usr/sbin/automount
-prog=`basename $DAEMON`
-DEVICE=autofs
-NAME=autofs
-PIDFILE=/var/run/${NAME}.pid
+PROG=automount
+DAEMON=/usr/sbin/$PROG
+NAME=autofs
+PIDFILE=/run/$NAME.pid
test -e $DAEMON || exit 0
@@ -37,103 +34,78 @@
. /etc/default/autofs
fi
+start_stop_autofs() {
+ start-stop-daemon $@ --pidfile $PIDFILE --exec $DAEMON -- \
+ $OPTIONS --pid-file $PIDFILE
+}
+
start() {
- log_action_begin_msg Starting $prog $prog
+ log_action_begin_msg Starting $PROG
- # Make sure autofs4 module is loaded
- if ! grep -q autofs /proc/filesystems
+ if ! grep -qw autofs /proc/filesystems
then
- # Try load the autofs4 module fail if we can't
- modprobe autofs4 /dev/null 21
- if [ $? -eq 1 ]
+ if ! modprobe autofs4 /dev/null 21
then
log_action_end_msg 1 failed to load autofs4 module
return 1
fi
elif [ -f /proc/modules ] grep -q ^autofs[^4] /proc/modules
then
- # wrong autofs filesystem module loaded
log_action_end_msg 1 autofs kernel module is loaded, autofs4
required
return 1
fi
- start-stop-daemon --start --exec $DAEMON --oknodo -- $OPTIONS
--pid-file $PIDFILE
- RETVAL=$?
- if [ $RETVAL -eq 0 ] ; then
- log_end_msg 0
- else
+ if ! start_stop_autofs --start --oknodo --quiet ; then
log_action_end_msg 1 no valid automount entries defined.
+ return 1
fi
+ log_end_msg 0
return 0
}
stop() {
- log_action_begin_msg $Stopping $prog:
- count=0
- while [ -n `pidof $prog` -a $count -lt 15 ] ; do
- start-stop-daemon --stop --exec $DAEMON --oknodo
- [ -z `pidof $prog` ] || sleep 3
- count=`expr $count + 1`
- done
- if [ -z `pidof $prog` ] ; then
- RETVAL=0
- log_action_end_msg 0
- else
- RETVAL=1
+ log_action_begin_msg Stopping $PROG
+ if ! start_stop_autofs --stop --retry 5 --oknodo --quiet ; then
log_action_end_msg 1
+ return 1
fi
- return $RETVAL
-}
-
-restart() {
- stop
- start
+ log_end_msg 0
+ return 0
}
reload() {
- pid=`pidof $prog`
- if [ -z $pid ]; then
- log_action_msg $$prog not running
- RETVAL=1
- else
- kill -HUP $pid 2 /dev/null
- log_action_msg $Reloading maps
- RETVAL=0
+ log_action_begin_msg Reloading $PROG maps
+ if ! start_stop_autofs --stop --signal=HUP --quiet
+ then
+ log_action_end_msg 1 $PROG not running
+ return 1
fi
- return $RETVAL
+ log_action_end_msg 0
+ return 0
}
-RETVAL=0
+forcestart() {
+ OPTIONS=$OPTIONS --force
+ start
+}
case $1 in
- start)
- start
- ;;
- forcestart)
- OPTIONS=$OPTIONS --force
- start
- ;;
- stop)
- stop
+ start|forcestart|stop|reload)
+ $1
;;
restart|force-reload)
- restart
+ stop
+ start
;;
forcerestart)
- OPTIONS=$OPTIONS --force
- restart
- ;;
- reload)
- reload
+ stop
+ forcestart
;;
status)
- status_of_proc -p $PIDFILE $DAEMON $prog
+ status_of_proc -p $PIDFILE $DAEMON $PROG
;;
*)
- echo $Usage: $0
{start|forcestart|stop|restart|forcerestart|reload|force-reload|status}
- exit 1;
+ echo Usage: $0
{start|forcestart|stop|restart|forcerestart|reload|force-reload|status}
+ exit 1
Bug#688928: unblock: rsyslog/5.8.11-2
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package rsyslog
The changelog reads:
* Disable omstdout module again. Upstream doesn't consider it viable for
production use but mainly for the internal testbench.
* debian/patches/03-fix_relp_dns_resolution.patch: When using RELP for
remote logging, correctly resolve the client hostname if the fromhost
property contains the client IP. (Closes: #682529)
Thanks to Apollon Oikonomopoulos for the patch.
Especially, the first point, dropping the omstdout plugin, is important.
I accidentally had that enabled in my last upload, but talking with
upstream it quickly became clear that this module should not be shipped
in our next Debian release.
Full debdiff attached.
Thanks for your great work,
Michael
unblock rsyslog/5.8.11-2
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index 849126e..ff6eca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+rsyslog (5.8.11-2) unstable; urgency=low
+
+ * Disable omstdout module again. Upstream doesn't consider it viable for
+production use but mainly for the internal testbench.
+ * debian/patches/03-fix_relp_dns_resolution.patch: When using RELP for
+remote logging, correctly resolve the client hostname if the fromhost
+property contains the client IP. (Closes: #682529)
+Thanks to Apollon Oikonomopoulos for the patch.
+
+ -- Michael Biebl bi...@debian.org Wed, 26 Sep 2012 20:36:09 +0200
+
rsyslog (5.8.11-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/03-fix_relp_dns_resolution.patch b/debian/patches/03-fix_relp_dns_resolution.patch
new file mode 100644
index 000..b3dfeab
--- /dev/null
+++ b/debian/patches/03-fix_relp_dns_resolution.patch
@@ -0,0 +1,44 @@
+--- a/plugins/imrelp/imrelp.c
b/plugins/imrelp/imrelp.c
+@@ -44,6 +44,7 @@
+ #include msg.h
+ #include unicode-helper.h
+ #include prop.h
++#include glbl.h
+
+ MODULE_TYPE_INPUT
+ MODULE_TYPE_NOKEEP
+@@ -52,6 +53,7 @@
+ DEF_IMOD_STATIC_DATA
+ DEFobjCurrIf(net)
+ DEFobjCurrIf(prop)
++DEFobjCurrIf(glbl)
+
+ /* Module static data */
+ static relpEngine_t *pRelpEngine; /* our relp engine */
+@@ -104,6 +106,9 @@
+ CHKiRet(relpEngineSetDbgprint(pRelpEngine, dbgprintf));
+ CHKiRet(relpEngineSetEnableCmd(pRelpEngine, (uchar*) syslog, eRelpCmdState_Required));
+ CHKiRet(relpEngineSetSyslogRcv(pRelpEngine, onSyslogRcv));
++ if (!glbl.GetDisableDNS()) {
++ CHKiRet(relpEngineSetDnsLookupMode(pRelpEngine, 1));
++ }
+ }
+
+ CHKiRet(relpEngineAddListner(pRelpEngine, pNewVal));
+@@ -162,6 +167,7 @@
+ iRet = relpEngineDestruct(pRelpEngine);
+
+ /* release objects we used */
++ objRelease(glbl, CORE_COMPONENT);
+ objRelease(prop, CORE_COMPONENT);
+ objRelease(net, LM_NET_FILENAME);
+ ENDmodExit
+@@ -187,6 +193,7 @@
+ CODEmodInit_QueryRegCFSLineHdlr
+ pRelpEngine = NULL;
+ /* request objects we use */
++ CHKiRet(objUse(glbl, CORE_COMPONENT));
+ CHKiRet(objUse(prop, CORE_COMPONENT));
+ CHKiRet(objUse(net, LM_NET_FILENAME));
+
diff --git a/debian/patches/series b/debian/patches/series
index c92adc9..d985f46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
# Debian patches for rsyslog
01-dont_create_db.patch
02-path_max.patch
+03-fix_relp_dns_resolution.patch
diff --git a/debian/rsyslog.install b/debian/rsyslog.install
index a538bfc..6c4248e 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -19,7 +19,6 @@ usr/lib/rsyslog/lmtcpsrv.so
usr/lib/rsyslog/lmzlibw.so
usr/lib/rsyslog/ommail.so
usr/lib/rsyslog/omprog.so
-usr/lib/rsyslog/omstdout.so
usr/lib/rsyslog/omuxsock.so
usr/lib/rsyslog/omruleset.so
usr/lib/rsyslog/pm*.so
diff --git a/debian/rules b/debian/rules
index 21e4367..c04f837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ override_dh_auto_configure:
--enable-pmrfc3164sd \
--enable-pmsnare \
--enable-omprog \
- --enable-omstdout \
--enable-omuxsock \
--disable-testbench \
--with-systemdsystemunitdir=/lib/systemd/system
Bug#688928: Acknowledgement (unblock: rsyslog/5.8.11-2)
The patch debian/patches/03-fix_relp_dns_resolution.patch has been reviewed by upstream and applied to the Git repository [1], fwiw. Cheers, Michael [1] http://git.adiscon.com/?p=rsyslog.git;a=commit;h=136f6e097800742ec232c968b2bdd03bfab687f4 -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
