Forgotten patches. Sorry for the inconvenience caused.

This commit is contained in:
is 2010-05-03 10:17:05 +00:00
parent b857f25651
commit 76ae3714ff
3 changed files with 13 additions and 80 deletions

View file

@ -1,58 +0,0 @@
$NetBSD: patch-ab,v 1.10 2007/12/09 23:38:31 wiz Exp $
--- configure.orig 2006-02-27 16:36:50.000000000 +0000
+++ configure
@@ -5940,7 +5940,7 @@ if [ $host_os3 = hpux ] ; then
fi
-if [ $host_vendor = linux ] ; then
+if [ "$host_vendor" = linux ] ; then
LDFLAGS="$LDFLAGS -z"
fi
@@ -6223,7 +6223,7 @@ else
# It would also be nice to do this for all -L options, not just this one.
if test -n "$x_libraries"; then
- X_LIBS="$X_LIBS -L$x_libraries"
+ X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
case `(uname -sr) 2>/dev/null` in
@@ -7283,7 +7283,7 @@ fi
# Check for libraries that X11R6 Xt/Xaw programs need.
ac_save_LDFLAGS=$LDFLAGS
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
# check for ICE first), but we must link in the order -lSM -lICE or
# we get undefined symbols. So assume we have SM if we have ICE.
@@ -7740,6 +7740,8 @@ if test X$use_floppyd = Xyes; then
fi
FLOPPYD="floppyd floppyd_installtest"
BINFLOPPYD="\$(DESTDIR)\$(bindir)/floppyd \$(DESTDIR)\$(bindir)/floppyd_installtest"
+ MANFLOPPYD="floppyd.1"
+ MANFLOPPYD_INSTTEST="floppyd_installtest.1"
cat >>confdefs.h <<\_ACEOF
#define USE_FLOPPYD 1
@@ -7748,6 +7750,8 @@ _ACEOF
else
FLOPPYD=
BINFLOPPYD=
+ MANFLOPPYD=
+ MANFLOPPYD_INSTTEST=
fi
@@ -8403,6 +8407,8 @@ s,@X_LIBS@,$X_LIBS,;t t
s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
s,@FLOPPYD@,$FLOPPYD,;t t
s,@BINFLOPPYD@,$BINFLOPPYD,;t t
+s%@MANFLOPPYD@%$MANFLOPPYD%g
+s%@MANFLOPPYD_INSTTEST@%$MANFLOPPYD_INSTTEST%g
s,@extraincludedir@,$extraincludedir,;t t
s,@extralibdir@,$extralibdir,;t t
s,@MACHDEPLIBS@,$MACHDEPLIBS,;t t

View file

@ -1,22 +0,0 @@
$NetBSD: patch-ac,v 1.7 2003/12/11 16:05:40 adam Exp $
--- floppyd.c.orig 2002-11-02 10:55:24.000000000 +0000
+++ floppyd.c
@@ -583,7 +583,7 @@ static uid_t getuserid(char *user)
}
else
{
- uid = 65535;
+ uid = getuserid("nobody");
}
#if DEBUG
@@ -609,7 +609,7 @@ static uid_t getgroupid(uid_t uid)
}
else
{
- gid = 65535;
+ gid = getgroupid(uid);
}
#if DEBUG

View file

@ -0,0 +1,13 @@
$NetBSD: patch-af,v 1.4 2010/05/03 10:17:05 is Exp $
--- charsetConv.c.orig 2008-11-18 21:33:11.000000000 +0000
+++ charsetConv.c
@@ -265,7 +265,7 @@ static void initialize_to_native(void)
*/
int wchar_to_native(const wchar_t *wchar, char *native, size_t len)
{
-#ifdef HAVE_ICONV_H
+#if defined(HAVE_ICONV_H) && defined(__linux__)
int mangled;
int r;
initialize_to_native();