Ensure we can build with the new CFLAGS

Also remove the git versioning in patches.

14 files changed, 52 insertions, 34 deletions

diff --git a/Build-with-Werror-implicit-int-where-supported.patch b/Build-with-Werror-implicit-int-where-supported.patch
new file mode 100644
index 0000000..2e0cd31
--- /dev/null
+++ b/Build-with-Werror-implicit-int-where-supported.patch
@@ -0,0 +1,23 @@
+From a4486f53b0477fd4c9e79e03450a7805110eb842 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 10 Nov 2016 13:20:49 -0500
+Subject: [PATCH] Build with -Werror-implicit-int where supported
+
+(cherry picked from commit 873d864230c9c64c65ff12a24199bac3adf3bc2f)
+---
+ src/aclocal.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/aclocal.m4 b/src/aclocal.m4
+index 9076016..9a2f873 100644
+--- a/src/aclocal.m4
++++ b/src/aclocal.m4
+@@ -527,7 +527,7 @@ if test "$GCC" = yes ; then
+     TRY_WARN_CC_FLAG(-Wno-format-zero-length)
+     # Other flags here may not be supported on some versions of
+     # gcc that people want to use.
+-    for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers ; do
++    for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int ; do
+       TRY_WARN_CC_FLAG(-W$flag)
+     done
+     #  old-style-definition? generates many, many warnings
diff --git a/Fix-declaration-without-type-in-t_shs3.c.patch b/Fix-declaration-without-type-in-t_shs3.c.patch
new file mode 100644
index 0000000..be46966
--- /dev/null
+++ b/Fix-declaration-without-type-in-t_shs3.c.patch
@@ -0,0 +1,22 @@
+From fcb8dd8c2c40994851c40fc64fa3dcf81a025d25 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 10 Nov 2016 12:57:19 -0500
+Subject: [PATCH] Fix declaration without type in t_shs3.c
+
+(cherry picked from commit 2adf66302ecfff350def3e81b58fa56f5ec9efcd)
+---
+ src/lib/crypto/builtin/sha1/t_shs3.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/crypto/builtin/sha1/t_shs3.c b/src/lib/crypto/builtin/sha1/t_shs3.c
+index ca985fb..f7932ef 100644
+--- a/src/lib/crypto/builtin/sha1/t_shs3.c
++++ b/src/lib/crypto/builtin/sha1/t_shs3.c
+@@ -56,6 +56,7 @@ int Dflag;
+ 
+ int
+ main(argc,argv)
++    int argc;
+     char **argv;
+ {
+     char *argp;
diff --git a/krb5-1.11-kpasswdtest.patch b/krb5-1.11-kpasswdtest.patch
index 5487a8b..ae35ab6 100644
--- a/krb5-1.11-kpasswdtest.patch
+++ b/krb5-1.11-kpasswdtest.patch
@@ -19,6 +19,3 @@ index 00c4429..9c4bc1d 100644
  		database_module = foobar_db2_module_blah
  	}
  
--- 
-2.9.3
-
diff --git a/krb5-1.11-run_user_0.patch b/krb5-1.11-run_user_0.patch
index 049e5e1..37fa96c 100644
--- a/krb5-1.11-run_user_0.patch
+++ b/krb5-1.11-run_user_0.patch
@@ -42,6 +42,3 @@ index 73f0fe6..4850c0d 100644
  #ifdef USE_SELINUX
              selabel = krb5int_push_fscreatecon_for(dirname);
  #endif
