summaryrefslogtreecommitdiff
path: root/multilib/lib32-heimdal
diff options
context:
space:
mode:
Diffstat (limited to 'multilib/lib32-heimdal')
-rw-r--r--multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch10
-rw-r--r--multilib/lib32-heimdal/002_all_heimal-fPIC.patch12
-rw-r--r--multilib/lib32-heimdal/003_all_heimdal-rxapps.patch22
-rw-r--r--multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch20
-rw-r--r--multilib/lib32-heimdal/012_all_heimdal-berkdb.patch124
-rw-r--r--multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch11
-rw-r--r--multilib/lib32-heimdal/014_all_heimdal-path.patch50
-rw-r--r--multilib/lib32-heimdal/PKGBUILD69
8 files changed, 0 insertions, 318 deletions
diff --git a/multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch b/multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch
deleted file mode 100644
index a551bdce1..000000000
--- a/multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4 2005-06-16 18:28:32.000000000 +0200
-+++ cf/krb-readline.m4 2005-06-27 23:17:06.000000000 +0200
-@@ -6,7 +6,6 @@
- dnl el_init
-
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
diff --git a/multilib/lib32-heimdal/002_all_heimal-fPIC.patch b/multilib/lib32-heimdal/002_all_heimal-fPIC.patch
deleted file mode 100644
index c67dbae76..000000000
--- a/multilib/lib32-heimdal/002_all_heimal-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am 2005-06-16 18:28:44.000000000 +0200
-+++ lib/editline/Makefile.am 2005-06-27 23:21:02.000000000 +0200
-@@ -41,6 +41,9 @@
-
- EXTRA_DIST = $(man_MANS)
-
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- $(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/multilib/lib32-heimdal/003_all_heimdal-rxapps.patch b/multilib/lib32-heimdal/003_all_heimdal-rxapps.patch
deleted file mode 100644
index 40fc05f08..000000000
--- a/multilib/lib32-heimdal/003_all_heimdal-rxapps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/kx/rxtelnet.in 2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxtelnet.in 2005-06-27 23:21:34.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
- while true
---- appl/kx/rxterm.in 2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxterm.in 2005-06-27 23:21:55.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
diff --git a/multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch b/multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch
deleted file mode 100644
index 35a9ed9f6..000000000
--- a/multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/su/Makefile.am 2005-06-16 18:27:46.000000000 +0200
-+++ appl/su/Makefile.am 2005-06-27 23:25:21.000000000 +0200
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c supaths.h
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
-
- LDADD = $(LIB_kafs) \
---- appl/otp/Makefile.am 2005-06-16 18:28:46.000000000 +0200
-+++ appl/otp/Makefile.am 2005-06-27 23:25:40.000000000 +0200
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
-
- man_MANS = otp.1 otpprint.1
-
diff --git a/multilib/lib32-heimdal/012_all_heimdal-berkdb.patch b/multilib/lib32-heimdal/012_all_heimdal-berkdb.patch
deleted file mode 100644
index 46762c220..000000000
--- a/multilib/lib32-heimdal/012_all_heimdal-berkdb.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ
-Index: heimdal/cf/db.m4
-===================================================================
---- heimdal.orig/cf/db.m4
-+++ heimdal/cf/db.m4
-@@ -18,24 +18,13 @@ db_type=unknown
-
- if test "$enable_berkeley_db" != no; then
-
-- AC_CHECK_HEADERS([ \
-- db4/db.h \
-- db3/db.h \
-- db.h \
-- db_185.h \
-- ])
-+ AC_CHECK_HEADERS([db.h])
-
- dnl db_create is used by db3 and db4
-
-- AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
-+ AC_FIND_FUNC_NO_LIBS(db_create, db, [
- #include <stdio.h>
-- #ifdef HAVE_DB4_DB_H
-- #include <db4/db.h>
-- #elif defined(HAVE_DB3_DB_H)
-- #include <db3/db.h>
-- #else
- #include <db.h>
-- #endif
- ],[NULL, NULL, 0])
-
- if test "$ac_cv_func_db_create" = "yes"; then
-@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4
-
- dnl dbopen is used by db1/db2
-
-- AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [
-+ AC_FIND_FUNC_NO_LIBS(dbopen, db, [
- #include <stdio.h>
-- #if defined(HAVE_DB2_DB_H)
-- #include <db2/db.h>
-- #elif defined(HAVE_DB_185_H)
-- #include <db_185.h>
-- #elif defined(HAVE_DB_H)
- #include <db.h>
-- #else
-- #error no db.h
-- #endif
- ],[NULL, 0, 0, 0, NULL])
-
- if test "$ac_cv_func_dbopen" = "yes"; then
-Index: heimdal/lib/hdb/db.c
-===================================================================
---- heimdal.orig/lib/hdb/db.c
-+++ heimdal/lib/hdb/db.c
-@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59:
-
- #if HAVE_DB1
-
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
- #include <db.h>
--#endif
-
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/hdb/db3.c
-===================================================================
---- heimdal.orig/lib/hdb/db3.c
-+++ heimdal/lib/hdb/db3.c
-@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10
-
- #if HAVE_DB3
-
--#ifdef HAVE_DB4_DB_H
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
-
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/roken/getcap.c
-===================================================================
---- heimdal.orig/lib/roken/getcap.c
-+++ heimdal/lib/roken/getcap.c
-@@ -38,11 +38,13 @@
- #include "roken.h"
- RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $");
-
-+#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
-+#define USE_DB
-+#endif
-+
- #include <sys/types.h>
- #include <ctype.h>
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
-+#ifdef USE_DB
- #include <db.h>
- #endif
- #include <errno.h>
-Index: heimdal/lib/roken/ndbm_wrap.c
-===================================================================
---- heimdal.orig/lib/roken/ndbm_wrap.c
-+++ heimdal/lib/roken/ndbm_wrap.c
-@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17
- #endif
-
- #include "ndbm_wrap.h"
--#if defined(HAVE_DB4_DB_H)
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
-
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch b/multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch
deleted file mode 100644
index 19f879407..000000000
--- a/multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-0.7.1/cf/pthreads.m4.old 2005-09-09 12:12:28.000000000 +0000
-+++ heimdal-0.7.1/cf/pthreads.m4 2005-09-17 22:23:23.000000000 +0000
-@@ -32,7 +32,7 @@
- 2.*)
- native_pthread_support=yes
- PTHREADS_CFLAGS=-pthread
-- PTHREADS_LIBS=-pthread
-+ PTHREADS_LIBS=-lpthread
- ;;
- esac
- ;;
diff --git a/multilib/lib32-heimdal/014_all_heimdal-path.patch b/multilib/lib32-heimdal/014_all_heimdal-path.patch
deleted file mode 100644
index 36a86f1f9..000000000
--- a/multilib/lib32-heimdal/014_all_heimdal-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/rcp/rcp.c.old 2006-05-03 13:31:59.398493625 +0200
-+++ appl/rcp/rcp.c 2006-05-03 13:32:04.494485981 +0200
-@@ -34,7 +34,7 @@
- #include "rcp_locl.h"
- #include <getarg.h>
-
--#define RSH_PROGRAM "rsh"
-+#define RSH_PROGRAM "krsh"
-
- struct passwd *pwd;
- uid_t userid;
---- appl/rcp/rcp_locl.h.old 2006-05-03 02:30:31.602025409 +0200
-+++ appl/rcp/rcp_locl.h 2006-05-03 02:30:35.886018983 +0200
-@@ -64,4 +64,4 @@
- #define _PATH_CP "/bin/cp"
- #endif
- #undef _PATH_RSH
--#define _PATH_RSH BINDIR "/rsh"
-+#define _PATH_RSH BINDIR "/krsh"
---- appl/telnet/telnetd/telnetd.h.old 2006-05-03 02:23:14.582680939 +0200
-+++ appl/telnet/telnetd/telnetd.h 2006-05-03 02:23:23.746667193 +0200
-@@ -192,7 +192,7 @@
- #endif
-
- #undef _PATH_LOGIN
--#define _PATH_LOGIN BINDIR "/login"
-+#define _PATH_LOGIN BINDIR "/klogin"
-
- /* fallbacks */
-
---- appl/login/shadow.c.old 2006-05-05 06:31:29.517138115 +0200
-+++ appl/login/shadow.c 2006-05-05 06:32:26.433052741 +0200
-@@ -38,7 +38,7 @@
- #ifdef HAVE_SHADOW_H
-
- #ifndef _PATH_CHPASS
--#define _PATH_CHPASS "/usr/bin/passwd"
-+#define _PATH_CHPASS "/usr/bin/kpasswd"
- #endif
-
- static int
-@@ -52,7 +52,7 @@
- printf("fork /bin/passwd");
- exit(1);
- case 0:
-- execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0);
-+ execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0);
- exit(1);
- default:
- waitpid(pid, &status, 0);
diff --git a/multilib/lib32-heimdal/PKGBUILD b/multilib/lib32-heimdal/PKGBUILD
deleted file mode 100644
index a60499d78..000000000
--- a/multilib/lib32-heimdal/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 26560 2010-09-15 22:34:46Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: webjdm <web.jdm@gmail.com>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=heimdal
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.3
-pkgrel=3
-pkgdesc="Implementation of Kerberos V5 libraries (32-bit)"
-arch=('x86_64')
-url="http://www.h5l.org/"
-license=('custom')
-depends=('lib32-e2fsprogs' 'lib32-openssl' 'lib32-db' lib32-sqlite3 $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool' '!emptydirs')
-source=(http://www.h5l.org/dist/src/${_pkgbasename}-${pkgver}.tar.gz
- 001_all_heimdal-no_libedit.patch
- 002_all_heimal-fPIC.patch
- 003_all_heimdal-rxapps.patch
- 005_all_heimdal-suid_fix.patch
- 012_all_heimdal-berkdb.patch
- 013_all_heimdal-pthread-lib.patch
- 014_all_heimdal-path.patch)
-md5sums=('963c09f1b14c41660be70b55fae9f163'
- '98e28f11f906c967aac22d6184102c9e'
- '6d5571bdedba2e2423b90bccdbac2c0a'
- '2feec3924ee5230b54175b4d4000c872'
- '45aeb207f360f9f4e9e0fabc8bfeecbc'
- '56f5d10d0ec40f2fda82ef144ffac1e0'
- '1b8665b771c4eb6b56ea8582c96e56e3'
- '8208ae8c0b6ff5ab4f64af1693e9e396')
-
-build() {
- cd ${srcdir}/heimdal-${pkgver}
- patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch
- patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch
- patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch
- patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch
- patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch
- patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch
- patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- libtoolize --force
- aclocal -I cf
- autoconf
- automake
-
- ./configure --prefix=/usr --enable-shared=yes --without-x \
- --libdir=/usr/lib32 \
- --with-openssl-lib=/usr/lib32 \
- --with-readline-lib=/usr/lib32 \
- --with-readline-include=/usr/include/readline \
- --with-sqlite3-lib=/usr/lib32 \
- --with-sqlite3-include=/usr/include
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{etc,bin,sbin,include,share,libexec}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}