Date: Sunday, September 29, 2013 @ 06:45:52
Author: bisson
Revision: 195248
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
abook/repos/extra-i686/PKGBUILD
(from rev 195247, abook/trunk/PKGBUILD)
abook/repos/extra-i686/vcard.patch
(from rev 195247, abook/trunk/vcard.patch)
abook/repos/extra-x86_64/PKGBUILD
(from rev 195247, abook/trunk/PKGBUILD)
abook/repos/extra-x86_64/vcard.patch
(from rev 195247, abook/trunk/vcard.patch)
Deleted:
abook/repos/extra-i686/PKGBUILD
abook/repos/extra-x86_64/PKGBUILD
--------------------------+
/PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 29 ------------------
extra-i686/vcard.patch | 26 ++++++++++++++++
extra-x86_64/PKGBUILD | 29 ------------------
extra-x86_64/vcard.patch | 26 ++++++++++++++++
5 files changed, 124 insertions(+), 58 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-09-29 04:45:26 UTC (rev 195247)
+++ extra-i686/PKGBUILD 2013-09-29 04:45:52 UTC (rev 195248)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Daniel J Griffiths <[email protected]>
-# Contributor: Thayer Williams <[email protected]>
-# Contributor: damir <[email protected]>
-
-pkgname=abook
-pkgver=0.6.0pre2.20130724
-pkgrel=1
-pkgdesc='Text-based addressbook designed for use with Mutt'
-url='http://abook.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('git')
-depends=('readline')
-source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68")
-sha1sums=('SKIP')
-
-build() {
- cd "${srcdir}/${pkgname}"
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
- cd po && make update-po
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-}
Copied: abook/repos/extra-i686/PKGBUILD (from rev 195247, abook/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-09-29 04:45:52 UTC (rev 195248)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+# Contributor: Thayer Williams <[email protected]>
+# Contributor: damir <[email protected]>
+
+pkgname=abook
+pkgver=0.6.0pre2.20130928
+pkgrel=1
+pkgdesc='Text-based addressbook designed for use with Mutt'
+url='http://abook.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('git')
+depends=('readline')
+source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
+ 'vcard.patch')
+sha1sums=('SKIP'
+ 'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../vcard.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ cd po && make update-po
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: abook/repos/extra-i686/vcard.patch (from rev 195247,
abook/trunk/vcard.patch)
===================================================================
--- extra-i686/vcard.patch (rev 0)
+++ extra-i686/vcard.patch 2013-09-29 04:45:52 UTC (rev 195248)
@@ -0,0 +1,26 @@
+diff -Naur old/filter.c new/filter.c
+--- old/filter.c 2013-08-22 20:49:06.229337260 -1000
++++ new/filter.c 2013-08-22 20:49:13.552700987 -1000
+@@ -1673,7 +1673,7 @@
+ // vCard(the country name)
+ item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
+
+- if(*value) xfree(value);
++ if(value) xfree(value);
+ }
+
+ static void
+@@ -2052,6 +2052,13 @@
+
+ free(name);
+
++ if(db_fget(item, NICK))
++ fprintf(out, "NICKNAME:%s\r\n",
++ safe_str(db_fget(item, NICK)));
++ if(db_fget(item, ANNIVERSARY))
++ fprintf(out, "BIRTHDAY:%s\r\n",
++ safe_str(db_fget(item, ANNIVERSARY)));
++
+ // see rfc6350 section 6.3.1
+ if(db_fget(item, ADDRESS)) {
+ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-09-29 04:45:26 UTC (rev 195247)
+++ extra-x86_64/PKGBUILD 2013-09-29 04:45:52 UTC (rev 195248)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Daniel J Griffiths <[email protected]>
-# Contributor: Thayer Williams <[email protected]>
-# Contributor: damir <[email protected]>
-
-pkgname=abook
-pkgver=0.6.0pre2.20130724
-pkgrel=1
-pkgdesc='Text-based addressbook designed for use with Mutt'
-url='http://abook.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('git')
-depends=('readline')
-source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68")
-sha1sums=('SKIP')
-
-build() {
- cd "${srcdir}/${pkgname}"
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
- cd po && make update-po
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-}
Copied: abook/repos/extra-x86_64/PKGBUILD (from rev 195247,
abook/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-09-29 04:45:52 UTC (rev 195248)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+# Contributor: Thayer Williams <[email protected]>
+# Contributor: damir <[email protected]>
+
+pkgname=abook
+pkgver=0.6.0pre2.20130928
+pkgrel=1
+pkgdesc='Text-based addressbook designed for use with Mutt'
+url='http://abook.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('git')
+depends=('readline')
+source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
+ 'vcard.patch')
+sha1sums=('SKIP'
+ 'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../vcard.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ cd po && make update-po
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: abook/repos/extra-x86_64/vcard.patch (from rev 195247,
abook/trunk/vcard.patch)
===================================================================
--- extra-x86_64/vcard.patch (rev 0)
+++ extra-x86_64/vcard.patch 2013-09-29 04:45:52 UTC (rev 195248)
@@ -0,0 +1,26 @@
+diff -Naur old/filter.c new/filter.c
+--- old/filter.c 2013-08-22 20:49:06.229337260 -1000
++++ new/filter.c 2013-08-22 20:49:13.552700987 -1000
+@@ -1673,7 +1673,7 @@
+ // vCard(the country name)
+ item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
+
+- if(*value) xfree(value);
++ if(value) xfree(value);
+ }
+
+ static void
+@@ -2052,6 +2052,13 @@
+
+ free(name);
+
++ if(db_fget(item, NICK))
++ fprintf(out, "NICKNAME:%s\r\n",
++ safe_str(db_fget(item, NICK)));
++ if(db_fget(item, ANNIVERSARY))
++ fprintf(out, "BIRTHDAY:%s\r\n",
++ safe_str(db_fget(item, ANNIVERSARY)));
++
+ // see rfc6350 section 6.3.1
+ if(db_fget(item, ADDRESS)) {
+ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
