Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=d7346658d7d497bf7fe4d668151c0749a4b27e06
commit d7346658d7d497bf7fe4d668151c0749a4b27e06
Merge: 860b9e8 8308510
Author: VÃRÃSKÅI András voros...@frugalware.org
Date: Fri Jul 2 09:34:07 2010 +0200
Merge branch 'master' of
git://git.frugalware.org/pub/frugalware/frugalware-current
Conflicts:
source/network-extra/openldap/FrugalBuild
source/network-extra/pure-ftpd/FrugalBuild
source/network-extra/vsftpd/FrugalBuild
source/network/wget/FrugalBuild
merge in current for fix conflicts
diff --cc source/apps-extra/chntpw/FrugalBuild
index afc7a24,3fe4ffd..fff068a
--- a/source/apps-extra/chntpw/FrugalBuild
+++ b/source/apps-extra/chntpw/FrugalBuild
@@@ -2,18 -2,18 +2,18 @@@
# Maintainer: exceed exceed.ced...@gmail.com
pkgname=chntpw
- pkgver=080526
+ pkgver=100627
_F_archive_name=${pkgname}-source
_F_cd_path=$pkgname-$pkgver
-pkgrel=1
+pkgrel=2
pkgdesc=Utility to (re)set the password of any user and registry editor on
Windows NT/2K/XP system
url=http://pogostick.net/~pnh/ntpasswd;
groups=('apps-extra')
archs=('i686')
-depends=('openssl')
+depends=('openssl=1.0.0')
source=($url/$pkgname-source-$pkgver.zip)
up2date=Flastarchive $url/editor.html .zip
- md5sums=('09addfe7ae469677da39ed66d83858d3')
+ sha1sums=('4b2a7e7a406ca9ecb68c9ab4fb6012864828806d')
build()
{
diff --cc source/devel-extra/git/FrugalBuild
index 89fdb7c,5f6cb19a..c2469a5
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@@ -8,14 -8,14 +8,14 @@@ USE_DEVEL=${USE_DEVEL:-n
USE_HTMLMAN=${USE_HTMLMAN:-y}
pkgname=git
- pkgver=1.7.1
+ pkgver=1.7.1.1
Fuse $USE_DEVEL pkgver=1.6.1.87.g1562445
-pkgrel=1
+pkgrel=2
pkgdesc=A fast, scalable, distributed revision control system.
url=http://git-scm.com/;
-depends=('curl=7.19.0' 'gmp' 'perl-error')
+depends=('curl=7.19.0' 'gmp' 'perl-error' 'openssl=1.0.0')
backup=(etc/sysconfig/git)
-makedepends=('asciidoc' 'docbook-xsl=1.73.0-2' 'docbook-xml'
'docbook2x=0.8.3-3' 'sgml-common' 'xmlto' 'dblatex')
+makedepends=('asciidoc' 'docbook-xsl=1.73.0-2' 'docbook-xml'
'docbook2x=0.8.3-3' 'sgml-common' 'xmlto' 'dblatex' 'openssl=1.0.0')
groups=('devel-extra')
archs=('i686' 'x86_64' 'ppc')
_F_archive_grepv=rc
diff --cc source/network-extra/openldap/FrugalBuild
index 7f87e1a,838929b..f897887
--- a/source/network-extra/openldap/FrugalBuild
+++ b/source/network-extra/openldap/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Miklos Vajna vmik...@frugalware.org
pkgname=openldap
- pkgver=2.4.22
+ pkgver=2.4.23
-pkgrel=1
+pkgrel=2
pkgdesc=A suite of the Lightweight Directory Access Protocol servers
url=http://www.openldap.org/;
groups=('network-extra')
diff --cc source/network-extra/pure-ftpd/FrugalBuild
index 9280176,4c5fada..9c37bce
--- a/source/network-extra/pure-ftpd/FrugalBuild
+++ b/source/network-extra/pure-ftpd/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@
pkgname=pure-ftpd
pkgver=1.0.29
--pkgrel=2
++pkgrel=3
pkgdesc=A free, secure, production-quality and standard-conformant FTP server
url=http://www.pureftpd.org/;
- depends=('libcap' 'libmysqlclient=5.1.34' 'openssl=1.0.0')
-depends=('libcap=2.19' 'libmysqlclient=5.1.34')
++depends=('libcap=2.19' 'libmysqlclient=5.1.34' 'openssl=1.0.0')
makedepends=('mysql=5.1.34')
backup=('etc/pure-ftpd.conf')
groups=('network-extra')
diff --cc source/network-extra/vsftpd/FrugalBuild
index 856ef10,967a1c8..02fba6d
--- a/source/network-extra/vsftpd/FrugalBuild
+++ b/source/network-extra/vsftpd/FrugalBuild
@@@ -4,7 -4,7 +4,7 @@@
pkgname=vsftpd
pkgver=2.2.2
--pkgrel=2
++pkgrel=3
pkgdesc=A very secure ftp server
url=http://vsftpd.beasts.org/;
license=GPL2
@@@ -13,7 -13,7 +13,7 @@@ up2date=Flasttar ftp://vsftpd.beasts.o
source=(ftp://vsftpd.beasts.org/users/cevans/$pkgname-$pkgver.tar.gz rc.vsftpd)
groups=('network-extra')
archs=('i686' 'x86_64')
- depends=('libcap' 'openssl=1.0.0' 'tcp_wrappers')
-depends=('libcap=2.19' 'openssl' 'tcp_wrappers')
++depends=('libcap=2.19' 'openssl=1.0.0' 'tcp_wrappers')
backup=(etc/vsftpd.conf)
sha1sums=('43976c6dbffe8e4bdc5f4add73a0c1431662a6c6' \
'ffc7521bc5845f2a382d56a2674680e903a9b895')
diff --cc source/network/wget/FrugalBuild
index 58a85a4,b1fa1c0..6a6c1a1
--- a/source/network/wget/FrugalBuild
+++ b/source/network/wget/FrugalBuild
@@@ -4,10 -4,10 +4,10 @@@
pkgname=wget
pkgver=1.12
--pkgrel=2
++pkgrel=3
pkgdesc=A network utility to retrieve files from the Web
url=http://www.gnu.org/software/wget/wget.html;
- depends=('openssl=1.0.0')
+ depends=('openssl=0.9.8' 'libidn')
Finclude texinfo
groups=('network' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
