[csw-devel] SF.net SVN: gar:[3789] csw/mgar/pkg/gftp/trunk
jake_goerzen at users.sourceforge.net
jake_goerzen at users.sourceforge.net
Tue Mar 17 04:56:02 CET 2009
Revision: 3789
http://gar.svn.sourceforge.net/gar/?rev=3789&view=rev
Author: jake_goerzen
Date: 2009-03-17 03:55:57 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
version 2.0.19 update; patch clean up; Makefile clean up
Modified Paths:
--------------
csw/mgar/pkg/gftp/trunk/Makefile
csw/mgar/pkg/gftp/trunk/checksums
csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend
Added Paths:
-----------
csw/mgar/pkg/gftp/trunk/files/lock.c.diff
Removed Paths:
-------------
csw/mgar/pkg/gftp/trunk/files/intl.diff
csw/mgar/pkg/gftp/trunk/files/lock.c.fixed
csw/mgar/pkg/gftp/trunk/files/suncc.diff
Modified: csw/mgar/pkg/gftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gftp/trunk/Makefile 2009-03-17 03:32:05 UTC (rev 3788)
+++ csw/mgar/pkg/gftp/trunk/Makefile 2009-03-17 03:55:57 UTC (rev 3789)
@@ -1,28 +1,22 @@
GARNAME = gftp
-GARVERSION = 2.0.18
+GARVERSION = 2.0.19
CATEGORIES = utils
-DESCRIPTION = A multithreaded ftp app for X.
+DESCRIPTION = A file transfer client with text and graphical user interfaces.
define BLURB
- gFTP is a multithreaded FTP client. It features simultaneous downloads, resuming of interrupted
- file transfers, support for the FTP, HTTP, and SSH protocols, file transfer queues, downloading of
- entire directories, FTP and HTTP proxy support, remote directory caching, passive and non-passive
- file transfers, drag-n-drop support, a very nice connection manager, and more.
+A multithreaded file transfer client supporting FTP, FTPS (control connection only), HTTP, HTTPS, SSH and FSP protocols.
endef
MASTER_SITES = http://www.gftp.org/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
DISTFILES += $(call admfiles,CSWgftp, depend )
-# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+PATCHFILES = lock.c.diff
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += LDFLAGS=-lrt
+CONFIGURE_ARGS += LD_OPTIONS=-L/opt/csw/lib
-CONFIGURE_ARGS = $(DIRPATHS) --disable-nls
-
TEST_TARGET = check
include gar/category.mk
-
-pre-configure:
- ( cd $(WORKSRC)/lib/fsplib ; gzip -dc $(GARCHIVEDIR)/fsplib-0.9.tar.gz | tar xvf - ; cp /export/home/jgoerzen/csw/gnome/gftp/files/lock.c.fixed lock.c)
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/gftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/gftp/trunk/checksums 2009-03-17 03:32:05 UTC (rev 3788)
+++ csw/mgar/pkg/gftp/trunk/checksums 2009-03-17 03:55:57 UTC (rev 3789)
@@ -1,3 +1,4 @@
-44b19442d06f6dc68c7211d66029d826 download/gftp-2.0.18.tar.bz2
+5183cb4955d94be0e03c892585547c64 download/gftp-2.0.19.tar.bz2
351516b0d9da33501cf3be76a1fa7a61 download/CSWgftp.gspec
-62f5c9d7c272629c5bf05c03598297fe download/CSWgftp.depend
+cf85c5ad82928bf1e4e9d0f89be8378f download/CSWgftp.depend
+a80450e02ea01bcc5276f8f2ded3c1d6 download/lock.c.diff
Modified: csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend 2009-03-17 03:32:05 UTC (rev 3788)
+++ csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend 2009-03-17 03:55:57 UTC (rev 3789)
@@ -1,10 +1,10 @@
-P CSWreadline readline
-P CSWpango libpango
-P CSWosslrt openssl_rt
-P CSWncurses ncurses
-P CSWlibatk libatk
-P CSWiconv libiconv
-P CSWgtk2 gtk2
-P CSWglib2 glib2
-P CSWggettext ggettext
-P CSWlibcairo libcairo
+P CSWreadline
+P CSWpango
+P CSWosslrt
+P CSWncurses
+P CSWlibatk
+P CSWiconv
+P CSWgtk2
+P CSWglib2
+P CSWggettextrt
+P CSWlibcairo
Deleted: csw/mgar/pkg/gftp/trunk/files/intl.diff
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/intl.diff 2009-03-17 03:32:05 UTC (rev 3788)
+++ csw/mgar/pkg/gftp/trunk/files/intl.diff 2009-03-17 03:55:57 UTC (rev 3789)
@@ -1,24 +0,0 @@
-diff -Nru gftp-2.0.16.orig/src/gtk/Makefile.in gftp-2.0.16/src/gtk/Makefile.in
---- gftp-2.0.16.orig/src/gtk/Makefile.in 2003-11-09 06:07:16.000000000 -0800
-+++ gftp-2.0.16/src/gtk/Makefile.in 2004-03-19 16:23:08.575949000 -0800
-@@ -116,7 +116,7 @@
- gftp_gtk_SOURCES = bookmarks.c chmod_dialog.c delete_dialog.c dnd.c gftp-gtk.c menu-items.c misc-gtk.c mkdir_dialog.c options_dialog.c rename_dialog.c transfer.c view_dialog.c
-
- INCLUDES = @GTK_CFLAGS@ @PTHREAD_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -I../../intl
--LDADD = ../../lib/libgftp.a @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ @SSL_LIBS@
-+LDADD = ../../lib/libgftp.a @LIBINTL@ @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ @SSL_LIBS@
- noinst_HEADERS = gftp-gtk.h
- localedir = $(datadir)/locale
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-diff -Nru gftp-2.0.16.orig/src/text/Makefile.in gftp-2.0.16/src/text/Makefile.in
---- gftp-2.0.16.orig/src/text/Makefile.in 2003-11-09 06:07:15.000000000 -0800
-+++ gftp-2.0.16/src/text/Makefile.in 2004-03-19 16:22:17.256017000 -0800
-@@ -115,7 +115,7 @@
- EXTRA_PROGRAMS = gftp-text
- gftp_text_SOURCES = gftp-text.c
- INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -I../../intl
--LDADD = ../../lib/libgftp.a @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ @SSL_LIBS@
-+LDADD = ../../lib/libgftp.a @LIBINTL@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ @SSL_LIBS@
- noinst_HEADERS = gftp-text.h
- localedir = $(datadir)/locale
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Added: csw/mgar/pkg/gftp/trunk/files/lock.c.diff
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/lock.c.diff (rev 0)
+++ csw/mgar/pkg/gftp/trunk/files/lock.c.diff 2009-03-17 03:55:57 UTC (rev 3789)
@@ -0,0 +1,32 @@
+diff --speed-large-files --minimal -Nru gftp-2.0.19.orig/lib/fsplib/lock.c gftp-2.0.19/lib/fsplib/lock.c
+--- gftp-2.0.19.orig/lib/fsplib/lock.c 2008-11-29 13:47:18.000000000 +0100
++++ gftp-2.0.19/lib/fsplib/lock.c 2009-03-17 04:22:26.936537459 +0100
+@@ -52,7 +52,7 @@
+ int val;
+ struct semid_ds *buf;
+ unsigned short int *array;
+- struct seminfo *__buf;
++// struct seminfo *__buf;
+ };
+ #endif
+
+@@ -91,7 +91,7 @@
+ mode_t omask;
+ key_t lock_key;
+ int fd;
+- union semun su;
++ union semun;
+ struct sembuf sem;
+
+ make_key_string(lock,server_addr,server_port);
+@@ -123,8 +123,8 @@
+ return -1;
+ }
+ /* we need to init this semaphore */
+- su.val=1;
+- if(semctl(lock->lock_sem,0,SETVAL,su) == -1)
++ // arg.val=1;
++ if(semctl(lock->lock_sem,0,SETVAL) == -1)
+ {
+ perror("semctl setval");
+ return -1;
Deleted: csw/mgar/pkg/gftp/trunk/files/lock.c.fixed
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/lock.c.fixed 2009-03-17 03:32:05 UTC (rev 3788)
+++ csw/mgar/pkg/gftp/trunk/files/lock.c.fixed 2009-03-17 03:55:57 UTC (rev 3789)
@@ -1,285 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-#include "lock.h"
-
-/* ************ Locking functions ***************** */
-#ifndef FSP_NOLOCKING
-
-static char code_str[] =
- "0123456789:_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-static void make_key_string( FSP_LOCK *lock,
- unsigned long server_addr,
- unsigned long server_port)
-{
- unsigned long v1, v2;
- char *p;
-
- strcpy(lock->key_string,FSP_KEY_PREFIX);
- for(p = lock->key_string; *p; p++);
- v1 = server_addr;
- v2 = server_port;
-
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- v1 = v1 | (v2 << (32-3*6));
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p++ = code_str[v1 & 0x3f]; v1 >>= 6;
- *p = 0;
-}
-#endif
-
-/********************************************************************/
-/******* For those systems that has SysV shared memory + semop ******/
-/********************************************************************/
-#ifdef FSP_USE_SHAREMEM_AND_SEMOP
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#ifdef _SEM_SEMUN_UNDEFINED
-union semun
-{
- int val;
- struct semid_ds *buf;
- unsigned short int *array;
-// struct seminfo *__buf;
-};
-#endif
-
-unsigned short client_get_key (FSP_LOCK *lock)
-{
- struct sembuf sem;
- sem.sem_num = 0;
- sem.sem_op = -1;
- sem.sem_flg = SEM_UNDO;
-
- if(semop(lock->lock_sem,&sem,1) == -1 )
- {
- perror("semop lock");
- }
- return(*lock->share_key);
-}
-
-void client_set_key (FSP_LOCK *lock,unsigned short key)
-{
- struct sembuf sem;
-
- sem.sem_num = 0;
- sem.sem_op = 1;
- sem.sem_flg = SEM_UNDO;
-
- *lock->share_key = key;
- if(semop(lock->lock_sem,&sem,1) == -1) {
- perror("semop unlock");
- }
-}
-
-int client_init_key (FSP_LOCK *lock,
- unsigned long server_addr,
- unsigned short server_port)
-{
- mode_t omask;
- key_t lock_key;
- int fd;
- union semun;
- struct sembuf sem;
-
- make_key_string(lock,server_addr,server_port);
-
- omask = umask(0);
- fd = open(lock->key_string,O_RDWR|O_CREAT,0666);
- umask(omask);
- close(fd);
-
- if((lock_key = ftok(lock->key_string,238)) == -1) {
- perror("ftok");
- return -1;
- }
-
- if((lock->lock_shm = shmget(lock_key,2*sizeof(unsigned int),IPC_CREAT|0666)) == -1) {
- perror("shmget");
- return -1;
- }
-
- if(!(lock->share_key = (unsigned int *) shmat(lock->lock_shm,NULL,0))) {
- perror("shmat");
- return -1;
- }
-
- if((lock->lock_sem = semget(lock_key,0,0)) == -1) {
- /* create a new semaphore and init it */
- if((lock->lock_sem = semget(lock_key,2,IPC_CREAT|0666)) == -1) {
- perror("semget");
- return -1;
- }
- /* we need to init this semaphore */
- // arg.val=1;
- if(semctl(lock->lock_sem,0,SETVAL) == -1)
- {
- perror("semctl setval");
- return -1;
- }
- }
-
- /* increase in use counter */
- sem.sem_num = 1;
- sem.sem_op = 1;
- sem.sem_flg = SEM_UNDO;
-
- if(semop(lock->lock_sem,&sem,1) == -1) {
- perror("semop incuse");
- }
-
- return 0;
-}
-
-void client_destroy_key(FSP_LOCK *lock)
-{
- int rc;
- struct sembuf sem;
-
- if (shmdt(lock->share_key) < 0)
- {
- perror("shmdt");
- return;
- }
- /* check if we are only one process holding lock */
- rc = semctl(lock->lock_sem,1,GETVAL);
- if (rc == 1)
- {
- /* safe to destroy */
- if (
- (semctl(lock->lock_sem,0,IPC_RMID) < 0) ||
- (shmctl(lock->lock_shm,IPC_RMID,NULL) < 0) ||
- (unlink(lock->key_string) < 0) )
- rc=0;/* ignore cleanup errors */
- }
- else
- if(rc > 1)
- {
- /* we need to decrease sem. */
- sem.sem_num = 1;
- sem.sem_op = -1;
- sem.sem_flg = SEM_UNDO;
-
- if(semop(lock->lock_sem,&sem,1) == -1) {
- perror("semop decuse");
- }
- }
-}
-#endif
-
-
-/********************************************************************/
-/******* For those who do not want to use locking *******************/
-/********************************************************************/
-#ifdef FSP_NOLOCKING
-
-unsigned short client_get_key (FSP_LOCK *lock)
-{
- return lock->share_key;
-}
-
-void client_set_key (FSP_LOCK *lock,unsigned short key)
-{
- lock->share_key=key;
-}
-
-int client_init_key (FSP_LOCK *lock,
- unsigned long server_addr,
- unsigned short server_port)
-{
- return 0;
-}
-
-void client_destroy_key(FSP_LOCK *lock)
-{
- return;
-}
-#endif
-
-/********************************************************************/
-/******* For those systems that has lockf function call *************/
-/********************************************************************/
-#ifdef FSP_USE_LOCKF
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-unsigned short client_get_key (FSP_LOCK *lock)
-{
- unsigned int okey;
-
- if (lockf(lock->lock_fd, F_LOCK, sizeof(okey)) < 0)
- {
- perror("lockf");
- }
-
- if (read(lock->lock_fd, &okey, sizeof(okey)) < 0)
- {
- perror("readlk");
- }
-
- if (lseek(lock->lock_fd, 0L, 0) < 0)
- {
- perror("seek");
- }
-
- return(okey);
-}
-
-void client_set_key (FSP_LOCK *lock,unsigned short nkey)
-{
- unsigned int key;
-
- key=nkey;
-
- if (write(lock->lock_fd, &key, sizeof(key)) < 0)
- {
- perror("write");
- }
- if (lseek(lock->lock_fd, 0L, 0) < 0)
- {
- perror("seek");
- }
- if (lockf(lock->lock_fd, F_ULOCK, sizeof(key)) < 0)
- {
- perror("unlockf");
- }
-}
-
-int client_init_key (FSP_LOCK *lock,
- unsigned long server_addr,
- unsigned short server_port)
-{
- mode_t omask;
-
- make_key_string(lock,server_addr, server_port);
-
- omask = umask(0);
- lock->lock_fd = open(lock->key_string, O_RDWR | O_CREAT, 0666);
- (void)umask(omask);
-
- if(lock->lock_fd < 0)
- return -1;
- else
- return 0;
-}
-
-void
-client_destroy_key(FSP_LOCK *lock)
-{
- (void)close(lock->lock_fd);
-}
-#endif
Deleted: csw/mgar/pkg/gftp/trunk/files/suncc.diff
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/suncc.diff 2009-03-17 03:32:05 UTC (rev 3788)
+++ csw/mgar/pkg/gftp/trunk/files/suncc.diff 2009-03-17 03:55:57 UTC (rev 3789)
@@ -1,12 +0,0 @@
-diff -Nru gftp-2.0.16.orig/src/gtk/gftp-gtk.h gftp-2.0.16/src/gtk/gftp-gtk.h
---- gftp-2.0.16.orig/src/gtk/gftp-gtk.h 2003-11-02 18:14:04.000000000 -0800
-+++ gftp-2.0.16/src/gtk/gftp-gtk.h 2004-03-19 16:13:36.806207000 -0800
-@@ -291,7 +291,7 @@
- void ftp_log ( gftp_logging_level level,
- gftp_request * request,
- const char *string,
-- ... ) __attribute__((format(printf, 3, 4)));
-+ ... );
-
- void refresh ( gftp_window_data * wdata );
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list