Refresh patches

diff --git a/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch b/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch
index f6c52afca6625eb6b1ad31e6b784300d1a9d4dad..60eaf0fffb4020852e28f84ff571244dca33d4dd 100644 (file)
--- a/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch
+++ b/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch
@@ -12,10 +12,10 @@ Forwarded: http://lists.freedesktop.org/archives/systemd-devel/2014-April/018960
  1 file changed, 6 insertions(+)
 
 diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index a752f7a..6c5e640 100644
+index 854ab16..2015667 100644
 --- a/src/shared/sleep-config.c
 +++ b/src/shared/sleep-config.c
-@@ -961,6 +961,12 @@ static bool enough_swap_for_hibernation(void) {
+@@ -968,6 +968,12 @@ static bool enough_swap_for_hibernation(void) {
          if (getenv_bool("SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK") > 0)
                  return true;
  

diff --git a/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch b/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch
index addd63d8bc75ecccd1c180945862a5898a53c56f..8af9e94744e3eb5da77a2918a87b92c977af3344 100644 (file)
--- a/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch
+++ b/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch
@@ -14,10 +14,10 @@ Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1141137
  1 file changed, 1 insertion(+), 10 deletions(-)
 
 diff --git a/src/core/unit.c b/src/core/unit.c
-index acbd582..dcb9ba6 100644
+index 7096e1f..f2a8278 100644
 --- a/src/core/unit.c
 +++ b/src/core/unit.c
-@@ -4627,16 +4627,7 @@ int unit_kill_context(
+@@ -4634,16 +4634,7 @@ int unit_kill_context(
  
                  } else if (r > 0) {
  

diff --git a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
index f520094b022492f5e06922ae6d98834841666073..347c71d1f8e7b7b286d43655f11e1684e3132658 100644 (file)
--- a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
+++ b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
@@ -19,10 +19,10 @@ Bug-Debian: https://bugs.debian.org/815020
  2 files changed, 1 insertion(+), 21 deletions(-)
 
 diff --git a/src/core/main.c b/src/core/main.c
-index a3fdd1d..c8b7d16 100644
+index 2b746ce..5cfdaef 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1649,24 +1649,6 @@ static void cmdline_take_random_seed(void) {
+@@ -1652,24 +1652,6 @@ static void cmdline_take_random_seed(void) {
                     "This functionality should not be used outside of testing environments.");
  }
  
@@ -47,7 +47,7 @@ index a3fdd1d..c8b7d16 100644
  static void initialize_core_pattern(bool skip_setup) {
          int r;
  
-@@ -2803,8 +2785,6 @@ int main(int argc, char *argv[]) {
+@@ -2806,8 +2788,6 @@ int main(int argc, char *argv[]) {
                          kernel_timestamp = DUAL_TIMESTAMP_NULL;
                  }