[packages/heimdal] - rediffed

hawk hawk at pld-linux.org
Mon May 10 00:33:39 CEST 2021 

commit b0db110a600bd207d04a07441f102469d2fc4435
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Mon May 10 00:33:19 2021 +0200

    - rediffed

 heimdal-dbpaths.patch | 65 ++++++++++++++++++++++++------------------------
 heimdal-info.patch    | 14 ++++++-----
 heimdal-libadd.patch  | 14 +++++------
 heimdal-sbindir.patch | 68 ++++++++++++++++++++++++++-------------------------
 heimdal-signal.patch  | 53 ++++++++++++++++++++-------------------
 5 files changed, 111 insertions(+), 103 deletions(-)
---
diff --git a/heimdal-dbpaths.patch b/heimdal-dbpaths.patch
index de51594..61aa4ff 100644
--- a/heimdal-dbpaths.patch
+++ b/heimdal-dbpaths.patch
@@ -1,7 +1,7 @@
-diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
---- heimdal-0.7/configure.ac	2005-06-16 18:29:14.000000000 +0200
-+++ heimdal-0.7.org/configure.ac	2005-07-03 18:58:54.158074120 +0200
-@@ -16,7 +16,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/configure.ac heimdal-7.7.0/configure.ac
+--- heimdal-7.7.0.org/configure.ac	2019-06-07 08:21:39.000000000 +0200
++++ heimdal-7.7.0/configure.ac	2021-05-10 00:31:52.351798762 +0200
+@@ -24,7 +24,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
  AC_PREFIX_DEFAULT(/usr/heimdal)
  
  test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
@@ -10,9 +10,10 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  
  AC_CANONICAL_HOST
  CANONICAL_HOST=$host
---- heimdal-1.7.old/doc/setup.texi	2016-11-15 05:29:47.000000000 +0200
-+++ heimdal-1.7.old/doc/setup.texi	2016-11-19 00:47:14.126318922 +0200
-@@ -122,8 +122,8 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/doc/setup.texi heimdal-7.7.0/doc/setup.texi
+--- heimdal-7.7.0.org/doc/setup.texi	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/doc/setup.texi	2021-05-10 00:31:52.352798762 +0200
+@@ -122,8 +122,8 @@ The database library will look for the d
  Make sure the directory has restrictive permissions.
  
  @example
