Adjust patch series for upstreamed patch

sysv-generator-Replace-Provides-symlinks-with-real-u.patch was pushed upstream,
move in d/p/series.

There's some gbp-pq patch noise for this, too.

diff --git a/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch b/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
index a06aa40baf9efa0f77401ce7b467c4cc1c071cee..34ac112d2f482ab9e4b8d90bc80e1e80cb95c8fb 100644 (file)
--- a/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
+++ b/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
@@ -7,7 +7,7 @@ Subject: Add support for rcS.d init scripts to the sysv-generator
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index ed3309f..c407f4a 100644
+index 6dc8835..6cc2cd5 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -41,6 +41,7 @@
@@ -43,7 +43,7 @@ index ed3309f..c407f4a 100644
          int sysv_start_priority;
          char *pid_file;
          char **before;
-@@ -180,6 +188,8 @@ static int generate_unit_file(SysvStub *s) {
+@@ -189,6 +197,8 @@ static int generate_unit_file(SysvStub *s) {
                  "Description=%s\n",
                  s->path, s->description);
  
@@ -52,7 +52,7 @@ index ed3309f..c407f4a 100644
          if (!isempty(before))
                  fprintf(f, "Before=%s\n", before);
          if (!isempty(after))
-@@ -193,11 +203,12 @@ static int generate_unit_file(SysvStub *s) {
+@@ -202,11 +212,12 @@ static int generate_unit_file(SysvStub *s) {
                  "\n[Service]\n"
                  "Type=forking\n"
                  "Restart=no\n"
@@ -66,7 +66,7 @@ index ed3309f..c407f4a 100644
                  yes_no(!s->pid_file));
  
          if (s->pid_file)
-@@ -701,6 +712,11 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
+@@ -710,6 +721,11 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
                  if (s->has_lsb && other->has_lsb)
                          continue;
  
@@ -78,7 +78,7 @@ index ed3309f..c407f4a 100644
                  if (other->sysv_start_priority < s->sysv_start_priority) {
                          r = strv_extend(&s->after, other->name);
                          if (r < 0)
-@@ -852,8 +868,12 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+@@ -861,8 +877,12 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                                  }
  
                                  if (de->d_name[0] == 'S')  {

diff --git a/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch b/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch
index f371a55b7d1e382fa70a9fff122c895449fa760c..73213959f78094d0120bf2d6d583144ff06524fe 100644 (file)
--- a/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch
+++ b/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch
@@ -8,10 +8,10 @@ Subject: Do not generate systemd units from sysv init scripts if a native
  1 file changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index c407f4a..b7cb94d 100644
+index 6cc2cd5..bd2ee1f 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
-@@ -736,6 +736,25 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
+@@ -745,6 +745,25 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
          return 0;
  }
  
@@ -37,7 +37,7 @@ index c407f4a..b7cb94d 100644
  static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
          char **path;
  
-@@ -776,6 +795,12 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
+@@ -785,6 +804,12 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                          if (hashmap_contains(all_services, name))
                                  continue;
  
@@ -50,7 +50,7 @@ index c407f4a..b7cb94d 100644
                          service = new0(SysvStub, 1);
                          if (!service)
                                  return log_oom();
-@@ -863,7 +888,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+@@ -872,7 +897,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
  
                                  service = hashmap_get(all_services, name);
                                  if (!service){

diff --git a/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch b/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch
index 2c1f595613d79442d088560262e4e0b9f077630d..133fe60f914ba0eacf09b67705f412de8abfe733 100644 (file)
--- a/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch
+++ b/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch
@@ -57,7 +57,7 @@ index b045047..fd613c6 100644
  #define SPECIAL_INITRD_FS_TARGET "initrd-fs.target"
  #define SPECIAL_INITRD_ROOT_FS_TARGET "initrd-root-fs.target"
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index b7cb94d..95c91e9 100644
+index bd2ee1f..4b87a78 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -72,9 +72,6 @@ static const struct {
@@ -70,7 +70,7 @@ index b7cb94d..95c91e9 100644
  typedef struct SysvStub {
          char *name;
          char *path;
-@@ -189,7 +186,7 @@ static int generate_unit_file(SysvStub *s) {
+@@ -198,7 +195,7 @@ static int generate_unit_file(SysvStub *s) {
                  s->path, s->description);
  
          if (s->sysinit)
@@ -79,7 +79,7 @@ index b7cb94d..95c91e9 100644
          if (!isempty(before))
                  fprintf(f, "Before=%s\n", before);
          if (!isempty(after))
-@@ -267,7 +264,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
+@@ -276,7 +273,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
  
          static const char * const table[] = {
                  /* LSB defined facilities */

diff --git a/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch b/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
index 1ae93a24e40b9baaa50305847f0b0fe0f8bda0b9..ea472d8695cdd529ccbe2d6cf0f727bdd4e72401 100644 (file)
--- a/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
+++ b/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
@@ -7,10 +7,10 @@ Subject: Map rcS.d init script dependencies to their systemd equivalent.
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 95c91e9..84ccbf6 100644
+index 4b87a78..eb50179 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
-@@ -269,8 +269,15 @@ static int sysv_translate_facility(const char *name, const char *filename, char
+@@ -278,8 +278,15 @@ static int sysv_translate_facility(const char *name, const char *filename, char
                  "named",                SPECIAL_NSS_LOOKUP_TARGET,
                  "portmap",              SPECIAL_RPCBIND_TARGET,
                  "remote_fs",            SPECIAL_REMOTE_FS_TARGET,

diff --git a/debian/patches/series b/debian/patches/series
index 99950cac87f7e76e6121d39ad4091d56bc484ff2..64155114df4b8698ebcf1a0039ce33aac579ae0a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ sysv-generator-handle-Provides-for-non-virtual-facil.patch
 sysv-generator-Avoid-wrong-dependencies-for-failing-.patch
 journal-Fix-syslog-forwarding-without-CAP_SYS_ADMIN.patch
 sysv-generator-Handle-.sh-suffixes-when-translating-.patch
+sysv-generator-Replace-Provides-symlinks-with-real-u.patch
 util-Add-some-missing-hidden_file-suffixes.patch
 
 ## Debian specific patches
@@ -61,5 +62,4 @@ Make-sd_login_monitor_new-work-for-logind-without-sy.patch
 Don-t-enable-audit-by-default.patch
 Accept-mountall-specific-fstab-options.patch
 Fix-usr-remount-failure-for-split-usr.patch
-sysv-generator-Replace-Provides-symlinks-with-real-u.patch
 util-Add-hidden-suffixes-for-ucf.patch

diff --git a/debian/patches/sysv-generator-Replace-Provides-symlinks-with-real-u.patch b/debian/patches/sysv-generator-Replace-Provides-symlinks-with-real-u.patch
index 4b98dd82ccbd7024295d3e67416388821f38be1b..19c593dc454274030d7dd3a3eb71904ba7fda65d 100644 (file)
--- a/debian/patches/sysv-generator-Replace-Provides-symlinks-with-real-u.patch
+++ b/debian/patches/sysv-generator-Replace-Provides-symlinks-with-real-u.patch
@@ -34,10 +34,10 @@ Bug-Debian: https://bugs.debian.org/775404
  1 file changed, 9 insertions(+)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 84ccbf6..eb50179 100644
+index ed3309f..6dc8835 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
-@@ -152,6 +152,7 @@ static int generate_unit_file(SysvStub *s) {
+@@ -147,6 +147,7 @@ static int generate_unit_file(SysvStub *s) {
          _cleanup_free_ char *wants = NULL;
          _cleanup_free_ char *conflicts = NULL;
          int r;
@@ -45,7 +45,7 @@ index 84ccbf6..eb50179 100644
  
          before = strv_join(s->before, " ");
          if (!before)
-@@ -173,6 +174,14 @@ static int generate_unit_file(SysvStub *s) {
+@@ -168,6 +169,14 @@ static int generate_unit_file(SysvStub *s) {
          if (!unit)
                  return log_oom();