| 1 |
mueli 08/07/31 10:59:34 |
| 2 |
|
| 3 |
Added: heimdal-symlinked-manpages.patch |
| 4 |
heimdal-autoconf-ipv6-backport.patch |
| 5 |
Log: |
| 6 |
added patches - were missing in last commit :( |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-crypt/heimdal/files/heimdal-symlinked-manpages.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: heimdal-symlinked-manpages.patch |
| 16 |
=================================================================== |
| 17 |
diff -NaurwB heimdal-1.2.1rc1.orig/cf/install-catman.sh heimdal-1.2.1rc1/cf/install-catman.sh |
| 18 |
--- heimdal-1.2.1rc1.orig/cf/install-catman.sh 2008-05-31 16:38:43.000000000 +0200 |
| 19 |
+++ heimdal-1.2.1rc1/cf/install-catman.sh 2008-07-11 01:17:51.000000000 +0200 |
| 20 |
@@ -38,26 +38,18 @@ |
| 21 |
fi |
| 22 |
if test "$cmd" = install ; then |
| 23 |
target="$mandir/$link.$section" |
| 24 |
- for lncmd in "ln -f $mandir/$base.$section $target" \ |
| 25 |
- "ln -s $base.$section $target" \ |
| 26 |
- "cp -f $mandir/$base.$section $target" |
| 27 |
- do |
| 28 |
+ lncmd="ln -sf $mandir/$base.$section $target" |
| 29 |
if eval "$lncmd"; then |
| 30 |
eval echo "$lncmd" |
| 31 |
break |
| 32 |
fi |
| 33 |
- done |
| 34 |
if test "$catinstall" = yes -a -f "$srcdir/$c"; then |
| 35 |
target="$catdir/$link.$suffix" |
| 36 |
- for lncmd in "ln -f $catdir/$base.$suffix $target" \ |
| 37 |
- "ln -fs $base.$suffix $target" \ |
| 38 |
- "cp -f $catdir/$base.$suffix $target" |
| 39 |
- do |
| 40 |
+ lncmd="ln -sf $catdir/$base.$suffix $target" |
| 41 |
if eval "$lncmd"; then |
| 42 |
eval echo "$lncmd" |
| 43 |
break |
| 44 |
fi |
| 45 |
- done |
| 46 |
fi |
| 47 |
elif test "$cmd" = uninstall ; then |
| 48 |
target="$mandir/$link.$section" |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: heimdal-autoconf-ipv6-backport.patch |
| 58 |
=================================================================== |
| 59 |
Index: cf/krb-ipv6.m4 |
| 60 |
=================================================================== |
| 61 |
--- cf/krb-ipv6.m4 (revision 23011) |
| 62 |
+++ cf/krb-ipv6.m4 (working copy) |
| 63 |
@@ -2,94 +2,97 @@ |
| 64 |
dnl |
| 65 |
dnl test for IPv6 |
| 66 |
dnl |
| 67 |
+ac_cv_lib_ipv6=check |
| 68 |
+ |
| 69 |
AC_DEFUN([AC_KRB_IPV6], [ |
| 70 |
AC_ARG_WITH(ipv6, |
| 71 |
AS_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[ |
| 72 |
-if test "$withval" = "no"; then |
| 73 |
- ac_cv_lib_ipv6=no |
| 74 |
-fi]) |
| 75 |
+ ac_cv_lib_ipv6="$withval" |
| 76 |
+]) |
| 77 |
save_CFLAGS="${CFLAGS}" |
| 78 |
-AC_CACHE_CHECK([for IPv6 stack type], rk_cv_v6type, |
| 79 |
-[dnl check for different v6 implementations (by itojun) |
| 80 |
-v6type=unknown |
| 81 |
-v6lib=none |
| 82 |
|
| 83 |
-for i in v6d toshiba kame inria zeta linux; do |
| 84 |
- case $i in |
| 85 |
- v6d) |
| 86 |
- AC_EGREP_CPP(yes, [ |
| 87 |
+if test "X$ac_cv_lib_ipv6" != "Xno"; then |
| 88 |
+ |
| 89 |
+ AC_CACHE_CHECK([for IPv6 stack type], rk_cv_v6type, |
| 90 |
+ [dnl check for different v6 implementations (by itojun) |
| 91 |
+ v6type=unknown |
| 92 |
+ v6lib=none |
| 93 |
+ |
| 94 |
+ for i in v6d toshiba kame inria zeta linux; do |
| 95 |
+ case $i in |
| 96 |
+ v6d) |
| 97 |
+ AC_EGREP_CPP(yes, [ |
| 98 |
#include </usr/local/v6/include/sys/types.h> |
| 99 |
#ifdef __V6D__ |
| 100 |
yes |
| 101 |
#endif], |
| 102 |
- [v6type=$i; v6lib=v6; |
| 103 |
- v6libdir=/usr/local/v6/lib; |
| 104 |
- CFLAGS="-I/usr/local/v6/include $CFLAGS"]) |
| 105 |
- ;; |
| 106 |
- toshiba) |
| 107 |
- AC_EGREP_CPP(yes, [ |
| 108 |
+ [v6type=$i; v6lib=v6; |
| 109 |
+ v6libdir=/usr/local/v6/lib; |
| 110 |
+ CFLAGS="-I/usr/local/v6/include $CFLAGS"]) |
| 111 |
+ ;; |
| 112 |
+ toshiba) |
| 113 |
+ AC_EGREP_CPP(yes, [ |
| 114 |
#include <sys/param.h> |
| 115 |
#ifdef _TOSHIBA_INET6 |
| 116 |
yes |
| 117 |
#endif], |
| 118 |
- [v6type=$i; v6lib=inet6; |
| 119 |
- v6libdir=/usr/local/v6/lib; |
| 120 |
- CFLAGS="-DINET6 $CFLAGS"]) |
| 121 |
- ;; |
| 122 |
- kame) |
| 123 |
- AC_EGREP_CPP(yes, [ |
| 124 |
+ [v6type=$i; v6lib=inet6; |
| 125 |
+ v6libdir=/usr/local/v6/lib; |
| 126 |
+ CFLAGS="-DINET6 $CFLAGS"]) |
| 127 |
+ ;; |
| 128 |
+ kame) |
| 129 |
+ AC_EGREP_CPP(yes, [ |
| 130 |
#include <netinet/in.h> |
| 131 |
#ifdef __KAME__ |
| 132 |
yes |
| 133 |
#endif], |
| 134 |
- [v6type=$i; v6lib=inet6; |
| 135 |
- v6libdir=/usr/local/v6/lib; |
| 136 |
- CFLAGS="-DINET6 $CFLAGS"]) |
| 137 |
- ;; |
| 138 |
- inria) |
| 139 |
- AC_EGREP_CPP(yes, [ |
| 140 |
+ [v6type=$i; v6lib=inet6; |
| 141 |
+ v6libdir=/usr/local/v6/lib; |
| 142 |
+ CFLAGS="-DINET6 $CFLAGS"]) |
| 143 |
+ ;; |
| 144 |
+ inria) |
| 145 |
+ AC_EGREP_CPP(yes, [ |
| 146 |
#include <netinet/in.h> |
| 147 |
#ifdef IPV6_INRIA_VERSION |
| 148 |
yes |
| 149 |
#endif], |
| 150 |
- [v6type=$i; CFLAGS="-DINET6 $CFLAGS"]) |
| 151 |
- ;; |
| 152 |
- zeta) |
| 153 |
- AC_EGREP_CPP(yes, [ |
| 154 |
+ [v6type=$i; CFLAGS="-DINET6 $CFLAGS"]) |
| 155 |
+ ;; |
| 156 |
+ zeta) |
| 157 |
+ AC_EGREP_CPP(yes, [ |
| 158 |
#include <sys/param.h> |
| 159 |
#ifdef _ZETA_MINAMI_INET6 |
| 160 |
yes |
| 161 |
#endif], |
| 162 |
- [v6type=$i; v6lib=inet6; |
| 163 |
- v6libdir=/usr/local/v6/lib; |
| 164 |
- CFLAGS="-DINET6 $CFLAGS"]) |
| 165 |
- ;; |
| 166 |
- linux) |
| 167 |
- if test -d /usr/inet6; then |
| 168 |
- v6type=$i |
| 169 |
- v6lib=inet6 |
| 170 |
- v6libdir=/usr/inet6 |
| 171 |
- CFLAGS="-DINET6 $CFLAGS" |
| 172 |
- fi |
| 173 |
- ;; |
| 174 |
- esac |
| 175 |
- if test "$v6type" != "unknown"; then |
| 176 |
- break |
| 177 |
- fi |
| 178 |
-done |
| 179 |
- |
| 180 |
-if test "$v6lib" != "none"; then |
| 181 |
- for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do |
| 182 |
- if test -d $dir -a -f $dir/lib$v6lib.a; then |
| 183 |
- LIBS="-L$dir -l$v6lib $LIBS" |
| 184 |
+ [v6type=$i; v6lib=inet6; |
| 185 |
+ v6libdir=/usr/local/v6/lib; |
| 186 |
+ CFLAGS="-DINET6 $CFLAGS"]) |
| 187 |
+ ;; |
| 188 |
+ linux) |
| 189 |
+ if test -d /usr/inet6; then |
| 190 |
+ v6type=$i |
| 191 |
+ v6lib=inet6 |
| 192 |
+ v6libdir=/usr/inet6 |
| 193 |
+ CFLAGS="-DINET6 $CFLAGS" |
| 194 |
+ fi |
| 195 |
+ ;; |
| 196 |
+ esac |
| 197 |
+ if test "$v6type" != "unknown"; then |
| 198 |
break |
| 199 |
fi |
| 200 |
done |
| 201 |
-fi |
| 202 |
-]) |
| 203 |
|
| 204 |
-AC_CACHE_CHECK([for IPv6], rk_cv_lib_ipv6, [ |
| 205 |
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
| 206 |
+ if test "$v6lib" != "none"; then |
| 207 |
+ for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do |
| 208 |
+ if test -d $dir -a -f $dir/lib$v6lib.a; then |
| 209 |
+ LIBS="-L$dir -l$v6lib $LIBS" |
| 210 |
+ break |
| 211 |
+ fi |
| 212 |
+ done |
| 213 |
+ fi]) |
| 214 |
+ |
| 215 |
+ AC_CACHE_CHECK([for IPv6], rk_cv_lib_ipv6, [ |
| 216 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
| 217 |
#ifdef HAVE_SYS_TYPES_H |
| 218 |
#include <sys/types.h> |
| 219 |
#endif |
| 220 |
@@ -103,7 +106,7 @@ |
| 221 |
#include <netinet/in6.h> |
| 222 |
#endif |
| 223 |
]], |
| 224 |
-[[ |
| 225 |
+ [[ |
| 226 |
struct sockaddr_in6 sin6; |
| 227 |
int s; |
| 228 |
|
| 229 |
@@ -114,8 +117,10 @@ |
| 230 |
sin6.sin6_addr = in6addr_any; |
| 231 |
bind(s, (struct sockaddr *)&sin6, sizeof(sin6)); |
| 232 |
]])], |
| 233 |
-[ac_cv_lib_ipv6=yes], |
| 234 |
-[ac_cv_lib_ipv6=no])]) |
| 235 |
+ [ac_cv_lib_ipv6=yes], |
| 236 |
+ [ac_cv_lib_ipv6=no])]) |
| 237 |
+fi |
| 238 |
+ |
| 239 |
if test "$ac_cv_lib_ipv6" = yes; then |
| 240 |
AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.]) |
| 241 |
else |
| 242 |
Index: lib/roken/mini_inetd.c |
| 243 |
=================================================================== |
| 244 |
--- lib/roken/mini_inetd.c (revision 14773) |
| 245 |
+++ lib/roken/mini_inetd.c (working copy) |
| 246 |
@@ -83,10 +83,8 @@ |
| 247 |
|
| 248 |
for (i = 0, a = ai; a != NULL; a = a->ai_next) { |
| 249 |
fds[i] = socket (a->ai_family, a->ai_socktype, a->ai_protocol); |
| 250 |
- if (fds[i] < 0) { |
| 251 |
- warn ("socket af = %d", a->ai_family); |
| 252 |
+ if (fds[i] < 0) |
| 253 |
continue; |
| 254 |
- } |
| 255 |
socket_set_reuseaddr (fds[i], 1); |
| 256 |
if (bind (fds[i], a->ai_addr, a->ai_addrlen) < 0) { |
| 257 |
warn ("bind af = %d", a->ai_family); |
Archives