diff --git a/.gitignore b/.gitignore index 224d9ce..01b9ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /sudo-1.9.11p3.tar.gz /sudo-1.9.12p2.tar.gz /sudo-1.9.13p2.tar.gz +/sudo-1.9.14p3.tar.gz diff --git a/sources b/sources index d221fe6..fc05228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sudo-1.9.13p2.tar.gz) = b3015a114fd518afd644c9934f2461046f1116506723217603af1a952bdb436689761b4d009dfe32b725bad2e0ebcaf19db72febfaa63895ba004256fea12bef +SHA512 (sudo-1.9.14p3.tar.gz) = d4af836e3316c35d8b81a2c869ca199e8f2d5cb26dbd98b8ad031f29be62b154452afdf5a506ddabad21b80e5988a49f1f7c8f1ec44718ffcbd7e89ccbdef612 diff --git a/sudo-configure-c99.patch b/sudo-configure-c99.patch deleted file mode 100644 index 69a0cd2..0000000 --- a/sudo-configure-c99.patch +++ /dev/null @@ -1,65 +0,0 @@ -Avoid implicit function declarations, so that the configure probe -results do not change with future compilers. - -Submitted upstream for discussion: - - - - -diff --git a/configure b/configure -index d406eb77a22d3c3c..29483788443d2b21 100755 ---- a/configure -+++ b/configure -@@ -31220,10 +31220,13 @@ else case e in #( - /* end confdefs.h. */ - #include - #include -+ -+void *volatile ptr; -+ - int - main (void) - { --(void)ldap_init(0, 0) -+ptr = (void *) ldap_msgfree - ; - return 0; - } -@@ -33914,7 +33917,7 @@ then : - else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- -+#include - - int - main (void) -diff --git a/m4/hardening.m4 b/m4/hardening.m4 -index f7d2a8c2911ed9d6..1ebfd9fdaf461285 100644 ---- a/m4/hardening.m4 -+++ b/m4/hardening.m4 -@@ -10,7 +10,7 @@ AC_DEFUN([SUDO_CHECK_HARDENING], [ - [sudo_cv_use_fortify_source], - [AC_LINK_IFELSE([ - AC_LANG_PROGRAM( -- [[]], [[char buf[4]; (void)sprintf(buf, "%s", "foo");]] -+ [[#include ]], [[char buf[4]; (void)sprintf(buf, "%s", "foo");]] - )], - [sudo_cv_use_fortify_source=yes], - [sudo_cv_use_fortify_source=no] -diff --git a/m4/ldap.m4 b/m4/ldap.m4 -index 78c21e0bc0a1f65f..a6361df044d84f92 100644 ---- a/m4/ldap.m4 -+++ b/m4/ldap.m4 -@@ -52,7 +52,10 @@ AC_DEFUN([SUDO_CHECK_LDAP], [ - #include ]) - AC_CACHE_CHECK([whether lber.h is needed when including ldap.h], [sudo_cv_header_lber_h], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include --#include ]], [[(void)ldap_init(0, 0)]])], [ -+#include -+ -+void *volatile ptr; -+]], [[ptr = (void *) ldap_msgfree]])], [ - # No need to explicitly include lber.h when including ldap.h. - sudo_cv_header_lber_h=no - ], [ diff --git a/sudo.spec b/sudo.spec index 315ea49..3237084 100644 --- a/sudo.spec +++ b/sudo.spec @@ -1,9 +1,9 @@ # comment out if no extra version -%global extraver p2 +%global extraver p3 Summary: Allows restricted root access for specified users Name: sudo -Version: 1.9.13 +Version: 1.9.14 # remove -b 3 after rebase !!! # use "-p -e % {?extraver}" when beta # use "-e % {?extraver}"" when patch version @@ -13,7 +13,6 @@ License: ISC URL: https://www.sudo.ws Source0: %{url}/dist/%{name}-%{version}%{?extraver}.tar.gz Source1: sudoers -Patch0: sudo-configure-c99.patch Requires: pam Recommends: system-default-editor Recommends: %{name}-python-plugin%{?_isa} = %{version}-%{release}