Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8748
Modified Files:
gpgme11.info gpgme11.patch
Log Message:
new version with consent of maintainer; rm'ed some obsolete-I-think patching
Index: gpgme11.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/gpgme11.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gpgme11.patch 16 Feb 2008 15:07:06 -0000 1.5
+++ gpgme11.patch 7 Jan 2009 07:07:00 -0000 1.6
@@ -1,61 +1,7 @@
-funopen is defined on OS X
-#include <netdb.h> for socklen_t
-ttyname_r returns a char* on OS X instead of int.
-
-diff --git a/assuan/assuan.h b/assuan/assuan.h
---- a/assuan/assuan.h
-+++ b/assuan/assuan.h
-@@ -25,7 +25,8 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <unistd.h>
--
-+/* for socklen_t */
-+#include <netdb.h>
-
- /* To use this file with libraries the following macros are useful:
-
-diff --git a/assuan/funopen.c b/assuan/funopen.c
---- a/assuan/funopen.c
-+++ b/assuan/funopen.c
-@@ -59,6 +59,4 @@ _assuan_funopen(void *cookie,
- readfn ? ( writefn ? "rw" : "r" )
- : ( writefn ? "w" : ""), io);
- }
--#else
--#error No known way to implement funopen.
- #endif
-diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
---- a/gpgme/engine-gpgsm.c
-+++ b/gpgme/engine-gpgsm.c
-@@ -448,7 +448,8 @@ gpgsm_new (void **engine, const char *fi
-
- if (isatty (1))
- {
-- if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
-+ /* ttyname_r returns a char* on OS X */
-+ if (!ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
- {
- err = gpg_error_from_errno (errno);
- goto leave;
-diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
---- a/gpgme/rungpg.c
-+++ b/gpgme/rungpg.c
-@@ -476,7 +476,8 @@ gpg_new (void **engine, const char *file
-
- if (isatty (1))
- {
-- if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
-+ /* ttyname_r returns char* on OS X */
-+ if (!ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
- rc = gpg_error_from_errno (errno);
- else
- {
-
-
---- a/tests/gpg/Makefile.am 2008-01-28 11:25:31.000000000 +0100
-+++ b/tests/gpg/Makefile.am 2008-01-28 11:29:29.000000000 +0100
-@@ -57,7 +57,7 @@
+diff -Nurd -x'*~' gpgme-1.1.8.orig/tests/gpg/Makefile.am
gpgme-1.1.8/tests/gpg/Makefile.am
+--- gpgme-1.1.8.orig/tests/gpg/Makefile.am 2008-12-03 08:39:37.000000000
-0500
++++ gpgme-1.1.8/tests/gpg/Makefile.am 2009-01-07 00:42:46.000000000 -0500
+@@ -63,7 +63,7 @@
--import Alpha/Secret.gpg Zulu/Secret.gpg
./Alpha/Secret.gpg: secdemo.asc
@@ -64,10 +10,9 @@
./gpg.conf:
# This is required for t-sig-notations.
-
-
---- a/tests/gpg/mkdemodirs 2008-01-28 11:26:45.000000000 +0100
-+++ b/tests/gpg/mkdemodirs 2008-01-28 11:27:29.000000000 +0100
+diff -Nurd -x'*~' gpgme-1.1.8.orig/tests/gpg/mkdemodirs
gpgme-1.1.8/tests/gpg/mkdemodirs
+--- gpgme-1.1.8.orig/tests/gpg/mkdemodirs 2005-09-08 10:42:32.000000000
-0400
++++ gpgme-1.1.8/tests/gpg/mkdemodirs 2009-01-07 00:42:46.000000000 -0500
@@ -19,7 +19,9 @@
set -e
Index: gpgme11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/gpgme11.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gpgme11.info 16 Feb 2008 15:07:06 -0000 1.13
+++ gpgme11.info 7 Jan 2009 07:07:00 -0000 1.14
@@ -1,17 +1,17 @@
Package: gpgme11
-Version: 1.1.4
-Revision: 4
+Version: 1.1.8
+Revision: 1
Maintainer: Darian Lanx <[email protected]>
-BuildDepends: glib2-dev, gdbm3, libiconv-dev, libgettext3-dev, libgpg-error,
pth2-dev, gnupg2, fink (>= 0.24.12)
+BuildDepends: glib2-dev (>= 2.18.0-1), libiconv-dev, libgettext3-dev,
libgpg-error, pth2-dev, gnupg2, fink (>= 0.24.12)
Depends: %N-shlibs (= %v-%r)
Replaces: gpgme, gpgme-shlibs, gpgme11-shlibs (<< 1.0.2-1)
Conflicts: gpgme
BuildDependsOnly: true
-Source: http://ftp.gnupg.org/gcrypt/gpgme/gpgme-%v.tar.gz
-Source-MD5: 0a2d20f70e6e01a4869ad6b7497404ae
+#Source: http://ftp.gnupg.org/gcrypt/gpgme/gpgme-%v.tar.gz
+Source: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%v.tar.gz
+Source-MD5: 1f500e7b4e81fcc76b901f1249ec09fc
PatchFile: %n.patch
-PatchFile-MD5: e08292db5c5ba88570313016d67ba9b3
-NoSetLDFLAGS: true
+PatchFile-MD5: e0fb33c16b1accfe614c1c8c0e703f8a
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --prefix=%p --infodir=%p/share/info --enable-shared
--enable-static --enable-fd-passing --disable-dependency-tracking --with-pic
--with-gpg=%p/bin/gpg2
@@ -19,7 +19,7 @@
SplitOff: <<
Package: %N-shlibs
Files: lib/libgpgme*.*.dylib
- Depends: pth2-shlibs, glib2-shlibs, libgpg-error-shlibs, libgettext3-shlibs,
libiconv, gnupg2
+ Depends: pth2-shlibs, glib2-shlibs (>= 2.18.0-1), libgpg-error-shlibs,
libgettext3-shlibs, libiconv, gnupg2
Shlibs: <<
%p/lib/libgpgme-pthread.11.dylib 18.0.0 %n (>= 1.1.3-12)
%p/lib/libgpgme.11.dylib 18.0.0 %n (>= 1.1.3-12)
@@ -43,9 +43,21 @@
dmacks--if using pth, then even main lib uses pth (ath-pth-compa.o) so
make sure to link libpth.
+
+dmacks updated 1.1.4-3 -> 1.1.8-1:
+
+ scrap patch to handler of ttyname_r return-value: ttyname_r()
+ is POSIX-compliant when __DARWIN_UNIX03 (default); ttyname_r()
+ only looks like (char*)ttyname() in pre-UNIX03 darwin.
+
+ not fixing a ton of implicit-declaration warnings
+
+ scrap empty %p/libexec (only used on win32)
+<<
+InstallScript: <<
+ make install DESTDIR=%d
+ rmdir %i/libexec
<<
-InstallScript: make install DESTDIR=%d
-#UpdateConfigGuess: true
DocFiles: AUTHORS COPYING ChangeLog NEWS README* THANKS TODO
InfoDocs: gpgme.info
Description: Application access library for GnuPG
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