@@ -23,7 +24,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  @end example
  
  Heimdal supports various database backends: lmdb (LMDB), db3 (Berkeley
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ To use LDAP, see @xref{Using LDAP to sto
  The keys of all the principals are stored in the database.  If you
  choose to, these can be encrypted with a master key.  You do not have to
  remember this key (or password), but just to enter it once and it will
@@ -32,7 +33,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  master key, run @samp{kstash} to create this master key:
  
  @example
-@@ -335,14 +335,14 @@
+@@ -335,14 +335,14 @@ want to start it from @command{inetd} yo
  one below to your @file{/etc/inetd.conf}.
  
  @example
@@ -49,7 +50,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  syntax:
  @smallexample
  principal       [priv1,priv2,...]       [glob-pattern]
-@@ -518,7 +518,7 @@
+@@ -518,7 +518,7 @@ for the database) and a keytab with the
  
  @example
  slave# ktutil get -p foo/admin hprop/`hostname`
@@ -58,7 +59,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  slave# hpropd
  @end example
  
-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ checked after 30 seconds of no event.
  The program that runs on the master is @command{ipropd-master} and all
  clients run @command{ipropd-slave}.
  
@@ -67,7 +68,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  the slaves that the database should be propagated to.  Each line contains
  the full name of the principal (for example
  @samp{iprop/hemligare.foo.se@@FOO.SE}).
-@@ -594,25 +594,25 @@
+@@ -594,25 +594,25 @@ for every slave.
  
  
  @example
@@ -98,7 +99,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  @end example
  
  To manage the iprop log file you should use the @command{iprop-log}
-@@ -623,9 +623,9 @@
+@@ -623,9 +623,9 @@ command. With it you can dump, truncate
  Both the master and slave provides status of the world as they see it.
  
  The master write outs the current status of the slaves, last seen and
@@ -110,7 +111,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  
  These locations can be changed with command line options, and in the
  case of @command{ipropd_master}, the configuration file.
-@@ -1567,7 +1567,7 @@
+@@ -1567,7 +1567,7 @@ mapping between a certificate and princi
  Note that the file contents are space sensitive.
  
  @example
@@ -119,10 +120,10 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
  # comments starts with #
  lha@@EXAMPLE.ORG:C=SE,O=Stockholm universitet,CN=Love,UID=lha
  lha@@EXAMPLE.ORG:CN=Love,UID=lha
-diff -urbB heimdal-0.7/kadmin/kadmind.8 heimdal-0.7.org/kadmin/kadmind.8
---- heimdal-0.7/kadmin/kadmind.8	2005-06-16 18:27:56.000000000 +0200
-+++ heimdal-0.7.org/kadmin/kadmind.8	2005-07-03 18:58:54.160073816 +0200
-@@ -85,7 +85,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kadmin/kadmind.8 heimdal-7.7.0/kadmin/kadmind.8
+--- heimdal-7.7.0.org/kadmin/kadmind.8	2019-06-07 08:21:39.000000000 +0200
++++ heimdal-7.7.0/kadmin/kadmind.8	2021-05-10 00:31:52.352798762 +0200
+@@ -84,7 +84,7 @@ slaves.
  Principals are always allowed to change their own password and list
  their own principal.  Apart from that, doing any operation requires
  permission explicitly added in the ACL file
@@ -131,7 +132,7 @@ diff -urbB heimdal-0.7/kadmin/kadmind.8 heimdal-0.7.org/kadmin/kadmind.8
  The format of this file is:
  .Bd -ragged
  .Va principal
-@@ -155,7 +155,7 @@
+@@ -139,7 +139,7 @@ representing the default port.
  .El
  .\".Sh ENVIRONMENT
  .Sh FILES
@@ -140,22 +141,22 @@ diff -urbB heimdal-0.7/kadmin/kadmind.8 heimdal-0.7.org/kadmin/kadmind.8
  .Sh EXAMPLES
  This will cause
  .Nm
-diff -urbB heimdal-0.7/kdc/kdc.8 heimdal-0.7.org/kdc/kdc.8
---- heimdal-0.7/kdc/kdc.8	2005-06-16 18:27:58.000000000 +0200
-+++ heimdal-0.7.org/kdc/kdc.8	2005-07-03 18:58:54.161073664 +0200
-@@ -77,7 +77,7 @@
- .Fl -config-file= Ns Ar file
- .Xc
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kdc/kdc.8 heimdal-7.7.0/kdc/kdc.8
+--- heimdal-7.7.0.org/kdc/kdc.8	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/kdc/kdc.8	2021-05-10 00:31:52.352798762 +0200
+@@ -70,7 +70,7 @@ Options supported:
+ .Bl -tag -width Ds
+ .It Fl c Ar file , Fl Fl config-file= Ns Ar file
  Specifies the location of the config file, the default is
 -.Pa /var/heimdal/kdc.conf .
 +.Pa /var/lib/heimdal/kdc.conf .
  This is the only value that can't be specified in the config file.
- .It Xo
- .Fl p ,
-diff -urbB heimdal-0.7/lib/krb5/krb5.conf.5 heimdal-0.7.org/lib/krb5/krb5.conf.5
---- heimdal-0.7/lib/krb5/krb5.conf.5	2005-06-16 18:28:09.000000000 +0200
-+++ heimdal-0.7.org/lib/krb5/krb5.conf.5	2005-07-03 18:58:54.162073512 +0200
-@@ -490,7 +490,7 @@
+ .It Fl p , Fl Fl no-require-preauth
+ Turn off the requirement for pre-autentication in the initial AS-REQ
+diff -urNp -x '*.orig' heimdal-7.7.0.org/lib/krb5/krb5.conf.5 heimdal-7.7.0/lib/krb5/krb5.conf.5
+--- heimdal-7.7.0.org/lib/krb5/krb5.conf.5	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/lib/krb5/krb5.conf.5	2021-05-10 00:31:52.352798762 +0200
+@@ -783,7 +783,7 @@ configuration file for Kerberos 5.
  		default_domain = foo.se
  	}
  [logging]
