Accept ddeb from remote repositories when using "update"

.gitignore

@@ -15,3 +15,9 @@ Makefile
 /debian/reprepro.debhelper.*
 /debian/reprepro.substvars
 /debian/reprepro
+/autom4te.cache/
+/config.h.in~
+/tests/.deps/
+/tests/testpkgs/
+/tests/testrepo/
+/tests/upstreamrepo/

README.md

@@ -0,0 +1,62 @@
+reprepro with multiple versions support
+=======================================
+
+This git repository hosts a branch for reprepro which adds multiple versions
+support to it. See [Debian bug #570623](https://bugs.debian.org/570623) for
+details and updates.
+
+The upstream repository can be found on https://salsa.debian.org/brlink/reprepro
+
+Release Notes
+=============
+
+The multiple-versions patch set adds following features:
+
+* Add shunit2 based tests (Closes: [#857302](https://bugs.debian.org/857302))
+* Support multiple versions. (Closes: [#570623](https://bugs.debian.org/570623))
+* Add the commands move, movesrc, movematched, movefilter
+* Add Limit and Archive option
+
+How to keep multiple versions
+-----------------------------
+
+The default behavior of this reprepro is identical to upstream's version. To
+keep multiple versions of the same package in the archive, you have to set the
+`Limit` option to the desired maximum amount (or to 0 for unlimited). See the
+description in the man page for details.
+
+Database layout changes
+-----------------------
+
+The database layout changes from the upstream release to the
+multiple versions patch set. The difference is as following:
+
+### upstream
+
+* packages.db maps "package name" to "control file" without duplicates
+* no packagenames.db
+
+### multiple versions
+
+* packages.db maps "package name|version" to "control file" without
+duplicates
+* packagenames.db maps "package name" to "package name|version"
+allowing duplicates and duplicates sorted by dpkg --compare-versions
+descending
+
+The first time the database is opened by reprepro with multiple versions
+support, the database will be upgraded from the upstream layout to the multiple
+versions layout. *Warning*: There is no way back (but could be done with a
+simple Python script)!
+
+Howto rebase
+============
+
+1. Rebase the `multiple-versions` branch on top of the updated upstream
+`master` branch and push it to https://salsa.debian.org/bdrung/reprepro/
+
+2. Refresh the `multiple-versions-debian` branch by taking the upstream
+`debian` branch. Apply patch `debian: Switch to dh` and
+`Run shunit2 tests on build time`. Cherry-pick all commits from
+`multiple-versions`. Then apply patch `Add trace debugging output`,
+`debian: Update changelog` and `Add README.md describing this git branch`.

archallflood.c

@@ -327,7 +327,7 @@ static retvalue floodlist_initialize(struct floodlist **fl, struct target *t) {
 
 	/* Begin with the packages currently in the archive */
 
-	r = package_openiterator(t, READONLY, &iterator);
+	r = package_openiterator(t, READONLY, true, &iterator);
 	if (RET_WAS_ERROR(r)) {
 		floodlist_free(list);
 		return r;
@@ -549,7 +549,7 @@ static retvalue floodlist_pull(struct floodlist *list, struct target *source) {
 	struct package_cursor iterator;
 
 	list->last = NULL;
-	r = package_openiterator(source, READONLY, &iterator);
+	r = package_openiterator(source, READONLY, true, &iterator);
 	if (RET_WAS_ERROR(r))
 		return r;
 	result = RET_NOTHING;

atoms.c

@@ -26,7 +26,7 @@
 
 const char **atoms_architectures;
 const char **atoms_components;
-const char * const packagetypes[4] = { "!!NONE!!", "dsc", "deb", "udeb" };
+const char * const packagetypes[5] = { "!!NONE!!", "dsc", "deb", "udeb", "ddeb" };
 const char **atoms_packagetypes = (const char **)&packagetypes;
 const char **atoms_commands;
 static int command_count;
@@ -159,6 +159,8 @@ packagetype_t packagetype_find(const char *value) {
 		return pt_deb;
 	else if (strcmp(value, "udeb") == 0)
 		return pt_udeb;
+	else if (strcmp(value, "ddeb") == 0)
+		return pt_ddeb;
 	else
 		return atom_unknown;
 }
@@ -169,8 +171,12 @@ packagetype_t packagetype_find_l(const char *value, size_t len) {
 			return pt_dsc;
 		else if (strncmp(value, "deb", 3) == 0)
 			return pt_deb;
-	} else if (len == 4 && strncmp(value, "udeb", 4) == 0)
-		return pt_udeb;
+	} else if (len == 4) {
+		if (strncmp(value, "udeb", 4) == 0)
+			return pt_udeb;
+		else if (strncmp(value, "ddeb", 4) == 0)
+			return pt_ddeb;
+	}
 	return atom_unknown;
 }
 

atoms.h

@@ -19,6 +19,7 @@ enum atom_type { at_architecture, at_component, at_packagetype, at_command };
 #define pt_dsc ((packagetype_t)1)
 #define pt_deb ((packagetype_t)2)
 #define pt_udeb ((packagetype_t)3)
+#define pt_ddeb ((packagetype_t)4)
 
 #define atom_defined(a) ((a) > (atom_t)0)
 

changes.c

@@ -164,6 +164,8 @@ retvalue changes_parsefileline(const char *fileline, /*@out@*/filetype *result_t
 
 	if (l >= 4 && memcmp(p-4, ".deb", 4) == 0)
 		type = fe_DEB;
+	else if (l >= 5 && memcmp(p-5, ".ddeb", 5) == 0)
+		type = fe_DDEB;
 	else if (l >= 5 && memcmp(p-5, ".udeb", 5) == 0)
 		type = fe_UDEB;
 	else
@@ -189,7 +191,7 @@ retvalue changes_parsefileline(const char *fileline, /*@out@*/filetype *result_t
 		if (type == fe_DEB)
 			archend = versionstart + l - 4;
 		else {
-			assert (type == fe_UDEB);
+			assert (type == fe_DDEB || type == fe_UDEB);
 			archend = versionstart + l - 5;
 		}
 		if (archend - archstart == 6 &&
@@ -204,7 +206,7 @@ retvalue changes_parsefileline(const char *fileline, /*@out@*/filetype *result_t
 		bool issignature = false;
 
 		/* without those, it gets more complicated.
-		 * It's not .deb or .udeb, so most likely a
+		 * It's not .deb, .ddeb or .udeb, so most likely a
 		 * source file (or perhaps a log (reprepro extension)) */
 
 		/* if it uses a known compression, things are easy,

changes.h

@@ -7,16 +7,16 @@
 
 typedef enum {
 	fe_UNKNOWN=0,
-	fe_DEB, fe_UDEB,
+	fe_DEB, fe_UDEB, fe_DDEB,
 	fe_DSC, fe_DIFF, fe_ORIG, fe_TAR,
 	fe_SIG,
 	fe_ALTSRC,
 	fe_BYHAND, fe_LOG, fe_CHANGES,
 	fe_BUILDINFO
 } filetype;
 
-#define FE_PACKAGE(ft) ((ft) == fe_DEB || (ft) == fe_UDEB || (ft) == fe_DSC)
-#define FE_BINARY(ft) ((ft) == fe_DEB || (ft) == fe_UDEB)
+#define FE_PACKAGE(ft) ((ft) == fe_DEB || (ft) == fe_UDEB || (ft) == fe_DSC || (ft) == fe_DDEB)
+#define FE_BINARY(ft) ((ft) == fe_DEB || (ft) == fe_DDEB || (ft) == fe_UDEB)
 #define FE_SOURCE(ft) ((ft) == fe_DIFF || (ft) == fe_ORIG || (ft) == fe_TAR || (ft) == fe_DSC || (ft) == fe_UNKNOWN || (ft) == fe_ALTSRC || (ft) == fe_SIG)
 
 struct hash_data;

checkin.c

@@ -207,6 +207,11 @@ static retvalue newentry(struct fileentry **entry, const char *fileline, const s
 		*ignoredlines_p = true;
 		return RET_NOTHING;
 	}
+	if (e->type == fe_DDEB && limitations_missed(packagetypes, pt_ddeb)) {
+		freeentries(e);
+		*ignoredlines_p = true;
+		return RET_NOTHING;
+	}
 	if (e->type != fe_LOG && e->type != fe_BUILDINFO &&
 			e->architecture_into == architecture_source &&
 			strcmp(e->name, sourcename) != 0) {
@@ -1243,6 +1248,15 @@ static retvalue changes_checkpkgs(struct distribution *distribution, struct chan
 				e->filekey, e->checksums,
 				&changes->binaries,
 				changes->source, changes->sourceversion);
+		} else if (e->type == fe_DDEB) {
+			r = deb_prepare(&e->pkg.deb,
+				e->component, e->architecture_into,
+				e->section, e->priority,
+				pt_ddeb,
+				distribution, fullfilename,
+				e->filekey, e->checksums,
+				&changes->binaries,
+				changes->source, changes->sourceversion);
 		} else if (e->type == fe_DSC) {
 			if (!changes->isbinnmu || IGNORING(dscinbinnmu,
 "File '%s' looks like a source package, but this .changes looks like a binNMU\n"
@@ -1291,6 +1305,15 @@ static retvalue changes_includepkgs(struct distribution *distribution, struct ch
 				pt_deb, distribution, trackingdata);
 			if (r == RET_NOTHING)
 				*missed_p = true;
+		} else if (e->type == fe_DDEB) {
+			r = deb_addprepared(e->pkg.deb,
+				/* architecture all needs this, the rest is
+				 * already filtered out */
+				(e->architecture_into == architecture_all)?
+					forcearchitectures:NULL,
+				pt_ddeb, distribution, trackingdata);
+			if (r == RET_NOTHING)
+				*missed_p = true;
 		} else if (e->type == fe_UDEB) {
 			r = deb_addprepared(e->pkg.deb,
 				/* architecture all needs this, the rest is

checkindeb.c

@@ -105,22 +105,43 @@ static retvalue deb_preparelocation(struct debpackage *pkg, component_t forcecom
 	const struct overridedata *oinfo;
 	retvalue r;
 
-	if (packagetype == pt_udeb) {
+	if (verbose >= 15) {
+		fprintf(stderr, "trace: deb_preparelocation(pkg={deb={name=%s}}, forcecomponent=%s, forcearchitectures=[",
+		        pkg == NULL ? NULL : pkg->deb.name, atoms_components[forcecomponent]);
+		atomlist_fprint(stderr, at_architecture, forcearchitectures);
+		fprintf(stderr, "], forcesection=%s, packagetype=%s, distribution={codename=%s}, debfilename=%s) called.\n",
+		        forcesection, atoms_packagetypes[packagetype], distribution->codename, debfilename);
+	}
+
+	if (packagetype == pt_ddeb) {
+		/* ddebs don't have overrides */
+		forcesection = "debug";
+		forcepriority = "extra";
+		binoverride = NULL;
+		components = &distribution->ddebcomponents;
+	} else if (packagetype == pt_udeb) {
 		binoverride = distribution->overrides.udeb;
 		components = &distribution->udebcomponents;
 	} else {
 		binoverride = distribution->overrides.deb;
 		components = &distribution->components;
 	}
 
-	oinfo = override_search(binoverride, pkg->deb.name);
-	*oinfo_ptr = oinfo;
-	if (forcesection == NULL) {
-		forcesection = override_get(oinfo, SECTION_FIELDNAME);
-	}
-	if (forcepriority == NULL) {
-		forcepriority = override_get(oinfo, PRIORITY_FIELDNAME);
+	if (binoverride == NULL) {
+		oinfo = NULL;
+	} else {
+		oinfo = override_search(binoverride, pkg->deb.name);
+
+		if (forcesection == NULL) {
+			forcesection = override_get(oinfo, SECTION_FIELDNAME);
+		}
+
+		if (forcepriority == NULL) {
+			forcepriority = override_get(oinfo, PRIORITY_FIELDNAME);
+		}
 	}
+	*oinfo_ptr = oinfo;
+
 	if (!atom_defined(forcecomponent)) {
 		const char *fc;
 
@@ -261,7 +282,29 @@ retvalue deb_prepare(/*@out@*/struct debpackage **deb, component_t forcecomponen
 		base = NULL;
 	}
 
-	if (!strlist_in(allowed_binaries, packagenametocheck) &&
+	if (packagetype == pt_ddeb) {
+		/* ddebs are allowed if they are an allowed
+		 * binary + "-dbgsym" */
+		int i;
+		bool found = false;
+
+		for (i = 0; i < allowed_binaries->count; i++) {
+			const char *s = allowed_binaries->values[i];
+			size_t len = strlen(s);
+
+			if (strncmp(s, pkg->deb.name, len) == 0 &&
+					strcmp(pkg->deb.name + len, "-dbgsym") == 0) {
+				found = true;
+			}
+		}
+
+		if (!found && !IGNORING(surprisingbinary,
+					"'%s' has packagename '%s' not corresponding to a .deb listed in the .changes file!\n",
+					debfilename, pkg->deb.name)) {
+			deb_free(pkg);
+			return RET_ERROR;
+		}
+	} else if (!strlist_in(allowed_binaries, packagenametocheck) &&
 	    !IGNORING(surprisingbinary,
 "'%s' has packagename '%s' not listed in the .changes file!\n",
 					debfilename, packagenametocheck)) {

configparser.h

@@ -226,6 +226,11 @@ static retvalue configparser_ ## sname ## _set_ ## name(UNUSED(void *dummy), con
 	struct sname *item = data; \
 	return config_gettruth(iter, name, &item->field); \
 }
+#define CFnumberSETPROC(sname, minval, maxval, field) \
+static retvalue configparser_ ## sname ## _set_ ## field(UNUSED(void *dummy), UNUSED(const char *name), void *data, struct configiterator *iter) { \
+	struct sname *item = data; \
+	return config_getnumber(iter, name, &item->field, minval, maxval); \
+}
 #define CFallSETPROC(sname, field) \
 static retvalue configparser_ ## sname ## _set_ ## field(UNUSED(void *dummy), UNUSED(const char *name), void *data, struct configiterator *iter) { \
 	struct sname *item = data; \