Date: Tuesday, August 8, 2017 @ 08:49:23
  Author: zorun
Revision: 249564

archrelease: copy trunk to community-x86_64, community-i686

Added:
  argon2/repos/community-i686/PKGBUILD
    (from rev 249563, argon2/trunk/PKGBUILD)
  argon2/repos/community-i686/fix-cflags.patch
    (from rev 249563, argon2/trunk/fix-cflags.patch)
  argon2/repos/community-i686/libargon2.pc
    (from rev 249563, argon2/trunk/libargon2.pc)
  argon2/repos/community-i686/only-install-shared-lib.patch
    (from rev 249563, argon2/trunk/only-install-shared-lib.patch)
  argon2/repos/community-x86_64/PKGBUILD
    (from rev 249563, argon2/trunk/PKGBUILD)
  argon2/repos/community-x86_64/fix-cflags.patch
    (from rev 249563, argon2/trunk/fix-cflags.patch)
  argon2/repos/community-x86_64/libargon2.pc
    (from rev 249563, argon2/trunk/libargon2.pc)
  argon2/repos/community-x86_64/only-install-shared-lib.patch
    (from rev 249563, argon2/trunk/only-install-shared-lib.patch)
Deleted:
  argon2/repos/community-i686/PKGBUILD
  argon2/repos/community-i686/libargon2.pc
  argon2/repos/community-x86_64/PKGBUILD
  argon2/repos/community-x86_64/libargon2.pc

------------------------------------------------+
 /PKGBUILD                                      |   98 +++++++++++++++++++++++
 /libargon2.pc                                  |   22 +++++
 community-i686/PKGBUILD                        |   38 --------
 community-i686/fix-cflags.patch                |   21 ++++
 community-i686/libargon2.pc                    |   11 --
 community-i686/only-install-shared-lib.patch   |   17 +++
 community-x86_64/PKGBUILD                      |   38 --------
 community-x86_64/fix-cflags.patch              |   21 ++++
 community-x86_64/libargon2.pc                  |   11 --
 community-x86_64/only-install-shared-lib.patch |   17 +++
 10 files changed, 196 insertions(+), 98 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD     2017-08-08 08:48:21 UTC (rev 249563)
+++ community-i686/PKGBUILD     2017-08-08 08:49:23 UTC (rev 249564)
@@ -1,38 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-pkgname=argon2
-pkgver=20161029
-pkgrel=2
-pkgdesc="A password-hashing function (reference C implementation)"
-arch=("x86_64" "i686")
-url="https://github.com/P-H-C/phc-winner-argon2";
-license=('Apache')
-depends=("glibc")
-source=("https://github.com/P-H-C/phc-winner-argon2/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz";
-        "libargon2.pc")
-sha256sums=('fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7'
-            '4189ce6c183319ceaf2c4ec96facd424deeaa9e2819efb7511893bcf3ef5c836')
-
-prepare() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  cp "${srcdir}/libargon2.pc" libargon2.pc
-  sed -i -e "s/@UPSTREAM_VER@/${pkgver}/" libargon2.pc
-}
-
-build() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  make argon2 libs
-}
-
-check() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  make test
-}
-
-package() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  chmod -x "${pkgdir}/usr/include/argon2.h"
-  install -Dm644 libargon2.pc "${pkgdir}/usr/lib/pkgconfig/libargon2.pc"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: argon2/repos/community-i686/PKGBUILD (from rev 249563, 
argon2/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD                             (rev 0)
+++ community-i686/PKGBUILD     2017-08-08 08:49:23 UTC (rev 249564)
@@ -0,0 +1,49 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+pkgname=argon2
+pkgver=20161029
+pkgrel=3
+pkgdesc="A password-hashing function (reference C implementation)"
+arch=("x86_64" "i686")
+url="https://github.com/P-H-C/phc-winner-argon2";
+license=('Apache')
+depends=("glibc")
+source=("https://github.com/P-H-C/phc-winner-argon2/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+        "libargon2.pc"
+        "fix-cflags.patch"
+        "only-install-shared-lib.patch")
+sha256sums=('fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7'
+            '4189ce6c183319ceaf2c4ec96facd424deeaa9e2819efb7511893bcf3ef5c836'
+            '4e6d2676d28a9a9a34ec58788ea942083e3892e6b67d2d765eafb32150246728'
+            '5b032ecbbdf057518f13ba29a8599c376551170de891780923502b65ff8bc128')
+
+prepare() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  # Fix an attempt at voodoo magic with the build flags (resulting in
+  # -march=native, which produces invalid opcodes when run on older CPUs)
+  # Similar issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828779
+  patch -p1 < "${srcdir}/fix-cflags.patch"
+  # This just avoids compiling the static lib in the package() function.
+  patch -p1 < "${srcdir}/only-install-shared-lib.patch"
+  # Copy custom pkg-config file
+  cp "${srcdir}/libargon2.pc" libargon2.pc
+  sed -i -e "s/@UPSTREAM_VER@/${pkgver}/" libargon2.pc
+}
+
+build() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  make argon2 libargon2.so OPTTARGET="${pkgarch/_/-}"
+}
+
+check() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  make test OPTTARGET="${pkgarch/_/-}"
+}
+
+package() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  chmod -x "${pkgdir}/usr/include/argon2.h"
+  install -Dm644 libargon2.pc "${pkgdir}/usr/lib/pkgconfig/libargon2.pc"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: argon2/repos/community-i686/fix-cflags.patch (from rev 249563, 
argon2/trunk/fix-cflags.patch)
===================================================================
--- community-i686/fix-cflags.patch                             (rev 0)
+++ community-i686/fix-cflags.patch     2017-08-08 08:49:23 UTC (rev 249564)
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 1838c13..6c28506 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@ SRC_BENCH = src/bench.c
+ SRC_GENKAT = src/genkat.c
+ OBJ = $(SRC:.c=.o)
+ 
+-CFLAGS += -std=c89 -pthread -O3 -Wall -g -Iinclude -Isrc
++CFLAGS += -std=c89 -pthread -Iinclude -Isrc
+ CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement 
-D_FORTIFY_SOURCE=2 \
+                               -Wextra -Wno-type-limits -Werror -coverage 
-DTEST_LARGE_RAM
+ 
+@@ -40,7 +40,6 @@ $(info Building without optimizations)
+       SRC += src/ref.c
+ else
+ $(info Building with optimizations for $(OPTTARGET))
+-      CFLAGS += -march=$(OPTTARGET)
+       SRC += src/opt.c
+ endif
+ 