@@ -163,4 +164,4 @@ diff -urbB heimdal-0.7/lib/krb5/krb5.conf.5 heimdal-0.7.org/lib/krb5/krb5.conf.5
 +	kdc = FILE:/var/lib/heimdal/kdc.log
  	kdc = SYSLOG:INFO
  	default = SYSLOG:INFO:USER
- .Ed
+ [kadmin]
diff --git a/heimdal-info.patch b/heimdal-info.patch
index 48fa0e6..01a7aeb 100644
--- a/heimdal-info.patch
+++ b/heimdal-info.patch
@@ -1,7 +1,8 @@
---- heimdal-0.8.1/doc/heimdal.texi.orig	2007-04-23 18:23:41.000000000 +0200
-+++ heimdal-0.8.1/doc/heimdal.texi	2007-07-06 07:42:15.047585047 +0200
+diff -urNp -x '*.orig' heimdal-7.7.0.org/doc/heimdal.texi heimdal-7.7.0/doc/heimdal.texi
+--- heimdal-7.7.0.org/doc/heimdal.texi	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/doc/heimdal.texi	2021-05-10 00:32:41.531798762 +0200
 @@ -20,9 +20,9 @@
- @set VERSION 1.0
+ @set EDITION 1.0
  
  @ifinfo
 - at dircategory Security
@@ -12,9 +13,10 @@
  @end direntry
  @end ifinfo
  
---- heimdal-0.8.1/doc/hx509.texi.orig	2007-04-23 18:23:41.000000000 +0200
-+++ heimdal-0.8.1/doc/hx509.texi	2007-07-06 07:42:27.984322270 +0200
-@@ -21,9 +21,9 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/doc/hx509.texi heimdal-7.7.0/doc/hx509.texi
+--- heimdal-7.7.0.org/doc/hx509.texi	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/doc/hx509.texi	2021-05-10 00:32:41.532798762 +0200
+@@ -20,9 +20,9 @@
  @set EDITION 1.0
  
  @ifinfo
diff --git a/heimdal-libadd.patch b/heimdal-libadd.patch
index 98efda0..562c58d 100644
--- a/heimdal-libadd.patch
+++ b/heimdal-libadd.patch
@@ -1,12 +1,12 @@
-diff -aurN heimdal-0.7.2.orig/lib/roken/Makefile.am heimdal-0.7.2/lib/roken/Makefile.am
---- heimdal-0.7.2.orig/lib/roken/Makefile.am	2005-05-24 13:39:01.000000000 +0200
-+++ heimdal-0.7.2/lib/roken/Makefile.am	2006-08-07 20:25:44.397632181 +0200
-@@ -110,6 +110,8 @@
- libroken_la_LIBADD += $(DBLIB)
- endif
+diff -urNp -x '*.orig' heimdal-7.7.0.org/lib/roken/Makefile.am heimdal-7.7.0/lib/roken/Makefile.am
+--- heimdal-7.7.0.org/lib/roken/Makefile.am	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/lib/roken/Makefile.am	2021-05-10 00:32:07.632798762 +0200
+@@ -142,6 +142,8 @@ EXTRA_libroken_la_SOURCES =	\
+ 
+ libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt) $(LIB_pidfile)
  
 +libroken_la_LIBADD += $(LIB_crypt)
 +
  $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS)
  
