[arch-commits] Commit in libssh/repos (4 files)

Antonio Rojas arojas at archlinux.org
Wed Jun 14 09:09:59 UTC 2017


    Date: Wednesday, June 14, 2017 @ 09:09:58
  Author: arojas
Revision: 298809

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

Added:
  libssh/repos/extra-i686/PKGBUILD
    (from rev 298808, libssh/trunk/PKGBUILD)
  libssh/repos/extra-x86_64/PKGBUILD
    (from rev 298808, libssh/trunk/PKGBUILD)
Deleted:
  libssh/repos/extra-i686/PKGBUILD
  libssh/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |  138 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   63 ---------------------
 extra-x86_64/PKGBUILD |   63 ---------------------
 3 files changed, 138 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-06-14 09:09:17 UTC (rev 298808)
+++ extra-i686/PKGBUILD	2017-06-14 09:09:58 UTC (rev 298809)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: ice-man <icemanf at gmail.com>
-# Contributor: sergeantspoon <sergeantspoon at archlinux.us>
-
-pkgbase=libssh
-pkgname=(libssh libssh-docs)
-pkgver=0.7.5
-pkgrel=1
-pkgdesc="Library for accessing ssh client services through C libraries"
-url="http://www.libssh.org/"
-license=(LGPL)
-arch=(i686 x86_64)
-depends=(libgcrypt zlib) # use openssl again for 0.8
-makedepends=(cmake cmocka doxygen)
-source=(https://red.libssh.org/attachments/download/218/$pkgname-$pkgver.tar.xz
-        https://red.libssh.org/attachments/download/217/$pkgname-$pkgver.tar.asc)
-sha256sums=('54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
-            'SKIP')
-validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org>
-
-prepare() {
-  # disable the test. It is confused by our clean container setup.
-  # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
-  # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
-  sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
-
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_GSSAPI=OFF \
-    -DWITH_GCRYPT=ON \
-    -DWITH_TESTING=ON
-  make
-  make doc
-}
-
-check() {
-  cd build
-  make test
-}
-
-package_libssh() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
-
-package_libssh-docs() {
-  pkgdesc="Documentation for libssh"
-  depends=()
-
-  mkdir -p "$pkgdir"/usr/share/doc/libssh
-  cp -r build/doc/html "$pkgdir"/usr/share/doc/libssh
-  cp -r build/doc/man "$pkgdir"/usr/share
-  rm "$pkgdir"/usr/share/man/man3/{bug,deprecated}.*
-}

Copied: libssh/repos/extra-i686/PKGBUILD (from rev 298808, libssh/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-06-14 09:09:58 UTC (rev 298809)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: ice-man <icemanf at gmail.com>
+# Contributor: sergeantspoon <sergeantspoon at archlinux.us>
+
+pkgbase=libssh
+pkgname=(libssh libssh-docs)
+pkgver=0.7.5
+pkgrel=2
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/"
+license=(LGPL)
+arch=(i686 x86_64)
+depends=(libgcrypt zlib) # use openssl again for 0.8
+makedepends=(cmake cmocka doxygen)
+source=(https://red.libssh.org/attachments/download/218/$pkgname-$pkgver.tar.xz
+        https://red.libssh.org/attachments/download/217/$pkgname-$pkgver.tar.asc
+        libssh-fix-read-config.patch::https://git.libssh.org/projects/libssh.git/patch/?id=5333be59)
+sha256sums=('54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
+            'SKIP'
+            'c39bed86f34a377015fb6d6552700a3838c5cae1a4a83b3e859539785aeabdba')
+validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org>
+
+prepare() {
+  # disable the test. It is confused by our clean container setup.
+  # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
+  # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
+  sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
+
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  # Fix reading SSH configuration files
+  patch -p1 -i ../libssh-fix-read-config.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_GSSAPI=OFF \
+    -DWITH_GCRYPT=ON \
+    -DWITH_TESTING=ON
+  make
+  make doc
+}
+
+check() {
+  cd build
+  make test
+}
+
+package_libssh() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
+
+package_libssh-docs() {
+  pkgdesc="Documentation for libssh"
+  depends=()
+
+  mkdir -p "$pkgdir"/usr/share/doc/libssh
+  cp -r build/doc/html "$pkgdir"/usr/share/doc/libssh
+  cp -r build/doc/man "$pkgdir"/usr/share
+  rm "$pkgdir"/usr/share/man/man3/{bug,deprecated}.*
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-06-14 09:09:17 UTC (rev 298808)
+++ extra-x86_64/PKGBUILD	2017-06-14 09:09:58 UTC (rev 298809)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: ice-man <icemanf at gmail.com>
-# Contributor: sergeantspoon <sergeantspoon at archlinux.us>
-
-pkgbase=libssh
-pkgname=(libssh libssh-docs)
-pkgver=0.7.5
-pkgrel=1
-pkgdesc="Library for accessing ssh client services through C libraries"
-url="http://www.libssh.org/"
-license=(LGPL)
-arch=(i686 x86_64)
-depends=(libgcrypt zlib) # use openssl again for 0.8
-makedepends=(cmake cmocka doxygen)
-source=(https://red.libssh.org/attachments/download/218/$pkgname-$pkgver.tar.xz
-        https://red.libssh.org/attachments/download/217/$pkgname-$pkgver.tar.asc)
-sha256sums=('54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
-            'SKIP')
-validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org>
-
-prepare() {
-  # disable the test. It is confused by our clean container setup.
-  # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
-  # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
-  sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
-
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_GSSAPI=OFF \
-    -DWITH_GCRYPT=ON \
-    -DWITH_TESTING=ON
-  make
-  make doc
-}
-
-check() {
-  cd build
-  make test
-}
-
-package_libssh() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
-
-package_libssh-docs() {
-  pkgdesc="Documentation for libssh"
-  depends=()
-
-  mkdir -p "$pkgdir"/usr/share/doc/libssh
-  cp -r build/doc/html "$pkgdir"/usr/share/doc/libssh
-  cp -r build/doc/man "$pkgdir"/usr/share
-  rm "$pkgdir"/usr/share/man/man3/{bug,deprecated}.*
-}

Copied: libssh/repos/extra-x86_64/PKGBUILD (from rev 298808, libssh/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-06-14 09:09:58 UTC (rev 298809)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: ice-man <icemanf at gmail.com>
+# Contributor: sergeantspoon <sergeantspoon at archlinux.us>
+
+pkgbase=libssh
+pkgname=(libssh libssh-docs)
+pkgver=0.7.5
+pkgrel=2
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/"
+license=(LGPL)
+arch=(i686 x86_64)
+depends=(libgcrypt zlib) # use openssl again for 0.8
+makedepends=(cmake cmocka doxygen)
+source=(https://red.libssh.org/attachments/download/218/$pkgname-$pkgver.tar.xz
+        https://red.libssh.org/attachments/download/217/$pkgname-$pkgver.tar.asc
+        libssh-fix-read-config.patch::https://git.libssh.org/projects/libssh.git/patch/?id=5333be59)
+sha256sums=('54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
+            'SKIP'
+            'c39bed86f34a377015fb6d6552700a3838c5cae1a4a83b3e859539785aeabdba')
+validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org>
+
+prepare() {
+  # disable the test. It is confused by our clean container setup.
+  # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
+  # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
+  sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
+
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  # Fix reading SSH configuration files
+  patch -p1 -i ../libssh-fix-read-config.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_GSSAPI=OFF \
+    -DWITH_GCRYPT=ON \
+    -DWITH_TESTING=ON
+  make
+  make doc
+}
+
+check() {
+  cd build
+  make test
+}
+
+package_libssh() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
+
+package_libssh-docs() {
+  pkgdesc="Documentation for libssh"
+  depends=()
+
+  mkdir -p "$pkgdir"/usr/share/doc/libssh
+  cp -r build/doc/html "$pkgdir"/usr/share/doc/libssh
+  cp -r build/doc/man "$pkgdir"/usr/share
+  rm "$pkgdir"/usr/share/man/man3/{bug,deprecated}.*
+}



More information about the arch-commits mailing list