bastetesting: pacman-g2-3.8.7-2-x86_64 * version test for livecd
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bastetesting.git;a=commitdiff;h=85e188a073b28add7be2d2864f8c109ccee03e94
commit 85e188a073b28add7be2d2864f8c109ccee03e94
Author: Baste <baste@...>
Date: Wed Feb 1 17:32:52 2012 +0100
pacman-g2-3.8.7-2-x86_64
* version test for livecd
diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index e0d2b89..9198563 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
<at> <at> -8,7 +8,7 <at> <at> USE_MINIMAL=${USE_MINIMAL:-"n"}
pkgname=pacman-g2
pkgver=3.8.7
Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053
-pkgrel=1
+pkgrel=2
pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/"
backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current})
<at> <at> -33,8 +33,8 <at> <at> archs=('i686' 'x86_64' 'ppc' 'arm')
_F_archive_nosort=y
up2date="Flasttar $url/releases/"
if ! Fuse $USE_DEVEL; then
- source=($url/releases/$pkgname-$pkgver.tar.gz)
- signatures=("$source.asc")
+ source=($url/releases/$pkgname-$pkgver.tar.gz 'virtualbox_patch.diff')
+ signatures=("$source.asc" '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
<at> <at> -56,6 +56,7 <at> <at> fi
build()
{
+
if Fuse $USE_DEVEL; then
(cd ~; mkdir -p git; cd git; git clone git://git.frugalware.org/pub/other/translations)
Funpack_scm
diff --git a/source/base/pacman-g2/virtualbox_patch.diff b/source/base/pacman-g2/virtualbox_patch.diff
new file mode 100644
index 0000000..4f105ea
--- /dev/null
+++ b/source/base/pacman-g2/virtualbox_patch.diff
<at> <at> -0,0 +1,128 <at> <at>
+diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c
+index 0a32291..9b960fe 100644
+--- lib/libftp/ftplib.c
++++ lib/libftp/ftplib_good.c
+ <at> <at> -460,6 +460,23 <at> <at> GLOBALDEF int FtpConnect(const char *host, netbuf **nControl)
+ net_close(sControl);
+ return 0;
+ }
++ struct timeval timeout;
++ timeout.tv_sec = 1;
++ timeout.tv_usec = 0;
++ if (setsockopt (sControl, SOL_SOCKET, SO_RCVTIMEO,
++ SETSOCKOPT_OPTVAL_TYPE &timeout, sizeof(timeout)) == -1)
++ {
++ perror("setsockopt");
++ net_close(sControl);
++ return -1;
++ }
++ if (setsockopt (sControl, SOL_SOCKET, SO_SNDTIMEO,
++ SETSOCKOPT_OPTVAL_TYPE &timeout, sizeof(timeout)) == -1)
++ {
++ perror("setsockopt");
++ net_close(sControl);
++ return -1;
++ }
+ if (connect(sControl, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+ {
+ perror("connect");
+ <at> <at> -674,6 +691,24 <at> <at> static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir)
+ net_close(sData);
+ return -1;
+ }
++ struct timeval timeout;
++ timeout.tv_sec = 1;
++ timeout.tv_usec = 0;
++ if (setsockopt (sData, SOL_SOCKET, SO_RCVTIMEO,
++ SETSOCKOPT_OPTVAL_TYPE &timeout, sizeof(timeout)) == -1)
++ {
++ perror("setsockopt");
++ net_close(sData);
++ return -1;
++ }
++ if (setsockopt (sData, SOL_SOCKET, SO_SNDTIMEO,
++ SETSOCKOPT_OPTVAL_TYPE &timeout, sizeof(timeout)) == -1)
++ {
++ perror("setsockopt");
++ net_close(sData);
++ return -1;
++ }
++
+ if (nControl->cmode == FTPLIB_PASSIVE)
+ {
+ if (connect(sData, &sin.sa, sizeof(sin.sa)) == -1)
+ <at> <at> -901,11 +936,11 <at> <at> GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData)
+ {
+ i = socket_wait(nData);
+ if (i != 1)
+- return 0;
++ return -1;
+ i = net_read(nData->handle, buf, max);
+ }
+ if (i == -1)
+- return 0;
++ return -1;
+ nData->xfered += i;
+ if (nData->idlecb && nData->cbbytes)
+ {
+ <at> <at> -969,7 +1004,7 <at> <at> GLOBALDEF int FtpClose(netbuf *nData)
+ net_close(nData->handle);
+ ctrl = nData->ctrl;
+ free(nData);
+- if (ctrl && (nData->errcode != ETIMEDOUT))
++ if (ctrl)
+ {
+ ctrl->data = NULL;
+ return(readresp('2', ctrl));
+ <at> <at> -1168,6 +1203,13 <at> <at> static int FtpXfer(const char *localfile, const char *path,
+ }
+ }
+
++ if((l == -1) && (errno == EWOULDBLOCK))
++ {
++ nControl->errcode = ETIMEDOUT;
++ strncpy(nControl->response, strerror(ETIMEDOUT),
++ sizeof(nControl->response));
++ }
++
+ if (nData->errcode)
+ rv = 0;
+
+ <at> <at> -1401,6 +1443,23 <at> <at> GLOBALREF int HttpConnect(const char *host, unsigned short port, netbuf **nContr
+ perror("socket");
+ return 0;
+ }
++ struct timeval timeout;
++ timeout.tv_sec = 1;
++ timeout.tv_usec = 0;
++ if (setsockopt (sControl, SOL_SOCKET, SO_RCVTIMEO,
++ SETSOCKOPT_OPTVAL_TYPE &timeout, sizeof(timeout)) == -1)
++ {
++ perror("setsockopt");
++ net_close(sControl);
++ return -1;
++ }
++ if (setsockopt (sControl, SOL_SOCKET, SO_SNDTIMEO,
++ SETSOCKOPT_OPTVAL_TYPE &timeout, sizeof(timeout)) == -1)
++ {
++ perror("setsockopt");
++ net_close(sControl);
++ return -1;
++ }
+ if (connect(sControl, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+ {
+ perror("connect");
+ <at> <at> -1528,6 +1587,13 <at> <at> static int HttpXfer(const char *localfile, const char *path, int *size,
+ }
+ }
+
++ if((l == -1) && (errno == EWOULDBLOCK))
++ {
++ nControl->errcode = ETIMEDOUT;
++ strncpy(nControl->response, strerror(ETIMEDOUT),
++ sizeof(nControl->response));
++ }
++
+ if(nControl->errcode)
+ rv = 0;
+ nControl->dir = FTPLIB_CONTROL;
RSS Feed