# HG changeset patch # User Michael Schloh von Bennewitz # Date 1316606437 -7200 # Node ID 255a25bcf7b0963a43153903fad3df87923eea83 # Parent c158bb6622e1b398d79c3fce69b008067d9915c5 No longer track simple boilerplate adjustments to upstream vendor packages. diff -r c158bb6622e1 -r 255a25bcf7b0 gpg-error/gpg-error.patch --- a/gpg-error/gpg-error.patch Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -Index: src/gpg-error.c ---- src/gpg-error.c.orig 2006-09-05 20:21:14 +0200 -+++ src/gpg-error.c 2006-09-14 16:59:50 +0200 -@@ -77,11 +77,15 @@ - locale_dir = get_locale_dir (); - if (locale_dir) - { -+#ifdef ENABLE_NLS - bindtextdomain (PACKAGE, locale_dir); -+#endif - drop_locale_dir (locale_dir); - } -+#ifdef ENABLE_NLS - textdomain (PACKAGE); - #endif -+#endif - } - - diff -r c158bb6622e1 -r 255a25bcf7b0 gpg-error/gpg-error.spec --- a/gpg-error/gpg-error.spec Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -## -## gpg-error.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 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: gpg-error -Summary: GnuPG Error Library -URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/ -Vendor: g10 Code GmbH -Packager: OpenPKG Foundation e.V. -Distribution: OpenPKG Community -Class: PLUS -Group: Cryptography -License: LGPL -Version: 1.9 -Release: 20101020 - -# list of sources -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.gz -Patch0: gpg-error.patch - -# build information -BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gawk -PreReq: OpenPKG, openpkg >= 20100101 - -%description - This is a library that defines common error values for all GnuPG - components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, - pinentry, SmartCard Daemon and possibly more in the future. - -%track - prog gpg-error = { - version = %{version} - url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/ - regex = gpg-error-(__VER__)\.tar\.gz - } - -%prep - %setup -q -n libgpg-error-%{version} - %patch -p0 - -%build - CC="%{l_cc}" \ - CXX="%{l_cxx}" \ - CFLAGS="%{l_cflags -O}" \ - CXXFLAGS="%{l_cxxflags -O}" \ - CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags}" \ - ./configure \ - --prefix=%{l_prefix} \ - --disable-nls \ - --enable-shared=no - %{l_make} %{l_mflags -O} - -%install - rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ - %{l_files_std} - -%files -f files - -%clean - rm -rf $RPM_BUILD_ROOT - diff -r c158bb6622e1 -r 255a25bcf7b0 libassuan/libassuan.patch --- a/libassuan/libassuan.patch Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -Index: libassuan-1.0.5/src/libassuan-config.in ---- libassuan-1.0.5/src/libassuan-config.in.orig 2006-10-09 12:41:47 +0200 -+++ libassuan-1.0.5/src/libassuan-config.in 2006-11-15 20:25:37 +0100 -@@ -105,6 +105,11 @@ - esac - shift - done -+ -+if test "x${thread_module}" = "x-pth"; then -+ cflags="$cflags `$prefix/bin/pth-config --cflags`" -+ extralibs="$extralibs `$prefix/bin/pth-config --libs`" -+fi - - if test "$echo_prefix" = "yes"; then - echo $prefix -Index: libassuan-2.0.1/src/libassuan-config.in ---- libassuan-2.0.1/src/libassuan-config.in.orig 2006-10-09 12:41:47 +0200 -+++ libassuan-2.0.1/src/libassuan-config.in 2006-11-15 20:25:37 +0100 -@@ -105,6 +105,11 @@ - esac - shift - done -+ -+if test "x${thread_module}" = "x-pth"; then -+ cflags="$cflags `$prefix/bin/pth-config --cflags`" -+ extralibs="$extralibs `$prefix/bin/pth-config --libs`" -+fi - - if test "$echo_prefix" = "yes"; then - echo $prefix diff -r c158bb6622e1 -r 255a25bcf7b0 libassuan/libassuan.spec --- a/libassuan/libassuan.spec Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,133 +0,0 @@ -## -## libassuan.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 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 version -%define V_assuan2 2.0.1 -%define V_assuan1 1.0.5 - -# package information -Name: libassuan -Summary: GnuPG IPC Library -URL: http://www.gnupg.org/related_software/libassuan/ -Vendor: Werner Koch et al. -Packager: OpenPKG Foundation e.V. -Distribution: OpenPKG Community -Class: PLUS -Group: Libraries -License: GPL/LGPL -Version: %{V_assuan2} -Release: 20101020 - -# list of sources -Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{V_assuan1}.tar.bz2 -Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{V_assuan2}.tar.bz2 -Patch0: libassuan.patch - -# build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20100101 -PreReq: OpenPKG, openpkg >= 20100101 -BuildPreReq: pth, gpg-error -PreReq: pth, gpg-error - -%description - Libassuan is the IPC library used by some GnuPG related software. - -%track - prog libassuan:libassuan1 = { - version = %{V_assuan1} - url = ftp://ftp.gnupg.org/gcrypt/libassuan/ - regex = libassuan-(1\.\d+\.\d+)\.tar\.bz2 - } - prog libassuan:libassuan2 = { - version = %{V_assuan2} - url = ftp://ftp.gnupg.org/gcrypt/libassuan/ - regex = libassuan-(2\.\d+\.\d+)\.tar\.bz2 - } - -%prep - %setup -q -c - %setup -q -D -a 1 - %patch -p0 - -%build - ( cd libassuan-%{V_assuan1} - CC="%{l_cc}" \ - CFLAGS="%{l_cflags -O}" \ - CPPFLAGS="%{l_cppflags pth .}" \ - LDFLAGS="%{l_ldflags}" \ - ./configure \ - --prefix=%{l_prefix} \ - --infodir=%{l_prefix}/info \ - --mandir=%{l_prefix}/man \ - --with-pth-prefix=%{l_prefix} \ - --disable-shared - %{l_make} %{l_mflags -O} - ) || exit $? - ( cd libassuan-%{V_assuan2} - CC="%{l_cc}" \ - CFLAGS="%{l_cflags -O}" \ - CPPFLAGS="%{l_cppflags pth .}" \ - LDFLAGS="%{l_ldflags}" \ - ./configure \ - --prefix=%{l_prefix} \ - --infodir=%{l_prefix}/info \ - --mandir=%{l_prefix}/man \ - --with-pth-prefix=%{l_prefix} \ - --disable-shared - %{l_make} %{l_mflags -O} - ) || exit $? - -%install - rm -rf $RPM_BUILD_ROOT - ( cd libassuan-%{V_assuan1} - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - mv $RPM_BUILD_ROOT%{l_prefix}/bin/libassuan-config \ - $RPM_BUILD_ROOT%{l_prefix}/bin/libassuan1-config - %{l_shtool} subst \ - -e 's;-lassuan;-lassuan1;g' \ - $RPM_BUILD_ROOT%{l_prefix}/bin/libassuan1-config - mv $RPM_BUILD_ROOT%{l_prefix}/include/assuan.h \ - $RPM_BUILD_ROOT%{l_prefix}/include/assuan1.h - mv $RPM_BUILD_ROOT%{l_prefix}/info/assuan.info \ - $RPM_BUILD_ROOT%{l_prefix}/info/assuan1.info - mv $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan.a \ - $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan1.a - mv $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan-pth.a \ - $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan1-pth.a - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan.la - mv $RPM_BUILD_ROOT%{l_prefix}/share/aclocal/libassuan.m4 \ - $RPM_BUILD_ROOT%{l_prefix}/share/aclocal/libassuan1.m4 - ) || exit $? - ( cd libassuan-%{V_assuan2} - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - ) || exit $? - rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} - -%files -f files - -%clean - rm -rf $RPM_BUILD_ROOT - diff -r c158bb6622e1 -r 255a25bcf7b0 libksba/libksba.spec --- a/libksba/libksba.spec Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -## -## libksba.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 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: libksba -Summary: CMS/X.509 Access Library -URL: http://www.gnupg.org/related_software/libksba/ -Vendor: Werner Koch et al. -Packager: OpenPKG Foundation e.V. -Distribution: OpenPKG Community -Class: PLUS -Group: Cryptography -License: GPL/LGPL -Version: 1.0.8 -Release: 20101020 - -# list of sources -Source0: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2 - -# build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20100101 -PreReq: OpenPKG, openpkg >= 20100101 -BuildPreReq: gpg-error -PreReq: gpg-error - -%description - LibKSBA is the CMS and X.509 access library used by some GnuPG - related software. - -%track - prog libksba = { - version = %{version} - url = ftp://ftp.gnupg.org/gcrypt/libksba/ - regex = libksba-(__VER__)\.tar\.bz2 - } - -%prep - %setup -q - -%build - CC="%{l_cc}" \ - CFLAGS="%{l_cflags -O}" \ - CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags}" \ - ./configure \ - --prefix=%{l_prefix} \ - --infodir=%{l_prefix}/info \ - --with-gpg-error-prefix=%{l_prefix} \ - --disable-shared - %{l_make} %{l_mflags -O} - -%install - rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} - -%files -f files - -%clean - rm -rf $RPM_BUILD_ROOT - diff -r c158bb6622e1 -r 255a25bcf7b0 pinentry/pinentry.patch --- a/pinentry/pinentry.patch Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -Index: gtk+-2/gtksecentry.c ---- gtk+-2/gtksecentry.c.orig 2004-09-02 03:47:13 +0200 -+++ gtk+-2/gtksecentry.c 2006-11-15 21:27:51 +0100 -@@ -39,6 +39,16 @@ - #include - #include - -+#define g_malloc my_g_malloc -+#define g_malloc0 my_g_malloc0 -+#define g_realloc my_g_realloc -+#define g_free my_g_free -+ -+gpointer g_malloc(gulong size); -+gpointer g_malloc0(gulong size); -+gpointer g_realloc(gpointer mem, gulong size); -+void g_free(gpointer mem); -+ - #include "gtksecentry.h" - #include "memory.h" - diff -r c158bb6622e1 -r 255a25bcf7b0 pinentry/pinentry.spec --- a/pinentry/pinentry.spec Wed Sep 21 13:55:11 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -## -## pinentry.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 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: pinentry -Summary: Interactive PIN Entry Dialogs -URL: http://www.gnupg.org/related_software/pinentry/ -Vendor: R. Bihlmeyer, W. Koch, S. Hansen, M. Brinkmann -Packager: OpenPKG Foundation e.V. -Distribution: OpenPKG Community -Class: PLUS -Group: Terminal -License: GPL -Version: 0.8.0 -Release: 20101020 - -# package options -%option with_x11 no - -# list of sources -Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-%{version}.tar.gz -Patch0: pinentry.patch - -# build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20100101 -PreReq: OpenPKG, openpkg >= 20100101 -BuildPreReq: ncurses, libiconv -PreReq: ncurses, libiconv -%if "%{with_x11}" == "yes" -BuildPreReq: gtk2 -PreReq: gtk2 -%endif - -%description - PINentry is a collection of simple PIN or passphrase entry dialogs - which utilize the Assuan protocol as described by the GnuPG - and Aegypten projects. It allows applications like GnuPG to - interactively request PINs or passphrases. - -%track - prog pinentry = { - version = %{version} - url = ftp://ftp.gnupg.org/gcrypt/pinentry/ - regex = pinentry-(__VER__)\.tar\.gz - } - -%prep - %setup -q - %patch -p0 - -%build - CC="%{l_cc}" \ - CXX="%{l_cxx}" \ - CFLAGS="%{l_cflags -O}" \ - CXXFLAGS="%{l_cxxflags -O}" \ - CPPFLAGS="%{l_cppflags ncurses .}" \ - LDFLAGS="%{l_ldflags}" \ - ./configure \ - --prefix=%{l_prefix} \ - --infodir=%{l_prefix}/info \ - --enable-pinentry-curses \ - --enable-fallback-curses \ - --with-ncurses-include-dir=%{l_prefix}/include/ncurses \ -%if "%{with_x11}" == "yes" - --with-x \ - --enable-pinentry-gtk2 \ -%else - --disable-pinentry-gtk2 \ -%endif - --disable-pinentry-gtk \ - --disable-pinentry-qt \ - --disable-threading - %{l_make} %{l_mflags -O} - -%install - rm -rf $RPM_BUILD_ROOT - %{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 - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} - -%files -f files - -%clean - rm -rf $RPM_BUILD_ROOT -