Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (26fc851f2b661c225348a7e5744d717e2c86b89c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (26fc851f2b661c225348a7e5744d717e2c86b89c)
  • Date: Sat, 2 Jan 2010 04:01:30 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

dev/null |binary
disk/ntfsprogs/HISTORY | 4 ++
disk/ntfsprogs/PRE_BUILD | 5 ++
disk/ntfsprogs/gnutls-2.8.patch | 52
+++++++++++++++++++++++++++++
disk/ntfsprogs/ntfsprogs-1.13.1.tar.gz.sig | 0
5 files changed, 61 insertions(+)

New commits:
commit 89ffb531cda9b4f4851bb2bffa15a19f74604bf9
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

ntfsprogs: added patch to fix compilation issue with gnutls 2.8
removed ntfsprogs-1.13.1.tar.gz.sig, useless

diff --git a/disk/ntfsprogs/HISTORY b/disk/ntfsprogs/HISTORY
index 6af5c2e..4844247 100644
--- a/disk/ntfsprogs/HISTORY
+++ b/disk/ntfsprogs/HISTORY
@@ -1,3 +1,7 @@
+2010-01-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, gnutls-2.8.patch: added, fixed compilation issue with
gnutls 2.8
+ * ntfsprogs-1.13.1.tar.gz.sig : removed, useless
+
2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: depends on libconfig if crypto is enabled

diff --git a/disk/ntfsprogs/PRE_BUILD b/disk/ntfsprogs/PRE_BUILD
new file mode 100755
index 0000000..1fd5308
--- /dev/null
+++ b/disk/ntfsprogs/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if is_depends_enabled $SPELL gnutls -a "$(installed_version gnutls | cut -d.
-f-2)" == "2.8"; then
+ patch -p0 < $SPELL_DIRECTORY/gnutls-2.8.patch
+fi
diff --git a/disk/ntfsprogs/gnutls-2.8.patch b/disk/ntfsprogs/gnutls-2.8.patch
new file mode 100644
index 0000000..28b2a0d
--- /dev/null
+++ b/disk/ntfsprogs/gnutls-2.8.patch
@@ -0,0 +1,52 @@
+--- libntfs/Makefile.am
++++ libntfs/Makefile.am
+@@ -38,8 +38,8 @@
+ -DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\"
+
+ if ENABLE_CRYPTO
+-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs
libconfig`
+-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags
libconfig`
++libntfs_la_LDFLAGS += `pkg-config --libs gnutls libconfig`
++libntfs_la_CFLAGS += `pkg-config --cflags gnutls libconfig`
+ endif
+
+ libntfs_la_SOURCES = \
+--- libntfs/Makefile.in
++++ libntfs/Makefile.in
+@@ -61,8 +61,8 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config
--libs libconfig`
+-@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config
--cflags libconfig`
++@ENABLE_CRYPTO_TRUE@am__append_1 = `pkg-config --libs gnutls libconfig`
++@ENABLE_CRYPTO_TRUE@am__append_2 = `pkg-config --cflags gnutls libconfig`
+ subdir = libntfs
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \
+--- ntfsprogs/Makefile.am
++++ ntfsprogs/Makefile.am
+@@ -125,8 +125,8 @@
+ if ENABLE_CRYPTO
+ ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h
+ ntfsdecrypt_LDADD = $(AM_LIBS)
+-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs`
+-ntfsdecrypt_CFLAGS = `libgnutls-config --cflags`
++ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `pkg-config --libs gnutls`
++ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls`
+ endif
+
+ # Extra targets
+--- ntfsprogs/Makefile.in
++++ ntfsprogs/Makefile.in
+@@ -449,8 +449,8 @@
+ ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS)
+ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h
+ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS)
+-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config
--libs`
+-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags`
++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `pkg-config --libs
gnutls`
++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls`
+ all: all-am
+
+ .SUFFIXES:
diff --git a/disk/ntfsprogs/ntfsprogs-1.13.1.tar.gz.sig
b/disk/ntfsprogs/ntfsprogs-1.13.1.tar.gz.sig
deleted file mode 100644
index 77b5614..0000000
Binary files a/disk/ntfsprogs/ntfsprogs-1.13.1.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (26fc851f2b661c225348a7e5744d717e2c86b89c), Julien ROZO, 01/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page