Deleted: community-i686/libargon2.pc
===================================================================
--- community-i686/libargon2.pc 2017-08-08 08:48:21 UTC (rev 249563)
+++ community-i686/libargon2.pc 2017-08-08 08:49:23 UTC (rev 249564)
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libargon2
-Description: Development libraries for libargon2
-Version: @UPSTREAM_VER@
-Libs: -L${libdir} -largon2 -lrt -ldl
-Cflags:
-URL: https://github.com/P-H-C/phc-winner-argon2

Copied: argon2/repos/community-i686/libargon2.pc (from rev 249563, 
argon2/trunk/libargon2.pc)
===================================================================
--- community-i686/libargon2.pc                         (rev 0)
+++ community-i686/libargon2.pc 2017-08-08 08:49:23 UTC (rev 249564)
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libargon2
+Description: Development libraries for libargon2
+Version: @UPSTREAM_VER@
+Libs: -L${libdir} -largon2 -lrt -ldl
+Cflags:
+URL: https://github.com/P-H-C/phc-winner-argon2

Copied: argon2/repos/community-i686/only-install-shared-lib.patch (from rev 
249563, argon2/trunk/only-install-shared-lib.patch)
===================================================================
--- community-i686/only-install-shared-lib.patch                                
(rev 0)
+++ community-i686/only-install-shared-lib.patch        2017-08-08 08:49:23 UTC 
(rev 249564)
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index 6c28506..1c1b028 100644
+--- a/Makefile
++++ b/Makefile
+@@ -151,10 +151,10 @@ format:
+               clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
+                       -i include/*.h src/*.c src/*.h src/blake2/*.c 
src/blake2/*.h
+ 
+-install: $(RUN) libs
++install:
+       $(INSTALL) -d $(INST_INCLUDE)
+       $(INSTALL) $(HEADERS) $(INST_INCLUDE)
+       $(INSTALL) -d $(INST_LIBRARY)
+-      $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
++      $(INSTALL) $(LIB_SH) $(INST_LIBRARY)
+       $(INSTALL) -d $(INST_BINARY)
+       $(INSTALL) $(RUN) $(INST_BINARY)

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD   2017-08-08 08:48:21 UTC (rev 249563)
+++ community-x86_64/PKGBUILD   2017-08-08 08:49:23 UTC (rev 249564)
@@ -1,38 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-pkgname=argon2
-pkgver=20161029
-pkgrel=2
-pkgdesc="A password-hashing function (reference C implementation)"
-arch=("x86_64" "i686")
-url="https://github.com/P-H-C/phc-winner-argon2";
-license=('Apache')
-depends=("glibc")
-source=("https://github.com/P-H-C/phc-winner-argon2/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz";
-        "libargon2.pc")
-sha256sums=('fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7'
-            '4189ce6c183319ceaf2c4ec96facd424deeaa9e2819efb7511893bcf3ef5c836')
-
-prepare() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  cp "${srcdir}/libargon2.pc" libargon2.pc
-  sed -i -e "s/@UPSTREAM_VER@/${pkgver}/" libargon2.pc
-}
-
-build() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  make argon2 libs
-}
-
-check() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  make test
-}
-
-package() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  chmod -x "${pkgdir}/usr/include/argon2.h"
-  install -Dm644 libargon2.pc "${pkgdir}/usr/lib/pkgconfig/libargon2.pc"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: argon2/repos/community-x86_64/PKGBUILD (from rev 249563, 
argon2/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD                           (rev 0)
+++ community-x86_64/PKGBUILD   2017-08-08 08:49:23 UTC (rev 249564)
@@ -0,0 +1,49 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+pkgname=argon2
+pkgver=20161029
+pkgrel=3
+pkgdesc="A password-hashing function (reference C implementation)"
+arch=("x86_64" "i686")
+url="https://github.com/P-H-C/phc-winner-argon2";
+license=('Apache')
+depends=("glibc")
+source=("https://github.com/P-H-C/phc-winner-argon2/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+        "libargon2.pc"
+        "fix-cflags.patch"
+        "only-install-shared-lib.patch")
+sha256sums=('fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7'
+            '4189ce6c183319ceaf2c4ec96facd424deeaa9e2819efb7511893bcf3ef5c836'
+            '4e6d2676d28a9a9a34ec58788ea942083e3892e6b67d2d765eafb32150246728'
+            '5b032ecbbdf057518f13ba29a8599c376551170de891780923502b65ff8bc128')
+
+prepare() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  # Fix an attempt at voodoo magic with the build flags (resulting in
+  # -march=native, which produces invalid opcodes when run on older CPUs)
+  # Similar issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828779
+  patch -p1 < "${srcdir}/fix-cflags.patch"
+  # This just avoids compiling the static lib in the package() function.
+  patch -p1 < "${srcdir}/only-install-shared-lib.patch"
+  # Copy custom pkg-config file
+  cp "${srcdir}/libargon2.pc" libargon2.pc
+  sed -i -e "s/@UPSTREAM_VER@/${pkgver}/" libargon2.pc
+}
+
+build() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  make argon2 libargon2.so OPTTARGET="${pkgarch/_/-}"
+}
+
+check() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  make test OPTTARGET="${pkgarch/_/-}"
+}
+
+package() {
+  cd "$srcdir/phc-winner-$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  chmod -x "${pkgdir}/usr/include/argon2.h"
+  install -Dm644 libargon2.pc "${pkgdir}/usr/lib/pkgconfig/libargon2.pc"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: argon2/repos/community-x86_64/fix-cflags.patch (from rev 249563, 
argon2/trunk/fix-cflags.patch)
===================================================================
--- community-x86_64/fix-cflags.patch                           (rev 0)
+++ community-x86_64/fix-cflags.patch   2017-08-08 08:49:23 UTC (rev 249564)
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 1838c13..6c28506 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@ SRC_BENCH = src/bench.c
+ SRC_GENKAT = src/genkat.c
+ OBJ = $(SRC:.c=.o)
+ 
+-CFLAGS += -std=c89 -pthread -O3 -Wall -g -Iinclude -Isrc
++CFLAGS += -std=c89 -pthread -Iinclude -Isrc
+ CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement 
-D_FORTIFY_SOURCE=2 \
+                               -Wextra -Wno-type-limits -Werror -coverage 
-DTEST_LARGE_RAM
+ 
+@@ -40,7 +40,6 @@ $(info Building without optimizations)
+       SRC += src/ref.c
+ else
+ $(info Building with optimizations for $(OPTTARGET))
+-      CFLAGS += -march=$(OPTTARGET)
+       SRC += src/opt.c
+ endif
+ 

Deleted: community-x86_64/libargon2.pc
===================================================================
--- community-x86_64/libargon2.pc       2017-08-08 08:48:21 UTC (rev 249563)
+++ community-x86_64/libargon2.pc       2017-08-08 08:49:23 UTC (rev 249564)
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libargon2
-Description: Development libraries for libargon2
-Version: @UPSTREAM_VER@
-Libs: -L${libdir} -largon2 -lrt -ldl
-Cflags:
-URL: https://github.com/P-H-C/phc-winner-argon2

Copied: argon2/repos/community-x86_64/libargon2.pc (from rev 249563, 
argon2/trunk/libargon2.pc)
===================================================================
--- community-x86_64/libargon2.pc                               (rev 0)
+++ community-x86_64/libargon2.pc       2017-08-08 08:49:23 UTC (rev 249564)
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libargon2
+Description: Development libraries for libargon2
+Version: @UPSTREAM_VER@
+Libs: -L${libdir} -largon2 -lrt -ldl
+Cflags:
+URL: https://github.com/P-H-C/phc-winner-argon2

Copied: argon2/repos/community-x86_64/only-install-shared-lib.patch (from rev 
249563, argon2/trunk/only-install-shared-lib.patch)
===================================================================
--- community-x86_64/only-install-shared-lib.patch                              
(rev 0)
+++ community-x86_64/only-install-shared-lib.patch      2017-08-08 08:49:23 UTC 
(rev 249564)
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index 6c28506..1c1b028 100644
+--- a/Makefile
++++ b/Makefile
+@@ -151,10 +151,10 @@ format:
+               clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
+                       -i include/*.h src/*.c src/*.h src/blake2/*.c 
src/blake2/*.h
+ 
+-install: $(RUN) libs
++install:
+       $(INSTALL) -d $(INST_INCLUDE)
+       $(INSTALL) $(HEADERS) $(INST_INCLUDE)
+       $(INSTALL) -d $(INST_LIBRARY)
+-      $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
++      $(INSTALL) $(LIB_SH) $(INST_LIBRARY)
+       $(INSTALL) -d $(INST_BINARY)
+       $(INSTALL) $(RUN) $(INST_BINARY)

Reply via email to