[packages/heimdal/dev-7.3: 5/21] 1.6rc2

baggins baggins at pld-linux.org
Sat May 27 23:18:25 CEST 2017


commit 1d7ff72f167cc060df20c33970c4b28b9b3ca1ca
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 1 13:31:24 2016 +0300

    1.6rc2

 heimdal-db4.patch             | 20 --------------------
 heimdal-dbpaths.patch         | 12 ------------
 heimdal-missing-exports.patch | 13 ++++---------
 heimdal-sbindir.patch         |  7 +++----
 heimdal.spec                  | 25 +++++++++++++++----------
 5 files changed, 22 insertions(+), 55 deletions(-)
---
diff --git a/heimdal.spec b/heimdal.spec
index dfae4be..bab18dd 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -6,16 +6,18 @@
 %bcond_with	openssl			# use OpenSSL instead of internal hcrypto
 %bcond_with	expose_internals	# install internal KCM headers
 
+%define		rel	0.1
 Summary:	Heimdal implementation of Kerberos V5 system
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 # see dev-7.3 WIP branch for newer version
 Name:		heimdal
-Version:	1.5.3
-Release:	7
+Version:	1.6
+Release:	0.rc2.%{rel}
 License:	Free
 Group:		Networking
-Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
-# Source0-md5:	30b379e3de12f332fbd201131f02ffca
+#Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
+Source0:	https://github.com/heimdal/heimdal/archive/heimdal-1-6-branch/%{name}-%{version}.tar.gz
+# Source0-md5:	4566d8a4f28c57b4a044e6a89b1cddc4
 Source1:	%{name}.init
 Source2:	%{name}-kpasswdd.init
 Source3:	%{name}-ipropd.init
@@ -406,29 +408,32 @@ Demony korzystające z systemu Kerberos do autoryzacji dostępu.
 %define	specflags	-pthread
 
 %prep
-%setup -q
+%setup -qc
+mv heimdal-heimdal-1-6-branch/* .
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
+#%patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
+#%patch14 -p1
+
+%{__rm} acinclude.m4
+# cf/{libtool,lt*}.m4
 
 %build
 install -d our-ld
 ln -s %{_bindir}/ld.bfd our-ld/ld
 export PATH=$(pwd)/our-ld:$PATH
 
-%{__rm} acinclude.m4 cf/{libtool,lt*}.m4
 %{__libtoolize}
 %{__aclocal} -I cf
 %{__autoconf}
diff --git a/heimdal-db4.patch b/heimdal-db4.patch
index 31ba23e..573b697 100644
--- a/heimdal-db4.patch
+++ b/heimdal-db4.patch
@@ -9,26 +9,6 @@
    #include <stdio.h>
    #ifdef HAVE_DB4_DB_H
    #include <db4/db.h>
---- heimdal-1.3.2/lib/hdb/db3.c.orig	2010-03-22 05:11:24.000000000 +0100
-+++ heimdal-1.3.2/lib/hdb/db3.c	2010-05-10 20:40:00.494935070 +0200
-@@ -268,7 +268,7 @@
-     db_create(&d, NULL, 0);
-     db->hdb_db = d;
- 
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
-     ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
- #else
-     ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
-@@ -276,7 +276,7 @@
- 
-     if (ret == ENOENT) {
- 	/* try to open without .db extension */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
- 			 myflags, mode);
- #else
 --- heimdal-1.3.2/lib/roken/ndbm_wrap.c.orig	2010-05-12 21:14:14.122937584 +0200
 +++ heimdal-1.3.2/lib/roken/ndbm_wrap.c	2010-05-12 21:11:09.002932556 +0200
 @@ -168,7 +168,7 @@
diff --git a/heimdal-dbpaths.patch b/heimdal-dbpaths.patch
index 6b8585c..79358b3 100644
--- a/heimdal-dbpaths.patch
+++ b/heimdal-dbpaths.patch
@@ -148,15 +148,3 @@ diff -urbB heimdal-0.7/lib/krb5/krb5.conf.5 heimdal-0.7.org/lib/krb5/krb5.conf.5
  	kdc = SYSLOG:INFO
  	default = SYSLOG:INFO:USER
  .Ed
