cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strl* fixes corresponding to those in devel/gettext; ok brad

Browse Source
This commit is contained in:
naddy 2007-08-25 13:51:08 +00:00
parent 56b1ef38ba
commit 55b2430e45
8 changed files with 56 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
converters/libiconv/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2006/10/28 11:19:20 espie Exp $
# $OpenBSD: Makefile,v 1.27 2007/08/25 13:51:08 naddy Exp $
COMMENT= "character set conversion library"
COMMENT= character set conversion library
DISTNAME= libiconv-1.9.2
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
SHARED_LIBS += charset 1.0 # .1.0
@ -11,7 +11,7 @@ SHARED_LIBS += iconv 4.0 # .4.0
HOMEPAGE= http://www.gnu.org/software/libiconv/
MAINTAINER= Brad Smith <brad@openbsd.org>
MAINTAINER= Brad Smith <brad@comstyle.com>
# LGPL
PERMIT_PACKAGE_CDROM= Yes

62
converters/libiconv/patches/patch-autoconf_ltmain_sh
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-autoconf_ltmain_sh,v 1.8 2003/12/24 00:08:02 brad Exp $
--- autoconf/ltmain.sh.orig 2003-04-15 19:22:56.000000000 -0400
+++ autoconf/ltmain.sh 2003-12-21 13:36:54.000000000 -0500
@@ -668,8 +668,6 @@ EOF
if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
exit $status
fi
- $show "chmod 777 ${xdir}$objdir"
- $run chmod 777 ${xdir}$objdir
fi
if test -z "$output_obj"; then
@@ -1696,8 +1694,6 @@ EOF
if test "$status" -ne 0 && test ! -d "$output_objdir"; then
exit $status
fi
- $show "chmod 777 $output_objdir"
- $run chmod 777 $output_objdir
fi
# Determine the type of output
@@ -5700,40 +5696,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;

8
converters/libiconv/patches/patch-lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.9 2005/12/24 16:11:52 espie Exp $
$OpenBSD: patch-lib_Makefile_in,v 1.10 2007/08/25 13:51:08 naddy Exp $
--- lib/Makefile.in.orig Sun May 18 16:19:16 2003
+++ lib/Makefile.in Sat Dec 24 17:04:04 2005
@@ -26,7 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=comp
+++ lib/Makefile.in Wed Aug 1 18:35:06 2007
@@ -26,7 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
LIBTOOL_LINK = $(LIBTOOL) --mode=link
LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.9 2005/12/24 16:11:52 espie Exp $
MV = mv
LN = @LN@
LN_S = @LN_S@
@@ -55,8 +55,10 @@ OBJECTS = iconv.lo localcharset.lo reloc
@@ -55,8 +55,10 @@ OBJECTS = iconv.lo localcharset.lo relocatable.lo
all : @PLUGLIB@ libiconv.la

8
converters/libiconv/patches/patch-lib_iconv_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_iconv_c,v 1.1 2005/04/16 21:10:22 espie Exp $
--- lib/iconv.c.orig Mon Apr 11 12:05:11 2005
+++ lib/iconv.c Mon Apr 11 12:05:30 2005
@@ -406,7 +406,7 @@ iconv_t iconv_open (const char* tocode,
$OpenBSD: patch-lib_iconv_c,v 1.2 2007/08/25 13:51:08 naddy Exp $
--- lib/iconv.c.orig Thu May 22 21:17:40 2003
+++ lib/iconv.c Wed Aug 1 18:35:03 2007
@@ -406,7 +406,7 @@ iconv_t iconv_open (const char* tocode, const char* fr
/* Initialize additional fields. */
if (from_wchar != to_wchar) {
struct wchar_conv_struct * wcd = (struct wchar_conv_struct *) cd;

26
converters/libiconv/patches/patch-lib_relocatable_c Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-lib_relocatable_c,v 1.1 2007/08/25 13:51:08 naddy Exp $
--- lib/relocatable.c.orig Fri Aug 1 18:24:10 2003
+++ lib/relocatable.c Wed Aug 1 19:31:16 2007
@@ -429,15 +429,19 @@ relocate (const char *pathname)
{
/* pathname starts with orig_prefix. */
const char *pathname_tail = &pathname[orig_prefix_len];
- char *result =
- (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
+ size_t len;
+ char *result;
+
+ len = curr_prefix_len + strlen (pathname_tail) + 1;
+ result = (char *) xmalloc (len);
#ifdef NO_XMALLOC
if (result != NULL)
#endif
{
memcpy (result, curr_prefix, curr_prefix_len);
- strcpy (result + curr_prefix_len, pathname_tail);
+ result[curr_prefix_len] = '\0';
+ strlcat (result, pathname_tail, len);
return result;
}
}

62
converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-libcharset_autoconf_ltmain_sh,v 1.8 2003/12/24 00:08:02 brad Exp $
--- libcharset/autoconf/ltmain.sh.orig 2003-04-15 19:22:56.000000000 -0400
+++ libcharset/autoconf/ltmain.sh 2003-12-21 13:36:54.000000000 -0500
@@ -668,8 +668,6 @@ EOF
if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
exit $status
fi
- $show "chmod 777 ${xdir}$objdir"
- $run chmod 777 ${xdir}$objdir
fi
if test -z "$output_obj"; then
@@ -1696,8 +1694,6 @@ EOF
if test "$status" -ne 0 && test ! -d "$output_objdir"; then
exit $status
fi
- $show "chmod 777 $output_objdir"
- $run chmod 777 $output_objdir
fi
# Determine the type of output
@@ -5700,40 +5696,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;

6
converters/libiconv/patches/patch-libcharset_lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.6 2005/12/24 16:11:52 espie Exp $
$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.7 2007/08/25 13:51:08 naddy Exp $
--- libcharset/lib/Makefile.in.orig Mon Apr 14 15:51:06 2003
+++ libcharset/lib/Makefile.in Sat Dec 24 17:03:18 2005
@@ -26,6 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=comp
+++ libcharset/lib/Makefile.in Wed Aug 1 18:35:06 2007
@@ -26,6 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
LIBTOOL_LINK = $(LIBTOOL) --mode=link
LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall

15
converters/libiconv/patches/patch-libcharset_lib_localcharset_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libcharset_lib_localcharset_c,v 1.1 2007/08/25 13:51:08 naddy Exp $
--- libcharset/lib/localcharset.c.orig Fri Jun 27 14:08:47 2003
+++ libcharset/lib/localcharset.c Wed Aug 1 19:32:53 2007
@@ -186,8 +186,9 @@ get_charset_aliases ()
res_size = 0;
break;
}
- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
- strcpy (res_ptr + res_size - (l2 + 1), buf2);
+ strlcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1,
+ l1 + 1 + l2 + 1 + 1);
+ strlcpy (res_ptr + res_size - (l2 + 1), buf2, l2 + 1 + 1);
}
fclose (fp);
if (res_size == 0)