Bug#681416: unblock: reprepro/4.12.4-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking package reprepro:
It fixes an unclean abort when told to generate only .bz2 index files,
avoids to stop on some unterminated line marker in .diff files
and fixes a typo in the manpage.
Thanks in advance,
Bernhard R. Link
unblock reprepro/4.12.4-1
diff -r -u -N reprepro_4.12.3-1/debian/changelog reprepro_4.12.4-1/debian/changelog
--- reprepro_4.12.3-1/debian/changelog 2012-06-24 23:13:38.000000000 +0200
+++ reprepro_4.12.4-1/debian/changelog 2012-07-12 15:35:27.000000000 +0200
@@ -1,3 +1,13 @@
+reprepro (4.12.4-1) unstable; urgency=low
+
+ * new bugfix release
+ - fix assert() triggering when requesting only .bz2 indicies
+ - fix typo in manpage (Closes: 681105)
+ - don't stop on no-newline warnings when parsing .diff.gz files
+ (Closes: 676519)
+
+ -- Bernhard R. Link <brlink@debian.org> Thu, 12 Jul 2012 15:30:12 +0200
+
reprepro (4.12.3-1) unstable; urgency=low
* new bugfix release
diff -r -u -N reprepro_4.12.3-1/ChangeLog reprepro_4.12.4-1/ChangeLog
--- reprepro_4.12.3-1/ChangeLog 2012-06-24 22:53:10.000000000 +0200
+++ reprepro_4.12.4-1/ChangeLog 2012-07-12 15:26:52.000000000 +0200
@@ -1,3 +1,10 @@
+2012-07-11
+ * fix bug in checking old unchanged {Packages/Sources}.bz2
+ files for existance. (Triggering even an assertion when
+ only .bz2 index files are requested).
+ * ignore diff comments about unterminated lines
+ when parsing .diff files
+
2012-06-24
* support http-method's extended 103 redirect status
* actually set REPREPRO_CONFIG_DIR in hooks as
diff -r -u -N reprepro_4.12.3-1/NEWS reprepro_4.12.4-1/NEWS
--- reprepro_4.12.3-1/NEWS 2012-06-24 22:58:01.000000000 +0200
+++ reprepro_4.12.4-1/NEWS 2012-07-12 15:26:52.000000000 +0200
@@ -1,3 +1,7 @@
+Updates between 4.12.3 and 4.12.4:
+- fix bug when only generating .bz2 indices
+- ignore diff comments about unterminated lines when parsing .diff files
+
Updates between 4.12.2 and 4.12.3:
- actually set REPREPRO_CONFIG_DIR in hooks as documented in manpage
- support 103 redirect message from apt's http method.
diff -r -u -N reprepro_4.12.3-1/release.c reprepro_4.12.4-1/release.c
--- reprepro_4.12.3-1/release.c 2012-06-07 22:57:13.000000000 +0200
+++ reprepro_4.12.4-1/release.c 2012-07-12 15:26:52.000000000 +0200
@@ -525,17 +525,20 @@
}
bool release_oldexists(struct filetorelease *file) {
- if (file->f[ic_uncompressed].fullfinalfilename != NULL) {
- if (file->f[ic_gzip].fullfinalfilename != NULL) {
- return isregularfile(file->f[ic_gzip].fullfinalfilename) &&
- isregularfile(file->f[ic_uncompressed].fullfinalfilename);
- } else {
- return isregularfile(file->f[ic_uncompressed].fullfinalfilename);
+ enum indexcompression ic;
+ bool hadanything = false;
+
+ for (ic = ic_uncompressed ; ic < ic_count ; ic++) {
+ char *f = file->f[ic].fullfinalfilename;
+
+ if (f != NULL) {
+ if (isregularfile(f))
+ hadanything = true;
+ else
+ return false;
}
- } else {
- assert (file->f[ic_gzip].fullfinalfilename != NULL);
- return isregularfile(file->f[ic_gzip].fullfinalfilename);
}
+ return hadanything;
}
static retvalue openfile(const char *dirofdist, struct openfile *f) {
diff -r -u -N reprepro_4.12.3-1/docs/reprepro.1 reprepro_4.12.4-1/docs/reprepro.1
--- reprepro_4.12.3-1/docs/reprepro.1 2012-06-24 22:53:10.000000000 +0200
+++ reprepro_4.12.4-1/docs/reprepro.1 2012-07-12 15:26:52.000000000 +0200
@@ -933,7 +933,7 @@
packages were still missing and now want to copy it to those architectures were
they are unlikely to break something (because a newbinary is already available).
.TP
-.B unusedsource \fR[\fP\fIdistributions\fP\fR]\fP
+.B unusedsources \fR[\fP\fIdistributions\fP\fR]\fP
List all source packages for which no binary package build from them is found.
.TP
.B sourcemissing \fR[\fP\fIdistributions\fP\fR]\fP
diff -r -u -N reprepro_4.12.3-1/sourceextraction.c reprepro_4.12.4-1/sourceextraction.c
--- reprepro_4.12.3-1/sourceextraction.c 2012-06-07 22:57:13.000000000 +0200
+++ reprepro_4.12.4-1/sourceextraction.c 2012-07-12 15:26:52.000000000 +0200
@@ -315,6 +315,13 @@
return RET_OK;
}
}
+ if (memcmp(p, "\\ No newline at end of file", 27) == 0) {
+ if (!u_getline()) {
+ /* nothing found successfully */
+ *found_p = false;
+ return RET_OK;
+ }
+ }
if (memcmp(p, "diff ", 4) == 0) {
if (!u_getline()) {
/* strange file, but nothing explicitly wrong */
diff -r -u -N reprepro_4.12.3-1/configure.ac reprepro_4.12.4-1/configure.ac
--- reprepro_4.12.3-1/configure.ac 2012-06-24 22:55:23.000000000 +0200
+++ reprepro_4.12.4-1/configure.ac 2012-07-12 15:26:52.000000000 +0200
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to produce a configure script
dnl
-AC_INIT(reprepro, 4.12.3, brlink@debian.org)
+AC_INIT(reprepro, 4.12.4, brlink@debian.org)
AC_CONFIG_SRCDIR(main.c)
AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
diff -r -u -N reprepro_4.12.3-1/configure reprepro_4.12.4-1/configure
--- reprepro_4.12.3-1/configure 2012-06-24 22:58:37.000000000 +0200
+++ reprepro_4.12.4-1/configure 2012-07-12 15:27:05.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for reprepro 4.12.3.
+# Generated by GNU Autoconf 2.69 for reprepro 4.12.4.
#
# Report bugs to <brlink@debian.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='reprepro'
PACKAGE_TARNAME='reprepro'
-PACKAGE_VERSION='4.12.3'
-PACKAGE_STRING='reprepro 4.12.3'
+PACKAGE_VERSION='4.12.4'
+PACKAGE_STRING='reprepro 4.12.4'
PACKAGE_BUGREPORT='brlink@debian.org'
PACKAGE_URL=''
@@ -1275,7 +1275,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures reprepro 4.12.3 to adapt to many kinds of systems.
+\`configure' configures reprepro 4.12.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1341,7 +1341,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of reprepro 4.12.3:";;
+ short | recursive ) echo "Configuration of reprepro 4.12.4:";;
esac
cat <<\_ACEOF
@@ -1439,7 +1439,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-reprepro configure 4.12.3
+reprepro configure 4.12.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1862,7 +1862,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by reprepro $as_me 4.12.3, which was
+It was created by reprepro $as_me 4.12.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2678,7 +2678,7 @@
# Define the identity of the package.
PACKAGE='reprepro'
- VERSION='4.12.3'
+ VERSION='4.12.4'
cat >>confdefs.h <<_ACEOF
@@ -6309,7 +6309,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by reprepro $as_me 4.12.3, which was
+This file was extended by reprepro $as_me 4.12.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6375,7 +6375,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-reprepro config.status 4.12.3
+reprepro config.status 4.12.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Reply to: