Bug#715633: Crash: Proposing fix
The crash referenced in the mayhem data occurs whenever the --pidfile
option is used (no matter what the argument).
The problem has been introduced by Debian, in the debian patch
add_pidfile_option.patch: The new argument pidfile is defined with
the no_argument specifier, but the argument processing switch tries to
call strdup on optarg - which is never set.
Trivial fix:
As the pidfile option doesn't have any effect, if gconf.pidfile
isn't set to anything non-NULL, I guess that the argument is really
mandatory. So change the no_argument specifier in line 102 of the
patch to required_argument.
I attach a new (fixed) version of the patch.
Cheers,
Martin
--- ample-0.5.7.orig/src/ample.c
+++ ample-0.5.7/src/ample.c
@@ -241,6 +241,26 @@
return;
}
+/*
+ * Write a pidfile
+ *
+ * Added by Debian Maintainer
+ *
+ */
+static int
+do_pidfile(void)
+{
+ FILE *f;
+ int pidnum;
+ pidnum = getpid();
+ f = fopen(gconf.pidfile, w);
+ if (!f) {
+ return (1);
+ }
+ fprintf(f,%d\n, pidnum);
+ fclose(f);
+ return(0);
+}
/*
* Checks if a file descriptor is a socket.
@@ -292,6 +312,15 @@
die(fork);
}
+/* Remove pidfile when dies
+ *
+ */
+static void
+removepidfile(void)
+{
+ unlink(gconf.pidfile);
+ exit(EXIT_SUCCESS);
+}
/*
* Prepares the proper way for ample to log messages.
@@ -460,6 +489,18 @@
checkopt(argc, argv);
gconf.inetd = issocket(0);
daemonize();
+
+ /* Added by Debian Maintainer */
+ if (gconf.pidfile) {
+ debug (1, pidfile:%s \n, gconf.pidfile);
+ if (do_pidfile() != 0) {
+ debug(1, could not write pidfile);
+ exit(1);
+ }
+
+ }
+ /**/
+
preparelog();
if(!gconf.inetd)
logmsg(Ample/%s started\n, AMPLE_VERSION);
@@ -488,6 +529,12 @@
memset(sa, 0, sizeof(sa));
sa.sa_handler = sigchild_handler;
sigaction(SIGCHLD, sa, NULL);
+
+ /* Added by the Debian Maintainer */
+ if (signal(SIGTERM, removepidfile) == SIG_ERR) {
+ debug(1, err, I can't quit);
+ }
+ /**/
sigemptyset(chld);
sigaddset(chld, SIGCHLD);
--- ample-0.5.7.orig/src/ample.h
+++ ample-0.5.7/src/ample.h
@@ -36,6 +36,7 @@
char * servername;
char * serveraddress;
char * filter;
+ char * pidfile;
};
struct childstat {
--- ample-0.5.7.orig/src/configuration.c
+++ ample-0.5.7/src/configuration.c
@@ -621,6 +621,7 @@
{servername, OPT_STRING, gconf.servername},
{serveraddress, OPT_STRING, gconf.serveraddress},
{username, OPT_STRING, gconf.username},
+ {pidfile, OPT_STRING, gconf.pidfile},
{NULL, 0, NULL}
};
@@ -674,13 +675,14 @@
{debug, optional_argument, NULL, 'd'},
{trace, no_argument, NULL, 't'},
{version, no_argument, NULL, 'v'},
+ {pidfile, required_argument, NULL, 'i'},
{NULL, 0, NULL, 0}
};
- while((c = getopt_long(argc, argv, p:oc:nf:m:hd::tv, longopts, i))
+ while((c = getopt_long(argc, argv, p:oc:nf:m:hd::ti:v, longopts, i))
!= -1) {
#else
- while((c = getopt(argc, argv, p:oc:nf:m:hd::tv)) != -1) {
+ while((c = getopt(argc, argv, p:oc:nf:m:hd::ti:v)) != -1) {
#endif
switch(c) {
case 'p':
@@ -718,6 +720,9 @@
case 'v':
printf(Ample version %s\n, AMPLE_VERSION);
exit(0);
+ case 'i':
+ gconf.pidfile = strdup(optarg);
+ break;
default:
usage(TRUE);
}
--- ample-0.5.7.orig/src/configuration.h
+++ ample-0.5.7/src/configuration.h
@@ -70,6 +70,7 @@
higher number means more detail\n\
-t, --trace no forking, no backgrounding\n\
helpful when debugging\n\
+ -i, --pidfile create a pidfile \n\
-v, --version output version information and exit\n\
\n\
Report bugs to da...@2gen.com\n
@@ -86,7 +87,8 @@
-d[=NUMBER] debug messages will be printed,\n\
higher number means more detail\n\
-t no forking, no backgrounding,\n\
- helpful when debugging)\n\
+ (helpful when debugging)\n\
+ -i create a pidfile \n\
-v output version information and exit\n\
\n\
Report bugs to da...@2gen.com\n
--- ample-0.5.7.orig/docs/ample.1.in
+++ ample-0.5.7/docs/ample.1.in
@@ -86,6 +86,9 @@
.B -v --version
Display version information and exit.
.TP
+.B -i --pidfile [PIDFILE]
+Write a PIDFILE to handle ample as a daemon
+.TP
.BI [ PATH ...]
These are path(s) to files or directories that Ample can use to
populate it's list of MP3's. If
Bug#759112: pppconfig: [INTL:pt] Updated Portuguese translation of manpage
Package: pppconfig Version: 2.3.21 Tags: l10n, patch Severity: wishlist Updated Portuguese translation for pppconfig's manpage. Translator: Américo Monteiro a_monte...@gmx.com Feel free to use it. For translation updates please contact 'Last Translator' or the Portuguese Translation Team traduz _at_ debianpt.org. -- Melhores cumprimentos/Best regards, Américo Monteiro pppconfig_2.3.21_pppconfig.pt.po.gz Description: GNU Zip compressed data
Bug#566517: Proposing fix
I was still able to reproduce the problem with the latest version of
ample in Debian sid/unstable (0.5.7-7), so I had a look at the problem.
It became obvious quickly that the problem was related to some stripping
of the mp3 files (removal of the ID3v1 from the end of the file and
ID3v2 from the beginning of the file) that was taken into account during
the streaming, but not during the preparation of the HTTP response
headers. Unfortunately, with the current function structure that
information was not available at the time of sending the HTTP response
headers. So some refactoring had to be done.
The good new is that the rewriting of the code fixes two more problems
that had not yet been reported to Debian so far: 1. The interpretation
of the positioning information in the HTTP Range header was not
consistent with the offsets (stripping ID3 info). 2. Regardless the
Range information, ample always sent the complete file, not only the
requested range (although its response header suggested partial content).
Find attached the proposed patch. It may need some further testing, I'm
not familiar with real-world use cases, so after the fix-up I only
tested it according to theoretical specifications (using general-purpose
tools like curl, wget etc.). This testing only covers the single-file
delivery methods, but the main switch in the program tells me that there
are several others. They are not likely to be affected by this patch,
but if maybe someone has a real-world use-case ready, testing might be
worth it anyway...
Cheers,
Martin
Description: Fix incorrect HTTP size info by rewriting offset handling
The offset handling (stripping ID3 info) was rewritten to fix the following
problem (reported in Debian bug #566517): The HTTP Content-Length header was
giving lengths that were inconsistent with the data actually sent over the
wire. The change couldn't be done without changing the function structure, so
some more code had to be rewritten. As a positive side effect of the rewrite,
two more (so far undetected) problems were solved: 1. The interpretation of
the positioning information in the HTTP Range header was not consistent with
the offsets (stripping ID3 info). 2. Regardless the Range information, ample
always sent the complete file, not only the requested range (although its
response header suggested partial content).
Author: Martin Steghöfer mar...@steghoefer.eu
Bug-Debian: https://bugs.debian.org/566517
--- a/src/client.c
+++ b/src/client.c
@@ -125,37 +125,29 @@
/*
- * Positions the stream at the correct start and decides where to stop.
+ * Calculates the offsets at start and end of file due to stripping of
+ * metadata (ID3v1 and ID3v2)
*
* Arguments: cconf - session information
- *stream - the stream to position
*entry - the file that is about to be played
- *
- * Returns: the offset where to stop
+ *startOffset - pointer to the variable used as out-parameter
+ * for the offset at the beginning of the file
+ *endOffset - pointer to the variable used as out-parameter
+ *for the offset at the end of the file
*/
-static long
-setoffsets(struct client_config *cconf, FILE *stream, mp3entry *entry)
+void
+getoffsets(struct client_config *cconf, mp3entry *entry, long *startOffset, long *endOffset)
{
- long start;
- long end;
-
- if(cconf-startpos 0 cconf-startpos entry-filesize)
- start = cconf-startpos;
- else if(!MODE_ISSET(MODE_SINGLE) entry-id3v2len)
- start = entry-id3v2len;
- else
- start = 0;
- fseek(stream, start, SEEK_SET);
+ *startOffset = 0;
+ if (!(MODE_ISSET(MODE_SINGLE) || MODE_ISSET(MODE_PARTIAL)))
+ *startOffset += entry-id3v2len;
- if(cconf-endpos 0 cconf-endpos entry-filesize)
- end = cconf-endpos;
- else if(HASID3V1(entry) end entry-id3v1len)
- end = entry-filesize - entry-id3v1len;
+ if (HASID3V1(entry))
+ *endOffset = entry-id3v1len;
else
- end = entry-filesize;
+ *endOffset = 0;
- debug(4, Start offset is %li, end offset is %li\n, start, end);
- return end;
+ debug(4, Start offset is %li, end offset is %li\n, *startOffset, *endOffset);
}
@@ -168,12 +160,39 @@
* Returns: void
*/
static void
-playfile(struct client_config *cconf, mp3entry *entry)
+playfile(struct client_config *cconf, mp3entry *entry)
{
FILE *file;
- char buf[NETBUFFSIZE];
- int amount;
- long end;
+ long startOffset, endOffset, end;
+
+ file = preparefile(cconf, entry, startOffset, endOffset);
+ if (file)
+ {
+ end = endOffset 0 ? entry-filesize - endOffset : -1;
+ playopenfile(cconf, entry, file, end);
+ }
+}
+
+/*
+ * Prepared a file for streaming: Opens the file, determines the offsets and seeks to the
+ * initial streaming position (skipping metadata, if desired, and skipping initial bytes,
+ * if cconf-startpos is given)
+ *
+ * Arguments: cconf - session information
+ *entry - the entry to play
+ *
Bug#756794: vsftpd: FTBFS on kfreebsd-*
Hello Steven, Am Donnerstag, den 21.08.2014, 14:56 +0100 schrieb Steven Chamberlain: [...] Hi, On 20/08/14 16:38, Jörg Frings-Fürst wrote: There are no changes at sysdeputil.c between vsftpd/3.0.2-14 and vsftpd/3.0.2-15. I see what happened: kfreebsd-kernel-headers introduced a new sys/capability.h which we did not have before. vsftpd will use it in preference to a dummyinc/sys/capability.h You can see in dummyinc/sys/capability.h that it would otherwise #undef VSF_SYSDEP_HAVE_LIBCAP. vsftpd expects sys/capability.h will define cap_t, but only libcap has that, our header does not. I'm not sure what's right/wrong here. libcap is a linux-any package currently but would conflict with this FreeBSD kernel header otherwise. (Why does libpcap put it in sys/?) Either way, we don't seem to have libcap on GNU/kFreeBSD, and quoting Ben Kaduk: It seems [libpcap] is the provider of the cap_t; there is no such concept in the base freebsd system. I think it is appropriate to add the attached, along with the other platform-specific configuration atop sysdeputil.c Regards, Many thanks for your work and the patch. I've added them into 3.0.2-16. CU Jörg -- pgp Fingerprint: 7D13 3C60 0A10 DBE1 51F8 EBCB 422B 44B0 BE58 1B6E pgp Key: BE581B6E CAcert Key S/N: 0E:D4:56 Jörg Frings-Fürst D-54526 Niederkail Threema: SYR8SJXB IRC: j_...@freenode.net j_...@oftc.net signature.asc Description: This is a digitally signed message part
Processing of gquilt_0.25-4_amd64.changes
gquilt_0.25-4_amd64.changes uploaded successfully to localhost along with the files: gquilt_0.25-4_all.deb gquilt_0.25-4.dsc gquilt_0.25-4.debian.tar.xz Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xleg0-0004au...@franck.debian.org
gquilt_0.25-4_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Sun, 24 Aug 2014 12:41:49 -0700 Source: gquilt Binary: gquilt Architecture: source all Version: 0.25-4 Distribution: unstable Urgency: low Maintainer: Debian QA Group packa...@qa.debian.org Changed-By: Christine Spang christ...@debian.org Description: gquilt - graphical wrapper for quilt and/or mercurial queues Changes: gquilt (0.25-4) unstable; urgency=low . * Orphan gquilt. Checksums-Sha1: d0548a307d7b56de31f9967f376737e14c776aa8 1822 gquilt_0.25-4.dsc 9bef9c016f37143dd8c4c5dcb6fee6e31ff4d8f6 5072 gquilt_0.25-4.debian.tar.xz e7f5947a3b40dd8dc3f8b6c503ba5c5c25002d83 109002 gquilt_0.25-4_all.deb Checksums-Sha256: b1a20baa5ac6550edd0816c0499937a6409596b699fb2529335a92a5fc2976f8 1822 gquilt_0.25-4.dsc 568cffe0f6e2a17e523e89a9663023fdba4c88cf41ad4f5e90727c82462ae991 5072 gquilt_0.25-4.debian.tar.xz 79303e375a1b9f7021ebdade54e5afbd4430dec0bbe5bee6520ec5b786c9f6ff 109002 gquilt_0.25-4_all.deb Files: 7973ebb5dc26799059723ac6d4f6081b 109002 vcs optional gquilt_0.25-4_all.deb 383f6d05bf21702b94a9425c0ccf619d 1822 vcs optional gquilt_0.25-4.dsc 8842a6f8b44f0fa12c1371b9817131c9 5072 vcs optional gquilt_0.25-4.debian.tar.xz -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCAAGBQJT+kgHAAoJEGSVn+mDjfGcHKgP/jZDtuk3d6djVfux9PEnfE9d WjJ+m9WnbVYrt/gAkUheTY5340IOtg2uZaSShR6PrPm1GwstC1EashWLynRCNNOH +tf6FEj+z4Uf9GaOnUbTPvGu0E6vyhRT7fjQSUsJGYWqfKPqnaWiZnVLj47O55Ay 4o8nkLofbH2DL8/LT7O87Bz1d+wYFXwjn25q5wTrt6BYL+kMtsHBdRKKHpqSCBSQ ufga8Ed1cqkzWS0MmeSJDCyL8Aev1xO1Twfkj4g/L9/SQS/Jf3DxVwr3zKWSNEeF 0QotuE7N1dLcLAgEPgPsb+7HJfl8KqJtzn+jEK3LRGxnzzCnvV+GHvCOClUmC+/k Ea33LtLsClRIHWcxVmQKyTvcLzZm7ac5kVZg+6FdxfMNLjOm4gg8uFhSPx8P5+F5 JxL0Ymv0r3xTOKIIoQW7MTAE0mdndtyMrHtuBoOCIqgIEVWwnMw00nrxDfAsmEVS kbeKOJ3bFEWWJM4xTh/bIcN+SJIZ4J4R3nd3irIWKcEW/Vp4QrNSAhKAyJcoMROm /YGg9PVUjmCxDflYjsfvKUmmTnqxLukOk+TIkWGxG4shShjNMDKQVBEFl5xGHzYj KfbdRS9LWIUodbVt0HrgZIsDUYX/5qdzfSQFXUiP/2Yh+dVsW7HTCpUMGnl8cNMp MSXmEBTdK5NE9/PcgXvu =j0m6 -END PGP SIGNATURE- Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xlexs-0002gn...@franck.debian.org
Bug#737338 blocking the ppc64el architecture bootstrap
Dear maintainer, The ppc64el architecture has been added to the Debian archive. Your package libmimedir fails to build as reported in bug #737338 and the build log is available on [1]. It would be very nice if you can upload a fixed version of this package. Don't hesitate to ask questions if you need help to fix this bug. If you lack time for that, I can also proceed with an NMU. Thanks, Aurelien [1] https://buildd.debian.org/status/logs.php?pkg=libmimedirarch=ppc64el -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140825024233.ga11...@ohm.rr44.fr
Bug#735214 blocking the ppc64el architecture bootstrap
Dear maintainer, The ppc64el architecture has been added to the Debian archive. Your package libast fails to build as reported in bug #735214 and the build log is available on [1]. It would be very nice if you can upload a fixed version of this package. Don't hesitate to ask questions if you need help to fix this bug. If you lack time for that, I can also proceed with an NMU. Thanks, Aurelien [1] https://buildd.debian.org/status/logs.php?pkg=libastarch=ppc64el -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140825024208.ga11...@ohm.rr44.fr
Bug#734231 blocking the ppc64el architecture bootstrap
Dear maintainer, The ppc64el architecture has been added to the Debian archive. Your package libwfut fails to build as reported in bug #734231 and the build log is available on [1]. It would be very nice if you can upload a fixed version of this package. Don't hesitate to ask questions if you need help to fix this bug. If you lack time for that, I can also proceed with an NMU. Thanks, Aurelien [1] https://buildd.debian.org/status/logs.php?pkg=libwfutarch=ppc64el -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140825024316.ga12...@ohm.rr44.fr
Bug#737068 blocking the ppc64el architecture bootstrap
Dear maintainer, The ppc64el architecture has been added to the Debian archive. Your package sane-backends-extras fails to build as reported in bug #737068 and the build log is available on [1]. It would be very nice if you can upload a fixed version of this package. Don't hesitate to ask questions if you need help to fix this bug. If you lack time for that, I can also proceed with an NMU. Thanks, Aurelien [1] https://buildd.debian.org/status/logs.php?pkg=sane-backends-extrasarch=ppc64el -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140825032634.ga20...@ohm.rr44.fr
Bug#735637 blocking the ppc64el architecture bootstrap
Dear maintainer, The ppc64el architecture has been added to the Debian archive. Your package libifp fails to build as reported in bug #735637 and the build log is available on [1]. It would be very nice if you can upload a fixed version of this package. Don't hesitate to ask questions if you need help to fix this bug. If you lack time for that, I can also proceed with an NMU. Thanks, Aurelien [1] https://buildd.debian.org/status/logs.php?pkg=libifparch=ppc64el -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140825032828.ga21...@ohm.rr44.fr
dump is marked for autoremoval from testing
dump 0.4b44-4 is marked for autoremoval from testing on 2014-09-03 It is affected by these RC bugs: 714234: dump: restore #157 dump fails to restore incremental if directory was removed -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xlm3a-00044y...@franck.debian.org
