---
 testing/haproxy/APKBUILD | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/testing/haproxy/APKBUILD b/testing/haproxy/APKBUILD
index 87a81ce..e699b09 100644
--- a/testing/haproxy/APKBUILD
+++ b/testing/haproxy/APKBUILD
@@ -1,8 +1,7 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=haproxy
-pkgver=1.5_alpha25
-_pkgver=${pkgver/_alpha/-dev}
+pkgver=1.5.10
 pkgrel=0
 pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
 url="http://haproxy.1wt.eu"
@@ -12,17 +11,17 @@ depends=""
 makedepends="pcre-dev openssl-dev"
 install="haproxy.pre-install haproxy.pre-upgrade"
 subpackages="$pkgname-doc"
-source="http://haproxy.1wt.eu/download/1.5/src/devel/$pkgname-$_pkgver.tar.gz
+source="http://haproxy.1wt.eu/download/1.5/src/$pkgname-$pkgver.tar.gz
 	haproxy.initd
 	haproxy.cfg"
 
 build() {
-	cd "$srcdir/$pkgname-$_pkgver"
+	cd "$srcdir/$pkgname-$pkgver"
 	make TARGET=linux2628 USE_PCRE=1 USE_OPENSSL=1 CFLAGS="$CFLAGS" || return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$_pkgver"
+	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy \
 		install
 	install -d "$pkgdir"/var/lib/haproxy
@@ -30,12 +29,12 @@ package() {
 	install -m644 -D "$srcdir"/haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg
 }
 
-md5sums="c4922e9666a90403c155c2584d5b4c39  haproxy-1.5-dev25.tar.gz
+md5sums="5631457ea1f84b3c0d8e5bc8015ed329  haproxy-1.5.10.tar.gz
 81319456a35408bf47443e9c314d2e94  haproxy.initd
 463f00b30bfb002750d5c5549382365f  haproxy.cfg"
-sha256sums="c98d6ae13233815f1c26acfd2df50e85fedf0673f01f149b3211da17d6309c4b  haproxy-1.5-dev25.tar.gz
+sha256sums="090264c834477c290f6ad6da558731d50aede0800996742d15e870b9947fe517  haproxy-1.5.10.tar.gz
 d0b91b3566768c40cfeb3b304d66728111d9b97d5c149d88589371c1bc4c6ba0  haproxy.initd
 7e3c03acb9a41e21e21059da609e694e6dd952d9a37297bd39cad37680af213f  haproxy.cfg"
-sha512sums="b3e1513f1a1d8bb4af2b56d9aab7f82f9a142e3dc6e345d86dca0e168b0439c0bd5f5d4ee671684946db96f3c93c69002dc846a9950eba378936aabca18349fb  haproxy-1.5-dev25.tar.gz
+sha512sums="d15aaca4be6d8b41a691509042728d6aaa177075f2c3ff783d91cc02150a0d7985863c2f0c19c5df20461fdf2c95eaca67031ed37992e75ac02fb887445308de  haproxy-1.5.10.tar.gz
 cb13279374006b1a6302f865f82defbaa6256aed424fb12da53a9459a1a96c6f9470b8156985a177a13bda4a74e7b0cd448666564f6a59cdeb589537580f4b64  haproxy.initd
 89d1366352af9cc7cb338779341d460606e2e3cfe9e4f7d5169af46680accb07035fab9a4bbb87dfbe383bb146e8e4d1e95a29e3d36ff64e97603a317a0b1b78  haproxy.cfg"
-- 
2.2.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

On 01/20/2015 10:57 AM, Natanael Copa wrote:
> On Sun, 18 Jan 2015 13:19:06 +0000
> Nathan Angelacos <nangel@alpinelinux.org> wrote:
>
>> ---
>>   testing/haproxy/APKBUILD | 15 +++++++--------
>>   1 file changed, 7 insertions(+), 8 deletions(-)
>>
>
> applied. thanks!
>
> maybe move it to main too? it looks like its no longer alpha.
>
>

1.4 branch doesn't use openssl as a dependency (its the bare-bones version)
1.5 supports SNI and so needs openssl

I have no problem moving it to main, but I wonder if we should keep the 
old one around. (And I'm bad with the naming schemes. :) )

haproxy
haproxy-ssl

?



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

On Sun, 18 Jan 2015 13:19:06 +0000
Nathan Angelacos <nangel@alpinelinux.org> wrote:

> ---
>  testing/haproxy/APKBUILD | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 

applied. thanks!

maybe move it to main too? it looks like its no longer alpha.


-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

On Tue, 20 Jan 2015 11:14:28 -0500
Nathan Angelacos <nangel@nothome.org> wrote:

> On 01/20/2015 10:57 AM, Natanael Copa wrote:
> > On Sun, 18 Jan 2015 13:19:06 +0000
> > Nathan Angelacos <nangel@alpinelinux.org> wrote:
> >
> >> ---
> >>   testing/haproxy/APKBUILD | 15 +++++++--------
> >>   1 file changed, 7 insertions(+), 8 deletions(-)
> >>
> >
> > applied. thanks!
> >
> > maybe move it to main too? it looks like its no longer alpha.
> >
> >
> 
> 1.4 branch doesn't use openssl as a dependency (its the bare-bones version)
> 1.5 supports SNI and so needs openssl
> 
> I have no problem moving it to main, but I wonder if we should keep the 
> old one around. (And I'm bad with the naming schemes. :) )
> 
> haproxy
> haproxy-ssl

haproxy 1.5 cannot just replace haproxy 1.4?

if we want support both we could do:

haproxy (current users get upgrade to 1.5 on distro upgrade)
haproxy1.4 (for those who want to stick to 1.4)

or:

haproxy (current users keep 1.4 on distro upgrade)
haproxy1.5 (for those who want the 1.5)


> 
> ?
> 
> 
> 
> ---
> Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
> Help:         alpine-aports+help@lists.alpinelinux.org
> ---
> 



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---