# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346171640 -7200 # Node ID afdc12167a5642ccd228dab26813efc7800f31ef # Parent e39a632d12f7ab9fc81991b21543e031b4e535b4 Import package vendor original specs for necessary manipulations. diff -r e39a632d12f7 -r afdc12167a56 libidn/libidn.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libidn/libidn.patch Tue Aug 28 18:34:00 2012 +0200 @@ -0,0 +1,91 @@ +Index: configure +--- configure.orig 2012-05-23 10:36:44.000000000 +0200 ++++ configure 2012-05-29 09:37:30.000000000 +0200 +@@ -4984,10 +4984,7 @@ + if $ac_preproc_ok; then : + + else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } ++ : + fi + + ac_ext=c +Index: contrib/doxygen/Doxyfile +Index: gl/error.c +--- gl/error.c.orig 2012-04-27 10:18:42.000000000 +0200 ++++ gl/error.c 2012-05-29 09:37:03.000000000 +0200 +@@ -28,7 +28,7 @@ + #include + #include + +-#if !_LIBC && ENABLE_NLS ++#if !_LIBC && defined(ENABLE_NLS) + # include "gettext.h" + # define _(msgid) gettext (msgid) + #endif +Index: gl/gettext.h +--- gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 ++++ gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 +@@ -19,7 +19,7 @@ + #define _LIBGETTEXT_H 1 + + /* NLS can be disabled through the configure --disable-nls option. */ +-#if ENABLE_NLS ++#ifdef ENABLE_NLS + + /* Get declarations of GNU message catalog functions. */ + # include +Index: lib/gl/gettext.h +--- lib/gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 ++++ lib/gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 +@@ -19,7 +19,7 @@ + #define _LIBGETTEXT_H 1 + + /* NLS can be disabled through the configure --disable-nls option. */ +-#if ENABLE_NLS ++#ifdef ENABLE_NLS + + /* Get declarations of GNU message catalog functions. */ + # include +Index: lib/gl/stdint.in.h +--- lib/gl/stdint.in.h.orig 2012-05-22 19:55:38.000000000 +0200 ++++ lib/gl/stdint.in.h 2012-05-29 09:37:03.000000000 +0200 +@@ -105,7 +105,7 @@ + # include + #endif + +-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ ++#if (@HAVE_SYS_BITYPES_H@ + 0) && ! defined __BIT_TYPES_DEFINED__ + /* Linux libc4 >= 4.6.7 and libc5 have a that defines + int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is + included by . */ +@@ -535,7 +535,7 @@ + # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) + # endif + #else +-# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) ++# define SIZE_MAX _STDINT_MAX (0, sizeof(size_t)*8, 0@SIZE_T_SUFFIX@) + #endif + + /* wchar_t limits */ +Index: lib/stringprep.c +--- lib/stringprep.c.orig 2012-04-27 12:48:08.000000000 +0200 ++++ lib/stringprep.c 2012-05-29 09:37:03.000000000 +0200 +@@ -33,6 +33,14 @@ + + #include + #include ++#include ++ ++#undef size_t ++#if 0 ++#ifndef SIZE_MAX ++#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1) ++#endif ++#endif + + #include "stringprep.h" + diff -r e39a632d12f7 -r afdc12167a56 libidn/libidn.spec --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libidn/libidn.spec Tue Aug 28 18:34:00 2012 +0200 @@ -0,0 +1,109 @@ +## +## libidn.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package information +Name: libidn +Summary: International Domain Name (IDN) Library +URL: http://www.gnu.org/software/libidn/ +Vendor: Simon Josefsson +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class: BASE +Group: DNS +License: LGPL +Version: 1.25 +Release: 20120529 + +# list of sources +Source0: ftp://ftp.gnu.org/pub/gnu/libidn/libidn-%{version}.tar.gz +Patch0: libidn.patch + +# build information +BuildPreReq: OpenPKG, openpkg >= 20100101 +PreReq: OpenPKG, openpkg >= 20100101 +BuildPreReq: libiconv +PreReq: libiconv + +%description + GNU Libidn is an implementation of the Stringprep, Punycode and + IDNA specifications defined by the IETF Internationalized Domain + Names (IDN) working group, used for internationalized domain names. + The library contains a generic Stringprep implementation that + does Unicode 3.2 NFKC normalization, mapping and prohibitation of + characters, and bidirectional character handling. Profiles for + iSCSI, Kerberos 5, Nameprep, SASL and XMPP are included. Punycode + and ASCII Compatible Encoding (ACE) via IDNA are supported. The + Stringprep API consists of two main functions, one for converting + data from the system's native representation into UTF-8, and + one function to perform the Stringprep processing. Adding a + new Stringprep profile for your application within the API is + straightforward. The Punycode API consists of one encoding function + and one decoding function. The IDNA API consists of the ToASCII + and ToUnicode functions, as well as an high-level interface for + converting entire domain names to and from the ACE encoded form. + +%track + prog libidn = { + version = %{version} + url = ftp://ftp.gnu.org/pub/gnu/libidn/ + regex = libidn-(__VER__)\.tar\.gz + } + +%prep + %setup -q + %patch -p0 + %{l_shtool} subst \ + -e 's;^\(SUBDIRS = .*\) doc \(.*\)$;\1 \2;' \ + Makefile.in + %{l_shtool} subst \ + -e 's;^\(Libs: -L${libdir} -lidn\)$;\1 @LTLIBICONV@;' \ + libidn.pc.in + +%build + CC="%{l_cc}" \ + CFLAGS="%{l_cflags -O}" \ + CPPFLAGS="%{l_cppflags}" \ + LDFLAGS="%{l_ldflags}" \ + MAKEINFO="true" \ + GREP=grep \ + ./configure \ + --prefix=%{l_prefix} \ + --includedir=%{l_prefix}/include/libidn \ + --with-libiconv-prefix=%{l_prefix} \ + --disable-shared \ + --disable-nls + %{l_make} %{l_mflags -O} + +%install + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/emacs + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/Libidn.dll + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ + %{l_files_std} + +%files -f files + +%clean +