[arch-commits] Commit in intltool/trunk (PKGBUILD intltool-fixrace.patch)

2020-06-21 Thread Jelle van der Waa via arch-commits 
Date: Sunday, June 21, 2020 @ 15:23:33
  Author: jelle
Revision: 389847

Add reproducible builds patch for race condition when running with -j $(nproc)

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950444

Added:
  intltool/trunk/intltool-fixrace.patch
Modified:
  intltool/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 intltool-fixrace.patch |   43 +++
 2 files changed, 49 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-21 15:22:48 UTC (rev 389846)
+++ PKGBUILD2020-06-21 15:23:33 UTC (rev 389847)
@@ -2,7 +2,7 @@
 
 pkgname=intltool
 pkgver=0.51.0
-pkgrel=5
+pkgrel=6
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://launchpad.net/intltool";
@@ -11,12 +11,14 @@
 
source=(https://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}
 intltool-0.51.0-perl-5.26.patch
 intltool-merge-Create-cache-file-atomically.patch
-intltool_distcheck-fix.patch)
+intltool_distcheck-fix.patch
+intltool-fixrace.patch)
 sha256sums=('67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd'
 'SKIP'
 '458f5d53ac358810879080f69b11649901babcacc14471c243eb850e9436d546'
 '13bd6deb65dc94933f132919d4eea4c24354d7c1c1c9e5930cb6e70c75703763'
-'58cb7d60796bc69c7d0865f106feb589d0271619e62f8741bff6f5ce1a2615ff')
+'58cb7d60796bc69c7d0865f106feb589d0271619e62f8741bff6f5ce1a2615ff'
+'5c453ccb8bfe6e0b05d7a55e66dcfa793ea81d9bbe9fdc41f668326ba9310deb')
 validpgpkeys=('9EBD001680E8C8F9FAC61A9BE1A701D4C9DE75B5')
 
 prepare() {
@@ -24,6 +26,7 @@
   patch -Np1 -i ../intltool-0.51.0-perl-5.26.patch
   patch -Np1 -i ../intltool-merge-Create-cache-file-atomically.patch
   patch -Np1 -i ../intltool_distcheck-fix.patch
+  patch -Np1 -i ../intltool-fixrace.patch # 
https://bugs.launchpad.net/intltool/+bug/1687644
 }
 
 build() {

Added: intltool-fixrace.patch
===
--- intltool-fixrace.patch  (rev 0)
+++ intltool-fixrace.patch  2020-06-21 15:23:33 UTC (rev 389847)
@@ -0,0 +1,43 @@
+From: Bernhard M. Wiedemann 
+
+avoid a race where some processes try to use a partial cache file
+that is still being written to.
+Note that we release the lock before load_cache,
+because if we got the lock, the cache is already completely written
+and it is OK to have multiple parallel readers
+
+Index: intltool-0.51.0/intltool-merge.in
+===
+--- intltool-0.51.0.orig/intltool-merge.in
 intltool-0.51.0/intltool-merge.in
+@@ -43,6 +43,7 @@ use Getopt::Long;
+ use Text::Wrap;
+ use File::Basename;
+ use Encode;
++use Fcntl qw(:flock);
+ 
+ my $must_end_tag  = -1;
+ my $last_depth= -1;
+@@ -392,11 +393,14 @@ sub load_cache
+ 
+ sub get_cached_translation_database
+ {
++open(my $lockfh, ">", "$cache_file.lock") or die $!;
++flock($lockfh, LOCK_EX) or die "Could not lock '$cache_file.lock' - $!";
+ my $cache_file_age = -M $cache_file;
+ if (defined $cache_file_age) 
+ {
+ if ($cache_file_age <= &get_newest_po_age) 
+ {
++close($lockfh);
+ &load_cache;
+ return;
+ }
+@@ -404,6 +408,7 @@ sub get_cached_translation_database
+ }
+ 
+ &create_cache;
++close($lockfh);
+ }
+ 
+ sub add_translation

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2020-05-16 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 16, 2020 @ 13:46:25
  Author: foutrelis
Revision: 384666

upgpkg: intltool 0.51.0-5: reproducibility rebuild

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 13:46:13 UTC (rev 384665)
+++ PKGBUILD2020-05-16 13:46:25 UTC (rev 384666)
@@ -2,7 +2,7 @@
 
 pkgname=intltool
 pkgver=0.51.0
-pkgrel=4
+pkgrel=5
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://launchpad.net/intltool";

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2018-11-09 Thread Evangelos Foutras via arch-commits 
Date: Friday, November 9, 2018 @ 23:44:37
  Author: foutrelis
Revision: 338794

PIE/BUILDINFO rebuild

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 23:42:24 UTC (rev 338793)
+++ PKGBUILD2018-11-09 23:44:37 UTC (rev 338794)
@@ -2,7 +2,7 @@
 
 pkgname=intltool
 pkgver=0.51.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://launchpad.net/intltool";

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2017-07-21 Thread Jan Steffens 
Date: Friday, July 21, 2017 @ 20:45:22
  Author: heftig
Revision: 301118

0.51.0-3: ergh; actually bump

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-21 20:44:59 UTC (rev 301117)
+++ PKGBUILD2017-07-21 20:45:22 UTC (rev 301118)
@@ -3,7 +3,7 @@
 
 pkgname=intltool
 pkgver=0.51.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://launchpad.net/intltool";

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2015-07-21 Thread Eric Bélanger 
Date: Tuesday, July 21, 2015 @ 22:24:45
  Author: eric
Revision: 242409

upgpkg: intltool 0.51.0-1

Upstream update

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-21 20:05:24 UTC (rev 242408)
+++ PKGBUILD2015-07-21 20:24:45 UTC (rev 242409)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=intltool
-pkgver=0.50.2
-pkgrel=2
+pkgver=0.51.0
+pkgrel=1
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://edge.launchpad.net/intltool";
@@ -10,9 +10,9 @@
 license=('GPL')
 depends=('perl-xml-parser')
 
source=(http://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad'
-  '85c71e9651df41fc330c5f171fdfe1bf11e44f65')
-validpgpkeys=('6977ECD0E1517D6CA45C0DA443ACFF9623AE85D2')
+sha1sums=('a0c3bcb99d1bcfc5db70f8d848232a47c47da090'
+  'SKIP')
+validpgpkeys=('9EBD001680E8C8F9FAC61A9BE1A701D4C9DE75B5')
 
 build() {
   cd ${pkgname}-${pkgver}

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2014-12-31 Thread Eric Bélanger 
Date: Thursday, January 1, 2015 @ 02:49:07
  Author: eric
Revision: 228288

Add validpgpkeys array

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-01 01:43:32 UTC (rev 228287)
+++ PKGBUILD2015-01-01 01:49:07 UTC (rev 228288)
@@ -12,6 +12,7 @@
 
source=(http://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
 sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad'
   '85c71e9651df41fc330c5f171fdfe1bf11e44f65')
+validpgpkeys=('6977ECD0E1517D6CA45C0DA443ACFF9623AE85D2')
 
 build() {
   cd ${pkgname}-${pkgver}

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2014-06-30 Thread Eric Bélanger 
Date: Tuesday, July 1, 2014 @ 02:02:19
  Author: eric
Revision: 215917

upgpkg: intltool 0.50.2-2

Rebuild to add mtree file, Fix source url

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-30 23:55:24 UTC (rev 215916)
+++ PKGBUILD2014-07-01 00:02:19 UTC (rev 215917)
@@ -3,29 +3,29 @@
 
 pkgname=intltool
 pkgver=0.50.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://edge.launchpad.net/intltool";
 license=('GPL')
 depends=('perl-xml-parser')
-source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=(http://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
 sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad'
   '85c71e9651df41fc330c5f171fdfe1bf11e44f65')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 doc/I18N-HOWTO 
"${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO"
 }

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2012-04-02 Thread Eric Bélanger 
Date: Monday, April 2, 2012 @ 21:22:47
  Author: eric
Revision: 155384

upgpkg: intltool 0.50.2-1

Upstream update

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-02 21:45:23 UTC (rev 155383)
+++ PKGBUILD2012-04-03 01:22:47 UTC (rev 155384)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=intltool
-pkgver=0.50.1
+pkgver=0.50.2
 pkgrel=1
 pkgdesc="The internationalization tool collection"
 arch=('any')
@@ -10,8 +10,8 @@
 license=('GPL')
 depends=('perl-xml-parser')
 
source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha1sums=('3964df4057a16c82f711e778df058e6c11fe093a'
-  '4f4f6489ee4728a71732f8e912cf1490c1685f1e')
+sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad'
+  '85c71e9651df41fc330c5f171fdfe1bf11e44f65')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2012-02-16 Thread Eric Bélanger 
Date: Thursday, February 16, 2012 @ 21:42:54
  Author: eric
Revision: 150338

upgpkg: intltool 0.50.1-1

Upstream update

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-16 23:38:08 UTC (rev 150337)
+++ PKGBUILD2012-02-17 02:42:54 UTC (rev 150338)
@@ -2,15 +2,16 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=intltool
-pkgver=0.50.0
+pkgver=0.50.1
 pkgrel=1
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://edge.launchpad.net/intltool";
 license=('GPL')
 depends=('perl-xml-parser')
-source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('0da9847a60391ca653df35123b1f7cc0')
+source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha1sums=('3964df4057a16c82f711e778df058e6c11fe093a'
+  '4f4f6489ee4728a71732f8e912cf1490c1685f1e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2010-08-17 Thread Jan de Groot 
Date: Tuesday, August 17, 2010 @ 09:59:51
  Author: jgc
Revision: 87653

upgpkg: intltool 0.41.1-2
Follow perlxml rename

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 13:54:45 UTC (rev 87652)
+++ PKGBUILD2010-08-17 13:59:51 UTC (rev 87653)
@@ -5,27 +5,25 @@
 
 pkgname=intltool
 pkgver=0.41.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The internationalization tool collection"
 arch=('any')
 url="https://edge.launchpad.net/intltool";
 license=('GPL')
-depends=('perlxml')
+depends=('perl-xml-parser')
 
source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('d6c91bf06681919ccfdf3624035b75dc')
 sha1sums=('20b2bf222395cf1711fee1f1b7b7650b9e0f2fc2')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-
-   ./configure --prefix=/usr || return 1
-   make || return 1
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure --prefix=/usr
+   make
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd "${srcdir}/${pkgname}-${pkgver}"

-   make DESTDIR=${pkgdir} install || return 1
-   install -Dm644 doc/I18N-HOWTO \
-   ${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO || return 1
+   make DESTDIR="${pkgdir}" install
+   install -Dm644 doc/I18N-HOWTO 
"${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO"
 }

[arch-commits] Commit in intltool/trunk (PKGBUILD)

2010-04-11 Thread Daniel Griffiths 
Date: Sunday, April 11, 2010 @ 22:06:41
  Author: dgriffiths
Revision: 77335

Upstream update.

Modified:
  intltool/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-12 01:55:38 UTC (rev 77334)
+++ PKGBUILD2010-04-12 02:06:41 UTC (rev 77335)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: Eric Belanger 
+# Contributor: Eric Belanger 
 # Contributor: Jan de Groot 
+# Maintainer: Daniel J Griffiths 
 
 pkgname=intltool
-pkgver=0.41.0
+pkgver=0.41.1
 pkgrel=1
 pkgdesc="The internationalization tool collection"
 arch=('any')
@@ -11,13 +12,20 @@
 license=('GPL')
 depends=('perlxml')
 
source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8a6e4afd3fc93637dcd70e36ab899364')
-sha1sums=('6a42075e8ef23d171882c43d68081420d5be6798')
+md5sums=('d6c91bf06681919ccfdf3624035b75dc')
+sha1sums=('20b2bf222395cf1711fee1f1b7b7650b9e0f2fc2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 doc/I18N-HOWTO 
${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO || return 1
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   ./configure --prefix=/usr || return 1
+   make || return 1
 }
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   
+   make DESTDIR=${pkgdir} install || return 1
+   install -Dm644 doc/I18N-HOWTO \
+   ${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO || return 1
+}