CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reprepro: update patch for ddeb support.

Browse source
This commit is contained in:
Luis Guzman 2024-06-19 05:25:52 +00:00
parent db13a69e70
commit e8dd66e1cb
2 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

98
helpers/DATA/reprepro/ddeb.patch
View file

@ -1,12 +1,12 @@
diff -ru reprepro.orig/source/atoms.c reprepro/source/atoms.c diff -ru a/atoms.c b/atoms.c
--- reprepro.orig/source/atoms.c 2016-12-23 19:11:30.000000000 -0500 --- a/atoms.c 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/atoms.c 2020-11-01 16:33:38.182181608 -0500 +++ b/atoms.c 2020-11-01 16:33:38.182181608 -0500
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
const char **atoms_architectures; const char **atoms_architectures;
const char **atoms_components; const char **atoms_components;
-const char * const packagetypes[4] = { "!!NONE!!", "dsc", "deb", "udeb" }; -static const char * const packagetypes[4] = { "!!NONE!!", "dsc", "deb", "udeb" };
+const char * const packagetypes[5] = { "!!NONE!!", "dsc", "deb", "udeb", "ddeb" }; +static const char * const packagetypes[5] = { "!!NONE!!", "dsc", "deb", "udeb", "ddeb" };
const char **atoms_packagetypes = (const char **)&packagetypes; const char **atoms_packagetypes = (const char **)&packagetypes;
const char **atoms_commands; const char **atoms_commands;
static int command_count; static int command_count;
@ -34,9 +34,9 @@ diff -ru reprepro.orig/source/atoms.c reprepro/source/atoms.c
return atom_unknown; return atom_unknown;
} }
diff -ru reprepro.orig/source/atoms.h reprepro/source/atoms.h diff -ru a/atoms.h b/atoms.h
--- reprepro.orig/source/atoms.h 2016-12-23 19:11:30.000000000 -0500 --- a/atoms.h 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/atoms.h 2020-11-01 16:33:38.182181608 -0500 +++ b/atoms.h 2020-11-01 16:33:38.182181608 -0500
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#define pt_dsc ((packagetype_t)1) #define pt_dsc ((packagetype_t)1)
#define pt_deb ((packagetype_t)2) #define pt_deb ((packagetype_t)2)
@ -45,9 +45,9 @@ diff -ru reprepro.orig/source/atoms.h reprepro/source/atoms.h
#define atom_defined(a) ((a) > (atom_t)0) #define atom_defined(a) ((a) > (atom_t)0)
diff -ru reprepro.orig/source/changes.c reprepro/source/changes.c diff -ru a/changes.c b/changes.c
--- reprepro.orig/source/changes.c 2016-12-23 19:11:30.000000000 -0500 --- a/changes.c 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/changes.c 2020-11-01 16:33:38.182181608 -0500 +++ b/changes.c 2020-11-01 16:33:38.182181608 -0500
@@ -164,6 +164,8 @@ @@ -164,6 +164,8 @@
if (l >= 4 && memcmp(p-4, ".deb", 4) == 0) if (l >= 4 && memcmp(p-4, ".deb", 4) == 0)
@ -76,8 +76,8 @@ diff -ru reprepro.orig/source/changes.c reprepro/source/changes.c
/* if it uses a known compression, things are easy, /* if it uses a known compression, things are easy,
diff -ru source.or/changes.h source/changes.h diff -ru source.or/changes.h source/changes.h
--- reprepro.orig/source/changes.h 2018-09-09 01:17:15.000000000 -0400 --- a/changes.h 2018-09-09 01:17:15.000000000 -0400
+++ reprepro/source/changes.h 2022-03-08 19:52:49.495104016 -0500 +++ b/changes.h 2022-03-08 19:52:49.495104016 -0500
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
typedef enum { typedef enum {
@ -98,9 +98,9 @@ diff -ru source.or/changes.h source/changes.h
#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) #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; struct hash_data;
diff -ru reprepro.orig/source/checkin.c reprepro/source/checkin.c diff -ru a/checkin.c b/checkin.c
--- reprepro.orig/source/checkin.c 2016-12-28 10:03:44.000000000 -0500 --- a/checkin.c 2016-12-28 10:03:44.000000000 -0500
+++ reprepro/source/checkin.c 2020-11-01 16:33:38.182181608 -0500 +++ b/checkin.c 2020-11-01 16:33:38.182181608 -0500
@@ -207,6 +207,11 @@ @@ -207,6 +207,11 @@
*ignoredlines_p = true; *ignoredlines_p = true;
return RET_NOTHING; return RET_NOTHING;
@ -145,9 +145,9 @@ diff -ru reprepro.orig/source/checkin.c reprepro/source/checkin.c
} else if (e->type == fe_UDEB) { } else if (e->type == fe_UDEB) {
r = deb_addprepared(e->pkg.deb, r = deb_addprepared(e->pkg.deb,
/* architecture all needs this, the rest is /* architecture all needs this, the rest is
diff -ru reprepro.orig/source/checkindeb.c reprepro/source/checkindeb.c diff -ru a/checkindeb.c b/checkindeb.c
--- reprepro.orig/source/checkindeb.c 2016-12-28 10:13:15.000000000 -0500 --- a/checkindeb.c 2016-12-28 10:13:15.000000000 -0500
+++ reprepro/source/checkindeb.c 2020-11-01 16:33:38.182181608 -0500 +++ b/checkindeb.c 2020-11-01 16:33:38.182181608 -0500
@@ -105,7 +105,13 @@ @@ -105,7 +105,13 @@
const struct overridedata *oinfo; const struct overridedata *oinfo;
retvalue r; retvalue r;
@ -223,9 +223,9 @@ diff -ru reprepro.orig/source/checkindeb.c reprepro/source/checkindeb.c
!IGNORING(surprisingbinary, !IGNORING(surprisingbinary,
"'%s' has packagename '%s' not listed in the .changes file!\n", "'%s' has packagename '%s' not listed in the .changes file!\n",
debfilename, packagenametocheck)) { debfilename, packagenametocheck)) {
diff -ru reprepro.orig/source/contents.c reprepro/source/contents.c diff -ru a/contents.c b/contents.c
--- reprepro.orig/source/contents.c 2016-12-23 19:11:30.000000000 -0500 --- a/contents.c 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/contents.c 2020-11-01 16:33:38.182181608 -0500 +++ b/contents.c 2020-11-01 16:33:38.182181608 -0500
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
cf_uncompressed, cf_gz, cf_bz2, cf_xz, cf_uncompressed, cf_gz, cf_bz2, cf_xz,
cf_percomponent, cf_allcomponents, cf_percomponent, cf_allcomponents,
@ -352,9 +352,9 @@ diff -ru reprepro.orig/source/contents.c reprepro/source/contents.c
} }
return result; return result;
} }
diff -ru reprepro.orig/source/contents.h reprepro/source/contents.h diff -ru a/contents.h b/contents.h
--- reprepro.orig/source/contents.h 2016-12-23 19:11:30.000000000 -0500 --- a/contents.h 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/contents.h 2020-11-01 16:33:38.182181608 -0500 +++ b/contents.h 2020-11-01 16:33:38.182181608 -0500
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
bool percomponent; bool percomponent;
bool allcomponents; bool allcomponents;
@ -363,9 +363,9 @@ diff -ru reprepro.orig/source/contents.h reprepro/source/contents.h
} flags; } flags;
compressionset compressions; compressionset compressions;
}; };
diff -ru reprepro.orig/source/copypackages.c reprepro/source/copypackages.c diff -ru a/copypackages.c b/copypackages.c
--- reprepro.orig/source/copypackages.c 2016-12-23 19:11:30.000000000 -0500 --- a/copypackages.c 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/copypackages.c 2020-11-01 16:33:38.182181608 -0500 +++ b/copypackages.c 2020-11-01 16:33:38.182181608 -0500
@@ -779,7 +779,14 @@ @@ -779,7 +779,14 @@
into->codename, into->codename,
atoms_architectures[architecture]); atoms_architectures[architecture]);
@ -382,9 +382,9 @@ diff -ru reprepro.orig/source/copypackages.c reprepro/source/copypackages.c
if (!atomlist_in(&into->components, component)) { if (!atomlist_in(&into->components, component)) {
fprintf(stderr, fprintf(stderr,
"Distribution '%s' does not contain component '%s!'\n", "Distribution '%s' does not contain component '%s!'\n",
diff -ru reprepro.orig/source/distribution.c reprepro/source/distribution.c diff -ru a/distribution.c b/distribution.c
--- reprepro.orig/source/distribution.c 2016-12-23 19:11:30.000000000 -0500 --- a/distribution.c 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/distribution.c 2020-11-01 16:33:38.182181608 -0500 +++ b/distribution.c 2020-11-01 16:33:38.182181608 -0500
@@ -69,8 +69,10 @@ @@ -69,8 +69,10 @@
exportmode_done(&distribution->dsc); exportmode_done(&distribution->dsc);
exportmode_done(&distribution->deb); exportmode_done(&distribution->deb);
@ -491,9 +491,9 @@ diff -ru reprepro.orig/source/distribution.c reprepro/source/distribution.c
CF("DebIndices", distribution, deb), CF("DebIndices", distribution, deb),
CF("DebOverride", distribution, deb_override), CF("DebOverride", distribution, deb_override),
CF("Description", distribution, description), CF("Description", distribution, description),
diff -ru reprepro.orig/source/distribution.h reprepro/source/distribution.h diff -ru a/distribution.h b/distribution.h
--- reprepro.orig/source/distribution.h 2016-12-23 19:11:30.000000000 -0500 --- a/distribution.h 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/distribution.h 2020-11-01 16:33:38.182181608 -0500 +++ b/distribution.h 2020-11-01 16:33:38.182181608 -0500
@@ -63,8 +63,10 @@ @@ -63,8 +63,10 @@
/* the list of components containing a debian-installer dir, /* the list of components containing a debian-installer dir,
* normally only "main" */ * normally only "main" */
@ -521,9 +521,9 @@ diff -ru reprepro.orig/source/distribution.h reprepro/source/distribution.h
udebcomponents_set; udebcomponents_set;
/* A list of all targets contained in the distribution*/ /* A list of all targets contained in the distribution*/
struct target *targets; struct target *targets;
diff -ru reprepro.orig/source/incoming.c reprepro/source/incoming.c diff -ru a/incoming.c b/incoming.c
--- reprepro.orig/source/incoming.c 2016-12-28 10:10:28.000000000 -0500 --- a/incoming.c 2016-12-28 10:10:28.000000000 -0500
+++ reprepro/source/incoming.c 2020-11-01 16:33:38.182181608 -0500 +++ b/incoming.c 2020-11-01 16:33:38.182181608 -0500
@@ -1264,9 +1264,13 @@ @@ -1264,9 +1264,13 @@
assert (file == package->master); assert (file == package->master);
if (file->type == fe_DEB) if (file->type == fe_DEB)
@ -563,9 +563,9 @@ diff -ru reprepro.orig/source/incoming.c reprepro/source/incoming.c
r = prepare_deb(i, c, d, file); r = prepare_deb(i, c, d, file);
break; break;
case fe_DSC: case fe_DSC:
diff -ru reprepro.orig/source/main.c reprepro/source/main.c diff -ru a/main.c b/main.c
--- reprepro.orig/source/main.c 2016-12-28 10:02:44.000000000 -0500 --- a/main.c 2016-12-28 10:02:44.000000000 -0500
+++ reprepro/source/main.c 2020-11-01 16:35:21.842197208 -0500 +++ b/main.c 2020-11-01 16:35:21.842197208 -0500
@@ -2512,7 +2512,9 @@ @@ -2512,7 +2512,9 @@
retvalue result, r; retvalue result, r;
@ -647,9 +647,9 @@ diff -ru reprepro.orig/source/main.c reprepro/source/main.c
" includeudeb <distribution> <.udeb-file>\n" " includeudeb <distribution> <.udeb-file>\n"
" Include the given installer binary package.\n" " Include the given installer binary package.\n"
" includedsc <distribution> <.dsc-file>\n" " includedsc <distribution> <.dsc-file>\n"
diff -ru reprepro.orig/source/target.c reprepro/source/target.c diff -ru a/target.c b/target.c
--- reprepro.orig/source/target.c 2016-12-23 19:11:30.000000000 -0500 --- a/target.c 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/target.c 2020-11-01 16:33:38.186181609 -0500 +++ b/target.c 2020-11-01 16:33:38.186181609 -0500
@@ -53,6 +53,10 @@ @@ -53,6 +53,10 @@
return mprintf("u|%s|%s|%s", codename, return mprintf("u|%s|%s|%s", codename,
atoms_components[component], atoms_components[component],
@ -687,9 +687,9 @@ diff -ru reprepro.orig/source/target.c reprepro/source/target.c
exportmode, readonly, noexport, target); exportmode, readonly, noexport, target);
} }
retvalue target_initialize_binary(struct distribution *d, component_t component, architecture_t architecture, const struct exportmode *exportmode, bool readonly, bool noexport, const char *fakecomponentprefix, struct target **target) { retvalue target_initialize_binary(struct distribution *d, component_t component, architecture_t architecture, const struct exportmode *exportmode, bool readonly, bool noexport, const char *fakecomponentprefix, struct target **target) {
diff -ru reprepro.orig/source/target.h reprepro/source/target.h diff -ru a/target.h b/target.h
--- reprepro.orig/source/target.h 2016-12-23 19:11:30.000000000 -0500 --- a/target.h 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/target.h 2020-11-01 16:33:38.186181609 -0500 +++ b/target.h 2020-11-01 16:33:38.186181609 -0500
@@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
}; };
@ -698,9 +698,9 @@ diff -ru reprepro.orig/source/target.h reprepro/source/target.h
retvalue target_initialize_binary(/*@dependant@*/struct distribution *, component_t, architecture_t, /*@dependent@*/const struct exportmode *, bool /*readonly*/, bool /*noexport*/, /*@NULL@*/const char *fakecomponentprefix, /*@out@*/struct target **); retvalue target_initialize_binary(/*@dependant@*/struct distribution *, component_t, architecture_t, /*@dependent@*/const struct exportmode *, bool /*readonly*/, bool /*noexport*/, /*@NULL@*/const char *fakecomponentprefix, /*@out@*/struct target **);
retvalue target_initialize_source(/*@dependant@*/struct distribution *, component_t, /*@dependent@*/const struct exportmode *, bool /*readonly*/, bool /*noexport*/, /*@NULL@*/const char *fakecomponentprefix, /*@out@*/struct target **); retvalue target_initialize_source(/*@dependant@*/struct distribution *, component_t, /*@dependent@*/const struct exportmode *, bool /*readonly*/, bool /*noexport*/, /*@NULL@*/const char *fakecomponentprefix, /*@out@*/struct target **);
retvalue target_free(struct target *); retvalue target_free(struct target *);
diff -ru reprepro.orig/source/tests/genpackage.sh reprepro/source/tests/genpackage.sh diff -ru a/tests/genpackage.sh b/tests/genpackage.sh
--- reprepro.orig/source/tests/genpackage.sh 2016-12-23 19:11:30.000000000 -0500 --- a/tests/genpackage.sh 2016-12-23 19:11:30.000000000 -0500
+++ reprepro/source/tests/genpackage.sh 2020-11-01 16:33:38.186181609 -0500 +++ b/tests/genpackage.sh 2020-11-01 16:33:38.186181609 -0500
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
fi fi

2
helpers/make-reprepro
View file

@ -21,7 +21,7 @@ VERSION=1
. ./config . ./config
patch --no-backup-if-mismatch -p2 < $DATA/ddeb.patch patch_p1 $DATA/ddeb.patch
#https://github.com/ionos-cloud/reprepro #https://github.com/ionos-cloud/reprepro
changelog "Adds support for ddeb files" changelog "Adds support for ddeb files"