- BUILT_SOURCES = make-roken.c roken.h
+ BUILT_SOURCES = roken.h
diff --git a/heimdal-sbindir.patch b/heimdal-sbindir.patch
index c46d2a0..f2c6d3f 100644
--- a/heimdal-sbindir.patch
+++ b/heimdal-sbindir.patch
@@ -1,7 +1,7 @@
-diff -ur heimdal-1.3.1/appl/dceutils/Makefile.am heimdal-1.3.1-sbin/appl/dceutils/Makefile.am
---- heimdal-1.3.1/appl/dceutils/Makefile.am	2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/dceutils/Makefile.am	2009-12-07 17:20:32.677628994 +0100
-@@ -8,7 +8,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/appl/dceutils/Makefile.am heimdal-7.7.0/appl/dceutils/Makefile.am
+--- heimdal-7.7.0.org/appl/dceutils/Makefile.am	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/appl/dceutils/Makefile.am	2021-05-10 00:32:51.411798762 +0200
+@@ -8,7 +8,7 @@ if AIX
  AIX_DFSPROGS = dpagaix
  endif
  
@@ -10,10 +10,10 @@ diff -ur heimdal-1.3.1/appl/dceutils/Makefile.am heimdal-1.3.1-sbin/appl/dceutil
  
  dpagaix_CFLAGS = $(dpagaix_cflags)
  dpagaix_LDFLAGS = $(dpagaix_ldflags)
-diff -ur heimdal-1.3.1/appl/kf/Makefile.am heimdal-1.3.1-sbin/appl/kf/Makefile.am
---- heimdal-1.3.1/appl/kf/Makefile.am	2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/kf/Makefile.am	2009-12-07 17:20:32.681638741 +0100
-@@ -4,7 +4,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/appl/kf/Makefile.am heimdal-7.7.0/appl/kf/Makefile.am
+--- heimdal-7.7.0.org/appl/kf/Makefile.am	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/appl/kf/Makefile.am	2021-05-10 00:32:51.411798762 +0200
+@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.am.common
  
  bin_PROGRAMS = kf
  
@@ -22,9 +22,10 @@ diff -ur heimdal-1.3.1/appl/kf/Makefile.am heimdal-1.3.1-sbin/appl/kf/Makefile.a
  
  man_MANS = kf.1 kfd.8
  