-diff -urbB heimdal-0.7/lib/krb5/krb5.conf.cat5 heimdal-0.7.org/lib/krb5/krb5.conf.cat5
---- heimdal-0.7/lib/krb5/krb5.conf.cat5	2005-06-16 18:33:58.000000000 +0200
-+++ heimdal-0.7.org/lib/krb5/krb5.conf.cat5	2005-07-03 18:58:54.163073360 +0200
-@@ -503,7 +503,7 @@
-                            default_domain = foo.se
-                    }
-            [logging]
--                   kdc = FILE:/var/heimdal/kdc.log
-+                   kdc = FILE:/var/lib/heimdal/kdc.log
-                    kdc = SYSLOG:INFO
-                    default = SYSLOG:INFO:USER
- 
diff --git a/heimdal-missing-exports.patch b/heimdal-missing-exports.patch
index 58d38bf..4e8029d 100644
--- a/heimdal-missing-exports.patch
+++ b/heimdal-missing-exports.patch
@@ -1,18 +1,13 @@
-diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map
-index dc39a10..76a1e5e 100644
---- a/lib/krb5/version-script.map
-+++ b/lib/krb5/version-script.map
-@@ -40,8 +40,10 @@ HEIMDAL_KRB5_2.0 {
+--- heimdal-1.6/lib/krb5/version-script.map~	2016-05-01 13:17:26.000000000 +0300
++++ heimdal-1.6/lib/krb5/version-script.map	2016-05-01 13:17:57.794201835 +0300
+@@ -36,6 +36,7 @@
  		krb5_auth_con_getlocalseqnumber;
  		krb5_auth_con_getlocalsubkey;
  		krb5_auth_con_getrcache;
 +		krb5_auth_con_getrecvsubkey;
  		krb5_auth_con_getremoteseqnumber;
  		krb5_auth_con_getremotesubkey;
-+		krb5_auth_con_getsendsubkey;
- 		krb5_auth_con_init;
- 		krb5_auth_con_removeflags;
- 		krb5_auth_con_setaddrs;
+ 		krb5_auth_con_getsendsubkey;
 @@ -53,8 +55,10 @@ HEIMDAL_KRB5_2.0 {
  		krb5_auth_con_setlocalseqnumber;
  		krb5_auth_con_setlocalsubkey;
diff --git a/heimdal-sbindir.patch b/heimdal-sbindir.patch
index 73b77e1..d2e96e9 100644
--- a/heimdal-sbindir.patch
+++ b/heimdal-sbindir.patch
@@ -153,13 +153,12 @@ diff -ur heimdal-1.3.1/kpasswd/Makefile.am heimdal-1.3.1-sbin/kpasswd/Makefile.a
  
  noinst_PROGRAMS = kpasswd-generator
  
-diff -ur heimdal-1.3.1/kuser/Makefile.am heimdal-1.3.1-sbin/kuser/Makefile.am
---- heimdal-1.3.1/kuser/Makefile.am	2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/kuser/Makefile.am	2009-12-07 17:20:32.711565532 +0100
+--- heimdal-1.6/kuser/Makefile.am~	2015-02-07 06:15:40.000000000 +0200
++++ heimdal-1.6/kuser/Makefile.am	2016-05-01 13:15:58.861442172 +0300
 @@ -16,7 +16,7 @@
  	kimpersonate.8
  
- bin_PROGRAMS = kinit kdestroy kgetcred kcc
+ bin_PROGRAMS = kinit kdestroy kgetcred heimtools
 -libexec_PROGRAMS = kdigest kimpersonate
 +sbin_PROGRAMS = kdigest kimpersonate
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/heimdal.git/commitdiff/08416d15b3ebeb603ccaa1fa8647376b4e5c7f78



More information about the pld-cvs-commit mailing list