Bug#697089: pre-approval for unblock: reprepro/4.12.5-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider pre-approving reprepro/4.12.5-1
(not yet uploaded, would go via unstable)
It is a new upstream release which contains only documentation
improvements and some small changes not affecting the Debian package.
unblock reprepro/4.12.5-1
Thanks in advance,
Bernhard R. Link
changelogs (debian and upstream):
ChangeLog | 21 +++++++++++++++++++++
NEWS | 4 ++++
debian/changelog | 9 ++++++++-
Documentation:
docs/manual.html | 30 +++++++++++++++++++++++++++---
docs/reprepro.1 | 43 +++++++++++++++++++++++++++++--------------
Upstream change in file not used in the Debian package:
extractcontrol.c | 3 ++-
Harmless change (that only avoids possible conflicts with headers)
termdecide.h | 4 ++--
Change of version number and autotools version numbers:
aclocal.m4 | 6 +++---
configure | 20 ++++++++++----------
configure.ac | 2 +-
Makefile.in | 4 ++--
docs/Makefile.in | 2 +-
tests/Makefile.in | 2 +-
13 files changed, 111 insertions(+), 39 deletions(-)
Below the commented debdiff:
First the .deb files:
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-1069-] {+1071+}
Version: [-4.12.4-1-] {+4.12.5-1+}
Then the .dsc differences:
First the changelog file changes:
diff -Nru reprepro-4.12.4/debian/changelog reprepro-4.12.5/debian/changelog
--- reprepro-4.12.4/debian/changelog 2012-07-12 15:35:27.000000000 +0200
+++ reprepro-4.12.5/debian/changelog 2012-12-31 17:16:57.000000000 +0100
@@ -1,10 +1,17 @@
+reprepro (4.12.5-1) unstable; urgency=low
+
+ * new bugfix release
+ - multiple documentation improvements
+
+ -- Bernhard R. Link <brlink@debian.org> Mon, 31 Dec 2012 17:12:47 +0100
+
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)
+ (Closes: 681094)
-- Bernhard R. Link <brlink@debian.org> Thu, 12 Jul 2012 15:30:12 +0200
diff -Nru reprepro-4.12.4/ChangeLog reprepro-4.12.5/ChangeLog
--- reprepro-4.12.4/ChangeLog 2012-07-12 15:26:52.000000000 +0200
+++ reprepro-4.12.5/ChangeLog 2012-12-31 16:51:10.000000000 +0100
@@ -1,3 +1,24 @@
+2012-12-31
+ * document byhandhook in manual.html
+
+2012-12-02
+ * add a reference to listfilter in the FilterFormula description
+
+2012-11-17
+ * improve some manpage descriptions about where ~/, +b/, +o/ and +c/ are allowed
+
+2012-11-10
+ * improve DownloadListsAs description in manpage
+
+2012-10-21
+ * fix wrong include type in termdecide.h
+
+2012-10-30
+ * repair bitrot of code used without libarchive
+
+2012-09-03
+ * fix overlong VerifyRelease example in manual.html
+
2012-07-11
* fix bug in checking old unchanged {Packages/Sources}.bz2
files for existance. (Triggering even an assertion when
diff -Nru reprepro-4.12.4/NEWS reprepro-4.12.5/NEWS
--- reprepro-4.12.4/NEWS 2012-07-12 15:26:52.000000000 +0200
+++ reprepro-4.12.5/NEWS 2012-12-31 16:53:56.000000000 +0100
@@ -1,3 +1,7 @@
+Updates between 4.12.4 and 4.12.5:
+- various documentation improvements
+- fix bitrot on non-libarchive code
+
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
Then the documentation improvements:
diff -Nru reprepro-4.12.4/docs/manual.html reprepro-4.12.5/docs/manual.html
--- reprepro-4.12.4/docs/manual.html 2012-07-12 15:23:34.000000000 +0200
+++ reprepro-4.12.5/docs/manual.html 2012-12-31 16:21:20.000000000 +0100
@@ -172,7 +172,7 @@
Method: http://security.debian.org/debian-security
Fallback: ftp://klecker.debian.org/debian-security
Suite: */updates
-VerifyRelease: A99951DAF9BB569BDB50AD90A70DAF536070D3A1|7EA391D72477203B58C04FBCB5D0C804ADB11277
+VerifyRelease: A70DAF536070D3A1|B5D0C804ADB11277
Architectures: i386
Components: main
UDebComponents:
@@ -180,7 +180,7 @@
Name: debian
Method: http://ftp2.de.debian.org/debian
Config: Acquire::Http::Proxy=http://proxy.myorg.de:8080
-VerifyRelease: A99951DAF9BB569BDB50AD90A70DAF536070D3A1|7EA391D72477203B58C04FBCB5D0C804ADB11277
+VerifyRelease: A70DAF536070D3A1|B5D0C804ADB11277
</pre>
(If there are no Architecture, Components or UDebComponents, it will try all the distribution to update has. Fallback means a URL to try when the first cannot offer some file (Has to be the same method)).
</li>
@@ -1039,8 +1039,9 @@
<br>
Currently you can execute your own scripts at the following occasions:
<ul>
-<li><a href="#exporthook">when creating index files (Packages.gz, Sources.gz)</a></li>
<li><a href="#addhook">after adding or removing packages</a></li>
+<li><a href="#byhandhook">to process byhand files</a></li>
+<li><a href="#exporthook">when creating index files (Packages.gz, Sources.gz)</a></li>
</ul>
<h3><a name="addhook">Scripts to be run when adding or removing packages</a></h3>
Whenever a package is added or removed,
@@ -1161,6 +1162,29 @@
given at the command line, if there is one
(e.g. with <tt class="command">include</tt>).
And of course all the <tt class="env">REPREPRO_*_DIR</tt> variables are set.
+<h3><a name="byhandhook">Scripts to be run to process byhand files</a></h3>
+<tt class="suffix">.changes</tt> files can (beside the usual packages files
+to be included in the repository) contain additional files to be processed
+specially.
+Those are marked by the special section <tt class="constant">byhand</tt> (in Debian)
+or <tt class="constant">raw-</tt>something (in Ubuntu).
+Besides storing them just in the pool besides the packages using the
+<tt class="constant">includebyhand</tt> value in the <tt class="field">Tracking</tt>
+settings you can also let reprepro process a hook to process them when encountering
+them in the <tt class="action">processincomming</tt> action
+(Typical usages are uploading documentation files this way that are unpacked next
+to the repository, or installer images or stuff like that).
+
+To use them add to the distribution's defining stanca in <tt class="filename">conf/distributions</tt> a field like:
+<pre class="config">
+ByhandHooks:
+ byhand * manifesto.txt handle-byhand.sh
+</pre>
+This will call the hook script <tt class="constant">handle-byhand.sh</tt> for every byhand file with section <tt class="constant">byhand</tt>, any priority and filename <tt class="constant">manifesto.txt</tt>. (The first three fields allow glob characters for matching).
+
+The script will then be alled with 5 arguments: the codename of the distribution, the section, the priority, the filename as found in the changes file and the filename of where the script can find the actual file.
+<h3>Scripts to be run when creating index files (Packages.gz, Sources.gz)</h3>
+this hook is described in the section <a href="#exporthook">"Additional index files"</a>.
<h2><a name="maintenance">Maintenance</a></h2>
This section lists some commands you can use to check and improve the health
of you repository.
diff -Nru reprepro-4.12.4/docs/reprepro.1 reprepro-4.12.5/docs/reprepro.1
--- reprepro-4.12.4/docs/reprepro.1 2012-07-12 15:26:52.000000000 +0200
+++ reprepro-4.12.5/docs/reprepro.1 2012-12-31 16:21:20.000000000 +0100
@@ -1,4 +1,4 @@
-.TH REPREPRO 1 "2012-06-24" "reprepro" REPREPRO
+.TH REPREPRO 1 "2012-12-02" "reprepro" REPREPRO
.SH NAME
reprepro \- produce, manage and sync a local repository of Debian packages
.mso www.tmac
@@ -1364,7 +1364,8 @@
be generated.
.TP
.B Uploaders
-Specifies a file (relative to confdir if not starting with a slash)
+Specifies a file (relative to confdir if not starting with
+.BR ~/ ", " +b/ ", " +c/ " or " / " )"
to specify who is allowed to upload packages. Without this there are no
limits, and this file can be ignored via \fB\-\-ignore=uploaders\fP.
See the section \fBUPLOADERS FILES\fP below.
@@ -1439,7 +1440,7 @@
If the filename for the log files does not start with a slash,
it is relative to the directory specified with \fB\-\-logdir\fP,
the scripts are relative to \fB\-\-confdir\fP unless starting with
-a slash.
+.BR ~/ ", " +b/ ", " +c/ " or " / .
.TP
.B ValidFor
If this field exists, an Valid\-Until field is put into generated
@@ -1631,13 +1632,17 @@
Dependency lines. To get only architecture all packages use
"architecture (== all)", to get only at least important
packages use "priority (==required) | priority (==important)".
+
+See the description of the listfilter command for the semantics
+of formulas.
.TP
.B FilterList\fR, \fPFilterSrcList
These take at least two arguments:
The first one is the default action when something is not found in the list,
then a list of filenames (relative to
.B \-\-confdir\fR,
-if not starting with a slash),
+if not starting with
+.BR ~/ ", " +b/ ", " +c/ " or " / " )"
in the format of dpkg \-\-get\-selections and only packages listed in
there as
.B install
@@ -1708,12 +1713,21 @@
will limit the update rule to packages from the specified source packages.
.TP
.B DownloadListsAs
-The arguments of this field, which much be elements of the
-form \fB.\fP, \fB.gz\fP, \fB.bz2\fP, \fB.lzma\fP, \fB.xz\fP and \fB.diff\fP
-specify in which order reprepro
-will look for a usable variant of needed index files
-in the downloaded Release file.
-(The default is \fB.diff .xz .lzma .bz2 .gz .\fP, i.e.
+The arguments of this field specify which index files reprepro
+will download.
+
+Allowed values are
+.BR . ", " .gz ", " .bz2 ", " .lzma ", " .xz ", " .lz ", " .diff ", "
+.BR force.gz ", " force.bz2 ", " force.lzma ", " force.xz ", "
+.BR force.lz ", and " force.diff "."
+
+Reprepro will try the first supported variant in the list given:
+Only compressions compiled in or for which an uncompressor was found
+are used.
+Unless the value starts with \fBforce.\fP,
+it is only tried if if is found in the Release or InRelease file.
+
+The default value is \fB.diff .xz .lzma .bz2 .gz .\fP, i.e.
download Packages.diff if listed in the Release file,
otherwise or if not usable download .xz if
listed in the Release file and there is a way to uncompress it,
@@ -1721,14 +1735,15 @@
then .bz2 if usable,
then .gz and then uncompressed).
-Together with \fBIgnoreRelease\fP reprepro will download the first
-in this list that could be unpacked.
-
Note there is no way to see if an uncompressed variant
of the file is available (as the Release file always lists their
checksums, even if not there),
so putting '\fB.\fP' anywhere but as the last argument can mean
trying to download a file that does not exist.
+
+Together with \fBIgnoreRelease\fP reprepro will download the first
+in this list that could be unpacked (i.e. \fBforce\fP is always assumed)
+and the default value is \fB.gz .bzip2 . .lzma .xz\fP.
.SS conf/pulls
This file contains the rules for pulling packages from one
distribution to another.
@@ -2294,7 +2309,7 @@
an hook script (currently only possible with processincoming).
.TP
.B filekey
-the position relative to the mirrordir. (as found as "Filename:" in Packages.gz)
+the position relative to the outdir. (as found in "Filename:" in Packages.gz)
.TP
.B "full filename"
the position relative to /
Exactcontrol.c is not used in the Debian package, as that uses libarchive:
diff -Nru reprepro-4.12.4/extractcontrol.c reprepro-4.12.5/extractcontrol.c
--- reprepro-4.12.4/extractcontrol.c 2012-07-12 15:23:34.000000000 +0200
+++ reprepro-4.12.5/extractcontrol.c 2012-12-31 16:21:20.000000000 +0100
@@ -29,6 +29,7 @@
#include "filecntl.h"
#include "readtextfile.h"
#include "debfile.h"
+#include "chunks.h"
#ifdef HAVE_LIBARCHIVE
#error Why did this file got compiled instead of debfile.c?
@@ -139,7 +140,7 @@
if (RET_IS_OK(r)) {
len = chunk_extract(controlchunk,
controlchunk, controllen,
- &afterchanges);
+ false, &afterchanges);
if (len == 0)
r = RET_NOTHING;
if (*afterchanges != '\0') {
Some unrelated small change that should cause no problems:
diff -Nru reprepro-4.12.4/termdecide.h reprepro-4.12.5/termdecide.h
--- reprepro-4.12.4/termdecide.h 2012-07-12 15:23:34.000000000 +0200
+++ reprepro-4.12.5/termdecide.h 2012-12-05 23:31:03.000000000 +0100
@@ -2,10 +2,10 @@
#define REPREPRO_TERMDECIDE_H
#ifndef REPREPRO_TERMS_H
-#include <terms.h>
+#include "terms.h"
#endif
#ifndef REPREPRO_TARGET_H
-#include <target.h>
+#include "target.h"
#endif
/* decide based on a chunk, (warning: string comparisons even for version!)*/
The rest is changes of the version number, resulting changes due to this version
number and changes of the autogenerated files (only version numbers except some
little automake improvement to the dist rule (again not used in the Debian package
itself)):
diff -Nru reprepro-4.12.4/configure.ac reprepro-4.12.5/configure.ac
--- reprepro-4.12.4/configure.ac 2012-07-12 15:26:52.000000000 +0200
+++ reprepro-4.12.5/configure.ac 2012-12-31 16:23:05.000000000 +0100
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to produce a configure script
dnl
-AC_INIT(reprepro, 4.12.4, brlink@debian.org)
+AC_INIT(reprepro, 4.12.5, brlink@debian.org)
AC_CONFIG_SRCDIR(main.c)
AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
diff -Nru reprepro-4.12.4/tests/Makefile.in reprepro-4.12.5/tests/Makefile.in
--- reprepro-4.12.4/tests/Makefile.in 2012-07-12 15:27:04.000000000 +0200
+++ reprepro-4.12.5/tests/Makefile.in 2012-12-31 17:01:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru reprepro-4.12.4/Makefile.in reprepro-4.12.5/Makefile.in
--- reprepro-4.12.4/Makefile.in 2012-07-12 15:27:04.000000000 +0200
+++ reprepro-4.12.5/Makefile.in 2012-12-31 17:01:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -777,7 +777,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff -Nru reprepro-4.12.4/docs/Makefile.in reprepro-4.12.5/docs/Makefile.in
--- reprepro-4.12.4/docs/Makefile.in 2012-07-12 15:27:04.000000000 +0200
+++ reprepro-4.12.5/docs/Makefile.in 2012-12-31 17:01:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru reprepro-4.12.4/aclocal.m4 reprepro-4.12.5/aclocal.m4
--- reprepro-4.12.4/aclocal.m4 2012-07-12 15:27:01.000000000 +0200
+++ reprepro-4.12.5/aclocal.m4 2012-12-31 17:01:04.000000000 +0100
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -38,7 +38,7 @@
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.5], [],
+m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -54,7 +54,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.5])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -Nru reprepro-4.12.4/configure reprepro-4.12.5/configure
--- reprepro-4.12.4/configure 2012-07-12 15:27:05.000000000 +0200
+++ reprepro-4.12.5/configure 2012-12-31 17:01:06.000000000 +0100
@@ -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.4.
+# Generated by GNU Autoconf 2.69 for reprepro 4.12.5.
#
# Report bugs to <brlink@debian.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='reprepro'
PACKAGE_TARNAME='reprepro'
-PACKAGE_VERSION='4.12.4'
-PACKAGE_STRING='reprepro 4.12.4'
+PACKAGE_VERSION='4.12.5'
+PACKAGE_STRING='reprepro 4.12.5'
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.4 to adapt to many kinds of systems.
+\`configure' configures reprepro 4.12.5 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.4:";;
+ short | recursive ) echo "Configuration of reprepro 4.12.5:";;
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.4
+reprepro configure 4.12.5
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.4, which was
+It was created by reprepro $as_me 4.12.5, 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.4'
+ VERSION='4.12.5'
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.4, which was
+This file was extended by reprepro $as_me 4.12.5, 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.4
+reprepro config.status 4.12.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Reply to: