[arch-commits] Commit in encpipe/repos/community-x86_64 (3 files)

[Kpcyrd]

    Date: Thursday, November 18, 2021 @ 23:36:35
  Author: kpcyrd
Revision: 1052750

archrelease: copy trunk to community-x86_64

Added:
  encpipe/repos/community-x86_64/PKGBUILD
    (from rev 1052749, encpipe/trunk/PKGBUILD)
  encpipe/repos/community-x86_64/ldflags.patch
    (from rev 1052749, encpipe/trunk/ldflags.patch)
Deleted:
  encpipe/repos/community-x86_64/PKGBUILD

---------------+
 PKGBUILD      |   69 ++++++++++++++++++++++++++++++--------------------------
 ldflags.patch |   29 +++++++++++++++++++++++
 2 files changed, 67 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-18 23:36:16 UTC (rev 1052749)
+++ PKGBUILD	2021-11-18 23:36:35 UTC (rev 1052750)
@@ -1,31 +0,0 @@
-# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
-
-pkgname=encpipe
-pkgver=0.5
-pkgrel=1
-pkgdesc='Encrypt data from stdin to stdout with libhydrogen'
-url='https://github.com/jedisct1/encpipe'
-arch=('x86_64')
-license=('ISC')
-makedepends=('git')
-source=("git+https://github.com/jedisct1/${pkgname}.git#tag=${pkgver}")
-b2sums=('SKIP')
-
-build() {
-  cd ${pkgname}
-  #make CFLAGS="${CFLAGS} -Iext/libhydrogen ${LDFLAGS}" bin
-  make CFLAGS="${CFLAGS} -Iext/libhydrogen ${LDFLAGS}" bin
-}
-
-check() {
-  cd ${pkgname}
-  make test
-}
-
-package() {
-  cd ${pkgname}
-  install -Dm 755 encpipe -t "${pkgdir}/usr/bin"
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-# vim: ts=2 sw=2 et:

Copied: encpipe/repos/community-x86_64/PKGBUILD (from rev 1052749, encpipe/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-18 23:36:35 UTC (rev 1052750)
@@ -0,0 +1,38 @@
+# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
+
+pkgname=encpipe
+pkgver=0.5
+pkgrel=2
+pkgdesc='Encrypt data from stdin to stdout with libhydrogen'
+url='https://github.com/jedisct1/encpipe'
+arch=('x86_64')
+license=('ISC')
+makedepends=('git')
+source=("git+https://github.com/jedisct1/${pkgname}.git#tag=${pkgver}"
+        # this patch was commited upstream as f278117be2e5ee563813df83e1f22fd567461d4e
+        "ldflags.patch")
+b2sums=('SKIP'
+        '7f874694b9af75592f44cc037a032099e56b2d83459da95ae02e6bc6d76b4e3a7fc3d39fa302141a2666cb1d6a7eb7ce5f2ed0d8bd2dc7885801d73f3b02b8ed')
+
+prepare() {
+  cd ${pkgname}
+  patch -p1 -i ../ldflags.patch
+}
+
+build() {
+  cd ${pkgname}
+  make bin
+}
+
+check() {
+  cd ${pkgname}
+  make test
+}
+
+package() {
+  cd ${pkgname}
+  install -Dm 755 encpipe -t "${pkgdir}/usr/bin"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:

Copied: encpipe/repos/community-x86_64/ldflags.patch (from rev 1052749, encpipe/trunk/ldflags.patch)
===================================================================
--- ldflags.patch	                        (rev 0)
+++ ldflags.patch	2021-11-18 23:36:35 UTC (rev 1052750)
@@ -0,0 +1,29 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,11 @@
+ PREFIX ?= /usr/local
+ WFLAGS ?= -Wall -Wextra -Wmissing-prototypes -Wdiv-by-zero -Wbad-function-cast -Wcast-align -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wnested-externs -Wno-unknown-pragmas -Wpointer-arith -Wredundant-decls -Wstrict-prototypes -Wswitch-enum -Wno-type-limits
+ CFLAGS ?= -Os -march=native -fno-exceptions $(WFLAGS)
+-CFLAGS += -I. -Iext/libhydrogen
+-OBJ = ext/libhydrogen/hydrogen.o src/encpipe.o src/safe_rw.o
++CPPFLAGS += -I. -Iext/libhydrogen
+ STRIP ?= strip
+ 
++OBJ = ext/libhydrogen/hydrogen.o src/encpipe.o src/safe_rw.o
++
+ SRC = \
+ 	ext/libhydrogen/hydrogen.c \
+ 	src/common.h \
+@@ -20,10 +21,10 @@ bin: encpipe
+ $(OBJ): $(SRC)
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+ 
+ encpipe: $(OBJ)
+-	$(CC) $(CFLAGS) -o encpipe $(OBJ)
++	$(CC) $(CFLAGS) -o encpipe $(LDFLAGS) $(OBJ)
+ 
+ ext/libhydrogen/hydrogen.c:
+ 	git submodule update --init || echo "** Make sure you cloned the repository **" >&2