Patches for aports can be sent to this list

3 2

[alpine-aports] [PATCH] main/ntfs-3g: upgrade to 2016.2.22, split to subpackages (libs, progs)

Valery Kartel
Details
Message ID
<1458651863-26176-1-git-send-email-valery.kartel@gmail.com>
Sender timestamp
1458651863
DKIM signature
missing
Download raw message
Patch: +18 -9
---
 main/ntfs-3g/APKBUILD | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
index 51ce04e..74531be 100644
--- a/main/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
@@ -1,21 +1,22 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ntfs-3g
-pkgver=2015.3.14
+_pkgreal=ntfs-3g_ntfsprogs
+pkgver=2016.2.22
 pkgrel=0
-pkgdesc="A userspace ntfs driver with write support"
+pkgdesc="Stable, full-featured, read-write NTFS driver"
 url="http://www.tuxera.com/community/ntfs-3g-download/"
 arch="all"
 license="GPL"
 depends=
 makedepends="attr-dev util-linux-dev linux-headers"
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz
+subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-progs"
+source="http://tuxera.com/opensource/$_pkgreal-$pkgver.tgz
 	musl-fixes.patch
 	"
 
-_builddir="$srcdir"/ntfs-3g_ntfsprogs-$pkgver
-
+_builddir="$srcdir"/$_pkgreal-$pkgver
 prepare() {
 	cd "$_builddir"
 	for i in $source; do
@@ -44,9 +45,17 @@ package() {
 	make -j1 DESTDIR="$pkgdir" LDCONFIG=: install || return 1
 }
 
-md5sums="8cd57768310e3b2be39b3191d808e241  ntfs-3g_ntfsprogs-2015.3.14.tgz
+progs() {
+	pkgdesc="Stable, full-featured, read-write NTFS userspace utilities"
+	mkdir -p "$subpkgdir"/sbin
+	mv "$pkgdir"/usr "$pkgdir"/lib "$subpkgdir"/
+	mv "$pkgdir"/sbin/mkfs.ntfs "$subpkgdir"/sbin
+	rm -fr "$subpkgdir"/lib "$subpkgdir"/usr/lib
+}
+
+md5sums="ccbe8672d0f757bd0c975b50aa4c512e  ntfs-3g_ntfsprogs-2016.2.22.tgz
 cdfca9f0d20ef96ec60e072ffe4fd061  musl-fixes.patch"
-sha256sums="97f996015d8316d4a272bd2629978e5e97072dd3cc148ce39802f8037c6538f2  ntfs-3g_ntfsprogs-2015.3.14.tgz
+sha256sums="d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0  ntfs-3g_ntfsprogs-2016.2.22.tgz
 f60f15b5650ada189d880ffea0e199869b3d5e855913d353cab8b0b7ebc47ae4  musl-fixes.patch"
-sha512sums="9744dee814e89a97050bc8beb76f1a7d8a585e7d7740e8041e393c6912c93e49803f9b41af84e8315b3162e58b19ca8d155d435395cb07ecaa7de9caaf2af441  ntfs-3g_ntfsprogs-2015.3.14.tgz
+sha512sums="dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15  ntfs-3g_ntfsprogs-2016.2.22.tgz
 5b4680956f11c75ee3122923f36b840e2a0a38e6cebecbe7be4a02f4423746f8b7d7a89b16d7a9bea62e64534d20e87503beb582273af38d458b946387e85a02  musl-fixes.patch"
-- 
2.7.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Timo Teras
Details
Message ID
<20160325142128.084ec7f0@vostro.util.wtbts.net>
In-Reply-To
<1458651863-26176-1-git-send-email-valery.kartel@gmail.com> (view parent)
Sender timestamp
1458908488
DKIM signature
missing
Download raw message
On Tue, 22 Mar 2016 15:04:23 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> ---
>  main/ntfs-3g/APKBUILD | 27 ++++++++++++++++++---------
>  1 file changed, 18 insertions(+), 9 deletions(-)
> 
> diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
> index 51ce04e..74531be 100644
> --- a/main/ntfs-3g/APKBUILD
> +++ b/main/ntfs-3g/APKBUILD
> @@ -1,21 +1,22 @@
> +# Contributor: Valery Kartel <valery.kartel@gmail.com>
>  # Contributor: Carlo Landmeter <clandmeter@gmail.com>
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  pkgname=ntfs-3g
> -pkgver=2015.3.14
> +_pkgreal=ntfs-3g_ntfsprogs
> +pkgver=2016.2.22
>  pkgrel=0
> -pkgdesc="A userspace ntfs driver with write support"
> +pkgdesc="Stable, full-featured, read-write NTFS driver"
>  url="http://www.tuxera.com/community/ntfs-3g-download/"

This fails for me with:
libtool: link: gcc -Os -fomit-frame-pointer -Wall -Wl,--as-needed -o .libs/ntfscp ntfscp.o utils.o  ../libntfs-3g/.libs/libntfs-3g.so
utils.o: In function `utils_inode_get_name':
utils.c:(.text+0x9ef): undefined reference to `libintl_snprintf'
utils.c:(.text+0xb09): undefined reference to `libintl_snprintf'
utils.o: In function `utils_attr_get_name':
utils.c:(.text+0xc22): undefined reference to `libintl_snprintf'
utils.c:(.text+0xc66): undefined reference to `libintl_snprintf'
utils.c:(.text+0xcf7): undefined reference to `libintl_snprintf'
utils.o:utils.c:(.text+0xd11): more undefined references to `libintl_snprintf' follow
collect2: error: ld returned 1 exit status
libtool: link: gcc -Os -fomit-frame-pointer -Wall -Wl,--as-needed -o .libs/ntfscmp ntfscmp.o utils.o  ../libntfs-3g/.libs/libntfs-3g.so
Makefile:876: recipe for target 'ntfscp' failed
make[2]: *** [ntfscp] Error 1
utils.o: In function `utils_inode_get_name':
utils.c:(.text+0x9ef): undefined reference to `libintl_snprintf'
utils.c:(.text+0xb09): undefined reference to `libintl_snprintf'
utils.o: In function `utils_attr_get_name':
utils.c:(.text+0xc22): undefined reference to `libintl_snprintf'
utils.c:(.text+0xc66): undefined reference to `libintl_snprintf'
utils.c:(.text+0xcf7): undefined reference to `libintl_snprintf'
utils.o:utils.c:(.text+0xd11): more undefined references to `libintl_snprintf' follow
collect2: error: ld returned 1 exit status
Makefile:872: recipe for target 'ntfscmp' failed
make[2]: *** [ntfscmp] Error 1
mv -f .deps/ntfsfix.Tpo .deps/ntfsfix.Po
mv -f .deps/ntfsundelete.Tpo .deps/ntfsundelete.Po
mv -f .deps/ntfsinfo.Tpo .deps/ntfsinfo.Po
mv -f .deps/ntfsclone.Tpo .deps/ntfsclone.Po
mv -f .deps/ntfsresize.Tpo .deps/ntfsresize.Po
mv -f .deps/mkntfs-mkntfs.Tpo .deps/mkntfs-mkntfs.Po
make[2]: Leaving directory '/home/tteras/aports/main/ntfs-3g/src/ntfs-3g_ntfsprogs-2016.2.22/ntfsprogs'
Makefile:493: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/tteras/aports/main/ntfs-3g/src/ntfs-3g_ntfsprogs-2016.2.22'
Makefile:403: recipe for target 'all' failed
make: *** [all] Error 2

Otherwise it looks good though. Any ideas?


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Valery Kartel
Details
Message ID
<CAKTwcDO-BpvS9TP_C4N6NYCNZ7wfonHu4b6BnA1m7MPcMnCUfA@mail.gmail.com>
In-Reply-To
<20160325142128.084ec7f0@vostro.util.wtbts.net> (view parent)
Sender timestamp
1458920318
DKIM signature
missing
Download raw message
A time ago I made a patch for gettext, that fix it. But its still not
applied. I have no problems with that patched gettext.
25 бер. 2016 14:21 "Timo Teras" <timo.teras@iki.fi> пише:

> On Tue, 22 Mar 2016 15:04:23 +0200
> Valery Kartel <valery.kartel@gmail.com> wrote:
>
> > ---
> >  main/ntfs-3g/APKBUILD | 27 ++++++++++++++++++---------
> >  1 file changed, 18 insertions(+), 9 deletions(-)
> >
> > diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
> > index 51ce04e..74531be 100644
> > --- a/main/ntfs-3g/APKBUILD
> > +++ b/main/ntfs-3g/APKBUILD
> > @@ -1,21 +1,22 @@
> > +# Contributor: Valery Kartel <valery.kartel@gmail.com>
> >  # Contributor: Carlo Landmeter <clandmeter@gmail.com>
> >  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> >  pkgname=ntfs-3g
> > -pkgver=2015.3.14
> > +_pkgreal=ntfs-3g_ntfsprogs
> > +pkgver=2016.2.22
> >  pkgrel=0
> > -pkgdesc="A userspace ntfs driver with write support"
> > +pkgdesc="Stable, full-featured, read-write NTFS driver"
> >  url="http://www.tuxera.com/community/ntfs-3g-download/"
>
> This fails for me with:
> libtool: link: gcc -Os -fomit-frame-pointer -Wall -Wl,--as-needed -o
> .libs/ntfscp ntfscp.o utils.o  ../libntfs-3g/.libs/libntfs-3g.so
> utils.o: In function `utils_inode_get_name':
> utils.c:(.text+0x9ef): undefined reference to `libintl_snprintf'
> utils.c:(.text+0xb09): undefined reference to `libintl_snprintf'
> utils.o: In function `utils_attr_get_name':
> utils.c:(.text+0xc22): undefined reference to `libintl_snprintf'
> utils.c:(.text+0xc66): undefined reference to `libintl_snprintf'
> utils.c:(.text+0xcf7): undefined reference to `libintl_snprintf'
> utils.o:utils.c:(.text+0xd11): more undefined references to
> `libintl_snprintf' follow
> collect2: error: ld returned 1 exit status
> libtool: link: gcc -Os -fomit-frame-pointer -Wall -Wl,--as-needed -o
> .libs/ntfscmp ntfscmp.o utils.o  ../libntfs-3g/.libs/libntfs-3g.so
> Makefile:876: recipe for target 'ntfscp' failed
> make[2]: *** [ntfscp] Error 1
> utils.o: In function `utils_inode_get_name':
> utils.c:(.text+0x9ef): undefined reference to `libintl_snprintf'
> utils.c:(.text+0xb09): undefined reference to `libintl_snprintf'
> utils.o: In function `utils_attr_get_name':
> utils.c:(.text+0xc22): undefined reference to `libintl_snprintf'
> utils.c:(.text+0xc66): undefined reference to `libintl_snprintf'
> utils.c:(.text+0xcf7): undefined reference to `libintl_snprintf'
> utils.o:utils.c:(.text+0xd11): more undefined references to
> `libintl_snprintf' follow
> collect2: error: ld returned 1 exit status
> Makefile:872: recipe for target 'ntfscmp' failed
> make[2]: *** [ntfscmp] Error 1
> mv -f .deps/ntfsfix.Tpo .deps/ntfsfix.Po
> mv -f .deps/ntfsundelete.Tpo .deps/ntfsundelete.Po
> mv -f .deps/ntfsinfo.Tpo .deps/ntfsinfo.Po
> mv -f .deps/ntfsclone.Tpo .deps/ntfsclone.Po
> mv -f .deps/ntfsresize.Tpo .deps/ntfsresize.Po
> mv -f .deps/mkntfs-mkntfs.Tpo .deps/mkntfs-mkntfs.Po
> make[2]: Leaving directory
> '/home/tteras/aports/main/ntfs-3g/src/ntfs-3g_ntfsprogs-2016.2.22/ntfsprogs'
> Makefile:493: recipe for target 'all-recursive' failed
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory
> '/home/tteras/aports/main/ntfs-3g/src/ntfs-3g_ntfsprogs-2016.2.22'
> Makefile:403: recipe for target 'all' failed
> make: *** [all] Error 2
>
> Otherwise it looks good though. Any ideas?
>
Timo Teras
Details
Message ID
<20160326121611.6b06531b@vostro>
In-Reply-To
<CAKTwcDO-BpvS9TP_C4N6NYCNZ7wfonHu4b6BnA1m7MPcMnCUfA@mail.gmail.com> (view parent)
Sender timestamp
1458987371
DKIM signature
missing
Download raw message
On Fri, 25 Mar 2016 17:38:38 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> A time ago I made a patch for gettext, that fix it. But its still not
> applied. I have no problems with that patched gettext.

Oh that. It never built for me; and in fact broke stuff. I fixed
gettext for now. Seems the library provided symbols change depending on
what configure / gnulib thinks of the system causing abi to change.

I added a kludge patch to make sure the libintl_*printf* symbols get
built, but are no longer overridden by the headers. This seems to fix
things.

I also applied this patch.

Thanks!


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---