pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/heimdal
Module Name: pkgsrc
Committed By: sevan
Date: Tue Nov 27 23:36:00 UTC 2018
Modified Files:
pkgsrc/security/heimdal: Makefile distinfo
pkgsrc/security/heimdal/patches: patch-ad patch-lib_libedit_configure
Log Message:
Support Minix.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/security/heimdal/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/heimdal/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/heimdal/patches/patch-ad
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/security/heimdal/patches/patch-lib_libedit_configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/heimdal/Makefile
diff -u pkgsrc/security/heimdal/Makefile:1.127 pkgsrc/security/heimdal/Makefile:1.128
--- pkgsrc/security/heimdal/Makefile:1.127 Fri Jul 20 03:33:55 2018
+++ pkgsrc/security/heimdal/Makefile Tue Nov 27 23:36:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2018/07/20 03:33:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.128 2018/11/27 23:36:00 sevan Exp $
DISTNAME= heimdal-1.5.3
PKGREVISION= 18
@@ -124,6 +124,11 @@ PLIST.vis= yes
PTHREAD_AUTO_VARS= yes
.endif
+.if ${OPSYS} == "Minix"
+# all of the tools need to link against pthread, force it.
+PTHREAD_AUTO_VARS= yes
+.endif
+
.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/security/heimdal/distinfo
diff -u pkgsrc/security/heimdal/distinfo:1.45 pkgsrc/security/heimdal/distinfo:1.46
--- pkgsrc/security/heimdal/distinfo:1.45 Wed Nov 4 01:17:46 2015
+++ pkgsrc/security/heimdal/distinfo Tue Nov 27 23:36:00 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.45 2015/11/04 01:17:46 agc Exp $
+$NetBSD: distinfo,v 1.46 2018/11/27 23:36:00 sevan Exp $
SHA1 (heimdal-1.5.3.tar.gz) = 23f39a099ae862dce1f5f4e5c3720861849a4bd0
RMD160 (heimdal-1.5.3.tar.gz) = 834660b4c0fe81a3aac4ffd9d8d37d74add1fa70
SHA512 (heimdal-1.5.3.tar.gz) = 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431
Size (heimdal-1.5.3.tar.gz) = 6798305 bytes
-SHA1 (patch-ad) = 1768f055dbdb6e7ed958dec34a0eb7e466712e38
+SHA1 (patch-ad) = 24acb603565e3c03acde37c0120ba25ef2bf27e1
SHA1 (patch-al) = 0cea9e7d48f2796b6856d9ef4512cfddcb5bfd03
SHA1 (patch-cf_install-catman.sh) = 72f3ffa374fb63dcaa89dec288936ecfff1b5228
SHA1 (patch-cf_libtool.m4) = ffc6c28e13051976c8c25a0f1e486ba7d693facc
@@ -13,7 +13,7 @@ SHA1 (patch-cf_roken-frag.m4) = 599216f2
SHA1 (patch-kdc_version-script.map) = bef9c33f2e4f4faa61771e2c462e43f1a56d0fb0
SHA1 (patch-lib_ipc_server.c) = fa806b549ed5cb3c4427e3865642e6d9555a59b0
SHA1 (patch-lib_libedit_aclocal.m4) = a556a5e2afab645263d3413422fc2e0a9825956b
-SHA1 (patch-lib_libedit_configure) = 54f92775849874b748e88e8f8923cc187cec5bae
+SHA1 (patch-lib_libedit_configure) = f7b0ce50a722d1320b01ef2bd97abb16b447d22f
SHA1 (patch-lib_libedit_configure.ac) = 3c6122731b47cb94a488874b3e8d35f3a0bee3b1
SHA1 (patch-lib_libedit_src_unvis.c) = 117c91ead1ca94aaed38c2d0611588fec6746d61
SHA1 (patch-lib_libedit_src_vis.c) = ade98e513187c3fa03194909409a9bb23f66509a
Index: pkgsrc/security/heimdal/patches/patch-ad
diff -u pkgsrc/security/heimdal/patches/patch-ad:1.15 pkgsrc/security/heimdal/patches/patch-ad:1.16
--- pkgsrc/security/heimdal/patches/patch-ad:1.15 Sat Jul 11 04:26:57 2015
+++ pkgsrc/security/heimdal/patches/patch-ad Tue Nov 27 23:36:00 2018
@@ -1,11 +1,36 @@
-$NetBSD: patch-ad,v 1.15 2015/07/11 04:26:57 rodent Exp $
+$NetBSD: patch-ad,v 1.16 2018/11/27 23:36:00 sevan Exp $
* GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
* OpenBSD's vish requires stdlib.h.
+* Support Minix
---- configure.orig 2012-12-09 22:09:32.000000000 +0000
+--- configure.orig Sun Dec 9 22:09:32 2012
+++ configure
-@@ -6779,7 +6779,7 @@ ia64-*-hpux*)
+@@ -5210,7 +5210,7 @@ else
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | minix*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -5702,12 +5702,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
+- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+- else
+- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+- fi
++netbsd* | minix*)
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+ ;;
+
+ newos6*)
+@@ -6779,7 +6775,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -14,7 +39,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
-@@ -6791,7 +6791,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6791,7 +6787,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -23,7 +48,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
-@@ -6810,7 +6810,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6810,7 +6806,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
*64-bit*)
case $host in
@@ -32,7 +57,29 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
LD="${LD-ld} -m elf_x86_64_fbsd"
;;
x86_64-*linux*)
-@@ -9567,29 +9567,6 @@ fi
+@@ -9130,14 +9126,13 @@ _LT_EOF
+ fi
+ ;;
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+- wlarc=
+- else
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- fi
++ netbsd* | minix*)
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ output_verbose_link_cmd=func_echo_all
+ ;;
+
+ solaris*)
+@@ -9567,29 +9562,6 @@ fi
hardcode_shlibpath_var=no
;;
@@ -62,7 +109,28 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10561,10 +10538,6 @@ dgux*)
+@@ -9763,15 +9735,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+- else
+- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+- fi
+- hardcode_libdir_flag_spec='-R$libdir'
++ netbsd* | minix*)
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
++ output_verbose_link_cmd=func_echo_all
+ ;;
+
+ newsos6)
+@@ -10561,10 +10531,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -73,7 +141,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10572,7 +10545,6 @@ freebsd* | dragonfly*)
+@@ -10572,7 +10538,6 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -81,7 +149,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
*) objformat=elf ;;
esac
fi
-@@ -10590,18 +10562,6 @@ freebsd* | dragonfly*)
+@@ -10590,18 +10555,6 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -100,7 +168,26 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
*) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
-@@ -12702,7 +12662,11 @@ fi #if test -n "$GCC"; then
+@@ -10799,6 +10752,18 @@ fi
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++minix*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Minix ld.elf_so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -12702,7 +12667,11 @@ fi #if test -n "$GCC"; then
esac
CC="$CC $abi"
@@ -113,7 +200,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
-@@ -14227,7 +14191,7 @@ case "$host" in
+@@ -14227,7 +14196,7 @@ case "$host" in
native_pthread_support="netbsd 3 uses explict pthread"
PTHREAD_LIBADD="-lpthread"
;;
@@ -122,7 +209,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
native_pthread_support=yes
PTHREAD_LIBADD="-pthread"
;;
-@@ -14245,7 +14209,7 @@ case "$host" in
+@@ -14245,7 +14214,7 @@ case "$host" in
;;
esac
;;
@@ -131,7 +218,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
native_pthread_support=yes
PTHREAD_CFLAGS=-pthread
PTHREAD_LIBADD=-pthread
-@@ -16057,6 +16021,7 @@ fi
+@@ -16057,6 +16026,7 @@ fi
for ac_header in vis.h
do :
ac_fn_c_check_header_compile "$LINENO" "vis.h" "ac_cv_header_vis_h" "
@@ -139,7 +226,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#ifndef VIS_SP
#error invis
-@@ -20473,6 +20438,7 @@ else
+@@ -20473,6 +20443,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -147,7 +234,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20510,6 +20476,7 @@ else
+@@ -20510,6 +20481,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -155,7 +242,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20547,6 +20514,7 @@ else
+@@ -20547,6 +20519,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -163,7 +250,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20584,6 +20552,7 @@ else
+@@ -20584,6 +20557,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -171,7 +258,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20621,6 +20590,7 @@ else
+@@ -20621,6 +20595,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -179,7 +266,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20658,6 +20628,7 @@ else
+@@ -20658,6 +20633,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -187,7 +274,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20695,6 +20666,7 @@ else
+@@ -20695,6 +20671,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
@@ -195,7 +282,7 @@ $NetBSD: patch-ad,v 1.15 2015/07/11 04:2
#include <vis.h>
#endif
struct foo { int foo; } xx;
-@@ -20732,6 +20704,7 @@ else
+@@ -20732,6 +20709,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_VIS_H
Index: pkgsrc/security/heimdal/patches/patch-lib_libedit_configure
diff -u pkgsrc/security/heimdal/patches/patch-lib_libedit_configure:1.2 pkgsrc/security/heimdal/patches/patch-lib_libedit_configure:1.3
--- pkgsrc/security/heimdal/patches/patch-lib_libedit_configure:1.2 Sat Jul 11 04:26:57 2015
+++ pkgsrc/security/heimdal/patches/patch-lib_libedit_configure Tue Nov 27 23:36:00 2018
@@ -1,10 +1,97 @@
-$NetBSD: patch-lib_libedit_configure,v 1.2 2015/07/11 04:26:57 rodent Exp $
+$NetBSD: patch-lib_libedit_configure,v 1.3 2018/11/27 23:36:00 sevan Exp $
Include termcap in the termcap test
+Support Minix
---- lib/libedit/configure.orig 2012-12-09 22:09:25.000000000 +0000
+--- lib/libedit/configure.orig Sun Dec 9 22:09:25 2012
+++ lib/libedit/configure
-@@ -11603,7 +11603,50 @@ test -n "$NROFF" || NROFF="/bin/false"
+@@ -4877,7 +4877,7 @@ else
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | minix*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -5369,12 +5369,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
+- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+- else
+- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+- fi
++netbsd* | minix*)
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+ ;;
+
+ newos6*)
+@@ -8661,14 +8657,13 @@ _LT_EOF
+ fi
+ ;;
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+- wlarc=
+- else
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- fi
++ netbsd* | minix*)
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ output_verbose_link_cmd=func_echo_all
+ ;;
+
+ solaris*)
+@@ -9294,15 +9289,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+- else
+- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+- fi
+- hardcode_libdir_flag_spec='-R$libdir'
++ netbsd* | minix*)
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
++ output_verbose_link_cmd=func_echo_all
+ ;;
+
+ newsos6)
+@@ -10330,6 +10323,18 @@ fi
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++minix*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Minix ld.elf_so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -11603,7 +11608,50 @@ test -n "$NROFF" || NROFF="/bin/false"
@@ -55,7 +142,7 @@ Include termcap in the termcap test
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
$as_echo_n "checking for tgetent in -lcurses... " >&6; }
if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
-@@ -11692,11 +11735,12 @@ _ACEOF
+@@ -11692,11 +11740,12 @@ _ACEOF
LIBS="-lncurses $LIBS"
else
Home |
Main Index |
Thread Index |
Old Index