From 94abf6fe09097fb81ccbf101bf1fd8f693019a8f Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Thu, 16 Sep 2010 00:05:17 +0000
Subject: main/libssh: new apkbuild (cherry picked from commit
 2901bdcc1917a2ea2acda77e8078ac86bc2e4a4b)

---
 main/libssh/APKBUILD | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 main/libssh/APKBUILD

(limited to 'main/libssh')

diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD
new file mode 100644
index 0000000000..0d40683add
--- /dev/null
+++ b/main/libssh/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Carlo Landmeter
+# Maintainer: 
+pkgname=libssh
+pkgver=0.4.5
+pkgrel=0
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/"
+license="LGPL"
+depends=
+makedepends="openssl-dev cmake"
+subpackages="$pkgname-dev"
+source="http://www.libssh.org/files/${pkgname}-${pkgver}.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$srcdir"
+	
+	mkdir build && cd build
+	cmake ../${pkgname}-${pkgver} \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/build
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="156bf2402f3251b50b15fe8598c9031d  libssh-0.4.5.tar.gz"
-- 
cgit v1.2.3


From 3fb06bc8db19861b569b7b66cfbce4d951128d0e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 5 Oct 2010 06:52:05 +0000
Subject: main/libss: upgrade to 0.4.6

---
 main/libssh/APKBUILD | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'main/libssh')

diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD
index 0d40683add..cd2354dd76 100644
--- a/main/libssh/APKBUILD
+++ b/main/libssh/APKBUILD
@@ -1,28 +1,36 @@
 # Contributor: Carlo Landmeter
 # Maintainer: 
 pkgname=libssh
-pkgver=0.4.5
+pkgver=0.4.6
 pkgrel=0
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
 license="LGPL"
 depends=
-makedepends="openssl-dev cmake"
+makedepends="openssl-dev cmake doxygen"
 subpackages="$pkgname-dev"
-source="http://www.libssh.org/files/${pkgname}-${pkgver}.tar.gz"
+source="http://www.libssh.org/files/${pkgname}-${pkgver}.tar.gz
+	libssh-ccache.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	# apply patches here
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
 }
 
 build() {
 	cd "$srcdir"
 	
 	mkdir build && cd build
-	cmake ../${pkgname}-${pkgver} \
+	cmake "$srcdir"/${pkgname}-${pkgver} \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release
 	make || return 1
@@ -33,4 +41,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="156bf2402f3251b50b15fe8598c9031d  libssh-0.4.5.tar.gz"
+md5sums="9efdc8911fdb150fb16500c2fbe4ef2e  libssh-0.4.6.tar.gz
+5b4b75e0d7e8d78185bed79c08e45f90  libssh-ccache.patch"
-- 
cgit v1.2.3


From a33599ccc3f96453286173267a61016b08f48d52 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 5 Oct 2010 09:11:31 +0000
Subject: main/libssh: add missing patch

---
 main/libssh/libssh-ccache.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 main/libssh/libssh-ccache.patch

(limited to 'main/libssh')

diff --git a/main/libssh/libssh-ccache.patch b/main/libssh/libssh-ccache.patch
new file mode 100644
index 0000000000..65927431d8
--- /dev/null
+++ b/main/libssh/libssh-ccache.patch
@@ -0,0 +1,28 @@
+--- ./ConfigureChecks.cmake.orig
++++ ./ConfigureChecks.cmake
+@@ -17,25 +17,6 @@
+ set(BINARYDIR ${CMAKE_BINARY_DIR})
+ set(SOURCEDIR ${CMAKE_SOURCE_DIR})
+ 
+-function(COMPILER_DUMPVERSION _OUTPUT_VERSION)
+-    execute_process(
+-        COMMAND
+-            ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} -dumpversion
+-        OUTPUT_VARIABLE _COMPILER_VERSION
+-    )
+-
+-    string(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+-        _COMPILER_VERSION ${_COMPILER_VERSION})
+-
+-    set(${_OUTPUT_VERSION} ${_COMPILER_VERSION} PARENT_SCOPE)
+-endfunction()
+-
+-if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
+-    compiler_dumpversion(GNUCC_VERSION)
+-    if (NOT GNUCC_VERSION EQUAL 34)
+-        check_c_compiler_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN)
+-    endif (NOT GNUCC_VERSION EQUAL 34)
+-endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
+ 
+ # HEADER FILES
+ check_include_file(argp.h HAVE_ARGP_H)
-- 
cgit v1.2.3


From da49ad32c469ea4e9426a6ac6d8c2e1db97edda6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 13 Dec 2010 16:00:16 +0000
Subject: main/*: add arch

---
 main/libssh/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

(limited to 'main/libssh')

diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD
index cd2354dd76..a38ec175d9 100644
--- a/main/libssh/APKBUILD
+++ b/main/libssh/APKBUILD
@@ -5,6 +5,7 @@ pkgver=0.4.6
 pkgrel=0
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
+arch="x86 x86_64"
 license="LGPL"
 depends=
 makedepends="openssl-dev cmake doxygen"
-- 
cgit v1.2.3