---- heimdal-7.1.0/kadmin/Makefile.am.orig	2017-01-25 21:23:47.817425405 +0100
-+++ heimdal-7.1.0/kadmin/Makefile.am	2017-01-25 21:26:46.720756697 +0100
-@@ -6,7 +6,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kadmin/Makefile.am heimdal-7.7.0/kadmin/Makefile.am
+--- heimdal-7.7.0.org/kadmin/Makefile.am	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/kadmin/Makefile.am	2021-05-10 00:32:51.411798762 +0200
+@@ -6,7 +6,7 @@ AM_CPPFLAGS += $(INCLUDE_libintl) $(INCL
  
  bin_PROGRAMS = kadmin
  
@@ -33,22 +34,22 @@ diff -ur heimdal-1.3.1/appl/kf/Makefile.am heimdal-1.3.1-sbin/appl/kf/Makefile.a
  
  man_MANS = kadmin.1 kadmind.8
  
-diff -ur heimdal-1.3.1/kcm/Makefile.am heimdal-1.3.1-sbin/kcm/Makefile.am
---- heimdal-1.3.1/kcm/Makefile.am	2009-12-07 17:20:42.687503717 +0100
-+++ heimdal-1.3.1-sbin/kcm/Makefile.am	2009-12-07 17:20:32.702508680 +0100
-@@ -4,7 +4,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kcm/Makefile.am heimdal-7.7.0/kcm/Makefile.am
+--- heimdal-7.7.0.org/kcm/Makefile.am	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/kcm/Makefile.am	2021-05-10 00:32:51.411798762 +0200
+@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.am.common
  
- AM_CPPFLAGS += $(INCLUDE_libintl) $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5
+ AM_CPPFLAGS += $(INCLUDE_libintl) -I$(srcdir)/../lib/krb5
  
 -libexec_PROGRAMS = kcm
 +sbin_PROGRAMS = kcm
  
  kcm_SOURCES =		\
  	acl.c		\
-diff -ur heimdal-1.3.1/kdc/Makefile.am heimdal-1.3.1-sbin/kdc/Makefile.am
---- heimdal-1.3.1/kdc/Makefile.am	2009-12-07 17:20:42.690503160 +0100
-+++ heimdal-1.3.1-sbin/kdc/Makefile.am	2009-12-07 17:21:16.991503983 +0100
-@@ -8,9 +8,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kdc/Makefile.am heimdal-7.7.0/kdc/Makefile.am
+--- heimdal-7.7.0.org/kdc/Makefile.am	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/kdc/Makefile.am	2021-05-10 00:32:51.412798762 +0200
+@@ -8,9 +8,7 @@ lib_LTLIBRARIES = libkdc.la
  
  bin_PROGRAMS = string2key
  
@@ -57,12 +58,12 @@ diff -ur heimdal-1.3.1/kdc/Makefile.am heimdal-1.3.1-sbin/kdc/Makefile.am
 -libexec_PROGRAMS = hprop hpropd kdc digest-service
 +sbin_PROGRAMS = kstash hprop hpropd kdc digest-service
  
- noinst_PROGRAMS = kdc-replay
+ noinst_PROGRAMS = kdc-replay kdc-tester
  
-diff -ur heimdal-1.3.1/kpasswd/Makefile.am heimdal-1.3.1-sbin/kpasswd/Makefile.am
---- heimdal-1.3.1/kpasswd/Makefile.am	2009-12-07 17:20:42.693503140 +0100
-+++ heimdal-1.3.1-sbin/kpasswd/Makefile.am	2009-12-07 17:20:32.708638409 +0100
-@@ -10,7 +10,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kpasswd/Makefile.am heimdal-7.7.0/kpasswd/Makefile.am
+--- heimdal-7.7.0.org/kpasswd/Makefile.am	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/kpasswd/Makefile.am	2021-05-10 00:32:51.412798762 +0200
+@@ -8,7 +8,7 @@ bin_PROGRAMS = kpasswd
  
  kpasswd_SOURCES = kpasswd.c kpasswd_locl.h
  
@@ -71,9 +72,10 @@ diff -ur heimdal-1.3.1/kpasswd/Makefile.am heimdal-1.3.1-sbin/kpasswd/Makefile.a
  
  noinst_PROGRAMS = kpasswd-generator
  
---- 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 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kuser/Makefile.am heimdal-7.7.0/kuser/Makefile.am
+--- heimdal-7.7.0.org/kuser/Makefile.am	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/kuser/Makefile.am	2021-05-10 00:32:51.412798762 +0200
+@@ -20,7 +20,7 @@ man_MANS = \
  	kimpersonate.8
  
  bin_PROGRAMS = kinit kdestroy kgetcred heimtools
@@ -82,10 +84,10 @@ diff -ur heimdal-1.3.1/kpasswd/Makefile.am heimdal-1.3.1-sbin/kpasswd/Makefile.a
  
  noinst_PROGRAMS = kverify kdecode_ticket generate-requests
  
-diff -ur heimdal-1.3.1/lib/kadm5/Makefile.am heimdal-1.3.1-sbin/lib/kadm5/Makefile.am
---- heimdal-1.3.1/lib/kadm5/Makefile.am	2009-12-07 17:20:42.696503142 +0100
-+++ heimdal-1.3.1-sbin/lib/kadm5/Makefile.am	2009-12-07 17:21:52.790508435 +0100
-@@ -10,7 +10,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/lib/kadm5/Makefile.am heimdal-7.7.0/lib/kadm5/Makefile.am
+--- heimdal-7.7.0.org/lib/kadm5/Makefile.am	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/lib/kadm5/Makefile.am	2021-05-10 00:32:51.412798762 +0200
+@@ -13,7 +13,7 @@ libkadm5clnt_la_LDFLAGS += $(LDFLAGS_VER
  libkadm5srv_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
  endif
  
@@ -94,7 +96,7 @@ diff -ur heimdal-1.3.1/lib/kadm5/Makefile.am heimdal-1.3.1-sbin/lib/kadm5/Makefi
  check_PROGRAMS = default_keys
  noinst_PROGRAMS = test_pw_quality
  
-@@ -25,8 +25,6 @@
+@@ -28,8 +28,6 @@ libkadm5srv_la_LIBADD = \
  libkadm5clnt_la_LIBADD = \
  	$(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken)
  
diff --git a/heimdal-signal.patch b/heimdal-signal.patch
index 62acd57..3c61809 100644
--- a/heimdal-signal.patch
+++ b/heimdal-signal.patch
@@ -1,7 +1,8 @@
---- heimdal-0.7.2/lib/roken/roken-common.h.orig	2005-04-27 14:17:53.000000000 +0200
-+++ heimdal-0.7.2/lib/roken/roken-common.h	2006-12-31 16:37:55.266203195 +0100
-@@ -260,6 +260,7 @@
- #ifndef IRIX4 /* fix for compiler bug */
+diff -urNp -x '*.orig' heimdal-7.7.0.org/lib/roken/roken-common.h heimdal-7.7.0/lib/roken/roken-common.h
+--- heimdal-7.7.0.org/lib/roken/roken-common.h	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/lib/roken/roken-common.h	2021-05-10 00:32:28.783798762 +0200
+@@ -294,7 +294,8 @@ ROKEN_CPP_START
+ #ifndef _WIN32
  #ifdef RETSIGTYPE
  typedef RETSIGTYPE (*SigAction)(int);
 -SigAction signal(int iSig, SigAction pAction); /* BSD compatible */
@@ -9,32 +10,19 @@
 +SigAction ROKEN_LIB_FUNCTION signal(int iSig, SigAction pAction); /* BSD compatible */
  #endif
  #endif
-
---- heimdal-0.7.2/lib/sl/sl.c.orig	2005-05-09 17:31:43.000000000 +0200
-+++ heimdal-0.7.2/lib/sl/sl.c	2006-12-31 17:32:01.759210289 +0100
-@@ -39,6 +39,11 @@
- #include "sl_locl.h"
- #include <setjmp.h>
- 
-+/* take it from glibc (libsl and libss are not linked with libroken) */
-+#ifdef signal
-+#undef signal
-+#endif
-+
- static void
- mandoc_template(SL_cmd *cmds,
- 		const char *extra_string)
---- heimdal-1.3.1/lib/roken/version-script.map~	2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1/lib/roken/version-script.map	2009-12-07 16:32:09.258566019 +0100
-@@ -87,6 +87,7 @@
- 		rk_readv;
- 		rk_realloc;
+ #endif
+diff -urNp -x '*.orig' heimdal-7.7.0.org/lib/roken/version-script.map heimdal-7.7.0/lib/roken/version-script.map
+--- heimdal-7.7.0.org/lib/roken/version-script.map	2019-06-07 08:21:35.000000000 +0200
++++ heimdal-7.7.0/lib/roken/version-script.map	2021-05-10 00:32:28.784798762 +0200
+@@ -95,6 +95,7 @@ HEIMDAL_ROKEN_1.0 {
+ 		rk_strerror;
+ 		rk_strerror_r;
  		rk_setprogname;
 +		rk_signal;
  		rk_simple_execle;
  		rk_simple_execlp;
  		rk_simple_execve;
-@@ -171,7 +172,6 @@
+@@ -183,7 +184,6 @@ HEIMDAL_ROKEN_1.0 {
  		rtbl_set_flags;
  		rtbl_set_prefix;
  		rtbl_set_separator;
@@ -42,3 +30,18 @@
  		simple_execl;
  		tm2time;
  		unix_verify_user;
+diff -urNp -x '*.orig' heimdal-7.7.0.org/lib/sl/sl.c heimdal-7.7.0/lib/sl/sl.c
+--- heimdal-7.7.0.org/lib/sl/sl.c	2016-12-20 15:23:06.000000000 +0100
++++ heimdal-7.7.0/lib/sl/sl.c	2021-05-10 00:32:28.784798762 +0200
+@@ -36,6 +36,11 @@
+ #include "sl_locl.h"
+ #include <setjmp.h>
+ 
++/* take it from glibc (libsl and libss are not linked with libroken) */
++#ifdef signal
++#undef signal
++#endif
++
+ static void
+ mandoc_template(SL_cmd *cmds,
+ 		const char *extra_string)
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list