--- 
-2.9.3
-
diff --git a/krb5-1.12-api.patch b/krb5-1.12-api.patch
index 849453b..8e4a0ce 100644
--- a/krb5-1.12-api.patch
+++ b/krb5-1.12-api.patch
@@ -35,6 +35,3 @@ index a693610..0ed7883 100644
      if (flags & KRB5_PRINCIPAL_COMPARE_ENTERPRISE) {
          /* Treat UPNs as if they were real principals */
          if (princ1->type == KRB5_NT_ENTERPRISE_PRINCIPAL) {
--- 
-2.9.3
-
diff --git a/krb5-1.12-ksu-path.patch b/krb5-1.12-ksu-path.patch
index ae8ec8e..7f13701 100644
--- a/krb5-1.12-ksu-path.patch
+++ b/krb5-1.12-ksu-path.patch
@@ -20,6 +20,3 @@ index 5755bb5..9d58f29 100644
  
  KSU_LIBS=@KSU_LIBS@
  PAM_LIBS=@PAM_LIBS@
--- 
-2.9.3
-
diff --git a/krb5-1.12-ktany.patch b/krb5-1.12-ktany.patch
index 9f2a578..e2c53dc 100644
--- a/krb5-1.12-ktany.patch
+++ b/krb5-1.12-ktany.patch
@@ -364,6 +364,3 @@ index 0d39b29..6534d7c 100644
  };
  const static struct krb5_kt_typelist krb5_kt_typelist_memory = {
      &krb5_mkt_ops,
--- 
-2.9.3
-
diff --git a/krb5-1.12.1-pam.patch b/krb5-1.12.1-pam.patch
index cb5dbcc..cb318f3 100644
--- a/krb5-1.12.1-pam.patch
+++ b/krb5-1.12.1-pam.patch
@@ -768,6 +768,3 @@ index fde09a1..79c0fe2 100644
  # Make localedir work in autoconf 2.5x.
  if test "${localedir+set}" != set; then
      localedir='$(datadir)/locale'
--- 
-2.9.3
-
diff --git a/krb5-1.13-dirsrv-accountlock.patch b/krb5-1.13-dirsrv-accountlock.patch
index b4fc641..7abdbfb 100644
--- a/krb5-1.13-dirsrv-accountlock.patch
+++ b/krb5-1.13-dirsrv-accountlock.patch
@@ -73,6 +73,3 @@ index d722dbf..5e8e9a8 100644
                                       "krbLastPwdChange",
                                       "krbLastAdminUnlock",
                                       "krbPrincipalAuthInd",
--- 
-2.9.3
-
diff --git a/krb5-1.15-beta1-buildconf.patch b/krb5-1.15-beta1-buildconf.patch
index 441459e..5e5c8ea 100644
--- a/krb5-1.15-beta1-buildconf.patch
+++ b/krb5-1.15-beta1-buildconf.patch
@@ -68,6 +68,3 @@ index 3e4af6c..2b20c3f 100644
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
  	CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
--- 
-2.9.3
-
diff --git a/krb5-1.15-beta1-selinux-label.patch b/krb5-1.15-beta1-selinux-label.patch
index 0fafbfb..910165d 100644
--- a/krb5-1.15-beta1-selinux-label.patch
+++ b/krb5-1.15-beta1-selinux-label.patch
@@ -1063,6 +1063,3 @@ index 0000000..2302634
 +}
 +
 +#endif /* USE_SELINUX */
--- 
-2.9.3
-
diff --git a/krb5-1.3.1-dns.patch b/krb5-1.3.1-dns.patch
index 6a3f3a5..fa7ac77 100644
--- a/krb5-1.3.1-dns.patch
+++ b/krb5-1.3.1-dns.patch
@@ -20,6 +20,3 @@ index 5b02b40..d49b7c1 100644
  ],dnl
  [AC_LIBRARY_NET]
  )])dnl
--- 
-2.9.3
-
diff --git a/krb5-1.9-debuginfo.patch b/krb5-1.9-debuginfo.patch
index 45290df..a6bf207 100644
--- a/krb5-1.9-debuginfo.patch
+++ b/krb5-1.9-debuginfo.patch
@@ -37,6 +37,3 @@ index 8669c24..a22f23c 100644
  
  install:
  	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
--- 
-2.9.3
-
diff --git a/krb5.spec b/krb5.spec
index 5429dd2..2d4e014 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -13,7 +13,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.15
-Release: 1%{?dist}.beta1.0
+Release: 2%{?dist}.beta1.0
 # - Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
 # - The sources below are stored in a lookaside cache. Upload with
@@ -56,6 +56,8 @@ Patch8: krb5-1.13-dirsrv-accountlock.patch
 Patch9: krb5-1.9-debuginfo.patch
 Patch10: krb5-1.11-run_user_0.patch
 Patch11: krb5-1.11-kpasswdtest.patch
+Patch12: Fix-declaration-without-type-in-t_shs3.c.patch
+Patch13: Build-with-Werror-implicit-int-where-supported.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -709,6 +711,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Thu Nov 10 2016 Robbie Harwood <rharwood@redhat.com> - 1.15-beta1-2
+- Ensure we can build with the new CFLAGS
+- Remove the git versioning in patches
+
 * Thu Oct 20 2016 Robbie Harwood <rharwood@redhat.com> - 1.15-beta1-1
 - New upstream release
 - Update selinux with RHEL hygene