Skip to contentSkip to conversation

cronie: update to 1.5.4

PATCH Superseded Oleksandr Kravchuk 2 participants 2 messages Apr 1, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 cronie: update to 1.5.4

---
 .../cronie/cronie/crond_pam_config.patch         | 16 ++++++++--------
 .../cronie/{cronie_1.5.2.bb => cronie_1.5.4.bb}  | 10 ++++------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename meta/recipes-extended/cronie/{cronie_1.5.2.bb => cronie_1.5.4.bb} (89%)
meta/recipes-extended/cronie/cronie/crond_pam_config.patch +8 -8
index 6c928165cd..c374790d1d 100644
@@ -4,19 +4,19 @@ configure files instead.
 Upstream-Status: Pending
 
 Signed-off-by: Wenzong Fan <[email protected]>
-Index: cronie-1.5.1/pam/crond
-===================================================================
---- cronie-1.5.1.orig/pam/crond
-+++ cronie-1.5.1/pam/crond
+diff --git a/pam/crond b/pam/crond
+index 560529d..95a6457 100644
+--- a/pam/crond
++++ b/pam/crond
 @@ -4,8 +4,8 @@
  #
  # Although no PAM authentication is called, auth modules
  # are used for credential setting
--auth       include    password-auth
+-auth       include    system-auth
 +auth       include    common-auth
  account    required   pam_access.so
--account    include    password-auth
-+account    include    common-account
+-account    include    system-auth
++account    include    common-auth
  session    required   pam_loginuid.so
--session    include    password-auth
+-session    include    system-auth
 +session    include    common-session-noninteractive
meta/recipes-extended/cronie/cronie_1.5.4.bb renamed from meta/recipes-extended/cronie/cronie_1.5.2.bb +4 -6
similarity index 89%
rename from meta/recipes-extended/cronie/cronie_1.5.2.bb
rename to meta/recipes-extended/cronie/cronie_1.5.4.bb
index 3abca7f920..e16b5d49cc 100644
@@ -16,17 +16,15 @@ SECTION = "utils"
 
 UPSTREAM_CHECK_URI = "https://github.com/cronie-crond/${BPN}/releases/"
 
-SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}/cronie-${PV}.tar.gz \
+SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}-final/cronie-${PV}.tar.gz \
            file://crond.init \
            file://crontab \
-           file://crond.service \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+           file://crond.service"
 
-PAM_SRC_URI = "file://crond_pam_config.patch"
 PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
 
-SRC_URI[md5sum] = "703314f58a49ea136e9966d3937d9bf4"
-SRC_URI[sha256sum] = "370bf34641691489330e708bd4cdbd779267296a030668a12f77b7e36872fd75"
+SRC_URI[md5sum] = "20233b96997e17a142e1fbe0d7ce8223"
+SRC_URI[sha256sum] = "af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882"
 
 inherit autotools update-rc.d useradd systemd
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 3 lines · Oleksandr Kravchuk
---
 .../cronie/cronie/crond_pam_config.patch         | 16 ++++++++--------

I don't see how this patch is now being applied? Those steps got remove.

Quoted 65 lines
 .../cronie/{cronie_1.5.2.bb => cronie_1.5.4.bb}  | 10 ++++------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename meta/recipes-extended/cronie/{cronie_1.5.2.bb => cronie_1.5.4.bb} (89%)
meta/recipes-extended/cronie/cronie/crond_pam_config.patch +8 -8
index 6c928165cd..c374790d1d 100644
@@ -4,19 +4,19 @@ configure files instead.
 Upstream-Status: Pending
 
 Signed-off-by: Wenzong Fan <[email protected]>
-Index: cronie-1.5.1/pam/crond
-===================================================================
---- cronie-1.5.1.orig/pam/crond
-+++ cronie-1.5.1/pam/crond
+diff --git a/pam/crond b/pam/crond
+index 560529d..95a6457 100644
+--- a/pam/crond
++++ b/pam/crond
 @@ -4,8 +4,8 @@
  #
  # Although no PAM authentication is called, auth modules
  # are used for credential setting
--auth       include    password-auth
+-auth       include    system-auth
 +auth       include    common-auth
  account    required   pam_access.so
--account    include    password-auth
-+account    include    common-account
+-account    include    system-auth
++account    include    common-auth
  session    required   pam_loginuid.so
--session    include    password-auth
+-session    include    system-auth
 +session    include    common-session-noninteractive
meta/recipes-extended/cronie/cronie_1.5.4.bb renamed from meta/recipes-extended/cronie/cronie_1.5.2.bb +4 -6
similarity index 89%
rename from meta/recipes-extended/cronie/cronie_1.5.2.bb
rename to meta/recipes-extended/cronie/cronie_1.5.4.bb
index 3abca7f920..e16b5d49cc 100644
@@ -16,17 +16,15 @@ SECTION = "utils"
 
 UPSTREAM_CHECK_URI = "https://github.com/cronie-crond/${BPN}/releases/"
 
-SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}/cronie-${PV}.tar.gz \
+SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}-final/cronie-${PV}.tar.gz \
            file://crond.init \
            file://crontab \
-           file://crond.service \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+           file://crond.service"
 
-PAM_SRC_URI = "file://crond_pam_config.patch"
 PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
 
-SRC_URI[md5sum] = "703314f58a49ea136e9966d3937d9bf4"
-SRC_URI[sha256sum] = "370bf34641691489330e708bd4cdbd779267296a030668a12f77b7e36872fd75"
+SRC_URI[md5sum] = "20233b96997e17a142e1fbe0d7ce8223"
+SRC_URI[sha256sum] = "af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882"
 
 inherit autotools update-rc.d useradd systemd