diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
| commit | 2648e999d277eac5c3d331a3609bcc73fafbea71 (patch) | |
| tree | 40951fb8e7fdbe28a0baa324ae615055203f1e2e /abs/extra/community | |
| parent | c759b5e0c4aa6fc37412b4dee2cf9ad993fd376d (diff) | |
| parent | 7e6f7ca174e1af67178dc5293a312a4a733eb095 (diff) | |
| download | linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.zip linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.gz linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.bz2 | |
Merge branch 'testing'
# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
LinHES-config: during install don't kill off lirc. This keeps the remote active all the way to the finish
Change version numbers to 8.0 to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
LinHES-conifig: mv_install.py for the last partition don't go all the way to the end. Gotta leave room for gpt tables.
xf86-video-ati: xorg ati driver.
LinHES-config: timezip.py add syncing up of parental lvl passwords and starting level with MBE.
LinHES-system: correct the logic for breaking out of the wmctrl loop. As written it would break out of the inner loop..but not the 60 iteration loop.
e16_theme_settings: remove slide-in prop for new windows. For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902
zilog-firmware: firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters but including the firmware just in case someone really wants to
linhes-udev-rules: added hdprv_lirc rule. All of these lirc rules are limited to exactly one device. If more then one device is present then only the last device in init will get the symlink
runit-scripts: fix logging for igdeamon, add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
LinHES-system: add lh_system_restore and lh_system_backup. These scripts are called from the mythmenu. refs #900
iguanair: rebuild with python 2.7
LinHES-system: msg_daemon.py fix init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
linhes-udev-rules: add rules for mce,streamzap,serial lirc devices.
mythinstall: recompile for matching libs
mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager
linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
LinHES-config, supplimental-web: Fix proxy numbering for Ceton infiniTV
linhes-system: add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
...
Diffstat (limited to 'abs/extra/community')
188 files changed, 201 insertions, 10131 deletions
diff --git a/abs/extra/community/afpfs-ng/01-gcrypt.patch b/abs/extra/community/afpfs-ng/01-gcrypt.patch deleted file mode 100644 index 7bcace2..0000000 --- a/abs/extra/community/afpfs-ng/01-gcrypt.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1+iPhone/configure.ac ---- afpfs-ng-0.8.1/configure.ac 2008-03-08 16:23:12.000000000 +0000 -+++ afpfs-ng-0.8.1+iPhone/configure.ac 2010-10-24 05:26:15.000000000 +0000 -@@ -50,21 +50,6 @@ - case $host in - *-*-darwin*) - AC_MSG_CHECKING([for correct gcrypt version]) -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([ -- #include <gcrypt.h> -- #include <stdio.h>],[ -- char*p= GCRYPT_VERSION; -- unsigned int vers; -- vers=atoi(p)*10000; -- p=strchr(p,'.')+1; -- vers+=atoi(p)*100; -- p=strchr(p,'.')+1; -- vers+=atoi(p); -- if (vers<10400) return 1; -- ])], -- [AC_MSG_RESULT([yes])], -- [AC_MSG_ERROR([version is < 1.4.0])]) - AM_CONDITIONAL(HAVE_LIBGCRYPT, true) - AC_DEFINE([HAVE_LIBGCRYPT], [1] ) - ;; - diff --git a/abs/extra/community/afpfs-ng/02-pointer.patch b/abs/extra/community/afpfs-ng/02-pointer.patch deleted file mode 100644 index 80507b5..0000000 --- a/abs/extra/community/afpfs-ng/02-pointer.patch +++ /dev/null @@ -1,280 +0,0 @@ -diff -up afpfs-ng-0.8.1/cmdline/getstatus.c.pointer afpfs-ng-0.8.1/cmdline/getstatus.c ---- afpfs-ng-0.8.1/cmdline/getstatus.c.pointer 2011-06-14 17:06:35.000000000 +0200 -+++ afpfs-ng-0.8.1/cmdline/getstatus.c 2011-06-14 17:07:25.000000000 +0200 -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - #include <pthread.h> - -diff -up afpfs-ng-0.8.1/fuse/client.c.pointer afpfs-ng-0.8.1/fuse/client.c ---- afpfs-ng-0.8.1/fuse/client.c.pointer 2008-03-08 03:44:16.000000000 +0100 -+++ afpfs-ng-0.8.1/fuse/client.c 2011-06-14 17:02:15.000000000 +0200 -@@ -61,8 +61,9 @@ static int start_afpfsd(void) - snprintf(filename, PATH_MAX, - "/usr/local/bin/%s",AFPFSD_FILENAME); - if (access(filename,X_OK)) { -- snprintf(filename, "/usr/bin/%s", -+ snprintf(filename, sizeof(filename), "/usr/bin/%s", - AFPFSD_FILENAME); -+ filename[sizeof(filename) - 1] = 0; - if (access(filename,X_OK)) { - printf("Could not find server (%s)\n", - filename); -diff -up afpfs-ng-0.8.1/fuse/fuse_int.c.pointer afpfs-ng-0.8.1/fuse/fuse_int.c ---- afpfs-ng-0.8.1/fuse/fuse_int.c.pointer 2008-03-02 06:06:24.000000000 +0100 -+++ afpfs-ng-0.8.1/fuse/fuse_int.c 2011-06-14 17:02:15.000000000 +0200 -@@ -197,7 +197,7 @@ static int fuse_open(const char *path, s - ret = ml_open(volume,path,flags,&fp); - - if (ret==0) -- fi->fh=(void *) fp; -+ fi->fh=(unsigned long) fp; - - return ret; - } -diff -up afpfs-ng-0.8.1/include/afpfs-ng/afp.h.pointer afpfs-ng-0.8.1/include/afp.h ---- afpfs-ng-0.8.1/include/afpfs-ng/afp.h.pointer 2008-03-08 17:08:18.000000000 +0100 -+++ afpfs-ng-0.8.1/include/afpfs-ng/afp.h 2011-06-14 17:02:15.000000000 +0200 -@@ -370,7 +370,7 @@ int afp_unmount_all_volumes(struct afp_s - - int afp_opendt(struct afp_volume *volume, unsigned short * refnum); - --int afp_closedt(struct afp_server * server, unsigned short * refnum); -+int afp_closedt(struct afp_server * server, unsigned short refnum); - - int afp_getcomment(struct afp_volume *volume, unsigned int did, - const char * pathname, struct afp_comment * comment); -diff -up afpfs-ng-0.8.1/include/afpfs-gn/utils.h.pointer afpfs-ng-0.8.1/include/utils.h ---- afpfs-ng-0.8.1/include/afpfs-ng/utils.h.pointer 2008-02-18 04:33:58.000000000 +0100 -+++ afpfs-ng-0.8.1/include/afpfs-ng/utils.h 2011-06-14 17:02:15.000000000 +0200 -@@ -8,8 +8,8 @@ - #define hton64(x) (x) - #define ntoh64(x) (x) - #else /* BYTE_ORDER == BIG_ENDIAN */ --#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \ -- (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32)) -+#define hton64(x) ((u_int64_t) (htonl((((unsigned long long)(x)) >> 32) & 0xffffffffLL)) | \ -+ (u_int64_t) ((htonl((unsigned long long)(x)) & 0xffffffffLL) << 32)) - #define ntoh64(x) (hton64(x)) - #endif /* BYTE_ORDER == BIG_ENDIAN */ - -diff -up afpfs-ng-0.8.1/lib/afp_url.c.pointer afpfs-ng-0.8.1/lib/afp_url.c ---- afpfs-ng-0.8.1/lib/afp_url.c.pointer 2008-03-04 21:16:49.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/afp_url.c 2011-06-14 17:02:15.000000000 +0200 -@@ -33,7 +33,7 @@ static int check_port(char * port) - static int check_uamname(const char * uam) - { - char * p; -- for (p=uam;*p;p++) { -+ for (p=(char *)uam;*p;p++) { - if (*p==' ') continue; - if ((*p<'A') || (*p>'z')) return -1; - } -@@ -188,7 +188,7 @@ int afp_parse_url(struct afp_url * url, - return -1; - - } -- if (p==NULL) p=toparse; -+ if (p==NULL) p=(char *)toparse; - - /* Now split on the first / */ - if (sscanf(p,"%[^/]/%[^$]", -diff -up afpfs-ng-0.8.1/lib/did.c.pointer afpfs-ng-0.8.1/lib/did.c ---- afpfs-ng-0.8.1/lib/did.c.pointer 2008-02-18 04:39:17.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/did.c 2011-06-14 17:02:15.000000000 +0200 -@@ -226,7 +226,7 @@ int get_dirid(struct afp_volume * volume - - - /* Go to the end of last known entry */ -- p=path+(p-copy); -+ p=(char *)path+(p-copy); - p2=p; - - while ((p=strchr(p+1,'/'))) { -diff -up afpfs-ng-0.8.1/lib/dsi.c.pointer afpfs-ng-0.8.1/lib/dsi.c ---- afpfs-ng-0.8.1/lib/dsi.c.pointer 2008-02-18 04:53:03.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/dsi.c 2011-06-14 17:02:15.000000000 +0200 -@@ -474,7 +474,7 @@ void dsi_getstatus_reply(struct afp_serv - } - server->flags=ntohs(reply1->flags); - -- p=(void *)((unsigned int) server->incoming_buffer + sizeof(*reply1)); -+ p=(void *)((unsigned long) server->incoming_buffer + sizeof(*reply1)); - p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1; - - /* Now work our way through the variable bits */ -@@ -757,7 +757,7 @@ gotenough: - printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read); - #endif - ret = read(server->fd, (void *) -- (((unsigned int) server->incoming_buffer)+server->data_read), -+ (((unsigned long) server->incoming_buffer)+server->data_read), - amount_to_read); - if (ret<0) return -1; - if (ret==0) { -diff -up afpfs-ng-0.8.1/lib/loop.c.pointer afpfs-ng-0.8.1/lib/loop.c ---- afpfs-ng-0.8.1/lib/loop.c.pointer 2008-02-18 04:40:11.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/loop.c 2011-06-14 17:02:15.000000000 +0200 -@@ -25,7 +25,7 @@ - static unsigned char exit_program=0; - - static pthread_t ending_thread; --static pthread_t main_thread = NULL; -+static pthread_t main_thread = (pthread_t)NULL; - - static int loop_started=0; - static pthread_cond_t loop_started_condition; -diff -up afpfs-ng-0.8.1/lib/lowlevel.c.pointer afpfs-ng-0.8.1/lib/lowlevel.c ---- afpfs-ng-0.8.1/lib/lowlevel.c.pointer 2008-02-20 02:33:17.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/lowlevel.c 2011-06-14 17:02:15.000000000 +0200 -@@ -582,7 +582,7 @@ int ll_getattr(struct afp_volume * volum - if (volume->server->using_version->av_number>=30) - stbuf->st_mode |= fp.unixprivs.permissions; - else -- set_nonunix_perms(stbuf,&fp); -+ set_nonunix_perms(&stbuf->st_mode,&fp); - - stbuf->st_uid=fp.unixprivs.uid; - stbuf->st_gid=fp.unixprivs.gid; -diff -up afpfs-ng-0.8.1/lib/midlevel.c.pointer afpfs-ng-0.8.1/lib/midlevel.c ---- afpfs-ng-0.8.1/lib/midlevel.c.pointer 2008-03-08 17:08:18.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/midlevel.c 2011-06-14 17:02:15.000000000 +0200 -@@ -713,7 +713,7 @@ int ml_write(struct afp_volume * volume, - { - - int ret,err=0; -- int totalwritten = 0; -+ size_t totalwritten = 0; - uint64_t sizetowrite, ignored; - unsigned char flags = 0; - unsigned int max_packet_size=volume->server->tx_quantum; -diff -up afpfs-ng-0.8.1/lib/proto_attr.c.pointer afpfs-ng-0.8.1/lib/proto_attr.c ---- afpfs-ng-0.8.1/lib/proto_attr.c.pointer 2008-01-30 05:37:58.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/proto_attr.c 2011-06-14 17:02:15.000000000 +0200 -@@ -166,7 +166,7 @@ int afp_getextattr(struct afp_volume * v - copy_path(server,p,pathname,strlen(pathname)); - unixpath_to_afppath(server,p); - p2=p+sizeof_path_header(server)+strlen(pathname); -- if (((unsigned int ) p2) & 0x1) p2++; -+ if (((unsigned long) p2) & 0x1) p2++; - req2=(void *) p2; - - req2->len=htons(namelen); -diff -up afpfs-ng-0.8.1/lib/proto_desktop.c.pointer afpfs-ng-0.8.1/lib/proto_desktop.c ---- afpfs-ng-0.8.1/lib/proto_desktop.c.pointer 2008-02-18 04:44:11.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/proto_desktop.c 2011-06-14 17:02:15.000000000 +0200 -@@ -168,7 +168,7 @@ int afp_getcomment_reply(struct afp_serv - return 0; - } - --int afp_closedt(struct afp_server * server, unsigned short * refnum) -+int afp_closedt(struct afp_server * server, unsigned short refnum) - { - struct { - struct dsi_header dsi_header __attribute__((__packed__)); -diff -up afpfs-ng-0.8.1/lib/proto_directory.c.pointer afpfs-ng-0.8.1/lib/proto_directory.c ---- afpfs-ng-0.8.1/lib/proto_directory.c.pointer 2008-02-19 03:39:29.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/proto_directory.c 2011-06-14 17:02:15.000000000 +0200 -@@ -248,6 +248,7 @@ int afp_enumerate_reply(struct afp_serve - - return 0; - } -+ - int afp_enumerateext2_reply(struct afp_server *server, char * buf, unsigned int size, void * other) - { - -@@ -266,8 +267,7 @@ int afp_enumerateext2_reply(struct afp_s - char * p = buf + sizeof(*reply); - int i; - char *max=buf+size; -- struct afp_file_info * filebase = NULL, *filecur=NULL, *new_file=NULL; -- void ** x = other; -+ struct afp_file_info * filebase = NULL, *filecur = NULL, *new_file = NULL, **x = (struct afp_file_info **) other; - - if (reply->dsi_header.return_code.error_code) { - return reply->dsi_header.return_code.error_code; -diff -up afpfs-ng-0.8.1/lib/proto_map.c.pointer afpfs-ng-0.8.1/lib/proto_map.c ---- afpfs-ng-0.8.1/lib/proto_map.c.pointer 2008-01-30 05:37:59.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/proto_map.c 2011-06-14 17:02:15.000000000 +0200 -@@ -122,7 +122,7 @@ int afp_mapid_reply(struct afp_server *s - - if (reply->header.return_code.error_code!=kFPNoErr) return -1; - -- copy_from_pascal_two(name,&reply->name,255); -+ copy_from_pascal_two(name,reply->name,255); - - return 0; - } -diff -up afpfs-ng-0.8.1/lib/proto_session.c.pointer afpfs-ng-0.8.1/lib/proto_session.c ---- afpfs-ng-0.8.1/lib/proto_session.c.pointer 2008-02-18 04:46:19.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/proto_session.c 2011-06-14 17:02:15.000000000 +0200 -@@ -39,7 +39,7 @@ int afp_getsessiontoken(struct afp_serve - switch (type) { - case kLoginWithTimeAndID: - case kReconnWithTimeAndID: { -- uint32_t *p = (void *) (((unsigned int) request)+ -+ uint32_t *p = (void *) (((unsigned long) request)+ - sizeof(*request)); - - offset=sizeof(timestamp); -@@ -63,7 +63,7 @@ int afp_getsessiontoken(struct afp_serve - goto error; - } - -- data=(void *) (((unsigned int) request)+sizeof(*request)+offset); -+ data=(void *) (((unsigned long) request)+sizeof(*request)+offset); - request->idlength=htonl(datalen); - request->pad=0; - request->type=htons(type); -@@ -127,7 +127,7 @@ int afp_disconnectoldsession(struct afp_ - if ((request=malloc(sizeof(*request) + AFP_TOKEN_MAX_LEN))==NULL) - return -1; - -- token_data = request + sizeof(*request); -+ token_data = (char *)request + sizeof(*request); - - request->type=htons(type); - -diff -up afpfs-ng-0.8.1/lib/uams.c.pointer afpfs-ng-0.8.1/lib/uams.c ---- afpfs-ng-0.8.1/lib/uams.c.pointer 2008-01-04 04:52:44.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/uams.c 2011-06-14 17:02:15.000000000 +0200 -@@ -180,7 +180,7 @@ static int cleartxt_login(struct afp_ser - goto cleartxt_fail; - - p += copy_to_pascal(p, username) + 1; -- if ((int)p & 0x1) -+ if ((long)p & 0x1) - len--; - else - p++; -@@ -230,7 +230,7 @@ static int cleartxt_passwd(struct afp_se - goto cleartxt_fail; - - p += copy_to_pascal(p, username) + 1; -- if ((int)p & 0x1) -+ if ((long)p & 0x1) - len--; - else - p++; -@@ -580,7 +580,7 @@ static int dhx_login(struct afp_server * - if (ai == NULL) - goto dhx_noctx_fail; - d += copy_to_pascal(ai, username) + 1; -- if (((int)d) % 2) -+ if (((long)d) % 2) - d++; - else - ai_len--; -diff -up afpfs-ng-0.8.1/lib/utils.c.pointer afpfs-ng-0.8.1/lib/utils.c ---- afpfs-ng-0.8.1/lib/utils.c.pointer 2008-02-18 04:53:37.000000000 +0100 -+++ afpfs-ng-0.8.1/lib/utils.c 2011-06-14 17:02:15.000000000 +0200 -@@ -196,7 +196,7 @@ int invalid_filename(struct afp_server * - maxlen=255; - - -- p=filename+1; -+ p=(char *)filename+1; - while ((q=strchr(p,'/'))) { - if (q>p+maxlen) - return 1; diff --git a/abs/extra/community/afpfs-ng/10-fix-errno.patch b/abs/extra/community/afpfs-ng/10-fix-errno.patch deleted file mode 100644 index ff7ce44..0000000 --- a/abs/extra/community/afpfs-ng/10-fix-errno.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- afpfs-ng-0.8.1/lib/afp.c 2011-09-04 19:42:42.000000000 +0200 -+++ afpfs-ng-0.8.1/lib/afp.c 2011-09-04 19:39:44.000000000 +0200 -@@ -19,7 +19,6 @@ - #include <sys/time.h> - #include <sys/types.h> - #include <sys/socket.h> --#include <errno.h> - - #include <afpfs-ng/afp_protocol.h> - #include <afpfs-ng/libafpclient.h> ---- afpfs-ng-0.8.1/lib/afp_url.c 2011-09-04 19:42:42.000000000 +0200 -+++ afpfs-ng-0.8.1/lib/afp_url.c 2011-09-04 19:40:27.000000000 +0200 -@@ -21,7 +21,9 @@ - - static int check_port(char * port) - { -- long long ret = strtol(port,NULL,10); -+ long long ret = 0; -+ errno = 0; -+ ret = strtol(port,NULL,10); - if ((ret<0) || (ret>32767)) return -1; - if (errno) { - printf("port error\n"); diff --git a/abs/extra/community/afpfs-ng/20-build-error-fixes.patch b/abs/extra/community/afpfs-ng/20-build-error-fixes.patch deleted file mode 100644 index 303e264..0000000 --- a/abs/extra/community/afpfs-ng/20-build-error-fixes.patch +++ /dev/null @@ -1,125 +0,0 @@ -Description: Fix build errors. -Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/afpfs-ng.git;a=blob;f=debian/patches/build-error-fixes.patch - ---- a/lib/afp_url.c -+++ b/lib/afp_url.c -@@ -233,7 +233,7 @@ - } - } - -- snprintf(url->servername,strlen(p)+1,p); -+ strcpy(url->servername,p); - if (check_servername(url->servername)) { - if (verbose) printf("This isn't a valid servername\n"); - return -1; -@@ -263,7 +263,7 @@ - if ((q=escape_strrchr(p,':',":"))) { - *q='\0'; - q++; -- snprintf(url->password,strlen(q)+1,q); -+ strcpy(url->password,q); - if (check_password(url->password)) { - if (verbose) printf("This isn't a valid passwd\n"); - return -1; -@@ -276,7 +276,7 @@ - if ((q=strstr(p,";AUTH="))) { - *q='\0'; - q+=6; -- snprintf(url->uamname,strlen(q)+1,q); -+ strcpy(url->uamname,q); - if (check_uamname(url->uamname)) { - if (verbose) printf("This isn't a valid uamname\n"); - return -1; -@@ -284,7 +284,7 @@ - } - - if (strlen(p)>0) { -- snprintf(url->username,strlen(p)+1,p); -+ strcpy(url->username,p); - if (check_username(url->username)) { - if (verbose) printf("This isn't a valid username\n"); - return -1;; -@@ -304,12 +304,12 @@ - *q='\0'; - q++; - } -- snprintf(url->volumename,strlen(p)+1,p); -+ strcpy(url->volumename,p); - - - if (q) { - url->path[0]='/'; -- snprintf(url->path+1,strlen(q)+1,q); -+ strcpy(url->path+1,q); - } - - done: ---- a/fuse/commands.c -+++ b/fuse/commands.c -@@ -163,8 +163,7 @@ - - if (c) { - len = strlen(c->client_string); -- snprintf(c->client_string+len, -- MAX_CLIENT_RESPONSE-len, -+ strcpy(c->client_string+len, - message); - } else { - -@@ -468,7 +467,7 @@ - volume->mapping=req->map; - afp_detect_mapping(volume); - -- snprintf(volume->mountpoint,255,req->mountpoint); -+ strcpy(volume->mountpoint,req->mountpoint); - - /* Create the new thread and block until we get an answer back */ - { ---- a/fuse/client.c -+++ b/fuse/client.c -@@ -547,7 +547,7 @@ - done: - memset(toprint,0,MAX_CLIENT_RESPONSE+200); - snprintf(toprint,MAX_CLIENT_RESPONSE+200,"%s",incoming_buffer+sizeof(*answer)); -- printf(toprint); -+ printf("%s",toprint); - return ((struct afp_server_response *) incoming_buffer)->result; - - return 0; ---- a/cmdline/cmdline_afp.c -+++ b/cmdline/cmdline_afp.c -@@ -828,11 +828,11 @@ - char text[40960]; - - afp_status_header(text,&len); -- printf(text); -+ printf("%s",text); - - len=40960; - afp_status_server(server,text,&len); -- printf(text); -+ printf("%s",text); - return 0; - } - ---- a/cmdline/cmdline_testafp.c -+++ b/cmdline/cmdline_testafp.c -@@ -26,12 +26,12 @@ - struct afp_url valid_url; - afp_default_url(&valid_url); - valid_url.protocol=protocol; -- sprintf(valid_url.servername,servername); -- sprintf(valid_url.volumename,volumename); -- sprintf(valid_url.path,path); -- sprintf(valid_url.username,username); -- sprintf(valid_url.password,password); -- sprintf(valid_url.uamname,uamname); -+ strcpy(valid_url.servername,servername); -+ strcpy(valid_url.volumename,volumename); -+ strcpy(valid_url.path,path); -+ strcpy(valid_url.username,username); -+ strcpy(valid_url.password,password); -+ strcpy(valid_url.uamname,uamname); - valid_url.port=port; - - if (afp_url_validate(url_string,&valid_url)) diff --git a/abs/extra/community/afpfs-ng/21-header-path-fix.patch b/abs/extra/community/afpfs-ng/21-header-path-fix.patch deleted file mode 100644 index fe79b1f..0000000 --- a/abs/extra/community/afpfs-ng/21-header-path-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Ensure internal headers are picked instead of system headers. -Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/afpfs-ng.git;a=blob;f=debian/patches/header-path-fix.patch - ---- a/include/afpfs-ng/afp.h -+++ b/include/afpfs-ng/afp.h -@@ -7,8 +7,8 @@ - #include <netdb.h> - #include <sys/statvfs.h> - #include <pwd.h> --#include <afpfs-ng/afp_protocol.h> --#include <afpfs-ng/libafpclient.h> -+#include "afp_protocol.h" -+#include "libafpclient.h" - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> diff --git a/abs/extra/community/afpfs-ng/30-include-fixes.patch b/abs/extra/community/afpfs-ng/30-include-fixes.patch deleted file mode 100644 index de4f883..0000000 --- a/abs/extra/community/afpfs-ng/30-include-fixes.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/include/afpfs-ng/dsi.h 2012-02-23 10:02:07.062734160 +0100 -+++ b/include/afpfs-ng/dsi.h 2012-02-23 10:09:46.297111254 +0100 -@@ -2,7 +2,7 @@ - #ifndef __DSI_H_ - #define __DSI_H_ - --#include "afpfs-ng/afp.h" -+#include "afp.h" - - struct dsi_request - { ---- a/include/afpfs-ng/map_def.h 2012-02-23 10:02:07.062734160 +0100 -+++ b/include/afpfs-ng/map_def.h 2012-02-23 10:11:32.769953053 +0100 -@@ -1,7 +1,7 @@ - #ifndef __MAP_H_ - #define __MAP_H_ - --#include "afpfs-ng/afp.h" -+#include "afp.h" - - #define AFP_MAPPING_UNKNOWN 0 - #define AFP_MAPPING_COMMON 1 ---- a/include/afpfs-ng/midlevel.h 2012-02-23 10:02:07.062734160 +0100 -+++ b/include/afpfs-ng/midlevel.h 2012-02-23 10:12:40.519943675 +0100 -@@ -2,7 +2,7 @@ - #define __MIDLEVEL_H_ - - #include <utime.h> --#include "afpfs-ng/afp.h" -+#include "afp.h" - - int ml_open(struct afp_volume * volume, const char *path, int flags, - struct afp_file_info **newfp); ---- a/include/afpfs-ng/utils.h 2012-02-23 10:14:42.212332892 +0100 -+++ b/include/afpfs-ng/utils.h 2012-02-23 10:14:51.116069525 +0100 -@@ -2,7 +2,7 @@ - #define __UTILS_H_ - #include <stdio.h> - --#include "afpfs-ng/afp.h" -+#include "afp.h" - - #if BYTE_ORDER == BIG_ENDIAN - #define hton64(x) (x) diff --git a/abs/extra/community/afpfs-ng/PKGBUILD b/abs/extra/community/afpfs-ng/PKGBUILD deleted file mode 100644 index 4538db9..0000000 --- a/abs/extra/community/afpfs-ng/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id$ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> -# Contributor: slubman <slubman.dndd@laposte.net> - -pkgname=afpfs-ng -pkgver=0.8.1 -pkgrel=5 -pkgdesc="A client for the Apple Filing Protocol (AFP)" -url="http://alexthepuffin.googlepages.com/" -license=('GPL') -depends=('gmp' 'fuse' 'libgcrypt') -arch=('i686' 'x86_64') -options=(!libtool) -source=( - "http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" - 'fix_afpfs-ng_includes.patch' - '01-gcrypt.patch' - '02-pointer.patch' - '10-fix-errno.patch' - '20-build-error-fixes.patch' - '21-header-path-fix.patch' - '30-include-fixes.patch' -) -sha256sums=( - '688560de1cde57ab8d9e0ef7dc6436dbf0267fe8884f9014e50ff92b297b01a8' - '627d94ab3c1cbc002b18839f514c6fa980b0a25dfc21e8761b389fcd39f32755' - '18dc77b064fc02c229e0cfa071a7e31cde6d0243671ebde2f561ebdf09dc38bb' - '8537b086c496e776be2a6757325717cb15dee6dcf2aedccebed6b4b2332d3dc1' - '0e1c0c0e3a9ff6e55ccbbbc1b4de630c874ff058e2ea94360b7d90e650d04811' - '393662da1bcd5d3aba180a2add37d9006e0a487c3bb7bf157a15aa492f4d6a87' - 'f551ae9debe8ce2c4ed1d7a8bce497801ace995473876a5fefa0443353232477' - '71b8f52923cef39f0cccb8fdff610575958fd5dbed66e5aa4413ae6aceeec656' -) - -build() { - cd "$pkgname-$pkgver" - # apply patches - msg2 'fix_afpfs-ng_includes.patch' - patch -Np1 -i "$srcdir/fix_afpfs-ng_includes.patch" - msg2 '01-gcrypt.patch' - patch -Np1 -i "$srcdir/01-gcrypt.patch" - msg2 '02-pointer.patch' - patch -Np1 -i "$srcdir/02-pointer.patch" - msg2 '10-fix-errno.patch' - patch -Np1 -i "$srcdir/10-fix-errno.patch" - msg2 '20-build-error-fixes.patch' - patch -Np1 -i "$srcdir/20-build-error-fixes.patch" - msg2 '21-header-path-fix.patch' - patch -Np1 -i "$srcdir/21-header-path-fix.patch" - msg2 '30-include-fixes.patch' - patch -Np1 -i "$srcdir/30-include-fixes.patch" - - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # install headers - cd include - for header in afpfs-ng/*.h; do - install -Dm644 "$header" "$pkgdir/usr/include/$header" - done -} diff --git a/abs/extra/community/afpfs-ng/fix_afpfs-ng_includes.patch b/abs/extra/community/afpfs-ng/fix_afpfs-ng_includes.patch deleted file mode 100644 index f507a48..0000000 --- a/abs/extra/community/afpfs-ng/fix_afpfs-ng_includes.patch +++ /dev/null @@ -1,3082 +0,0 @@ -diff -Naur afpfs-ng-0.8.1/cmdline/cmdline_afp.c afpfs-ng-0.8.1.patch/cmdline/cmdline_afp.c ---- afpfs-ng-0.8.1/cmdline/cmdline_afp.c 2008-02-19 02:54:19.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/cmdline/cmdline_afp.c 2011-09-10 12:13:50.102124369 +0200 -@@ -3,9 +3,9 @@ - - */ - --#include "afp.h" --#include "midlevel.h" --#include "map_def.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/midlevel.h" -+#include "afpfs-ng/map_def.h" - - #include <string.h> - #include <stdio.h> -diff -Naur afpfs-ng-0.8.1/cmdline/cmdline_testafp.c afpfs-ng-0.8.1.patch/cmdline/cmdline_testafp.c ---- afpfs-ng-0.8.1/cmdline/cmdline_testafp.c 2008-03-04 21:16:50.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/cmdline/cmdline_testafp.c 2011-09-10 12:13:50.102124369 +0200 -@@ -3,8 +3,8 @@ - - */ - --#include "afp.h" --#include "midlevel.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/midlevel.h" - - #include "cmdline_main.h" - -diff -Naur afpfs-ng-0.8.1/cmdline/getstatus.c afpfs-ng-0.8.1.patch/cmdline/getstatus.c ---- afpfs-ng-0.8.1/cmdline/getstatus.c 2008-02-18 04:28:09.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/cmdline/getstatus.c 2011-09-10 12:13:50.109124463 +0200 -@@ -2,7 +2,7 @@ - #include <string.h> - #include <pthread.h> - --#include "afp.h" -+#include "afpfs-ng/afp.h" - - static int getstatus(char * address_string, unsigned int port) - { -diff -Naur afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1.patch/configure.ac ---- afpfs-ng-0.8.1/configure.ac 2008-03-08 17:23:12.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/configure.ac 2011-09-10 12:13:50.109124463 +0200 -@@ -11,6 +11,7 @@ - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_LIBTOOL -+AM_PROG_CC_C_O - - # Checks for libraries. - # FIXME: Replace `main' with a function in `-lncurses': -@@ -105,7 +106,7 @@ - - - --AC_CONFIG_FILES([lib/Makefile fuse/Makefile cmdline/Makefile Makefile docs/Makefile]) -+AC_CONFIG_FILES([lib/Makefile fuse/Makefile cmdline/Makefile Makefile include/Makefile include/afpfs-ng/Makefile docs/Makefile]) - - AC_OUTPUT - -diff -Naur afpfs-ng-0.8.1/fuse/client.c afpfs-ng-0.8.1.patch/fuse/client.c ---- afpfs-ng-0.8.1/fuse/client.c 2008-03-08 03:44:16.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/fuse/client.c 2011-09-10 12:13:50.110124477 +0200 -@@ -12,11 +12,11 @@ - #include <grp.h> - - #include "config.h" --#include <afp.h> -+#include <afpfs-ng/afp.h> - #include "afp_server.h" --#include "uams_def.h" --#include "map_def.h" --#include "libafpclient.h" -+#include "afpfs-ng/uams_def.h" -+#include "afpfs-ng/map_def.h" -+#include "afpfs-ng/libafpclient.h" - - #define default_uam "Cleartxt Passwrd" - -diff -Naur afpfs-ng-0.8.1/fuse/commands.c afpfs-ng-0.8.1.patch/fuse/commands.c ---- afpfs-ng-0.8.1/fuse/commands.c 2008-03-08 17:06:25.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/fuse/commands.c 2011-09-10 12:13:50.110124477 +0200 -@@ -19,15 +19,15 @@ - #include <getopt.h> - #include <signal.h> - --#include "afp.h" --#include "dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/dsi.h" - #include "afp_server.h" --#include "utils.h" -+#include "afpfs-ng/utils.h" - #include "daemon.h" --#include "uams_def.h" --#include "codepage.h" --#include "libafpclient.h" --#include "map_def.h" -+#include "afpfs-ng/uams_def.h" -+#include "afpfs-ng/codepage.h" -+#include "afpfs-ng/libafpclient.h" -+#include "afpfs-ng/map_def.h" - #include "fuse_int.h" - #include "fuse_error.h" - #include "fuse_internal.h" -diff -Naur afpfs-ng-0.8.1/fuse/daemon.c afpfs-ng-0.8.1.patch/fuse/daemon.c ---- afpfs-ng-0.8.1/fuse/daemon.c 2008-03-04 18:26:05.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/fuse/daemon.c 2011-09-10 12:13:50.110124477 +0200 -@@ -23,11 +23,11 @@ - #include <signal.h> - #include <sys/socket.h> - --#include "afp.h" -+#include "afpfs-ng/afp.h" - --#include "dsi.h" -+#include "afpfs-ng/dsi.h" - #include "afp_server.h" --#include "utils.h" -+#include "afpfs-ng/utils.h" - #include "daemon.h" - #include "commands.h" - -diff -Naur afpfs-ng-0.8.1/fuse/fuse_error.c afpfs-ng-0.8.1.patch/fuse/fuse_error.c ---- afpfs-ng-0.8.1/fuse/fuse_error.c 2008-01-18 05:40:10.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/fuse/fuse_error.c 2011-09-10 12:13:50.111124491 +0200 -@@ -4,7 +4,7 @@ - #include <unistd.h> - #include <string.h> - #include <stdio.h> --#include "libafpclient.h" -+#include "afpfs-ng/libafpclient.h" - #include "fuse_internal.h" - - #define TMP_FILE "/tmp/fuse_stderr" -diff -Naur afpfs-ng-0.8.1/fuse/fuse_int.c afpfs-ng-0.8.1.patch/fuse/fuse_int.c ---- afpfs-ng-0.8.1/fuse/fuse_int.c 2008-03-02 06:06:24.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/fuse/fuse_int.c 2011-09-10 12:13:50.111124491 +0200 -@@ -18,7 +18,7 @@ - #define FUSE_USE_VERSION 25 - - --#include "afp.h" -+#include "afpfs-ng/afp.h" - - #include <fuse.h> - #include <stdio.h> -@@ -39,10 +39,10 @@ - #include <pwd.h> - #include <stdarg.h> - --#include "dsi.h" --#include "afp_protocol.h" --#include "codepage.h" --#include "midlevel.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp_protocol.h" -+#include "afpfs-ng/codepage.h" -+#include "afpfs-ng/midlevel.h" - #include "fuse_error.h" - - /* Uncomment the following line to enable full debugging: */ -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/afp.h afpfs-ng-0.8.1.patch/include/afpfs-ng/afp.h ---- afpfs-ng-0.8.1/include/afpfs-ng/afp.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/afp.h 2011-09-10 12:13:50.112124505 +0200 -@@ -0,0 +1,533 @@ -+ -+#ifndef _AFP_H_ -+#define _AFP_H_ -+ -+#include <arpa/inet.h> -+#include <pthread.h> -+#include <netdb.h> -+#include <sys/statvfs.h> -+#include <pwd.h> -+#include <afpfs-ng/afp_protocol.h> -+#include <afpfs-ng/libafpclient.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+#include <netinet/in.h> -+ -+ -+#define AFPFS_VERSION "0.8.1" -+ -+/* This is the maximum AFP version this library supports */ -+#define AFP_MAX_SUPPORTED_VERSION 32 -+ -+/* afp_url is used to pass locations around */ -+struct afp_url { -+ enum {TCPIP,AT} protocol; -+ char username[AFP_MAX_USERNAME_LEN]; -+ char uamname[50]; -+ char password[AFP_MAX_PASSWORD_LEN]; -+ char servername[AFP_SERVER_NAME_UTF8_LEN]; -+ int port; -+ char volumename[AFP_VOLUME_NAME_UTF8_LEN]; -+ char path[AFP_MAX_PATH]; -+ -+ int requested_version; -+ char zone[AFP_ZONE_LEN]; /* Only used for Appletalk */ -+ char volpassword[9];; -+}; -+ -+struct afp_token { -+ unsigned int length; -+ char data[AFP_TOKEN_MAX_LEN]; -+}; -+ -+#define SERVER_MAX_VERSIONS 10 -+#define SERVER_MAX_UAMS 10 -+ -+struct afp_rx_buffer { -+ unsigned int size; -+ unsigned int maxsize; -+ char * data; -+ int errorcode; -+}; -+ -+ -+struct afp_file_info { -+ unsigned short attributes; -+ unsigned int did; -+ unsigned int creation_date; -+ unsigned int modification_date; -+ unsigned int backup_date; -+ unsigned int fileid; -+ unsigned short offspring; -+ char sync; -+ char finderinfo[32]; -+ char name[AFP_MAX_PATH]; -+ char basename[AFP_MAX_PATH]; -+ char translated_name[AFP_MAX_PATH]; -+ struct afp_unixprivs unixprivs; -+ unsigned int accessrights; -+ struct afp_file_info * next; -+ struct afp_file_info * largelist_next; -+ unsigned char isdir; -+ unsigned long long size; -+ unsigned short resourcesize; -+ unsigned int resource; -+ unsigned short forkid; -+ struct afp_icon * icon; -+ int eof; -+}; -+ -+ -+#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_KNOWN 0x1 -+#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_BROKEN 0x2 -+#define VOLUME_EXTRA_FLAGS_SHOW_APPLEDOUBLE 0x4 -+#define VOLUME_EXTRA_FLAGS_VOL_SUPPORTS_UNIX 0x8 -+#define VOLUME_EXTRA_FLAGS_NO_LOCKING 0x10 -+#define VOLUME_EXTRA_FLAGS_IGNORE_UNIXPRIVS 0x20 -+#define VOLUME_EXTRA_FLAGS_READONLY 0x40 -+ -+#define AFP_VOLUME_UNMOUNTED 0 -+#define AFP_VOLUME_MOUNTED 1 -+#define AFP_VOLUME_UNMOUNTING 2 -+ -+struct afp_volume { -+ unsigned short volid; -+ char flags; /* This is from afpGetSrvrParms */ -+ unsigned short attributes; /* This is from VolOpen */ -+ unsigned short signature; /* This is fixed or variable */ -+ unsigned int creation_date; -+ unsigned int modification_date; -+ unsigned int backup_date; -+ struct statvfs stat; -+ unsigned char mounted; -+ char mountpoint[255]; -+ struct afp_server * server; -+ char volume_name[AFP_VOLUME_NAME_LEN]; -+ char volume_name_printable[AFP_VOLUME_NAME_UTF8_LEN]; -+ unsigned short dtrefnum; -+ char volpassword[AFP_VOLPASS_LEN]; -+ unsigned int extra_flags; /* This is an afpfs-ng specific field */ -+ -+ /* Our directory ID cache */ -+ struct did_cache_entry * did_cache_base; -+ pthread_mutex_t did_cache_mutex; -+ -+ /* Our journal of open forks */ -+ struct afp_file_info * open_forks; -+ pthread_mutex_t open_forks_mutex; -+ -+ /* Used to trigger startup */ -+ pthread_cond_t startup_condition_cond; -+ -+ struct { -+ uint64_t hits; -+ uint64_t misses; -+ uint64_t expired; -+ uint64_t force_removed; -+ } did_cache_stats; -+ -+ void * priv; /* This is a private structure for fuse/cmdline, etc */ -+ pthread_t thread; /* This is the per-volume thread */ -+ -+ int mapping; -+ -+}; -+ -+#define SERVER_STATE_CONNECTED 1 -+#define SERVER_STATE_DISCONNECTED 2 -+ -+enum server_type{ -+ AFPFS_SERVER_TYPE_UNKNOWN, -+ AFPFS_SERVER_TYPE_NETATALK, -+ AFPFS_SERVER_TYPE_AIRPORT, -+ AFPFS_SERVER_TYPE_MACINTOSH, -+}; -+ -+#define is_netatalk(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_NETATALK ) -+#define is_airport(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_AIRPORT ) -+#define is_macintosh(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_MACINTOSH ) -+ -+ -+ -+struct afp_versions { -+ char *av_name; -+ int av_number; -+}; -+extern struct afp_versions afp_versions[]; -+ -+struct afp_server { -+ -+ /* Our buffer sizes */ -+ unsigned int tx_quantum; -+ unsigned int rx_quantum; -+ -+ unsigned int tx_delay; -+ -+ /* Connection information */ -+ struct sockaddr_in address; -+ int fd; -+ -+ /* Some stats, for information only */ -+ struct { -+ uint64_t runt_packets; -+ uint64_t incoming_dsi; -+ uint64_t rx_bytes; -+ uint64_t tx_bytes; -+ uint64_t requests_pending; -+ } stats; -+ -+ /* General information */ -+ char server_name[AFP_SERVER_NAME_LEN]; -+ char server_name_utf8[AFP_SERVER_NAME_UTF8_LEN]; -+ char server_name_printable[AFP_SERVER_NAME_UTF8_LEN]; -+ -+ char machine_type[17]; -+ char icon[256]; -+ char signature[16]; -+ unsigned short flags; -+ int connect_state; -+ enum server_type server_type; -+ -+ /* This is the time we connected */ -+ time_t connect_time; -+ -+ /* UAMs */ -+ unsigned int supported_uams; -+ unsigned int using_uam; -+ -+ /* Authentication */ -+ char username[AFP_MAX_USERNAME_LEN]; -+ char password[AFP_MAX_PASSWORD_LEN]; -+ -+ /* Session */ -+ struct afp_token token; -+ char need_resume; -+ -+ /* Versions */ -+ unsigned char requested_version; -+ unsigned char versions[SERVER_MAX_VERSIONS]; -+ struct afp_versions *using_version; -+ -+ /* Volumes */ -+ unsigned char num_volumes; -+ struct afp_volume * volumes; -+ -+ void * dsi; -+ unsigned int exit_flag; -+ -+ /* Our DSI request queue */ -+ pthread_mutex_t requestid_mutex; -+ pthread_mutex_t request_queue_mutex; -+ unsigned short lastrequestid; -+ unsigned short expectedrequestid; -+ struct dsi_request * command_requests; -+ -+ -+ char loginmesg[200]; -+ char servermesg[200]; -+ char path_encoding; -+ -+ /* This is the data for the incoming buffer */ -+ char * incoming_buffer; -+ int data_read; -+ int bufsize; -+ -+ /* And this is for the outgoing queue */ -+ pthread_mutex_t send_mutex; -+ -+ /* This is for user mapping */ -+ struct passwd passwd; -+ unsigned int server_uid, server_gid; -+ int server_gid_valid; -+ -+ struct afp_server *next; -+ -+ /* These are for DSI attention packets */ -+ unsigned int attention_quantum; -+ unsigned int attention_len; -+ char * attention_buffer; -+ -+}; -+ -+struct afp_extattr_info { -+ unsigned int maxsize; -+ unsigned int size; -+ char data[1024]; -+}; -+struct afp_comment { -+ unsigned int maxsize; -+ unsigned int size; -+ char *data; -+}; -+ -+struct afp_icon { -+ unsigned int maxsize; -+ unsigned int size; -+ char *data; -+}; -+ -+#define AFP_DEFAULT_ATTENTION_QUANTUM 1024 -+ -+void afp_unixpriv_to_stat(struct afp_file_info *fp, -+ struct stat *stat); -+ -+int init_uams(void) ; -+ -+unsigned int find_uam_by_name(const char * name); -+char * uam_bitmap_to_string(unsigned int bitmap); -+ -+ -+char * get_uam_names_list(void); -+ -+unsigned int default_uams_mask(void); -+ -+struct afp_volume * find_volume_by_name(struct afp_server * server, -+ const char * volname); -+ -+struct afp_connection_request { -+ unsigned int uam_mask; -+ struct afp_url url; -+}; -+ -+void afp_default_url(struct afp_url *url); -+int afp_parse_url(struct afp_url * url, const char * toparse, int verbose); -+void afp_print_url(struct afp_url * url); -+int afp_url_validate(char * url_string, struct afp_url * valid_url); -+ -+int afp_list_volnames(struct afp_server * server, char * names, int max); -+ -+/* User mapping */ -+int afp_detect_mapping(struct afp_volume * volume); -+ -+/* These are some functions that help with simple status text generation */ -+ -+int afp_status_header(char * text, int * len); -+int afp_status_server(struct afp_server * s,char * text, int * len); -+ -+ -+struct afp_server * afp_server_full_connect(void * priv, struct afp_connection_request * req); -+ -+void * just_end_it_now(void *other); -+void add_fd_and_signal(int fd); -+void loop_disconnect(struct afp_server *s); -+void afp_wait_for_started_loop(void); -+ -+ -+struct afp_versions * pick_version(unsigned char *versions, -+ unsigned char requested) ; -+int pick_uam(unsigned int u1, unsigned int u2); -+ -+int afp_server_login(struct afp_server *server, -+ char * mesg, unsigned int *l, unsigned int max); -+ -+ -+int afp_dologin(struct afp_server *server, -+ unsigned int uam, char * username, char * passwd); -+ -+void afp_free_server(struct afp_server **server); -+ -+struct afp_server * afp_server_init(struct sockaddr_in * address); -+int afp_get_address(void * priv, const char * hostname, unsigned int port, -+ struct sockaddr_in * address); -+ -+ -+int afp_main_loop(int command_fd); -+int afp_main_quick_startup(pthread_t * thread); -+ -+int afp_server_destroy(struct afp_server *s) ; -+int afp_server_reconnect(struct afp_server * s, char * mesg, -+ unsigned int *l, unsigned int max); -+int afp_server_connect(struct afp_server *s, int full); -+ -+struct afp_server * afp_server_complete_connection( -+ void * priv, -+ struct afp_server * server, -+ struct sockaddr_in * address, unsigned char * versions, -+ unsigned int uams, char * username, char * password, -+ unsigned int requested_version, unsigned int uam_mask); -+ -+int afp_connect_volume(struct afp_volume * volume, struct afp_server * server, -+ char * mesg, unsigned int * l, unsigned int max); -+int something_is_mounted(struct afp_server * server); -+ -+int add_cache_entry(struct afp_file_info * file) ; -+struct afp_file_info * get_cache_by_name(char * name); -+struct afp_server * find_server_by_address(struct sockaddr_in * address); -+struct afp_server * find_server_by_signature(char * signature); -+struct afp_server * find_server_by_name(char * name); -+int server_still_valid(struct afp_server * server); -+ -+ -+struct afp_server * get_server_base(void); -+int afp_server_remove(struct afp_server * server); -+ -+int afp_unmount_volume(struct afp_volume * volume); -+int afp_unmount_all_volumes(struct afp_server * server); -+ -+#define volume_is_readonly(x) (((x)->attributes&kReadOnly) || \ -+ ((x)->extra_flags & VOLUME_EXTRA_FLAGS_READONLY)) -+ -+int afp_opendt(struct afp_volume *volume, unsigned short * refnum); -+ -+int afp_closedt(struct afp_server * server, unsigned short * refnum); -+ -+int afp_getcomment(struct afp_volume *volume, unsigned int did, -+ const char * pathname, struct afp_comment * comment); -+ -+int afp_addcomment(struct afp_volume *volume, unsigned int did, -+ const char * pathname, char * comment,uint64_t *size); -+ -+int afp_geticon(struct afp_volume * volume, unsigned int filecreator, -+ unsigned int filetype, unsigned char icontype, -+ unsigned short length, struct afp_icon * icon); -+ -+/* Things you want to do to a server */ -+ -+int afp_getsrvrmsg(struct afp_server *server, unsigned short messagetype,unsigned char utf8, unsigned char block, char * mesg); -+ -+int afp_login(struct afp_server *server, char * uaname, -+ char * userauthinfo, unsigned int userauthinfo_len, -+ struct afp_rx_buffer *rx); -+ -+int afp_changepassword(struct afp_server *server, char * uaname, -+ char * userauthinfo, unsigned int userauthinfo_len, -+ struct afp_rx_buffer *rx); -+ -+int afp_logincont(struct afp_server *server, unsigned short id, -+ char * userauthinfo, unsigned int userauthinfo_len, -+ struct afp_rx_buffer *rx); -+ -+int afp_getsessiontoken(struct afp_server * server, int type, -+ unsigned int timestamp, struct afp_token *outgoing_token, -+ struct afp_token * incoming_token); -+ -+int afp_getsrvrparms(struct afp_server *server); -+ -+int afp_logout(struct afp_server *server,unsigned char wait); -+ -+int afp_mapname(struct afp_server * server, unsigned char subfunction, -+ char * name, unsigned int * id); -+ -+int afp_mapid(struct afp_server * server, unsigned char subfunction, -+ unsigned int id, char *name); -+ -+int afp_getuserinfo(struct afp_server * server, int thisuser, -+ unsigned int userid, unsigned short bitmap, -+ unsigned int *newuid, unsigned int *newgid); -+ -+int afp_zzzzz(struct afp_server *server); -+ -+int afp_volopen(struct afp_volume * volume, -+ unsigned short bitmap, char * password); -+ -+int afp_flush(struct afp_volume * volume); -+ -+int afp_getfiledirparms(struct afp_volume *volume, unsigned int did, -+ unsigned int filebitmap, unsigned int dirbitmap, const char * pathname, -+ struct afp_file_info *fp); -+ -+int afp_enumerate(struct afp_volume * volume, -+ unsigned int dirid, -+ unsigned int filebitmap, unsigned int dirbitmap, -+ unsigned short reqcount, -+ unsigned short startindex, -+ char * path, -+ struct afp_file_info ** file_p); -+ -+int afp_enumerateext2(struct afp_volume * volume, -+ unsigned int dirid, -+ unsigned int filebitmap, unsigned int dirbitmap, -+ unsigned short reqcount, -+ unsigned long startindex, -+ char * path, -+ struct afp_file_info ** file_p); -+ -+int afp_openfork(struct afp_volume * volume, -+ unsigned char forktype, -+ unsigned int dirid, -+ unsigned short accessmode, -+ char * filename, -+ struct afp_file_info *fp); -+ -+int afp_read(struct afp_volume * volume, unsigned short forkid, -+ uint32_t offset, -+ uint32_t count, struct afp_rx_buffer * rx); -+ -+int afp_readext(struct afp_volume * volume, unsigned short forkid, -+ uint64_t offset, -+ uint64_t count, struct afp_rx_buffer * rx); -+ -+int afp_getvolparms(struct afp_volume * volume, unsigned short bitmap); -+ -+ -+int afp_createdir(struct afp_volume * volume, unsigned int dirid, const char * pathname, unsigned int *did_p); -+ -+int afp_delete(struct afp_volume * volume, -+ unsigned int dirid, char * pathname); -+ -+ -+int afp_createfile(struct afp_volume * volume, unsigned char flag, -+ unsigned int did, char * pathname); -+ -+int afp_write(struct afp_volume * volume, unsigned short forkid, -+ uint32_t offset, uint32_t reqcount, -+ char * data, uint32_t * written); -+ -+int afp_writeext(struct afp_volume * volume, unsigned short forkid, -+ uint64_t offset, uint64_t reqcount, -+ char * data, uint64_t * written); -+ -+int afp_flushfork(struct afp_volume * volume, unsigned short forkid); -+ -+int afp_closefork(struct afp_volume * volume, unsigned short forkid); -+int afp_setfileparms(struct afp_volume * volume, -+ unsigned int dirid, const char * pathname, unsigned short bitmap, -+ struct afp_file_info *fp); -+int afp_setfiledirparms(struct afp_volume * volume, -+ unsigned int dirid, const char * pathname, unsigned short bitmap, -+ struct afp_file_info *fp); -+ -+int afp_setdirparms(struct afp_volume * volume, -+ unsigned int dirid, const char * pathname, unsigned short bitmap, -+ struct afp_file_info *fp); -+ -+int afp_volclose(struct afp_volume * volume); -+ -+ -+int afp_setforkparms(struct afp_volume *volume, -+ unsigned short forkid, unsigned short bitmap, unsigned long len); -+ -+int afp_byterangelock(struct afp_volume * volume, -+ unsigned char flag, -+ unsigned short forkid, -+ uint32_t offset, -+ uint32_t len, uint32_t *generated_offset); -+ -+int afp_byterangelockext(struct afp_volume * volume, -+ unsigned char flag, -+ unsigned short forkid, -+ uint64_t offset, -+ uint64_t len, uint64_t *generated_offset); -+ -+int afp_moveandrename(struct afp_volume *volume, -+ unsigned int src_did, -+ unsigned int dst_did, -+ char * src_path, char * dst_path, char *new_name); -+ -+int afp_rename(struct afp_volume * volume, -+ unsigned int dirid, -+ char * path_from, char * path_to); -+ -+int afp_listextattr(struct afp_volume * volume, -+ unsigned int dirid, unsigned short bitmap, -+ char * pathname, struct afp_extattr_info * info); -+ -+/* This is a currently undocumented command */ -+int afp_newcommand76(struct afp_volume * volume, unsigned int dlen, char * data); -+ -+/* For debugging */ -+char * afp_get_command_name(char code); -+ -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/afp_protocol.h afpfs-ng-0.8.1.patch/include/afpfs-ng/afp_protocol.h ---- afpfs-ng-0.8.1/include/afpfs-ng/afp_protocol.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/afp_protocol.h 2011-09-10 12:13:50.112124505 +0200 -@@ -0,0 +1,361 @@ -+ -+#ifndef _AFP_PROTOCOL_H_ -+#define _AFP_PROTOCOL_H_ -+ -+#include <sys/types.h> -+#include <stddef.h> -+#include <unistd.h> -+#include <stdint.h> -+ -+/* This file defines constants for the Apple File Protocol. -+ All page references are from "Apple Filing Protocol Programming" version 3.2. -+ except where noted. -+*/ -+ -+#define AFP_SERVER_NAME_LEN 33 -+#define AFP_SERVER_NAME_UTF8_LEN 255 -+#define AFP_VOLUME_NAME_LEN 33 -+#define AFP_VOLUME_NAME_UTF8_LEN 33 -+#define AFP_SIGNATURE_LEN 16 -+#define AFP_MACHINETYPE_LEN 33 -+#define AFP_LOGINMESG_LEN 200 -+#define AFP_VOLPASS_LEN 8 -+#define AFP_HOSTNAME_LEN 255 -+/* This is actually just a guess, and only used for appletalk */ -+#define AFP_ZONE_LEN 255 -+ -+#define AFP_SERVER_ICON_LEN 256 -+ -+ -+#define AFP_MAX_USERNAME_LEN 127 -+#define AFP_MAX_PASSWORD_LEN 127 -+ -+ -+/* This is the maximum length of any UAM string */ -+#define AFP_UAM_LENGTH 24 -+ -+/* This is the maximum length of any path description */ -+#define AFP_MAX_PATH 768 -+ -+#define AFP_VOL_FLAT 1 -+#define AFP_VOL_FIXED 2 -+#define AFP_VOL_VARIABLE 3 -+ -+/* The root directory ID, p.26 */ -+ -+#define AFP_ROOT_DID 2 -+ -+/* Path type constants, p.249 */ -+ -+enum { -+kFPShortName = 1, -+kFPLongName = 2, -+kFPUTF8Name = 3 -+}; -+ -+/* fork types */ -+ -+#define AFP_FORKTYPE_DATA 0x0 -+#define AFP_FORKTYPE_RESOURCE 0x80 -+ -+/* openfork access modes, from p.196 */ -+ -+#define AFP_OPENFORK_ALLOWREAD 1 -+#define AFP_OPENFORK_ALLOWWRITE 2 -+#define AFP_OPENFORK_DENYREAD 0x10 -+#define AFP_OPENFORK_DENYWRITE 0x20 -+ -+/* Message type for getsrvmesg, p. 169*/ -+ -+typedef enum { -+ AFPMESG_LOGIN = 0, -+ AFPMESG_SERVER = 1 -+} afpmessage_t; -+ -+/* Message bitmap for getsrvrmsg */ -+ -+#define AFP_GETSRVRMSG_UTF8 0x2 -+#define AFP_GETSRVRMSG_GETMSG 0x1 -+ -+ -+/* Maximum Version length, p.17 */ -+#define AFP_MAX_VERSION_LENGTH 16 -+ -+/* Maximum length of a token, this is undocumented */ -+#define AFP_TOKEN_MAX_LEN 256 -+ -+/* The maximum size of a file for AFP 2 */ -+#define AFP_MAX_AFP2_FILESIZE (4294967296) -+ -+/* Unix privs, p.240 */ -+ -+struct afp_unixprivs { -+ uint32_t uid __attribute__((__packed__)); -+ uint32_t gid __attribute__((__packed__)); -+ uint32_t permissions __attribute__((__packed__)); -+ uint32_t ua_permissions __attribute__((__packed__)); -+ -+}; -+ -+ -+/* AFP Volume attributes bitmap, p.241 */ -+ -+enum { -+ kReadOnly = 0x01, -+ kHasVolumePassword = 0x02, -+ kSupportsFileIDs = 0x04, -+ kSupportsCatSearch = 0x08, -+ kSupportsBlankAccessPrivs = 0x10, -+ kSupportsUnixPrivs = 0x20, -+ kSupportsUTF8Names = 0x40, -+ kNoNetworkUserIDs = 0x80, -+ kDefaultPrivsFromParent = 0x100, -+ kNoExchangeFiles = 0x200, -+ kSupportsExtAttrs = 0x400, -+ kSupportsACLs=0x800 -+}; -+ -+/* AFP file creation constantes, p.250 */ -+enum { -+kFPSoftCreate = 0, -+kFPHardCreate = 0x80 -+}; -+ -+/* AFP Directory attributes, taken from the protocol guide p.236 */ -+ -+enum { -+ kFPAttributeBit = 0x1, -+ kFPParentDirIDBit = 0x2, -+ kFPCreateDateBit = 0x4, -+ kFPModDateBit = 0x8, -+ kFPBackupDateBit = 0x10, -+ kFPFinderInfoBit = 0x20, -+ kFPLongNameBit = 0x40, -+ kFPShortNameBit = 0x80, -+ kFPNodeIDBit = 0x100, -+ kFPOffspringCountBit = 0x0200, -+ kFPOwnerIDBit = 0x0400, -+ kFPGroupIDBit = 0x0800, -+ kFPAccessRightsBit = 0x1000, -+ kFPProDOSInfoBit = 0x2000, // AFP version 2.2 and earlier -+ kFPUTF8NameBit = 0x2000, // AFP version 3.0 and later -+ kFPUnixPrivsBit = 0x8000 // AFP version 3.0 and later -+}; -+ -+/* AFP File bitmap, p.238. These are the ones not in the AFP Directory -+ attributes map. */ -+ -+enum { -+ kFPDataForkLenBit = 0x0200, -+ kFPRsrcForkLenBit = 0x0400, -+ kFPExtDataForkLenBit = 0x0800, // AFP version 3.0 and later -+ kFPLaunchLimitBit = 0x1000, -+ kFPExtRsrcForkLenBit = 0x4000, // AFP version 3.0 and later -+}; -+ -+/* AFP Extended Attributes Bitmap, p.238 */ -+ -+enum { -+ kXAttrNoFollow = 0x1, -+ kXAttrCreate = 0x2, -+ kXAttrREplace=0x4 -+}; -+ -+ -+/* AFP function codes */ -+enum AFPFunction -+{ -+ afpByteRangeLock = 1, afpCloseVol, afpCloseDir, afpCloseFork, -+ afpCopyFile, afpCreateDir, afpCreateFile, -+ afpDelete, afpEnumerate, afpFlush, afpFlushFork, -+ afpGetForkParms = 14, afpGetSrvrInfo, afpGetSrvrParms, -+ afpGetVolParms, afpLogin, afpLoginCont, afpLogout, afpMapID, -+ afpMapName, afpMoveAndRename, afpOpenVol, afpOpenDir, afpOpenFork, -+ afpRead, afpRename, afpSetDirParms, afpSetFileParms, -+ afpSetForkParms, afpSetVolParms, afpWrite, afpGetFileDirParms, -+ afpSetFileDirParms, afpChangePassword, -+ afpGetUserInfo=37,afpGetSrvrMsg = 38, -+ afpOpenDT=48, -+ afpCloseDT=49, -+ afpGetIcon=51, afpGetIconInfo=52, -+ afpAddComment=56, afpRemoveComment=57, afpGetComment=58, -+ afpByteRangeLockExt=59, afpReadExt, afpWriteExt, -+ afpGetAuthMethods=62, -+ afp_LoginExt=63, -+ afpGetSessionToken=64, -+ afpDisconnectOldSession=65, -+ afpEnumerateExt=66, -+ afpCatSearchExt = 67, -+ afpEnumerateExt2 = 68, afpGetExtAttr, afpSetExtAttr, -+ afpRemoveExtAttr , afpListExtAttrs, -+ afpZzzzz = 122, -+ afpAddIcon=192, -+}; -+ -+/* AFP Volume bitmap. Take from 242 of the protocol guide. */ -+enum { -+ kFPBadVolPre222Bitmap = 0xFe00, -+ kFPBadVolBitmap = 0xF000, -+ kFPVolAttributeBit = 0x1, -+ kFPVolSignatureBit = 0x2, -+ kFPVolCreateDateBit = 0x4, -+ kFPVolModDateBit = 0x8, -+ kFPVolBackupDateBit = 0x10, -+ kFPVolIDBit = 0x20, -+ kFPVolBytesFreeBit = 0x40, -+ kFPVolBytesTotalBit = 0x80, -+ kFPVolNameBit = 0x100, -+ kFPVolExtBytesFreeBit = 0x200, -+ kFPVolExtBytesTotalBit = 0x400, -+ kFPVolBlockSizeBit = 0x800 -+}; -+ -+/* AFP Attention Codes -- 4 bits */ -+#define AFPATTN_SHUTDOWN (1 << 15) /* shutdown/disconnect */ -+#define AFPATTN_CRASH (1 << 14) /* server crashed */ -+#define AFPATTN_MESG (1 << 13) /* server has message */ -+#define AFPATTN_NORECONNECT (1 << 12) /* don't reconnect */ -+/* server notification */ -+#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT) -+ -+/* extended bitmap -- 12 bits. volchanged is only useful w/ a server -+ * notification, and time is only useful for shutdown. */ -+#define AFPATTN_VOLCHANGED (1 << 0) /* volume has changed */ -+#define AFPATTN_TIME(x) ((x) & 0xfff) /* time in minutes */ -+ -+#define kFPNoErr 0 -+ -+/* AFP result codes, p252 */ -+#define kASPSessClosed -1072 -+#define kFPAccessDenied -5000 -+#define kFPAuthContinue -5001 -+#define kFPBadUAM -5002 -+#define kFPBadVersNum -5003 -+#define kFPBitmapErr -5004 -+#define kFPCantMove -5005 -+#define kFPDenyConflict -5006 -+#define kFPDirNotEmpty -5007 -+#define kFPDiskFull -5008 -+#define kFPEOFErr -5009 -+#define kFPFileBusy -5010 -+#define kFPFlatVol -5011 -+#define kFPItemNotFound -5012 -+#define kFPLockErr -5013 -+#define kFPMiscErr -5014 -+#define kFPNoMoreLocks -5015 -+#define kFPNoServer -5016 -+#define kFPObjectExists -5017 -+#define kFPObjectNotFound -5018 -+#define kFPParamErr -5019 -+#define kFPRangeNotLocked -5020 -+#define kFPRangeOverlap -5021 -+#define kFPSessClosed -5022 -+#define kFPUserNotAuth -5023 -+#define kFPCallNotSupported -5024 -+#define kFPObjectTypeErr -5025 -+#define kFPTooManyFilesOpen -5026 -+#define kFPServerGoingDown -5027 -+#define kFPCantRename -5028 -+#define kFPDirNotFound -5029 -+#define kFPIconTypeError -5030 -+#define kFPVolLocked -5031 -+#define kFPObjectLocked -5032 -+#define kFPContainsSharedErr -5033 -+#define kFPIDNotFound -5034 -+#define kFPIDExists -5035 -+#define kFPDiffVolErr -5036 -+#define kFPCatalogChanged -5037 -+#define kFPSameObjectErr -5038 -+#define kFPBadIDErr -5039 -+#define kFPPwdSameErr -5040 -+#define kFPPwdTooShortErr -5041 -+#define kFPPwdExpiredErr -5042 -+#define kFPInsideSharedErr -5043 -+#define kFPInsideTrashErr -5044 -+#define kFPPwdNeedsChangeErr -5045 -+#define kFPPwdPolicyErr -5046 -+#define kFPDiskQuotaExceeded –5047 -+ -+ -+ -+/* These flags determine to lock or unlock in ByteRangeLock(Ext) */ -+ -+enum { -+ByteRangeLock_Lock = 0, -+ByteRangeLock_Unlock = 1 -+}; -+ -+/* These flags are used in volopen and getsrvrparm replies, p.171 */ -+ -+#define HasConfigInfo 0x1 -+#define HasPassword 0x80 -+ -+/* These are the subfunction for kFPMapID, as per p.248 */ -+ -+enum { -+kUserIDToName = 1, -+kGroupIDToName = 2, -+kUserIDToUTF8Name = 3, -+kGroupIDToUTF8Name = 4, -+kUserUUIDToUTF8Name = 5, -+kGroupUUIDToUTF8Name = 6 -+}; -+ -+ -+/* These are the subfunction flags described in the FPMapName command, p.286. -+ Note that this is different than what's described on p. 186. */ -+ -+enum { -+kNameToUserID = 1, -+kNameToGroupID = 2, -+kUTF8NameToUserID = 3, -+kUTF8NameToGroupID = 4, -+kUTF8NameToUserUUID = 5, -+kUTF8NameToGroupUUID = 6 -+}; -+ -+/* These are bits for FPGetUserInfo, p.173. */ -+#define kFPGetUserInfo_USER_ID 1 -+#define kFPGetUserInfo_PRI_GROUPID 2 -+ -+/* Flags for the replies of GetSrvrInfo and DSI GetStatus, p.240 */ -+ -+enum { -+ kSupportsCopyfile = 0x01, -+ kSupportsChgPwd = 0x02, -+ kDontAllowSavePwd = 0x04, -+ kSupportsSrvrMsg = 0x08, -+ kSrvrSig = 0x10, -+ kSupportsTCP = 0x20, -+ kSupportsSrvrNotify = 0x40, -+ kSupportsReconnect = 0x80, -+ kSupportsDirServices = 0x100, -+ kSupportsUTF8SrvrName = 0x200, -+ kSupportsUUIDs = 0x400, -+ kSupportsSuperClient = 0x8000 -+}; -+ -+ -+/* p.247 */ -+ -+enum { -+ kLoginWithoutID = 0, -+ kLoginWithID = 1, -+ kReconnWithID = 2, -+ kLoginWithTimeAndID = 3, -+ kReconnWithTimeAndID = 4, -+ kRecon1Login = 5, -+ kRecon1ReconnectLogin = 6, -+ kRecon1Refresh = 7, kGetKerberosSessionKey = 8 -+}; -+ -+ -+#define AFP_CHMOD_ALLOWED_BITS_22 \ -+ (S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH | S_IFREG ) -+ -+ -+#endif -+ -+ -+ -+ -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/codepage.h afpfs-ng-0.8.1.patch/include/afpfs-ng/codepage.h ---- afpfs-ng-0.8.1/include/afpfs-ng/codepage.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/codepage.h 2011-09-10 12:13:50.113124518 +0200 -@@ -0,0 +1,11 @@ -+#ifndef __CODE_PAGE_H_ -+#define __CODE_PAGE_H_ -+int convert_utf8dec_to_utf8pre(const char *src, int src_len, -+ char * dest, int dest_len); -+int convert_utf8pre_to_utf8dec(const char * src, int src_len, -+ char * dest, int dest_len); -+int convert_path_to_unix(char encoding, char * dest, -+ char * src, int dest_len); -+int convert_path_to_afp(char encoding, char * dest, -+ char * src, int dest_len); -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/dsi.h afpfs-ng-0.8.1.patch/include/afpfs-ng/dsi.h ---- afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/dsi.h 2011-09-10 12:13:50.115124544 +0200 -@@ -0,0 +1,33 @@ -+ -+#ifndef __DSI_H_ -+#define __DSI_H_ -+ -+#include "afpfs-ng/afp.h" -+ -+struct dsi_request -+{ -+ unsigned short requestid; -+ unsigned char subcommand; -+ void * other; -+ unsigned char wait; -+ pthread_cond_t condition_cond; -+ struct dsi_request * next; -+ int return_code; -+}; -+ -+int dsi_receive(struct afp_server * server, void * data, int size); -+int dsi_getstatus(struct afp_server * server); -+ -+int dsi_opensession(struct afp_server *server); -+ -+int dsi_send(struct afp_server *server, char * msg, int size,int wait,unsigned char subcommand, void ** other); -+struct dsi_session * dsi_create(struct afp_server *server); -+int dsi_restart(struct afp_server *server); -+int dsi_recv(struct afp_server * server); -+ -+#define DSI_BLOCK_TIMEOUT -1 -+#define DSI_DONT_WAIT 0 -+#define DSI_DEFAULT_TIMEOUT 5 -+ -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/libafpclient.h afpfs-ng-0.8.1.patch/include/afpfs-ng/libafpclient.h ---- afpfs-ng-0.8.1/include/afpfs-ng/libafpclient.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/libafpclient.h 2011-09-10 12:13:50.115124544 +0200 -@@ -0,0 +1,50 @@ -+ -+#ifndef __CLIENT_H_ -+#define __CLIENT_H_ -+ -+#include <unistd.h> -+#include <syslog.h> -+ -+#define MAX_CLIENT_RESPONSE 2048 -+ -+ -+enum loglevels { -+ AFPFSD, -+}; -+ -+struct afp_server; -+struct afp_volume; -+ -+struct libafpclient { -+ int (*unmount_volume) (struct afp_volume * volume); -+ void (*log_for_client)(void * priv, -+ enum loglevels loglevel, int logtype, const char *message); -+ void (*forced_ending_hook)(void); -+ int (*scan_extra_fds)(int command_fd,fd_set *set, int * max_fd); -+ void (*loop_started)(void); -+} ; -+ -+extern struct libafpclient * libafpclient; -+ -+void libafpclient_register(struct libafpclient * tmpclient); -+ -+ -+void signal_main_thread(void); -+ -+/* These are logging functions */ -+ -+#define MAXLOGSIZE 2048 -+ -+#define LOG_METHOD_SYSLOG 1 -+#define LOG_METHOD_STDOUT 2 -+ -+void set_log_method(int m); -+ -+ -+void log_for_client(void * priv, -+ enum loglevels loglevel, int logtype, char * message,...); -+ -+void stdout_log_for_client(void * priv, -+ enum loglevels loglevel, int logtype, const char *message); -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/Makefile.am afpfs-ng-0.8.1.patch/include/afpfs-ng/Makefile.am ---- afpfs-ng-0.8.1/include/afpfs-ng/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/Makefile.am 2011-09-10 12:13:50.115124544 +0200 -@@ -0,0 +1,6 @@ -+## Process this file with automake to produce Makefile.in -+ -+afpfsincludedir = $(includedir)/afpfs-ng -+ -+afpfsinclude_HEADERS = afp.h afp_protocol.h libafpclient.h -+nodist_afpfsinclude_HEADERS = codepage.h dsi.h map_def.h midlevel.h uams_def.h utils.h -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/map_def.h afpfs-ng-0.8.1.patch/include/afpfs-ng/map_def.h ---- afpfs-ng-0.8.1/include/afpfs-ng/map_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/map_def.h 2011-09-10 12:13:50.116124557 +0200 -@@ -0,0 +1,15 @@ -+#ifndef __MAP_H_ -+#define __MAP_H_ -+ -+#include "afpfs-ng/afp.h" -+ -+#define AFP_MAPPING_UNKNOWN 0 -+#define AFP_MAPPING_COMMON 1 -+#define AFP_MAPPING_LOGINIDS 2 -+#define AFP_MAPPING_NAME 3 -+ -+unsigned int map_string_to_num(char * name); -+char * get_mapping_name(struct afp_volume * volume); -+ -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/midlevel.h afpfs-ng-0.8.1.patch/include/afpfs-ng/midlevel.h ---- afpfs-ng-0.8.1/include/afpfs-ng/midlevel.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/midlevel.h 2011-09-10 12:13:50.116124557 +0200 -@@ -0,0 +1,64 @@ -+#ifndef __MIDLEVEL_H_ -+#define __MIDLEVEL_H_ -+ -+#include <utime.h> -+#include "afpfs-ng/afp.h" -+ -+int ml_open(struct afp_volume * volume, const char *path, int flags, -+ struct afp_file_info **newfp); -+ -+int ml_creat(struct afp_volume * volume, const char *path,mode_t mode); -+ -+int ml_readdir(struct afp_volume * volume, -+ const char *path, -+ struct afp_file_info **base); -+ -+int ml_read(struct afp_volume * volume, const char *path, -+ char *buf, size_t size, off_t offset, -+ struct afp_file_info *fp, int * eof); -+ -+int ml_chmod(struct afp_volume * vol, const char * path, mode_t mode); -+ -+int ml_unlink(struct afp_volume * vol, const char *path); -+ -+int ml_mkdir(struct afp_volume * vol, const char * path, mode_t mode); -+ -+int ml_close(struct afp_volume * volume, const char * path, -+ struct afp_file_info * fp); -+ -+int ml_getattr(struct afp_volume * volume, const char *path, -+ struct stat *stbuf); -+ -+int ml_write(struct afp_volume * volume, const char * path, -+ const char *data, size_t size, off_t offset, -+ struct afp_file_info * fp, uid_t uid, -+ gid_t gid); -+ -+int ml_readlink(struct afp_volume * vol, const char * path, -+ char *buf, size_t size); -+ -+int ml_rmdir(struct afp_volume * vol, const char *path); -+ -+int ml_chown(struct afp_volume * vol, const char * path, -+ uid_t uid, gid_t gid); -+ -+int ml_truncate(struct afp_volume * vol, const char * path, off_t offset); -+ -+int ml_utime(struct afp_volume * vol, const char * path, -+ struct utimbuf * timebuf); -+ -+int ml_symlink(struct afp_volume *vol, const char * path1, const char * path2); -+ -+int ml_rename(struct afp_volume * vol, -+ const char * path_from, const char * path_to); -+ -+int ml_statfs(struct afp_volume * vol, const char *path, struct statvfs *stat); -+ -+void afp_ml_filebase_free(struct afp_file_info **filebase); -+ -+int ml_passwd(struct afp_server *server, -+ char * username, char * oldpasswd, char * newpasswd); -+ -+ -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/uams_def.h afpfs-ng-0.8.1.patch/include/afpfs-ng/uams_def.h ---- afpfs-ng-0.8.1/include/afpfs-ng/uams_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/uams_def.h 2011-09-10 12:13:50.116124557 +0200 -@@ -0,0 +1,16 @@ -+#ifndef __UAM_DEFS_H_ -+#define __UAM_DEFS_H_ -+ -+#define UAM_NOUSERAUTHENT 0x1 -+#define UAM_CLEARTXTPASSWRD 0x2 -+#define UAM_RANDNUMEXCHANGE 0x4 -+#define UAM_2WAYRANDNUM 0x8 -+#define UAM_DHCAST128 0x10 -+#define UAM_CLIENTKRB 0x20 -+#define UAM_DHX2 0x40 -+#define UAM_RECON1 0x80 -+ -+int uam_string_to_bitmap(char * name); -+char * uam_bitmap_to_string(unsigned int bitmap); -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/utils.h afpfs-ng-0.8.1.patch/include/afpfs-ng/utils.h ---- afpfs-ng-0.8.1/include/afpfs-ng/utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afpfs-ng/utils.h 2011-09-10 12:13:50.116124557 +0200 -@@ -0,0 +1,43 @@ -+#ifndef __UTILS_H_ -+#define __UTILS_H_ -+#include <stdio.h> -+ -+#include "afpfs-ng/afp.h" -+ -+#if BYTE_ORDER == BIG_ENDIAN -+#define hton64(x) (x) -+#define ntoh64(x) (x) -+#else /* BYTE_ORDER == BIG_ENDIAN */ -+#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \ -+ (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32)) -+#define ntoh64(x) (hton64(x)) -+#endif /* BYTE_ORDER == BIG_ENDIAN */ -+ -+#define min(a,b) (((a)<(b)) ? (a) : (b)) -+#define max(a,b) (((a)>(b)) ? (a) : (b)) -+ -+ -+ -+unsigned char unixpath_to_afppath( -+ struct afp_server * server, -+ char * buf); -+ -+unsigned char sizeof_path_header(struct afp_server * server); -+ -+ -+ -+unsigned char copy_from_pascal(char *dest, char *pascal,unsigned int max_len) ; -+unsigned short copy_from_pascal_two(char *dest, char *pascal,unsigned int max_len); -+ -+unsigned char copy_to_pascal(char *dest, const char *src); -+unsigned short copy_to_pascal_two(char *dest, const char *src); -+ -+void copy_path(struct afp_server * server, char * dest, const char * pathname, unsigned char len); -+ -+ -+char * create_path(struct afp_server * server, char * pathname, unsigned short * len); -+ -+ -+int invalid_filename(struct afp_server * server, const char * filename); -+ -+#endif -diff -Naur afpfs-ng-0.8.1/include/afp.h afpfs-ng-0.8.1.patch/include/afp.h ---- afpfs-ng-0.8.1/include/afp.h 2008-03-08 17:08:18.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afp.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,533 +0,0 @@ -- --#ifndef _AFP_H_ --#define _AFP_H_ -- --#include <arpa/inet.h> --#include <pthread.h> --#include <netdb.h> --#include <sys/statvfs.h> --#include <pwd.h> --#include <afp_protocol.h> --#include <libafpclient.h> --#include <sys/types.h> --#include <sys/stat.h> --#include <unistd.h> --#include <netinet/in.h> -- -- --#define AFPFS_VERSION "0.8.1" -- --/* This is the maximum AFP version this library supports */ --#define AFP_MAX_SUPPORTED_VERSION 32 -- --/* afp_url is used to pass locations around */ --struct afp_url { -- enum {TCPIP,AT} protocol; -- char username[AFP_MAX_USERNAME_LEN]; -- char uamname[50]; -- char password[AFP_MAX_PASSWORD_LEN]; -- char servername[AFP_SERVER_NAME_UTF8_LEN]; -- int port; -- char volumename[AFP_VOLUME_NAME_UTF8_LEN]; -- char path[AFP_MAX_PATH]; -- -- int requested_version; -- char zone[AFP_ZONE_LEN]; /* Only used for Appletalk */ -- char volpassword[9];; --}; -- --struct afp_token { -- unsigned int length; -- char data[AFP_TOKEN_MAX_LEN]; --}; -- --#define SERVER_MAX_VERSIONS 10 --#define SERVER_MAX_UAMS 10 -- --struct afp_rx_buffer { -- unsigned int size; -- unsigned int maxsize; -- char * data; -- int errorcode; --}; -- -- --struct afp_file_info { -- unsigned short attributes; -- unsigned int did; -- unsigned int creation_date; -- unsigned int modification_date; -- unsigned int backup_date; -- unsigned int fileid; -- unsigned short offspring; -- char sync; -- char finderinfo[32]; -- char name[AFP_MAX_PATH]; -- char basename[AFP_MAX_PATH]; -- char translated_name[AFP_MAX_PATH]; -- struct afp_unixprivs unixprivs; -- unsigned int accessrights; -- struct afp_file_info * next; -- struct afp_file_info * largelist_next; -- unsigned char isdir; -- unsigned long long size; -- unsigned short resourcesize; -- unsigned int resource; -- unsigned short forkid; -- struct afp_icon * icon; -- int eof; --}; -- -- --#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_KNOWN 0x1 --#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_BROKEN 0x2 --#define VOLUME_EXTRA_FLAGS_SHOW_APPLEDOUBLE 0x4 --#define VOLUME_EXTRA_FLAGS_VOL_SUPPORTS_UNIX 0x8 --#define VOLUME_EXTRA_FLAGS_NO_LOCKING 0x10 --#define VOLUME_EXTRA_FLAGS_IGNORE_UNIXPRIVS 0x20 --#define VOLUME_EXTRA_FLAGS_READONLY 0x40 -- --#define AFP_VOLUME_UNMOUNTED 0 --#define AFP_VOLUME_MOUNTED 1 --#define AFP_VOLUME_UNMOUNTING 2 -- --struct afp_volume { -- unsigned short volid; -- char flags; /* This is from afpGetSrvrParms */ -- unsigned short attributes; /* This is from VolOpen */ -- unsigned short signature; /* This is fixed or variable */ -- unsigned int creation_date; -- unsigned int modification_date; -- unsigned int backup_date; -- struct statvfs stat; -- unsigned char mounted; -- char mountpoint[255]; -- struct afp_server * server; -- char volume_name[AFP_VOLUME_NAME_LEN]; -- char volume_name_printable[AFP_VOLUME_NAME_UTF8_LEN]; -- unsigned short dtrefnum; -- char volpassword[AFP_VOLPASS_LEN]; -- unsigned int extra_flags; /* This is an afpfs-ng specific field */ -- -- /* Our directory ID cache */ -- struct did_cache_entry * did_cache_base; -- pthread_mutex_t did_cache_mutex; -- -- /* Our journal of open forks */ -- struct afp_file_info * open_forks; -- pthread_mutex_t open_forks_mutex; -- -- /* Used to trigger startup */ -- pthread_cond_t startup_condition_cond; -- -- struct { -- uint64_t hits; -- uint64_t misses; -- uint64_t expired; -- uint64_t force_removed; -- } did_cache_stats; -- -- void * priv; /* This is a private structure for fuse/cmdline, etc */ -- pthread_t thread; /* This is the per-volume thread */ -- -- int mapping; -- --}; -- --#define SERVER_STATE_CONNECTED 1 --#define SERVER_STATE_DISCONNECTED 2 -- --enum server_type{ -- AFPFS_SERVER_TYPE_UNKNOWN, -- AFPFS_SERVER_TYPE_NETATALK, -- AFPFS_SERVER_TYPE_AIRPORT, -- AFPFS_SERVER_TYPE_MACINTOSH, --}; -- --#define is_netatalk(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_NETATALK ) --#define is_airport(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_AIRPORT ) --#define is_macintosh(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_MACINTOSH ) -- -- -- --struct afp_versions { -- char *av_name; -- int av_number; --}; --extern struct afp_versions afp_versions[]; -- --struct afp_server { -- -- /* Our buffer sizes */ -- unsigned int tx_quantum; -- unsigned int rx_quantum; -- -- unsigned int tx_delay; -- -- /* Connection information */ -- struct sockaddr_in address; -- int fd; -- -- /* Some stats, for information only */ -- struct { -- uint64_t runt_packets; -- uint64_t incoming_dsi; -- uint64_t rx_bytes; -- uint64_t tx_bytes; -- uint64_t requests_pending; -- } stats; -- -- /* General information */ -- char server_name[AFP_SERVER_NAME_LEN]; -- char server_name_utf8[AFP_SERVER_NAME_UTF8_LEN]; -- char server_name_printable[AFP_SERVER_NAME_UTF8_LEN]; -- -- char machine_type[17]; -- char icon[256]; -- char signature[16]; -- unsigned short flags; -- int connect_state; -- enum server_type server_type; -- -- /* This is the time we connected */ -- time_t connect_time; -- -- /* UAMs */ -- unsigned int supported_uams; -- unsigned int using_uam; -- -- /* Authentication */ -- char username[AFP_MAX_USERNAME_LEN]; -- char password[AFP_MAX_PASSWORD_LEN]; -- -- /* Session */ -- struct afp_token token; -- char need_resume; -- -- /* Versions */ -- unsigned char requested_version; -- unsigned char versions[SERVER_MAX_VERSIONS]; -- struct afp_versions *using_version; -- -- /* Volumes */ -- unsigned char num_volumes; -- struct afp_volume * volumes; -- -- void * dsi; -- unsigned int exit_flag; -- -- /* Our DSI request queue */ -- pthread_mutex_t requestid_mutex; -- pthread_mutex_t request_queue_mutex; -- unsigned short lastrequestid; -- unsigned short expectedrequestid; -- struct dsi_request * command_requests; -- -- -- char loginmesg[200]; -- char servermesg[200]; -- char path_encoding; -- -- /* This is the data for the incoming buffer */ -- char * incoming_buffer; -- int data_read; -- int bufsize; -- -- /* And this is for the outgoing queue */ -- pthread_mutex_t send_mutex; -- -- /* This is for user mapping */ -- struct passwd passwd; -- unsigned int server_uid, server_gid; -- int server_gid_valid; -- -- struct afp_server *next; -- -- /* These are for DSI attention packets */ -- unsigned int attention_quantum; -- unsigned int attention_len; -- char * attention_buffer; -- --}; -- --struct afp_extattr_info { -- unsigned int maxsize; -- unsigned int size; -- char data[1024]; --}; --struct afp_comment { -- unsigned int maxsize; -- unsigned int size; -- char *data; --}; -- --struct afp_icon { -- unsigned int maxsize; -- unsigned int size; -- char *data; --}; -- --#define AFP_DEFAULT_ATTENTION_QUANTUM 1024 -- --void afp_unixpriv_to_stat(struct afp_file_info *fp, -- struct stat *stat); -- --int init_uams(void) ; -- --unsigned int find_uam_by_name(const char * name); --char * uam_bitmap_to_string(unsigned int bitmap); -- -- --char * get_uam_names_list(void); -- --unsigned int default_uams_mask(void); -- --struct afp_volume * find_volume_by_name(struct afp_server * server, -- const char * volname); -- --struct afp_connection_request { -- unsigned int uam_mask; -- struct afp_url url; --}; -- --void afp_default_url(struct afp_url *url); --int afp_parse_url(struct afp_url * url, const char * toparse, int verbose); --void afp_print_url(struct afp_url * url); --int afp_url_validate(char * url_string, struct afp_url * valid_url); -- --int afp_list_volnames(struct afp_server * server, char * names, int max); -- --/* User mapping */ --int afp_detect_mapping(struct afp_volume * volume); -- --/* These are some functions that help with simple status text generation */ -- --int afp_status_header(char * text, int * len); --int afp_status_server(struct afp_server * s,char * text, int * len); -- -- --struct afp_server * afp_server_full_connect(void * priv, struct afp_connection_request * req); -- --void * just_end_it_now(void *other); --void add_fd_and_signal(int fd); --void loop_disconnect(struct afp_server *s); --void afp_wait_for_started_loop(void); -- -- --struct afp_versions * pick_version(unsigned char *versions, -- unsigned char requested) ; --int pick_uam(unsigned int u1, unsigned int u2); -- --int afp_server_login(struct afp_server *server, -- char * mesg, unsigned int *l, unsigned int max); -- -- --int afp_dologin(struct afp_server *server, -- unsigned int uam, char * username, char * passwd); -- --void afp_free_server(struct afp_server **server); -- --struct afp_server * afp_server_init(struct sockaddr_in * address); --int afp_get_address(void * priv, const char * hostname, unsigned int port, -- struct sockaddr_in * address); -- -- --int afp_main_loop(int command_fd); --int afp_main_quick_startup(pthread_t * thread); -- --int afp_server_destroy(struct afp_server *s) ; --int afp_server_reconnect(struct afp_server * s, char * mesg, -- unsigned int *l, unsigned int max); --int afp_server_connect(struct afp_server *s, int full); -- --struct afp_server * afp_server_complete_connection( -- void * priv, -- struct afp_server * server, -- struct sockaddr_in * address, unsigned char * versions, -- unsigned int uams, char * username, char * password, -- unsigned int requested_version, unsigned int uam_mask); -- --int afp_connect_volume(struct afp_volume * volume, struct afp_server * server, -- char * mesg, unsigned int * l, unsigned int max); --int something_is_mounted(struct afp_server * server); -- --int add_cache_entry(struct afp_file_info * file) ; --struct afp_file_info * get_cache_by_name(char * name); --struct afp_server * find_server_by_address(struct sockaddr_in * address); --struct afp_server * find_server_by_signature(char * signature); --struct afp_server * find_server_by_name(char * name); --int server_still_valid(struct afp_server * server); -- -- --struct afp_server * get_server_base(void); --int afp_server_remove(struct afp_server * server); -- --int afp_unmount_volume(struct afp_volume * volume); --int afp_unmount_all_volumes(struct afp_server * server); -- --#define volume_is_readonly(x) (((x)->attributes&kReadOnly) || \ -- ((x)->extra_flags & VOLUME_EXTRA_FLAGS_READONLY)) -- --int afp_opendt(struct afp_volume *volume, unsigned short * refnum); -- --int afp_closedt(struct afp_server * server, unsigned short * refnum); -- --int afp_getcomment(struct afp_volume *volume, unsigned int did, -- const char * pathname, struct afp_comment * comment); -- --int afp_addcomment(struct afp_volume *volume, unsigned int did, -- const char * pathname, char * comment,uint64_t *size); -- --int afp_geticon(struct afp_volume * volume, unsigned int filecreator, -- unsigned int filetype, unsigned char icontype, -- unsigned short length, struct afp_icon * icon); -- --/* Things you want to do to a server */ -- --int afp_getsrvrmsg(struct afp_server *server, unsigned short messagetype,unsigned char utf8, unsigned char block, char * mesg); -- --int afp_login(struct afp_server *server, char * uaname, -- char * userauthinfo, unsigned int userauthinfo_len, -- struct afp_rx_buffer *rx); -- --int afp_changepassword(struct afp_server *server, char * uaname, -- char * userauthinfo, unsigned int userauthinfo_len, -- struct afp_rx_buffer *rx); -- --int afp_logincont(struct afp_server *server, unsigned short id, -- char * userauthinfo, unsigned int userauthinfo_len, -- struct afp_rx_buffer *rx); -- --int afp_getsessiontoken(struct afp_server * server, int type, -- unsigned int timestamp, struct afp_token *outgoing_token, -- struct afp_token * incoming_token); -- --int afp_getsrvrparms(struct afp_server *server); -- --int afp_logout(struct afp_server *server,unsigned char wait); -- --int afp_mapname(struct afp_server * server, unsigned char subfunction, -- char * name, unsigned int * id); -- --int afp_mapid(struct afp_server * server, unsigned char subfunction, -- unsigned int id, char *name); -- --int afp_getuserinfo(struct afp_server * server, int thisuser, -- unsigned int userid, unsigned short bitmap, -- unsigned int *newuid, unsigned int *newgid); -- --int afp_zzzzz(struct afp_server *server); -- --int afp_volopen(struct afp_volume * volume, -- unsigned short bitmap, char * password); -- --int afp_flush(struct afp_volume * volume); -- --int afp_getfiledirparms(struct afp_volume *volume, unsigned int did, -- unsigned int filebitmap, unsigned int dirbitmap, const char * pathname, -- struct afp_file_info *fp); -- --int afp_enumerate(struct afp_volume * volume, -- unsigned int dirid, -- unsigned int filebitmap, unsigned int dirbitmap, -- unsigned short reqcount, -- unsigned short startindex, -- char * path, -- struct afp_file_info ** file_p); -- --int afp_enumerateext2(struct afp_volume * volume, -- unsigned int dirid, -- unsigned int filebitmap, unsigned int dirbitmap, -- unsigned short reqcount, -- unsigned long startindex, -- char * path, -- struct afp_file_info ** file_p); -- --int afp_openfork(struct afp_volume * volume, -- unsigned char forktype, -- unsigned int dirid, -- unsigned short accessmode, -- char * filename, -- struct afp_file_info *fp); -- --int afp_read(struct afp_volume * volume, unsigned short forkid, -- uint32_t offset, -- uint32_t count, struct afp_rx_buffer * rx); -- --int afp_readext(struct afp_volume * volume, unsigned short forkid, -- uint64_t offset, -- uint64_t count, struct afp_rx_buffer * rx); -- --int afp_getvolparms(struct afp_volume * volume, unsigned short bitmap); -- -- --int afp_createdir(struct afp_volume * volume, unsigned int dirid, const char * pathname, unsigned int *did_p); -- --int afp_delete(struct afp_volume * volume, -- unsigned int dirid, char * pathname); -- -- --int afp_createfile(struct afp_volume * volume, unsigned char flag, -- unsigned int did, char * pathname); -- --int afp_write(struct afp_volume * volume, unsigned short forkid, -- uint32_t offset, uint32_t reqcount, -- char * data, uint32_t * written); -- --int afp_writeext(struct afp_volume * volume, unsigned short forkid, -- uint64_t offset, uint64_t reqcount, -- char * data, uint64_t * written); -- --int afp_flushfork(struct afp_volume * volume, unsigned short forkid); -- --int afp_closefork(struct afp_volume * volume, unsigned short forkid); --int afp_setfileparms(struct afp_volume * volume, -- unsigned int dirid, const char * pathname, unsigned short bitmap, -- struct afp_file_info *fp); --int afp_setfiledirparms(struct afp_volume * volume, -- unsigned int dirid, const char * pathname, unsigned short bitmap, -- struct afp_file_info *fp); -- --int afp_setdirparms(struct afp_volume * volume, -- unsigned int dirid, const char * pathname, unsigned short bitmap, -- struct afp_file_info *fp); -- --int afp_volclose(struct afp_volume * volume); -- -- --int afp_setforkparms(struct afp_volume *volume, -- unsigned short forkid, unsigned short bitmap, unsigned long len); -- --int afp_byterangelock(struct afp_volume * volume, -- unsigned char flag, -- unsigned short forkid, -- uint32_t offset, -- uint32_t len, uint32_t *generated_offset); -- --int afp_byterangelockext(struct afp_volume * volume, -- unsigned char flag, -- unsigned short forkid, -- uint64_t offset, -- uint64_t len, uint64_t *generated_offset); -- --int afp_moveandrename(struct afp_volume *volume, -- unsigned int src_did, -- unsigned int dst_did, -- char * src_path, char * dst_path, char *new_name); -- --int afp_rename(struct afp_volume * volume, -- unsigned int dirid, -- char * path_from, char * path_to); -- --int afp_listextattr(struct afp_volume * volume, -- unsigned int dirid, unsigned short bitmap, -- char * pathname, struct afp_extattr_info * info); -- --/* This is a currently undocumented command */ --int afp_newcommand76(struct afp_volume * volume, unsigned int dlen, char * data); -- --/* For debugging */ --char * afp_get_command_name(char code); -- -- --#endif -diff -Naur afpfs-ng-0.8.1/include/afp_protocol.h afpfs-ng-0.8.1.patch/include/afp_protocol.h ---- afpfs-ng-0.8.1/include/afp_protocol.h 2008-02-18 04:33:43.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/afp_protocol.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,361 +0,0 @@ -- --#ifndef _AFP_PROTOCOL_H_ --#define _AFP_PROTOCOL_H_ -- --#include <sys/types.h> --#include <stddef.h> --#include <unistd.h> --#include <stdint.h> -- --/* This file defines constants for the Apple File Protocol. -- All page references are from "Apple Filing Protocol Programming" version 3.2. -- except where noted. --*/ -- --#define AFP_SERVER_NAME_LEN 33 --#define AFP_SERVER_NAME_UTF8_LEN 255 --#define AFP_VOLUME_NAME_LEN 33 --#define AFP_VOLUME_NAME_UTF8_LEN 33 --#define AFP_SIGNATURE_LEN 16 --#define AFP_MACHINETYPE_LEN 33 --#define AFP_LOGINMESG_LEN 200 --#define AFP_VOLPASS_LEN 8 --#define AFP_HOSTNAME_LEN 255 --/* This is actually just a guess, and only used for appletalk */ --#define AFP_ZONE_LEN 255 -- --#define AFP_SERVER_ICON_LEN 256 -- -- --#define AFP_MAX_USERNAME_LEN 127 --#define AFP_MAX_PASSWORD_LEN 127 -- -- --/* This is the maximum length of any UAM string */ --#define AFP_UAM_LENGTH 24 -- --/* This is the maximum length of any path description */ --#define AFP_MAX_PATH 768 -- --#define AFP_VOL_FLAT 1 --#define AFP_VOL_FIXED 2 --#define AFP_VOL_VARIABLE 3 -- --/* The root directory ID, p.26 */ -- --#define AFP_ROOT_DID 2 -- --/* Path type constants, p.249 */ -- --enum { --kFPShortName = 1, --kFPLongName = 2, --kFPUTF8Name = 3 --}; -- --/* fork types */ -- --#define AFP_FORKTYPE_DATA 0x0 --#define AFP_FORKTYPE_RESOURCE 0x80 -- --/* openfork access modes, from p.196 */ -- --#define AFP_OPENFORK_ALLOWREAD 1 --#define AFP_OPENFORK_ALLOWWRITE 2 --#define AFP_OPENFORK_DENYREAD 0x10 --#define AFP_OPENFORK_DENYWRITE 0x20 -- --/* Message type for getsrvmesg, p. 169*/ -- --typedef enum { -- AFPMESG_LOGIN = 0, -- AFPMESG_SERVER = 1 --} afpmessage_t; -- --/* Message bitmap for getsrvrmsg */ -- --#define AFP_GETSRVRMSG_UTF8 0x2 --#define AFP_GETSRVRMSG_GETMSG 0x1 -- -- --/* Maximum Version length, p.17 */ --#define AFP_MAX_VERSION_LENGTH 16 -- --/* Maximum length of a token, this is undocumented */ --#define AFP_TOKEN_MAX_LEN 256 -- --/* The maximum size of a file for AFP 2 */ --#define AFP_MAX_AFP2_FILESIZE (4294967296) -- --/* Unix privs, p.240 */ -- --struct afp_unixprivs { -- uint32_t uid __attribute__((__packed__)); -- uint32_t gid __attribute__((__packed__)); -- uint32_t permissions __attribute__((__packed__)); -- uint32_t ua_permissions __attribute__((__packed__)); -- --}; -- -- --/* AFP Volume attributes bitmap, p.241 */ -- --enum { -- kReadOnly = 0x01, -- kHasVolumePassword = 0x02, -- kSupportsFileIDs = 0x04, -- kSupportsCatSearch = 0x08, -- kSupportsBlankAccessPrivs = 0x10, -- kSupportsUnixPrivs = 0x20, -- kSupportsUTF8Names = 0x40, -- kNoNetworkUserIDs = 0x80, -- kDefaultPrivsFromParent = 0x100, -- kNoExchangeFiles = 0x200, -- kSupportsExtAttrs = 0x400, -- kSupportsACLs=0x800 --}; -- --/* AFP file creation constantes, p.250 */ --enum { --kFPSoftCreate = 0, --kFPHardCreate = 0x80 --}; -- --/* AFP Directory attributes, taken from the protocol guide p.236 */ -- --enum { -- kFPAttributeBit = 0x1, -- kFPParentDirIDBit = 0x2, -- kFPCreateDateBit = 0x4, -- kFPModDateBit = 0x8, -- kFPBackupDateBit = 0x10, -- kFPFinderInfoBit = 0x20, -- kFPLongNameBit = 0x40, -- kFPShortNameBit = 0x80, -- kFPNodeIDBit = 0x100, -- kFPOffspringCountBit = 0x0200, -- kFPOwnerIDBit = 0x0400, -- kFPGroupIDBit = 0x0800, -- kFPAccessRightsBit = 0x1000, -- kFPProDOSInfoBit = 0x2000, // AFP version 2.2 and earlier -- kFPUTF8NameBit = 0x2000, // AFP version 3.0 and later -- kFPUnixPrivsBit = 0x8000 // AFP version 3.0 and later --}; -- --/* AFP File bitmap, p.238. These are the ones not in the AFP Directory -- attributes map. */ -- --enum { -- kFPDataForkLenBit = 0x0200, -- kFPRsrcForkLenBit = 0x0400, -- kFPExtDataForkLenBit = 0x0800, // AFP version 3.0 and later -- kFPLaunchLimitBit = 0x1000, -- kFPExtRsrcForkLenBit = 0x4000, // AFP version 3.0 and later --}; -- --/* AFP Extended Attributes Bitmap, p.238 */ -- --enum { -- kXAttrNoFollow = 0x1, -- kXAttrCreate = 0x2, -- kXAttrREplace=0x4 --}; -- -- --/* AFP function codes */ --enum AFPFunction --{ -- afpByteRangeLock = 1, afpCloseVol, afpCloseDir, afpCloseFork, -- afpCopyFile, afpCreateDir, afpCreateFile, -- afpDelete, afpEnumerate, afpFlush, afpFlushFork, -- afpGetForkParms = 14, afpGetSrvrInfo, afpGetSrvrParms, -- afpGetVolParms, afpLogin, afpLoginCont, afpLogout, afpMapID, -- afpMapName, afpMoveAndRename, afpOpenVol, afpOpenDir, afpOpenFork, -- afpRead, afpRename, afpSetDirParms, afpSetFileParms, -- afpSetForkParms, afpSetVolParms, afpWrite, afpGetFileDirParms, -- afpSetFileDirParms, afpChangePassword, -- afpGetUserInfo=37,afpGetSrvrMsg = 38, -- afpOpenDT=48, -- afpCloseDT=49, -- afpGetIcon=51, afpGetIconInfo=52, -- afpAddComment=56, afpRemoveComment=57, afpGetComment=58, -- afpByteRangeLockExt=59, afpReadExt, afpWriteExt, -- afpGetAuthMethods=62, -- afp_LoginExt=63, -- afpGetSessionToken=64, -- afpDisconnectOldSession=65, -- afpEnumerateExt=66, -- afpCatSearchExt = 67, -- afpEnumerateExt2 = 68, afpGetExtAttr, afpSetExtAttr, -- afpRemoveExtAttr , afpListExtAttrs, -- afpZzzzz = 122, -- afpAddIcon=192, --}; -- --/* AFP Volume bitmap. Take from 242 of the protocol guide. */ --enum { -- kFPBadVolPre222Bitmap = 0xFe00, -- kFPBadVolBitmap = 0xF000, -- kFPVolAttributeBit = 0x1, -- kFPVolSignatureBit = 0x2, -- kFPVolCreateDateBit = 0x4, -- kFPVolModDateBit = 0x8, -- kFPVolBackupDateBit = 0x10, -- kFPVolIDBit = 0x20, -- kFPVolBytesFreeBit = 0x40, -- kFPVolBytesTotalBit = 0x80, -- kFPVolNameBit = 0x100, -- kFPVolExtBytesFreeBit = 0x200, -- kFPVolExtBytesTotalBit = 0x400, -- kFPVolBlockSizeBit = 0x800 --}; -- --/* AFP Attention Codes -- 4 bits */ --#define AFPATTN_SHUTDOWN (1 << 15) /* shutdown/disconnect */ --#define AFPATTN_CRASH (1 << 14) /* server crashed */ --#define AFPATTN_MESG (1 << 13) /* server has message */ --#define AFPATTN_NORECONNECT (1 << 12) /* don't reconnect */ --/* server notification */ --#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT) -- --/* extended bitmap -- 12 bits. volchanged is only useful w/ a server -- * notification, and time is only useful for shutdown. */ --#define AFPATTN_VOLCHANGED (1 << 0) /* volume has changed */ --#define AFPATTN_TIME(x) ((x) & 0xfff) /* time in minutes */ -- --#define kFPNoErr 0 -- --/* AFP result codes, p252 */ --#define kASPSessClosed -1072 --#define kFPAccessDenied -5000 --#define kFPAuthContinue -5001 --#define kFPBadUAM -5002 --#define kFPBadVersNum -5003 --#define kFPBitmapErr -5004 --#define kFPCantMove -5005 --#define kFPDenyConflict -5006 --#define kFPDirNotEmpty -5007 --#define kFPDiskFull -5008 --#define kFPEOFErr -5009 --#define kFPFileBusy -5010 --#define kFPFlatVol -5011 --#define kFPItemNotFound -5012 --#define kFPLockErr -5013 --#define kFPMiscErr -5014 --#define kFPNoMoreLocks -5015 --#define kFPNoServer -5016 --#define kFPObjectExists -5017 --#define kFPObjectNotFound -5018 --#define kFPParamErr -5019 --#define kFPRangeNotLocked -5020 --#define kFPRangeOverlap -5021 --#define kFPSessClosed -5022 --#define kFPUserNotAuth -5023 --#define kFPCallNotSupported -5024 --#define kFPObjectTypeErr -5025 --#define kFPTooManyFilesOpen -5026 --#define kFPServerGoingDown -5027 --#define kFPCantRename -5028 --#define kFPDirNotFound -5029 --#define kFPIconTypeError -5030 --#define kFPVolLocked -5031 --#define kFPObjectLocked -5032 --#define kFPContainsSharedErr -5033 --#define kFPIDNotFound -5034 --#define kFPIDExists -5035 --#define kFPDiffVolErr -5036 --#define kFPCatalogChanged -5037 --#define kFPSameObjectErr -5038 --#define kFPBadIDErr -5039 --#define kFPPwdSameErr -5040 --#define kFPPwdTooShortErr -5041 --#define kFPPwdExpiredErr -5042 --#define kFPInsideSharedErr -5043 --#define kFPInsideTrashErr -5044 --#define kFPPwdNeedsChangeErr -5045 --#define kFPPwdPolicyErr -5046 --#define kFPDiskQuotaExceeded –5047 -- -- -- --/* These flags determine to lock or unlock in ByteRangeLock(Ext) */ -- --enum { --ByteRangeLock_Lock = 0, --ByteRangeLock_Unlock = 1 --}; -- --/* These flags are used in volopen and getsrvrparm replies, p.171 */ -- --#define HasConfigInfo 0x1 --#define HasPassword 0x80 -- --/* These are the subfunction for kFPMapID, as per p.248 */ -- --enum { --kUserIDToName = 1, --kGroupIDToName = 2, --kUserIDToUTF8Name = 3, --kGroupIDToUTF8Name = 4, --kUserUUIDToUTF8Name = 5, --kGroupUUIDToUTF8Name = 6 --}; -- -- --/* These are the subfunction flags described in the FPMapName command, p.286. -- Note that this is different than what's described on p. 186. */ -- --enum { --kNameToUserID = 1, --kNameToGroupID = 2, --kUTF8NameToUserID = 3, --kUTF8NameToGroupID = 4, --kUTF8NameToUserUUID = 5, --kUTF8NameToGroupUUID = 6 --}; -- --/* These are bits for FPGetUserInfo, p.173. */ --#define kFPGetUserInfo_USER_ID 1 --#define kFPGetUserInfo_PRI_GROUPID 2 -- --/* Flags for the replies of GetSrvrInfo and DSI GetStatus, p.240 */ -- --enum { -- kSupportsCopyfile = 0x01, -- kSupportsChgPwd = 0x02, -- kDontAllowSavePwd = 0x04, -- kSupportsSrvrMsg = 0x08, -- kSrvrSig = 0x10, -- kSupportsTCP = 0x20, -- kSupportsSrvrNotify = 0x40, -- kSupportsReconnect = 0x80, -- kSupportsDirServices = 0x100, -- kSupportsUTF8SrvrName = 0x200, -- kSupportsUUIDs = 0x400, -- kSupportsSuperClient = 0x8000 --}; -- -- --/* p.247 */ -- --enum { -- kLoginWithoutID = 0, -- kLoginWithID = 1, -- kReconnWithID = 2, -- kLoginWithTimeAndID = 3, -- kReconnWithTimeAndID = 4, -- kRecon1Login = 5, -- kRecon1ReconnectLogin = 6, -- kRecon1Refresh = 7, kGetKerberosSessionKey = 8 --}; -- -- --#define AFP_CHMOD_ALLOWED_BITS_22 \ -- (S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH | S_IFREG ) -- -- --#endif -- -- -- -- -diff -Naur afpfs-ng-0.8.1/include/codepage.h afpfs-ng-0.8.1.patch/include/codepage.h ---- afpfs-ng-0.8.1/include/codepage.h 2007-09-23 16:21:30.000000000 +0200 -+++ afpfs-ng-0.8.1.patch/include/codepage.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,11 +0,0 @@ --#ifndef __CODE_PAGE_H_ --#define __CODE_PAGE_H_ --int convert_utf8dec_to_utf8pre(const char *src, int src_len, -- char * dest, int dest_len); --int convert_utf8pre_to_utf8dec(const char * src, int src_len, -- char * dest, int dest_len); --int convert_path_to_unix(char encoding, char * dest, -- char * src, int dest_len); --int convert_path_to_afp(char encoding, char * dest, -- char * src, int dest_len); --#endif -diff -Naur afpfs-ng-0.8.1/include/dsi.h afpfs-ng-0.8.1.patch/include/dsi.h ---- afpfs-ng-0.8.1/include/dsi.h 2008-02-18 04:33:24.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/dsi.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,33 +0,0 @@ -- --#ifndef __DSI_H_ --#define __DSI_H_ -- --#include "afp.h" -- --struct dsi_request --{ -- unsigned short requestid; -- unsigned char subcommand; -- void * other; -- unsigned char wait; -- pthread_cond_t condition_cond; -- struct dsi_request * next; -- int return_code; --}; -- --int dsi_receive(struct afp_server * server, void * data, int size); --int dsi_getstatus(struct afp_server * server); -- --int dsi_opensession(struct afp_server *server); -- --int dsi_send(struct afp_server *server, char * msg, int size,int wait,unsigned char subcommand, void ** other); --struct dsi_session * dsi_create(struct afp_server *server); --int dsi_restart(struct afp_server *server); --int dsi_recv(struct afp_server * server); -- --#define DSI_BLOCK_TIMEOUT -1 --#define DSI_DONT_WAIT 0 --#define DSI_DEFAULT_TIMEOUT 5 -- -- --#endif -diff -Naur afpfs-ng-0.8.1/include/libafpclient.h afpfs-ng-0.8.1.patch/include/libafpclient.h ---- afpfs-ng-0.8.1/include/libafpclient.h 2008-01-30 05:37:59.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/libafpclient.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,50 +0,0 @@ -- --#ifndef __CLIENT_H_ --#define __CLIENT_H_ -- --#include <unistd.h> --#include <syslog.h> -- --#define MAX_CLIENT_RESPONSE 2048 -- -- --enum loglevels { -- AFPFSD, --}; -- --struct afp_server; --struct afp_volume; -- --struct libafpclient { -- int (*unmount_volume) (struct afp_volume * volume); -- void (*log_for_client)(void * priv, -- enum loglevels loglevel, int logtype, const char *message); -- void (*forced_ending_hook)(void); -- int (*scan_extra_fds)(int command_fd,fd_set *set, int * max_fd); -- void (*loop_started)(void); --} ; -- --extern struct libafpclient * libafpclient; -- --void libafpclient_register(struct libafpclient * tmpclient); -- -- --void signal_main_thread(void); -- --/* These are logging functions */ -- --#define MAXLOGSIZE 2048 -- --#define LOG_METHOD_SYSLOG 1 --#define LOG_METHOD_STDOUT 2 -- --void set_log_method(int m); -- -- --void log_for_client(void * priv, -- enum loglevels loglevel, int logtype, char * message,...); -- --void stdout_log_for_client(void * priv, -- enum loglevels loglevel, int logtype, const char *message); -- --#endif -diff -Naur afpfs-ng-0.8.1/include/Makefile.am afpfs-ng-0.8.1.patch/include/Makefile.am ---- afpfs-ng-0.8.1/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/Makefile.am 2011-09-10 12:13:50.126124692 +0200 -@@ -0,0 +1,3 @@ -+## Process this file with automake to produce Makefile.in -+ -+SUBDIRS = afpfs-ng -diff -Naur afpfs-ng-0.8.1/include/map_def.h afpfs-ng-0.8.1.patch/include/map_def.h ---- afpfs-ng-0.8.1/include/map_def.h 2008-01-17 05:55:46.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/map_def.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,15 +0,0 @@ --#ifndef __MAP_H_ --#define __MAP_H_ -- --#include "afp.h" -- --#define AFP_MAPPING_UNKNOWN 0 --#define AFP_MAPPING_COMMON 1 --#define AFP_MAPPING_LOGINIDS 2 --#define AFP_MAPPING_NAME 3 -- --unsigned int map_string_to_num(char * name); --char * get_mapping_name(struct afp_volume * volume); -- -- --#endif -diff -Naur afpfs-ng-0.8.1/include/midlevel.h afpfs-ng-0.8.1.patch/include/midlevel.h ---- afpfs-ng-0.8.1/include/midlevel.h 2007-12-24 20:39:25.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/midlevel.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,64 +0,0 @@ --#ifndef __MIDLEVEL_H_ --#define __MIDLEVEL_H_ -- --#include <utime.h> --#include "afp.h" -- --int ml_open(struct afp_volume * volume, const char *path, int flags, -- struct afp_file_info **newfp); -- --int ml_creat(struct afp_volume * volume, const char *path,mode_t mode); -- --int ml_readdir(struct afp_volume * volume, -- const char *path, -- struct afp_file_info **base); -- --int ml_read(struct afp_volume * volume, const char *path, -- char *buf, size_t size, off_t offset, -- struct afp_file_info *fp, int * eof); -- --int ml_chmod(struct afp_volume * vol, const char * path, mode_t mode); -- --int ml_unlink(struct afp_volume * vol, const char *path); -- --int ml_mkdir(struct afp_volume * vol, const char * path, mode_t mode); -- --int ml_close(struct afp_volume * volume, const char * path, -- struct afp_file_info * fp); -- --int ml_getattr(struct afp_volume * volume, const char *path, -- struct stat *stbuf); -- --int ml_write(struct afp_volume * volume, const char * path, -- const char *data, size_t size, off_t offset, -- struct afp_file_info * fp, uid_t uid, -- gid_t gid); -- --int ml_readlink(struct afp_volume * vol, const char * path, -- char *buf, size_t size); -- --int ml_rmdir(struct afp_volume * vol, const char *path); -- --int ml_chown(struct afp_volume * vol, const char * path, -- uid_t uid, gid_t gid); -- --int ml_truncate(struct afp_volume * vol, const char * path, off_t offset); -- --int ml_utime(struct afp_volume * vol, const char * path, -- struct utimbuf * timebuf); -- --int ml_symlink(struct afp_volume *vol, const char * path1, const char * path2); -- --int ml_rename(struct afp_volume * vol, -- const char * path_from, const char * path_to); -- --int ml_statfs(struct afp_volume * vol, const char *path, struct statvfs *stat); -- --void afp_ml_filebase_free(struct afp_file_info **filebase); -- --int ml_passwd(struct afp_server *server, -- char * username, char * oldpasswd, char * newpasswd); -- -- -- --#endif -diff -Naur afpfs-ng-0.8.1/include/uams_def.h afpfs-ng-0.8.1.patch/include/uams_def.h ---- afpfs-ng-0.8.1/include/uams_def.h 2007-09-07 15:10:51.000000000 +0200 -+++ afpfs-ng-0.8.1.patch/include/uams_def.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,16 +0,0 @@ --#ifndef __UAM_DEFS_H_ --#define __UAM_DEFS_H_ -- --#define UAM_NOUSERAUTHENT 0x1 --#define UAM_CLEARTXTPASSWRD 0x2 --#define UAM_RANDNUMEXCHANGE 0x4 --#define UAM_2WAYRANDNUM 0x8 --#define UAM_DHCAST128 0x10 --#define UAM_CLIENTKRB 0x20 --#define UAM_DHX2 0x40 --#define UAM_RECON1 0x80 -- --int uam_string_to_bitmap(char * name); --char * uam_bitmap_to_string(unsigned int bitmap); -- --#endif -diff -Naur afpfs-ng-0.8.1/include/utils.h afpfs-ng-0.8.1.patch/include/utils.h ---- afpfs-ng-0.8.1/include/utils.h 2008-02-18 04:33:58.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/include/utils.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,43 +0,0 @@ --#ifndef __UTILS_H_ --#define __UTILS_H_ --#include <stdio.h> -- --#include "afp.h" -- --#if BYTE_ORDER == BIG_ENDIAN --#define hton64(x) (x) --#define ntoh64(x) (x) --#else /* BYTE_ORDER == BIG_ENDIAN */ --#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \ -- (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32)) --#define ntoh64(x) (hton64(x)) --#endif /* BYTE_ORDER == BIG_ENDIAN */ -- --#define min(a,b) (((a)<(b)) ? (a) : (b)) --#define max(a,b) (((a)>(b)) ? (a) : (b)) -- -- -- --unsigned char unixpath_to_afppath( -- struct afp_server * server, -- char * buf); -- --unsigned char sizeof_path_header(struct afp_server * server); -- -- -- --unsigned char copy_from_pascal(char *dest, char *pascal,unsigned int max_len) ; --unsigned short copy_from_pascal_two(char *dest, char *pascal,unsigned int max_len); -- --unsigned char copy_to_pascal(char *dest, const char *src); --unsigned short copy_to_pascal_two(char *dest, const char *src); -- --void copy_path(struct afp_server * server, char * dest, const char * pathname, unsigned char len); -- -- --char * create_path(struct afp_server * server, char * pathname, unsigned short * len); -- -- --int invalid_filename(struct afp_server * server, const char * filename); -- --#endif -diff -Naur afpfs-ng-0.8.1/lib/afp.c afpfs-ng-0.8.1.patch/lib/afp.c ---- afpfs-ng-0.8.1/lib/afp.c 2008-03-08 03:44:16.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/afp.c 2011-09-10 12:13:50.131124759 +0200 -@@ -9,7 +9,7 @@ - - - --#include "afp.h" -+#include "afpfs-ng/afp.h" - #include <config.h> - - #include <stdio.h> -@@ -21,17 +21,17 @@ - #include <sys/socket.h> - #include <errno.h> - --#include "afp_protocol.h" --#include "libafpclient.h" -+#include "afpfs-ng/afp_protocol.h" -+#include "afpfs-ng/libafpclient.h" - #include "server.h" --#include "dsi.h" -+#include "afpfs-ng/dsi.h" - #include "dsi_protocol.h" --#include "utils.h" -+#include "afpfs-ng/utils.h" - #include "afp_replies.h" - #include "afp_internal.h" - #include "did.h" - #include "forklist.h" --#include "codepage.h" -+#include "afpfs-ng/codepage.h" - - struct afp_versions afp_versions[] = { - { "AFPVersion 1.1", 11 }, -diff -Naur afpfs-ng-0.8.1/lib/afp_internal.h afpfs-ng-0.8.1.patch/lib/afp_internal.h ---- afpfs-ng-0.8.1/lib/afp_internal.h 2007-11-09 05:27:20.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/afp_internal.h 2011-09-10 12:13:50.132124772 +0200 -@@ -1,7 +1,7 @@ - #ifndef _AFP_INTERNAL_H_ - #define _AFP_INTERNAL_H_ - --#include "afp.h" -+#include "afpfs-ng/afp.h" - - extern struct afp_versions afp_versions[]; - -diff -Naur afpfs-ng-0.8.1/lib/afp_url.c afpfs-ng-0.8.1.patch/lib/afp_url.c ---- afpfs-ng-0.8.1/lib/afp_url.c 2008-03-04 21:16:49.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/afp_url.c 2011-09-10 12:13:50.132124772 +0200 -@@ -3,7 +3,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <errno.h> --#include "afp.h" -+#include "afpfs-ng/afp.h" - - void afp_default_url(struct afp_url *url) - { -diff -Naur afpfs-ng-0.8.1/lib/client.c afpfs-ng-0.8.1.patch/lib/client.c ---- afpfs-ng-0.8.1/lib/client.c 2008-02-18 04:36:30.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/client.c 2011-09-10 12:13:50.132124772 +0200 -@@ -1,5 +1,5 @@ --#include <afp.h> --#include <libafpclient.h> -+#include <afpfs-ng/afp.h> -+#include <afpfs-ng/libafpclient.h> - - - struct libafpclient * libafpclient = NULL; -diff -Naur afpfs-ng-0.8.1/lib/codepage.c afpfs-ng-0.8.1.patch/lib/codepage.c ---- afpfs-ng-0.8.1/lib/codepage.c 2008-02-18 04:36:54.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/codepage.c 2011-09-10 12:13:50.133124786 +0200 -@@ -14,8 +14,8 @@ - - #include <string.h> - #include <stdlib.h> --#include "afp_protocol.h" --#include "utils.h" -+#include "afpfs-ng/afp_protocol.h" -+#include "afpfs-ng/utils.h" - #include "unicode.h" - - int convert_utf8dec_to_utf8pre(const char *src, int src_len, -diff -Naur afpfs-ng-0.8.1/lib/connect.c afpfs-ng-0.8.1.patch/lib/connect.c ---- afpfs-ng-0.8.1/lib/connect.c 2008-02-18 04:38:59.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/connect.c 2011-09-10 12:13:50.133124786 +0200 -@@ -10,13 +10,13 @@ - #include <string.h> - #include <sys/socket.h> - --#include "afp.h" --#include "dsi.h" --#include "utils.h" --#include "uams_def.h" --#include "codepage.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/uams_def.h" -+#include "afpfs-ng/codepage.h" - #include "users.h" --#include "libafpclient.h" -+#include "afpfs-ng/libafpclient.h" - #include "server.h" - - -diff -Naur afpfs-ng-0.8.1/lib/did.c afpfs-ng-0.8.1.patch/lib/did.c ---- afpfs-ng-0.8.1/lib/did.c 2008-02-18 04:39:17.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/did.c 2011-09-10 12:13:50.133124786 +0200 -@@ -9,8 +9,8 @@ - #include <string.h> - #include <stdio.h> - --#include "afp.h" --#include "afp_protocol.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/afp_protocol.h" - - #undef DID_CACHE_DISABLE - -diff -Naur afpfs-ng-0.8.1/lib/dsi.c afpfs-ng-0.8.1.patch/lib/dsi.c ---- afpfs-ng-0.8.1/lib/dsi.c 2008-02-18 04:53:03.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/dsi.c 2011-09-10 12:13:50.134124800 +0200 -@@ -19,12 +19,12 @@ - #include <signal.h> - #include <iconv.h> - --#include "utils.h" --#include "dsi.h" --#include "afp.h" --#include "uams_def.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/uams_def.h" - #include "dsi_protocol.h" --#include "libafpclient.h" -+#include "afpfs-ng/libafpclient.h" - #include "afp_internal.h" - #include "afp_replies.h" - -diff -Naur afpfs-ng-0.8.1/lib/forklist.c afpfs-ng-0.8.1.patch/lib/forklist.c ---- afpfs-ng-0.8.1/lib/forklist.c 2008-01-17 05:49:16.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/forklist.c 2011-09-10 12:13:50.135124814 +0200 -@@ -10,7 +10,7 @@ - */ - - --#include "afp.h" -+#include "afpfs-ng/afp.h" - - #include <stdlib.h> - #include <pthread.h> -diff -Naur afpfs-ng-0.8.1/lib/log.c afpfs-ng-0.8.1.patch/lib/log.c ---- afpfs-ng-0.8.1/lib/log.c 2008-01-30 05:37:58.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/log.c 2011-09-10 12:13:50.135124814 +0200 -@@ -3,7 +3,7 @@ - #include <stdarg.h> - #include <string.h> - #include <stdlib.h> --#include "libafpclient.h" -+#include "afpfs-ng/libafpclient.h" - - void log_for_client(void * priv, - enum loglevels loglevel, int logtype, char *format, ...) { -diff -Naur afpfs-ng-0.8.1/lib/loop.c afpfs-ng-0.8.1.patch/lib/loop.c ---- afpfs-ng-0.8.1/lib/loop.c 2008-02-18 04:40:11.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/loop.c 2011-09-10 12:13:50.135124814 +0200 -@@ -16,9 +16,9 @@ - #include <sys/time.h> - #include <signal.h> - --#include "afp.h" --#include "dsi.h" --#include "utils.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/utils.h" - - #define SIGNAL_TO_USE SIGUSR2 - -diff -Naur afpfs-ng-0.8.1/lib/lowlevel.c afpfs-ng-0.8.1.patch/lib/lowlevel.c ---- afpfs-ng-0.8.1/lib/lowlevel.c 2008-02-20 02:33:17.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/lowlevel.c 2011-09-10 12:13:50.136124828 +0200 -@@ -19,10 +19,10 @@ - #else - #include <fcntl.h> - #endif --#include "afp.h" --#include "afp_protocol.h" --#include "codepage.h" --#include "utils.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/afp_protocol.h" -+#include "afpfs-ng/codepage.h" -+#include "afpfs-ng/utils.h" - #include "did.h" - #include "users.h" - -diff -Naur afpfs-ng-0.8.1/lib/map_def.c afpfs-ng-0.8.1.patch/lib/map_def.c ---- afpfs-ng-0.8.1/lib/map_def.c 2007-09-07 15:10:59.000000000 +0200 -+++ afpfs-ng-0.8.1.patch/lib/map_def.c 2011-09-10 12:13:50.136124828 +0200 -@@ -1,6 +1,6 @@ - #include <string.h> --#include "afp.h" --#include "map_def.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/map_def.h" - - static char *afp_map_strings[] = { - "Unknown", -diff -Naur afpfs-ng-0.8.1/lib/meta.c afpfs-ng-0.8.1.patch/lib/meta.c ---- afpfs-ng-0.8.1/lib/meta.c 2008-01-04 04:52:44.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/meta.c 2011-09-10 12:13:50.137124841 +0200 -@@ -17,10 +17,10 @@ - #include <unistd.h> - #include <sys/time.h> - --#include "afp.h" --#include "dsi.h" --#include "afp_protocol.h" --#include "utils.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp_protocol.h" -+#include "afpfs-ng/utils.h" - - - int afp_meta_getattr(const char *path, struct stat *stbuf) -diff -Naur afpfs-ng-0.8.1/lib/midlevel.c afpfs-ng-0.8.1.patch/lib/midlevel.c ---- afpfs-ng-0.8.1/lib/midlevel.c 2008-03-08 17:08:18.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/midlevel.c 2011-09-10 12:13:50.160125150 +0200 -@@ -10,7 +10,7 @@ - */ - - --#include "afp.h" -+#include "afpfs-ng/afp.h" - - #include <sys/stat.h> - #include <string.h> -@@ -28,9 +28,9 @@ - #include "users.h" - #include "did.h" - #include "resource.h" --#include "utils.h" --#include "codepage.h" --#include "midlevel.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/codepage.h" -+#include "afpfs-ng/midlevel.h" - #include "afp_internal.h" - #include "forklist.h" - #include "uams.h" -diff -Naur afpfs-ng-0.8.1/lib/proto_attr.c afpfs-ng-0.8.1.patch/lib/proto_attr.c ---- afpfs-ng-0.8.1/lib/proto_attr.c 2008-01-30 05:37:58.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_attr.c 2011-09-10 12:13:50.168125257 +0200 -@@ -7,10 +7,10 @@ - - #include <string.h> - #include <stdlib.h> --#include "dsi.h" --#include "afp.h" --#include "utils.h" --#include "afp_protocol.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/afp_protocol.h" - #include "dsi_protocol.h" - - /* This is a new command, function 76. There are currently no docs, so this -diff -Naur afpfs-ng-0.8.1/lib/proto_desktop.c afpfs-ng-0.8.1.patch/lib/proto_desktop.c ---- afpfs-ng-0.8.1/lib/proto_desktop.c 2008-02-18 04:44:11.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_desktop.c 2011-09-10 12:13:50.168125257 +0200 -@@ -9,10 +9,10 @@ - #include <string.h> - #include <stdlib.h> - --#include "dsi.h" --#include "afp.h" --#include "utils.h" --#include "afp_protocol.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/afp_protocol.h" - #include "dsi_protocol.h" - - /* closedt, addicon, geticoninfo, addappl, removeappl */ -diff -Naur afpfs-ng-0.8.1/lib/proto_directory.c afpfs-ng-0.8.1.patch/lib/proto_directory.c ---- afpfs-ng-0.8.1/lib/proto_directory.c 2008-02-19 03:39:29.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_directory.c 2011-09-10 12:13:50.168125257 +0200 -@@ -9,10 +9,10 @@ - #include <string.h> - #include <stdlib.h> - --#include "dsi.h" --#include "afp.h" --#include "utils.h" --#include "afp_protocol.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/afp_protocol.h" - #include "dsi_protocol.h" - #include "afp_replies.h" - -diff -Naur afpfs-ng-0.8.1/lib/proto_files.c afpfs-ng-0.8.1.patch/lib/proto_files.c ---- afpfs-ng-0.8.1/lib/proto_files.c 2008-02-18 04:46:18.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_files.c 2011-09-10 12:13:50.169125270 +0200 -@@ -8,11 +8,11 @@ - - #include <stdlib.h> - #include <string.h> --#include "dsi.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "dsi_protocol.h" --#include "afp_protocol.h" -+#include "afpfs-ng/afp_protocol.h" - #include "afp_internal.h" - - /* afp_setfileparms, afp_setdirparms and afpsetfiledirparms are all remarkably -diff -Naur afpfs-ng-0.8.1/lib/proto_fork.c afpfs-ng-0.8.1.patch/lib/proto_fork.c ---- afpfs-ng-0.8.1/lib/proto_fork.c 2008-01-30 05:37:58.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_fork.c 2011-09-10 12:13:50.169125270 +0200 -@@ -9,11 +9,11 @@ - #include <stdlib.h> - #include <string.h> - --#include "dsi.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "dsi_protocol.h" --#include "afp_protocol.h" -+#include "afpfs-ng/afp_protocol.h" - - int afp_setforkparms(struct afp_volume * volume, - unsigned short forkid, unsigned short bitmap, unsigned long len) -diff -Naur afpfs-ng-0.8.1/lib/proto_login.c afpfs-ng-0.8.1.patch/lib/proto_login.c ---- afpfs-ng-0.8.1/lib/proto_login.c 2008-01-30 05:37:59.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_login.c 2011-09-10 12:13:50.169125270 +0200 -@@ -10,10 +10,10 @@ - - #include <stdlib.h> - #include <string.h> --#include "dsi.h" -+#include "afpfs-ng/dsi.h" - #include "dsi_protocol.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "afp_internal.h" - - -diff -Naur afpfs-ng-0.8.1/lib/proto_map.c afpfs-ng-0.8.1.patch/lib/proto_map.c ---- afpfs-ng-0.8.1/lib/proto_map.c 2008-01-30 05:37:59.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_map.c 2011-09-10 12:13:50.170125283 +0200 -@@ -9,11 +9,11 @@ - #include <stdlib.h> - #include <string.h> - --#include "dsi.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "dsi_protocol.h" --#include "afp_protocol.h" -+#include "afpfs-ng/afp_protocol.h" - - /* This is used to pass the return values back from afp_getuserinfo_reply() */ - struct uidgid { -diff -Naur afpfs-ng-0.8.1/lib/proto_replyblock.c afpfs-ng-0.8.1.patch/lib/proto_replyblock.c ---- afpfs-ng-0.8.1/lib/proto_replyblock.c 2008-02-18 04:46:19.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_replyblock.c 2011-09-10 12:13:50.170125283 +0200 -@@ -6,9 +6,9 @@ - */ - - #include <string.h> --#include "dsi.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "afp_internal.h" - - -diff -Naur afpfs-ng-0.8.1/lib/proto_server.c afpfs-ng-0.8.1.patch/lib/proto_server.c ---- afpfs-ng-0.8.1/lib/proto_server.c 2008-02-19 02:56:21.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_server.c 2011-09-10 12:13:50.170125283 +0200 -@@ -7,12 +7,12 @@ - */ - #include <stdlib.h> - #include <string.h> --#include "dsi.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "dsi_protocol.h" --#include "afp_protocol.h" --#include "codepage.h" -+#include "afpfs-ng/afp_protocol.h" -+#include "afpfs-ng/codepage.h" - #include "afp_internal.h" - - int afp_getsrvrparms(struct afp_server *server) -diff -Naur afpfs-ng-0.8.1/lib/proto_session.c afpfs-ng-0.8.1.patch/lib/proto_session.c ---- afpfs-ng-0.8.1/lib/proto_session.c 2008-02-18 04:46:19.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_session.c 2011-09-10 12:13:50.170125283 +0200 -@@ -8,10 +8,10 @@ - */ - #include <stdlib.h> - #include <string.h> --#include "dsi.h" -+#include "afpfs-ng/dsi.h" - #include "dsi_protocol.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - - int afp_getsessiontoken(struct afp_server * server, int type, - unsigned int timestamp, struct afp_token *outgoing_token, -diff -Naur afpfs-ng-0.8.1/lib/proto_volume.c afpfs-ng-0.8.1.patch/lib/proto_volume.c ---- afpfs-ng-0.8.1/lib/proto_volume.c 2008-02-18 04:47:48.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/proto_volume.c 2011-09-10 12:13:50.171125296 +0200 -@@ -8,13 +8,13 @@ - - #include <string.h> - #include <stdlib.h> --#include "dsi.h" --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "dsi_protocol.h" --#include "afp_protocol.h" -+#include "afpfs-ng/afp_protocol.h" - #include "afp_internal.h" --#include "codepage.h" -+#include "afpfs-ng/codepage.h" - - static int parse_volbitmap_reply(struct afp_server * server, - struct afp_volume * tmpvol, -diff -Naur afpfs-ng-0.8.1/lib/resource.c afpfs-ng-0.8.1.patch/lib/resource.c ---- afpfs-ng-0.8.1/lib/resource.c 2008-02-18 04:46:56.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/resource.c 2011-09-10 12:13:50.171125296 +0200 -@@ -3,11 +3,11 @@ - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include "afp.h" -+#include "afpfs-ng/afp.h" - #include "resource.h" - #include "lowlevel.h" - #include "did.h" --#include "midlevel.h" -+#include "afpfs-ng/midlevel.h" - - #define appledouble ".AppleDouble" - #define finderinfo_string ".finderinfo" -diff -Naur afpfs-ng-0.8.1/lib/server.c afpfs-ng-0.8.1.patch/lib/server.c ---- afpfs-ng-0.8.1/lib/server.c 2008-02-19 02:56:21.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/server.c 2011-09-10 12:13:50.172125310 +0200 -@@ -8,15 +8,15 @@ - #include <string.h> - #include <time.h> - --#include "afp.h" --#include "dsi.h" --#include "utils.h" --#include "uams_def.h" --#include "codepage.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/uams_def.h" -+#include "afpfs-ng/codepage.h" - #include "users.h" --#include "libafpclient.h" -+#include "afpfs-ng/libafpclient.h" - #include "afp_internal.h" --#include "dsi.h" -+#include "afpfs-ng/dsi.h" - - - struct afp_server * afp_server_complete_connection( -diff -Naur afpfs-ng-0.8.1/lib/status.c afpfs-ng-0.8.1.patch/lib/status.c ---- afpfs-ng-0.8.1/lib/status.c 2008-03-08 17:08:38.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/status.c 2011-09-10 12:13:50.172125310 +0200 -@@ -1,8 +1,8 @@ - #include <string.h> - #include <stdio.h> --#include "map_def.h" --#include "dsi.h" --#include "afp.h" -+#include "afpfs-ng/map_def.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" - - int afp_status_header(char * text, int * len) - { -diff -Naur afpfs-ng-0.8.1/lib/uams.c afpfs-ng-0.8.1.patch/lib/uams.c ---- afpfs-ng-0.8.1/lib/uams.c 2008-01-04 04:52:44.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/uams.c 2011-09-10 12:13:50.173125324 +0200 -@@ -8,10 +8,10 @@ - - #include <string.h> - #include <stdlib.h> --#include "dsi.h" --#include "afp.h" --#include "utils.h" --#include "uams_def.h" -+#include "afpfs-ng/dsi.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" -+#include "afpfs-ng/uams_def.h" - #include "config.h" - - #ifdef HAVE_LIBGCRYPT -diff -Naur afpfs-ng-0.8.1/lib/users.c afpfs-ng-0.8.1.patch/lib/users.c ---- afpfs-ng-0.8.1/lib/users.c 2008-02-18 04:48:56.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/users.c 2011-09-10 12:13:50.174125338 +0200 -@@ -3,8 +3,8 @@ - #include <grp.h> - #include <string.h> - --#include "afp.h" --#include "map_def.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/map_def.h" - - /* How mapping works - * -diff -Naur afpfs-ng-0.8.1/lib/utils.c afpfs-ng-0.8.1.patch/lib/utils.c ---- afpfs-ng-0.8.1/lib/utils.c 2008-02-18 04:53:37.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/lib/utils.c 2011-09-10 12:13:50.174125338 +0200 -@@ -8,10 +8,10 @@ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> --#include "afp.h" --#include "utils.h" -+#include "afpfs-ng/afp.h" -+#include "afpfs-ng/utils.h" - #include "afp_internal.h" --#include "afp_protocol.h" -+#include "afpfs-ng/afp_protocol.h" - - struct afp_path_header_long { - unsigned char type; -diff -Naur afpfs-ng-0.8.1/Makefile.am afpfs-ng-0.8.1.patch/Makefile.am ---- afpfs-ng-0.8.1/Makefile.am 2008-02-18 04:24:14.000000000 +0100 -+++ afpfs-ng-0.8.1.patch/Makefile.am 2011-09-10 12:13:50.176125365 +0200 -@@ -1,5 +1,5 @@ - if HAVE_LIBFUSE --SUBDIRS = lib fuse cmdline docs -+SUBDIRS = lib fuse cmdline include docs - else --SUBDIRS = lib cmdline docs -+SUBDIRS = lib cmdline include docs - endif diff --git a/abs/extra/community/agg/PKGBUILD b/abs/extra/community/agg/PKGBUILD deleted file mode 100644 index b0d6d40..0000000 --- a/abs/extra/community/agg/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $ -# Maintainer: - -pkgname=agg -pkgver=2.5 -pkgrel=3 -pkgdesc="A High Quality Rendering Engine for C++" -arch=('i686' 'x86_64') -url="http://www.antigrain.com/" -license=('GPL') -depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9') -makedepends=('automake') -provides=('antigrain') -replaces=('antigrain') -options=('!libtool' '!makeflags') -source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz - agg-2.4-depends.patch - agg-2.5-pkgconfig.patch) -md5sums=('0229a488bc47be10a2fee6cf0b2febd6' - '22f8e48c137d25038181c86d5e40b110' - '43a19a7b1564c591e56c8d09a0fd8da5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1 - patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1 - sh ./autogen.sh || return 1 - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/extra/community/agg/agg-2.4-depends.patch b/abs/extra/community/agg/agg-2.4-depends.patch deleted file mode 100644 index 9d4f6e3..0000000 --- a/abs/extra/community/agg/agg-2.4-depends.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100 -+++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100 -@@ -4,8 +4,9 @@ - agginclude_HEADERS = agg_font_freetype.h - lib_LTLIBRARIES = libaggfontfreetype.la - --libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ -+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ - libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp - libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ -+libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@ - endif - ---- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100 -+++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100 -@@ -5,6 +5,6 @@ - libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ - libaggplatformsdl_la_SOURCES = agg_platform_support.cpp - libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@ --libaggplatformsdl_la_LIBADD = @SDL_LIBS@ -+libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@ - endif - ---- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100 -+++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000 -@@ -122,7 +122,8 @@ - fi - AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) - AC_SUBST(x_includes) --AC_SUBST(x_libraries) -+test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries" -+AC_SUBST(X_LDFLAGS) - dnl ############################################### - - dnl Settung up library version ---- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000 -+++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000 -@@ -1,8 +1,8 @@ - if ENABLE_X11 - lib_LTLIBRARIES = libaggplatformX11.la - --libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ -+libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@ - libaggplatformX11_la_SOURCES = agg_platform_support.cpp - libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ --libaggplatformX11_la_LIBADD = -lX11 -+libaggplatformX11_la_LIBADD = ../../libagg.la -lX11 - endif diff --git a/abs/extra/community/agg/agg-2.5-pkgconfig.patch b/abs/extra/community/agg/agg-2.5-pkgconfig.patch deleted file mode 100644 index a303bfb..0000000 --- a/abs/extra/community/agg/agg-2.5-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000 -+++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000 -@@ -6,5 +6,6 @@ - Name: libagg - Description: Anti Grain Geometry - A High Quality Rendering Engine for C++ - Version: @VERSION@ --Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg -+Requires.private: freetype2 -+Libs: -L${libdir} -lagg - Cflags: -I${includedir} diff --git a/abs/extra/community/amule/PKGBUILD b/abs/extra/community/amule/PKGBUILD deleted file mode 100644 index 47cc580..0000000 --- a/abs/extra/community/amule/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 98336 2010-11-07 18:59:29Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Henrik Ronellenfitsch <searinox@web.de> -# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> -# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> - -pkgname=amule -pkgver=10365 -pkgrel=1 -pkgdesc="An eMule-like client for ed2k p2p network" -arch=('i686' 'x86_64') -url="http://www.amule.org" -license=('GPL') -depends=('wxgtk' 'gd' 'geoip' 'libupnp') -makedepends=('crypto++') -source=(http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2) -md5sums=('fa19689a81616d066f8f7bdcddd771ac') - -build() { - cd "${srcdir}/aMule-SVN-r${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-cas \ - --enable-wxcas \ - --enable-amule-daemon \ - --enable-amulecmd \ - --enable-amule-gui \ - --enable-alc \ - --enable-alcc \ - --enable-webserver \ - --disable-debug \ - --enable-optimize \ - --enable-ccache \ - --enable-geoip \ - --enable-upnp - - make || return 1 -} - -package() { - cd "${srcdir}/aMule-SVN-r${pkgver}" - make DESTDIR=${pkgdir}/ install || return 1 -} diff --git a/abs/extra/community/athcool/PKGBUILD b/abs/extra/community/athcool/PKGBUILD index fb24df1..58d7c21 100644 --- a/abs/extra/community/athcool/PKGBUILD +++ b/abs/extra/community/athcool/PKGBUILD @@ -6,7 +6,7 @@ url="http://members.jcom.home.ne.jp/jacobi/linux/softwares.html" depends=('pciutils') license=('GPL') install=athcool.install -arch=('i686') +arch=('i686' 'x86_64') source=(http://members.jcom.home.ne.jp/jacobi/linux/files/$pkgname-$pkgver.tar.gz athcool run finish) @@ -17,7 +17,7 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - /bin/install -D -m0755 ../athcool ${pkgdir}/etc/rc.d/athcool + install -D -m0755 ../athcool ${pkgdir}/etc/rc.d/athcool mkdir -p ${pkgdir}/etc/sv/athcool/supervise install -D -m0755 ../run ${pkgdir}/etc/sv/athcool install -D -m0755 ../finish ${pkgdir}/etc/sv/athcool diff --git a/abs/extra/community/blockcontrol/PKGBUILD b/abs/extra/community/blockcontrol/PKGBUILD deleted file mode 100644 index 2507adc..0000000 --- a/abs/extra/community/blockcontrol/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Daniele Marinello <marinz at email dot it> - -pkgname=blockcontrol -pkgver=1.6.9 -pkgrel=3 -pkgdesc="blockcontrol is designed to do all tasks related to IP block daemons (MoBlock or NFBlock). They check internet traffic based on large lists of IP address ranges in order to protect your privacy." -arch=('i686' 'x86_64') -url="http://moblock-deb.sourceforge.net/" -license=('GPL2' 'BSD') -depends=('moblock' 'wget') -conflicts=('moblockcontrol') -source=(http://downloads.sourceforge.net/moblock-deb/$pkgname-$pkgver.tar.gz \ - blockcontrol.lib.patch) -backup=('etc/blockcontrol/blockcontrol.conf' 'etc/blockcontrol/blocklists.list') - -build() { - cd "$startdir/src/$pkgname-$pkgver" - patch -Np1 -i ../blockcontrol.lib.patch || return 1 - - install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol ${pkgdir}/usr/bin/blockcontrol - install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.main ${pkgdir}/usr/lib/blockcontrol/blockcontrol.main - install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.defaults ${pkgdir}/usr/lib/blockcontrol/blockcontrol.defaults - install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.lib ${pkgdir}/usr/lib/blockcontrol/blockcontrol.lib - install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.wd ${pkgdir}/usr/bin/blockcontrol.wd - install -D -m 644 $startdir/src/$pkgname-$pkgver/allow.p2p ${pkgdir}/etc/blockcontrol/allow.p2p - install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.conf ${pkgdir}/etc/blockcontrol/blockcontrol.conf - install -D -m 644 $startdir/src/$pkgname-$pkgver/blocklists.list ${pkgdir}/etc/blockcontrol/blocklists.list -# install -D -m 755 $startdir/src/$pkgname-$pkgver/if-up ${pkgdir}/etc/network/if-up.d/blockcontrol - install -D -m 755 $startdir/src/$pkgname-$pkgver/cron.daily ${pkgdir}/etc/cron.daily/blockcontrol - install -D -m 755 $startdir/src/$pkgname-$pkgver/init ${pkgdir}/etc/rc.d/blockcontrol - install -D -m 644 $startdir/src/$pkgname-$pkgver/logrotate ${pkgdir}/etc/logrotate.d/blockcontrol - install -d ${pkgdir}/var/lib/blockcontrol - install -d ${pkgdir}/var/spool/blockcontrol -} - -md5sums=('d02002745aacf6100ff9057bdc80adf3' - 'efcca84e52ea98cc10610830f9c2ba37') diff --git a/abs/extra/community/blockcontrol/blockcontrol.lib.patch b/abs/extra/community/blockcontrol/blockcontrol.lib.patch deleted file mode 100644 index 4be1c75..0000000 --- a/abs/extra/community/blockcontrol/blockcontrol.lib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- blockcontrol/blockcontrol_old.lib 2009-09-14 19:35:24.000000000 +0200 -+++ blockcontrol/blockcontrol.lib 2009-11-05 20:29:50.000000000 +0100 -@@ -1344,10 +1344,10 @@ - DAEMON_OPTS="$CUSTOM_DAEMON_OPTS" - elif [ "$NAME" = moblock ] ; then - # The options MoBlock is started with -- DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $LOG_TIMESTAMP_OPT $REJECT_OPT $ACCEPT_OPT $DAEMON_LOG" -+ DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $DAEMON_LOG" - elif [ "$NAME" = nfblockd ] ; then - # The options NFBlock is started with -- DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $REJECT_OPT $ACCEPT_OPT $LOG_SYSLOG_OPT" -+ DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT" - fi - - # Test NICE_LEVEL setting. diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD deleted file mode 100644 index df239af..0000000 --- a/abs/extra/community/chromium/PKGBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# $Id: PKGBUILD 150259 2012-02-16 02:37:46Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -# Building for x86_64 requires lib32-glibc & lib32-zlib from [multilib]. These -# libraries are linked from the NaCl toolchain, and are only needed during -# build time. - -pkgname=chromium -pkgver=17.0.963.56 -pkgrel=2 -pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" -arch=('i686' 'x86_64') -url="http://www.chromium.org/" -license=('BSD') -depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' - 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils' - 'hicolor-icon-theme') -makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' - 'elfutils') -optdepends=('kdebase-kdialog: needed for file dialogs in KDE' - 'mozplugger-chromium: A Mozilla multimedia plugin for Chromium') -# Needed for the NaCl toolchain -[[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib') -provides=('chromium-browser') -conflicts=('chromium-browser') -replaces=('firefox' 'firefox-i18n' 'mozplugger') -install=chromium.install -source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2 - http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip - chromium.desktop - chromium.sh - gcc-4.6.patch - nacl-cflags-remove-fstack-protector.patch - chromium-media-no-sse-r0.patch) -sha256sums=('270be138d499c6c2092644af69acab8310cb05c3d06c3afe7891e488c29b020f' - '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01' - '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' - 'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3' - '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e' - '59e732880314333d6e9acf6ac99de467c98e8a92aa5c5292ae808a805e0f8d76' - '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761') - -build() { - cd "$srcdir/chromium-$pkgver" - - # Fix build with gcc 4.6 - # http://code.google.com/p/chromium/issues/detail?id=80071 - patch -Np0 -i "$srcdir/gcc-4.6.patch" - - # Filter -fstack-protector out of cflags for nacl_helper_bootstrap - # http://code.google.com/p/chromium/issues/detail?id=104569 - patch -d native_client -Np1 -i \ - "$srcdir/nacl-cflags-remove-fstack-protector.patch" - - # Remove unconditional use of SSE3 (patch from Gentoo) - patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch" - - # Use Python 2 - find . -type f -exec sed -i -r \ - -e 's|/usr/bin/python$|&2|g' \ - -e 's|(/usr/bin/python2)\.4$|\1|g' \ - {} + - # There are still a lot of relative calls which need a workaround - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - export PATH="$srcdir/python2-path:$PATH" - - pushd "$srcdir/nacl_sdk" - ./naclsdk update pepper_16 - popd - - ln -s "$srcdir/nacl_sdk/pepper_16/toolchain/linux_x86_newlib" \ - native_client/toolchain/linux_x86_newlib - - # We need to disable system_ssl until "next protocol negotiation" support is - # available in our nss package. - # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) - - # CFLAGS are passed through release_extra_cflags below - export -n CFLAGS CXXFLAGS - - build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dno_strict_aliasing=1 \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -Dlinux_strip_binary=1 \ - -Drelease_extra_cflags="$CFLAGS" \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 \ - -Duse_system_bzip2=1 \ - -Duse_system_ffmpeg=0 \ - -Duse_system_libevent=1 \ - -Duse_system_libjpeg=0 \ - -Duse_system_libpng=1 \ - -Duse_system_libxml=0 \ - -Duse_system_ssl=0 \ - -Duse_system_yasm=1 \ - -Duse_system_zlib=1 \ - -Duse_gconf=0 \ - $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1') - - make chrome chrome_sandbox BUILDTYPE=Release -} - -package() { - cd "$srcdir/chromium-$pkgver" - - install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium - - install -Dm4755 -o root -g root out/Release/chrome_sandbox \ - "$pkgdir/usr/lib/chromium/chromium-sandbox" - - cp out/Release/{{chrome,resources}.pak,libffmpegsumo.so} \ - out/Release/nacl_helper{,_bootstrap} \ - out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} \ - "$pkgdir/usr/lib/chromium/" - - # These links are only needed when building with system ffmpeg - #ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/ - #ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/ - #ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/ - - cp -a out/Release/locales out/Release/resources "$pkgdir/usr/lib/chromium/" - - find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete - - install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" - - install -Dm644 "$srcdir/chromium.desktop" \ - "$pkgdir/usr/share/applications/chromium.desktop" - - for size in 16 22 24 32 48 64 128 256; do - install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" - done - - install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/chromium/__changelog b/abs/extra/community/chromium/__changelog deleted file mode 100644 index 0b5b4c8..0000000 --- a/abs/extra/community/chromium/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -* Add replaces=('firefox' 'firefox-i18n' 'mozplugger') array -* Add optdepends=('mozplugger-chromium: A Mozilla multimedia plugin for Chromium') diff --git a/abs/extra/community/chromium/chromium-media-no-sse-r0.patch b/abs/extra/community/chromium/chromium-media-no-sse-r0.patch deleted file mode 100644 index 07cda2d..0000000 --- a/abs/extra/community/chromium/chromium-media-no-sse-r0.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- media/media.gyp.orig 2012-02-02 10:03:41.000000000 +0100 -+++ media/media.gyp 2012-02-02 10:04:09.000000000 +0100 -@@ -467,14 +467,6 @@ - [ 'os_posix == 1 and OS != "mac" and OS != "android"', { - 'cflags': [ - '-msse2', -- '-msse3', -- '-mssse3', -- ], -- }], -- [ 'OS == "openbsd"', { -- # OpenBSD's gcc (4.2.1) does not support -mssse3 -- 'cflags!': [ -- '-mssse3', - ], - }], - [ 'OS == "mac"', { diff --git a/abs/extra/community/chromium/chromium.desktop b/abs/extra/community/chromium/chromium.desktop deleted file mode 100644 index 18446d4..0000000 --- a/abs/extra/community/chromium/chromium.desktop +++ /dev/null @@ -1,113 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Chromium -# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. -# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. -GenericName=Web Browser -GenericName[ar]=متصفح الشبكة -GenericName[bg]=Уеб браузър -GenericName[ca]=Navegador web -GenericName[cs]=WWW prohlížeč -GenericName[da]=Browser -GenericName[de]=Web-Browser -GenericName[el]=Περιηγητής ιστού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hu]=Webböngésző -GenericName[it]=Browser Web -GenericName[ja]=ウェブブラウザ -GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ -GenericName[ko]=웹 브라우저 -GenericName[lt]=Žiniatinklio naršyklė -GenericName[lv]=Tīmekļa pārlūks -GenericName[ml]=വെബ് ബ്രൌസര് -GenericName[mr]=वेब ब्राऊजर -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador da Internet -GenericName[ro]=Navigator de Internet -GenericName[ru]=Веб-браузер -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[ta]=இணைய உலாவி -GenericName[th]=เว็บเบราว์เซอร์ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[zh_CN]=网页浏览器 -GenericName[zh_HK]=網頁瀏覽器 -GenericName[zh_TW]=網頁瀏覽器 -# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[fil]=Web Browser -GenericName[hr]=Web preglednik -GenericName[id]=Browser Web -GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର -GenericName[sk]=WWW prehliadač -GenericName[sr]=Интернет прегледник -GenericName[te]=మహాతల అన్వేషి -GenericName[vi]=Bộ duyệt Web -# Gnome and KDE 3 uses Comment. -Comment=Access the Internet -Comment[ar]=الدخول إلى الإنترنت -Comment[bg]=Достъп до интернет -Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন -Comment[ca]=Accedeix a Internet -Comment[cs]=Přístup k internetu -Comment[da]=Få adgang til internettet -Comment[de]=Internetzugriff -Comment[el]=Πρόσβαση στο Διαδίκτυο -Comment[en_GB]=Access the Internet -Comment[es]=Accede a Internet. -Comment[et]=Pääs Internetti -Comment[fi]=Käytä internetiä -Comment[fil]=I-access ang Internet -Comment[fr]=Accéder à Internet -Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો -Comment[he]=גישה אל האינטרנט -Comment[hi]=इंटरनेट तक पहुंच स्थापित करें -Comment[hr]=Pristup Internetu -Comment[hu]=Internetelérés -Comment[id]=Akses Internet -Comment[it]=Accesso a Internet -Comment[ja]=インターネットにアクセス -Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ -Comment[ko]=인터넷 연결 -Comment[lt]=Interneto prieiga -Comment[lv]=Piekļūt internetam -Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക -Comment[mr]=इंटरनेटमध्ये प्रवेश करा -Comment[nb]=Gå til Internett -Comment[nl]=Verbinding maken met internet -Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ -Comment[pl]=Skorzystaj z internetu -Comment[pt]=Aceder à Internet -Comment[pt_BR]=Acessar a internet -Comment[ro]=Accesaţi Internetul -Comment[ru]=Доступ в Интернет -Comment[sk]=Prístup do siete Internet -Comment[sl]=Dostop do interneta -Comment[sr]=Приступите Интернету -Comment[sv]=Gå ut på Internet -Comment[ta]=இணையத்தை அணுகுதல் -Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి -Comment[th]=เข้าถึงอินเทอร์เน็ต -Comment[tr]=İnternet'e erişin -Comment[uk]=Доступ до Інтернету -Comment[vi]=Truy cập Internet -Comment[zh_CN]=访问互联网 -Comment[zh_HK]=連線到網際網路 -Comment[zh_TW]=連線到網際網路 -Exec=chromium %U -Terminal=false -Icon=chromium -Type=Application -Categories=GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/abs/extra/community/chromium/chromium.install b/abs/extra/community/chromium/chromium.install deleted file mode 100644 index d43ea7c..0000000 --- a/abs/extra/community/chromium/chromium.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/abs/extra/community/chromium/chromium.sh b/abs/extra/community/chromium/chromium.sh deleted file mode 100755 index e1c3388..0000000 --- a/abs/extra/community/chromium/chromium.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export CHROME_WRAPPER=/usr/lib/chromium/chromium -export CHROME_DESKTOP=chromium.desktop -exec /usr/lib/chromium/chromium "$@" diff --git a/abs/extra/community/chromium/gcc-4.6.patch b/abs/extra/community/chromium/gcc-4.6.patch deleted file mode 100644 index b5e61dc..0000000 --- a/abs/extra/community/chromium/gcc-4.6.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h ---- chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-13 13:23:41.000000000 +0400 -+++ chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-20 19:32:58.000000000 +0400 -@@ -7,6 +7,7 @@ - #pragma once - - #include <vector> -+#include <cstddef> - - class GURL; - class PrefService; -diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h ---- gpu/command_buffer/common/types.h 2011-04-13 13:22:57.000000000 +0400 -+++ gpu/command_buffer/common/types.h 2011-04-20 19:32:58.000000000 +0400 -@@ -11,6 +11,7 @@ - #include <stdint.h> - #endif - #include <string> -+#include <cstddef> - - typedef signed char schar; - typedef signed char int8; -diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h ---- ppapi/cpp/paint_aggregator.h 2011-04-13 13:22:58.000000000 +0400 -+++ ppapi/cpp/paint_aggregator.h 2011-04-20 20:11:44.000000000 +0400 -@@ -9,6 +9,7 @@ - - #include "ppapi/cpp/point.h" - #include "ppapi/cpp/rect.h" -+#include <cstddef> - - namespace pp { - -diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc ---- third_party/ots/src/os2.cc 2011-04-13 13:24:06.000000000 +0400 -+++ third_party/ots/src/os2.cc 2011-04-20 19:45:44.000000000 +0400 -@@ -5,6 +5,7 @@ - #include "os2.h" - - #include "head.h" -+#include <cstddef> - - // OS/2 - OS/2 and Windows Metrics - // http://www.microsoft.com/opentype/otspec/os2.htm -diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h ---- third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-20 19:32:58.000000000 +0400 -@@ -38,6 +38,7 @@ - #include <config.h> - - #include <limits> -+#include <cstddef> - - #include "base/basictypes.h" - #include "base/logging.h" -diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h ---- third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-20 19:32:58.000000000 +0400 -@@ -37,6 +37,7 @@ - - #define HAVE_VDSO_SUPPORT 1 - -+#include <cstddef> - #include <stdlib.h> // for NULL - #include <link.h> // for ElfW - #include "base/basictypes.h" -diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc ---- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 -@@ -34,6 +34,7 @@ - #include "config.h" - #include "common.h" - #include "system-alloc.h" -+#include <cstddef> - - namespace tcmalloc { - -diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h ---- third_party/tcmalloc/chromium/src/symbolize.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/symbolize.h 2011-04-20 19:32:58.000000000 +0400 -@@ -38,6 +38,7 @@ - #include <stdint.h> // for uintptr_t - #endif - #include <map> -+#include <cstddef> - - using std::map; - -diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h ---- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 -+++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 -@@ -7,6 +7,7 @@ - #pragma once - - #include <vector> -+#include <cstddef> - - class SkBitmap; - diff --git a/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch b/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch deleted file mode 100644 index 0e4f7cf..0000000 --- a/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/trusted/service_runtime/linux/nacl_bootstrap.gyp -diff --git a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp -index 66d95ca4dc98653219c965b899dbd5ad35d2960c..083e3fdd24ff4562d2037f8d17a06540e05357b8 100644 ---- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp -+++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp -@@ -84,6 +84,11 @@ - '-fasan', - '-faddress-sanitizer', - '-w', -+ # We filter these out because release_extra_cflags or another -+ # such thing might be adding them in, and those options wind up -+ # coming after the -fno-stack-protector we added above. -+ '-fstack-protector', -+ '-fstack-protector-all', - ], - 'conditions': [ - ['clang==1', { diff --git a/abs/extra/community/chrpath/ChangeLog b/abs/extra/community/chrpath/ChangeLog deleted file mode 100644 index dabc6f9..0000000 --- a/abs/extra/community/chrpath/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2009-05-21 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - - * 0.13-2 : - Replaced in my '# Contributor:' line by '# Maintainer:' - - -2009-03-19 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - - * 0.13-1 : - Initial release. diff --git a/abs/extra/community/chrpath/PKGBUILD b/abs/extra/community/chrpath/PKGBUILD deleted file mode 100644 index 2fefddf..0000000 --- a/abs/extra/community/chrpath/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=chrpath -pkgver=0.13 -pkgrel=2 -pkgdesc="Change or delete the rpath or runpath in ELF files" -arch=('i686' 'x86_64') -url="http://packages.debian.org/chrpath" -license=('GPL2') -depends=('glibc') -source=(http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) -md5sums=('b73072a8fbba277558c50364b65bb407') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir docdir=/usr/share/doc/chrpath install -} diff --git a/abs/extra/community/cksfv/PKGBUILD b/abs/extra/community/cksfv/PKGBUILD deleted file mode 100644 index da4ba00..0000000 --- a/abs/extra/community/cksfv/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl> - -pkgname=cksfv -pkgver=1.3.14 -pkgrel=1 -pkgdesc="SFV (Simple File Verification) Checker" -arch=('i686' 'x86_64') -url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/" -license=('GPL') -depends=('glibc') -source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz) -md5sums=('2e15289753ea0b90b6ea86993f93b383') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --package-prefix=$startdir/pkg - make || return 1 - make install - chmod 644 $startdir/pkg/usr/share/man/man1/$pkgname.1 -} diff --git a/abs/extra/community/codecs/PKGBUILD b/abs/extra/community/codecs/PKGBUILD deleted file mode 100644 index 416ff37..0000000 --- a/abs/extra/community/codecs/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> - -pkgname=codecs -pkgver=20100303 -pkgrel=4 -pkgdesc="Non-linux native codec pack." -arch=('i686') -url="http://www.mplayerhq.hu/design7/dload.html" -license=('unknown') -depends=('libstdc++5') -conflicts=('codecs-extra') -replaces=('codecs-extra') -options=('!strip') -source=(http://www.mplayerhq.hu/MPlayer/releases/codecs/all-$pkgver.tar.bz2) -md5sums=('4a7eb1a706f4ed9950bf6dd7f063ef68') - -build() { - install -d $pkgdir/usr/lib/codecs - ln -s codecs ${pkgdir}/usr/lib/win32 - install -m644 $srcdir/all-$pkgver/* $pkgdir/usr/lib/codecs -} - diff --git a/abs/extra/community/cpulimit/PKGBUILD b/abs/extra/community/cpulimit/PKGBUILD index 28a3b55..cb73d72 100644 --- a/abs/extra/community/cpulimit/PKGBUILD +++ b/abs/extra/community/cpulimit/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD,v 1.6 2009/02/09 18:02:27 abhidg Exp $ -# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> +# $Id: PKGBUILD 65094 2012-02-20 03:37:27Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cpulimit pkgver=1.1 -pkgrel=1 +pkgrel=3 pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT" arch=('i686' 'x86_64') url="http://cpulimit.sourceforge.net/" license=("GPL") +depends=(glibc) source=("http://downloads.sourceforge.net/sourceforge/cpulimit/cpulimit-$pkgver.tar.gz") md5sums=('f4ff6d4bfaef1258e8f5cd2041e2e2a3') -build () { - cd $startdir/src/$pkgname-$pkgver +build() { + cd $srcdir/$pkgname-$pkgver make - install -D -m0755 cpulimit $startdir/pkg/usr/bin/cpulimit + install -D -m0755 cpulimit $pkgdir/usr/bin/cpulimit } - diff --git a/abs/extra/community/cwiid-git/PKGBUILD b/abs/extra/community/cwiid-git/PKGBUILD deleted file mode 100644 index 2a88d26..0000000 --- a/abs/extra/community/cwiid-git/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -#Contributor:Andrea Tarocchi <valdar@email.it> -pkgname=cwiid-git -#pkgver=`date +%Y%m%d` -pkgver=20111102 -pkgrel=1 -pkgdesc="Cwiid-git is the bleeding edge version of a wiimote's driver and utility tools" -arch=('i686' 'x86_64') -url="http://github.com/abstrakraft/cwiid" -license=('GPL') - -depends=('bluez>=4' 'gtk2' 'python2') -makedepends=('git' 'make' 'automake' 'autoconf') -replaces=('cwiid' 'cwiid-svn') -provides=('cwiid' 'cwiid-git') -install=('cwiid.install') -source=() - -_gitroot=git://github.com/abstrakraft/cwiid.git -_gitname=cwiid -_builddir=$srcdir/$_gitname-build - -build() { - - export LDFLAGS="" - - cd $srcdir/ - msg "Connecting to github.com GIT server...." - if [ -d $srcdir/$_gitname ] ; then - pushd $_gitname && git pull origin && popd - msg "The local files are updated." - else - git clone $_gitroot - fi - msg "GIT checkout done or server timeout" - msg "Starting make..." - rm -rf $_gitname-build - git clone $_gitname $_gitname-build - - cd $_builddir - - aclocal - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --with-python=python2 --disable-ldconfig - - make || return 1 -} - -package() { - cd ${_builddir} - make DESTDIR="${pkgdir}" install || return 1 - -# aclocal -# autoreconf - -# ./configure --disable-ldconfig --prefix=/usr --sysconfdir=/etc --with-cwiid-plugins-dir=/lib/cwiid/plugins -# make LDFLAGS=-L../libcwiid || return 1 - -# install -d $startdir/pkg/usr/bin -# install -d $startdir/pkg/etc -# install -d $startdir/pkg/usr/lib -# install -d $startdir/pkg/usr/include - -# make install LDFLAGS=-L../libcwiid prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install - -# install -D -m644 ./wminput/README $pkgdir/usr/share/doc/cwiid/wminput -} -md5sums=() diff --git a/abs/extra/community/cwiid-git/cwiid.install b/abs/extra/community/cwiid-git/cwiid.install deleted file mode 100644 index 5dc5faf..0000000 --- a/abs/extra/community/cwiid-git/cwiid.install +++ /dev/null @@ -1,16 +0,0 @@ -# arg 1: the new package version -post_install() { -echo -e "Note:" -echo -e "\033[1;31m==> In order to use wminput you have to load the uinput kernel module:\033[0m" -echo -e "\033[1;31m==> modprobe uinput (as root)\033[0m" -echo -e "\033[1;31m==> and you have to assign correct right acces to /dev/uinput\033[0m" -echo -e "\033[1;31m==> PLEAS READ THE DOC FILE /usr/share/doc/cwiid/wminput\033[0m" -} - -post_upgrade() { - post_install $1 -} - -op=$1 -shift -$op $*
\ No newline at end of file diff --git a/abs/extra/community/deluge/PKGBUILD b/abs/extra/community/deluge/PKGBUILD deleted file mode 100644 index 3d36405..0000000 --- a/abs/extra/community/deluge/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 97661 2010-10-31 22:31:52Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=deluge -pkgver=1.3.1 -pkgrel=1 -pkgdesc="A bittorrent client written with python and pygtk" -arch=('any') -url="http://deluge-torrent.org/" -license=('GPL3') -depends=('pyxdg' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'pyopenssl' 'xdg-utils' 'python-chardet') -makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako') -optdepends=('python-notify: libnotify notifications' - 'pygtk: needed for gtk ui' - 'librsvg: needed for gtk ui' - 'python-mako: needed for web ui') -source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 deluged deluged.conf.d deluge-web) -backup=(etc/conf.d/deluged) -install=deluge.install -md5sums=('496a9cfaf01e6cf7ab141498acf2d1f1' - '7d5790eeb14cd0b47d1bb3e0a19c9935' - '332d23fe0d21ce92b494efd73322856c' - '6c913ec7322eaa60494ac9d53103005f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - - install -d -m755 "${pkgdir}"/srv/deluge - install -D -m644 deluge/data/pixmaps/deluge.svg "${pkgdir}"/usr/share/pixmaps/deluge.svg - install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged - install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web - install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged -} diff --git a/abs/extra/community/deluge/__changelog b/abs/extra/community/deluge/__changelog deleted file mode 100644 index c5602d9..0000000 --- a/abs/extra/community/deluge/__changelog +++ /dev/null @@ -1 +0,0 @@ -change 'setuptools' dep to 'python2-distribute' diff --git a/abs/extra/community/deluge/deluge-web b/abs/extra/community/deluge/deluge-web deleted file mode 100644 index 587496f..0000000 --- a/abs/extra/community/deluge/deluge-web +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/deluged - -[[ -f /var/run/deluge-web.pid ]] && PID=$(cat /var/run/deluge-web.pid) -[[ -d /proc/$PID ]] || PID= - -case "$1" in - start) - stat_busy "Starting Deluge WebUI" - [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f >/dev/null" $DELUGE_USER - if [ $? -gt 0 ]; then - stat_fail - else - sleep 1 - echo $(pgrep -u $DELUGE_USER deluge-web) > /var/run/deluge-web.pid - add_daemon deluge-web - stat_done - fi - ;; - stop) - stat_busy "Stopping Deluge WebUI" - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/deluge-web.pid - rm_daemon deluge-web - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/community/deluge/deluge.install b/abs/extra/community/deluge/deluge.install deleted file mode 100644 index 9377a63..0000000 --- a/abs/extra/community/deluge/deluge.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { - getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge - if getent passwd deluge > /dev/null 2>&1; then - usr/sbin/usermod -c 'Deluge user' -d /srv/deluge -s /bin/false deluge > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge - fi - usr/bin/passwd -l deluge &>/dev/null - - chown deluge.deluge srv/deluge - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - -cat << _EOF ->>> Deluge's daemon is running default with the "deluge" user. The default download directory is /srv/deluge/. - You can change the user by editing /etc/conf.d/deluged -_EOF -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - getent passwd deluge >/dev/null 2>&1 && userdel deluge - getent group deluge >/dev/null 2>&1 && groupdel deluge - - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - diff --git a/abs/extra/community/deluge/deluged b/abs/extra/community/deluge/deluged deleted file mode 100644 index 096d36a..0000000 --- a/abs/extra/community/deluge/deluged +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/deluged - -[[ -f /var/run/deluged.pid ]] && PID=$(cat /var/run/deluged.pid) -[[ -d /proc/$PID ]] || PID= - -case "$1" in - start) - stat_busy "Starting Deluge Daemon" - [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged >/dev/null" $DELUGE_USER - if [ $? -gt 0 ]; then - stat_fail - else - sleep 1 - echo $(pgrep -u $DELUGE_USER deluged) > /var/run/deluged.pid - add_daemon deluged - stat_done - fi - ;; - stop) - stat_busy "Stopping Deluge Daemon" - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/deluged.pid - rm_daemon deluged - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/abs/extra/community/deluge/deluged.conf.d b/abs/extra/community/deluge/deluged.conf.d deleted file mode 100644 index 7f4e873..0000000 --- a/abs/extra/community/deluge/deluged.conf.d +++ /dev/null @@ -1 +0,0 @@ -DELUGE_USER="deluge" diff --git a/abs/extra/community/desktop-file-utils/PKGBUILD b/abs/extra/community/desktop-file-utils/PKGBUILD index 8673057..1588bfc 100644 --- a/abs/extra/community/desktop-file-utils/PKGBUILD +++ b/abs/extra/community/desktop-file-utils/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 73005 2010-03-21 18:23:06Z jgc $ +# $Id: PKGBUILD 161386 2012-06-10 16:51:40Z jgc $ # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=desktop-file-utils -pkgver=0.16 +pkgver=0.20 pkgrel=1 pkgdesc="Command line utilities for working with desktop entries" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" license=('GPL') depends=('glib2') -source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.bz2) +source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz) +md5sums=('8c85cbc13632ba69077c6bc41ce4d0ac') build() { cd "${srcdir}/desktop-file-utils-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/desktop-file-utils-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('6811712bced796d025d1a8a0f728d941') diff --git a/abs/extra/community/djmount/PKGBUILD b/abs/extra/community/djmount/PKGBUILD deleted file mode 100644 index a3648dc..0000000 --- a/abs/extra/community/djmount/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Contributor: Michele Schäuble <mschaeuble@swissonline.ch> - -pkgname=djmount -pkgver=0.71 -pkgrel=1 -pkgdesc="A UPnP AV client that mounts media server contents as a filesystem." -arch=('i686') -url="http://djmount.sourceforge.net/" -license=('GPL') -depends=('fuse') -source=(http://voxel.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - djmount.rcd djmount.confd) -md5sums=('c922753e706c194bf82a8b6ca77e6a9a' \ - 'f473b5150df385447f2f58049bfb6199' \ - '21de4c947c17e8558f1007a20757f254') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - - install -D -m755 $startdir/src/djmount.rcd $startdir/pkg/etc/rc.d/djmount - install -D -m644 $startdir/src/djmount.confd $startdir/pkg/etc/conf.d/djmount -} diff --git a/abs/extra/community/djmount/djmount.confd b/abs/extra/community/djmount/djmount.confd deleted file mode 100644 index 079100e..0000000 --- a/abs/extra/community/djmount/djmount.confd +++ /dev/null @@ -1,2 +0,0 @@ -OPTIONS="-o ro,allow_other" -MOUNTPOINT="/media/upnp" diff --git a/abs/extra/community/djmount/djmount.rcd b/abs/extra/community/djmount/djmount.rcd deleted file mode 100755 index 84899dd..0000000 --- a/abs/extra/community/djmount/djmount.rcd +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - - . /etc/rc.conf - . /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/djmount ] && . /etc/conf.d/djmount - - case "$1" in - - start) - stat_busy "Starting djmount" - /usr/bin/djmount $OPTIONS $MOUNTPOINT &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon djmount - stat_done - fi - ;; - - stop) - stat_busy "Stopping djmount" - fusermount -u $MOUNTPOINT - kill -9 `pidof /usr/bin/djmount` &>/dev/null - rm_daemon djmount - stat_done - ;; - - restart) - stat_busy "Restarting djmount ..." - $0 stop - $0 start - stat_done - ;; - - *) - echo "usage: $0 {start|stop|restart}" - esac diff --git a/abs/extra/community/dolphin-emu/Dolphin_Logo.png b/abs/extra/community/dolphin-emu/Dolphin_Logo.png Binary files differdeleted file mode 100644 index 63450da..0000000 --- a/abs/extra/community/dolphin-emu/Dolphin_Logo.png +++ /dev/null diff --git a/abs/extra/community/dolphin-emu/PKGBUILD b/abs/extra/community/dolphin-emu/PKGBUILD deleted file mode 100644 index 2c4d3b6..0000000 --- a/abs/extra/community/dolphin-emu/PKGBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# Maintainer: schuay <jakob.gruber@gmail.com> -# Contributor: Jeremy Newton (Mystro256) -# Special thanks to the contributors of dolphin-emu-svn: for the icon, desktop file and some lines from the PKGBUILD -# Thanks to all that contributed! :) - -pkgname=dolphin-emu -pkgver=3.0 -pkgrel=11 -epoch=1 -pkgdesc="A GameCube and Wii emulator (stable git branch)" -arch=('i686' 'x86_64') -url="http://www.dolphin-emulator.com/" -license=('GPL2') - -makedepends=('git' 'cmake' 'glproto' 'opencl-headers') -depends=('sdl' 'libxxf86vm' 'libao' 'wxgtk' 'wiiuse' 'nvidia-cg-toolkit' \ - 'glew' 'mesa' 'libgl' 'openal' 'portaudio' 'lzo2') - -# Cannot be BUILT with sfml later than 1.6 -# IF YOU NEED SFML>=1.7 FOR SOMETHING ELSE, TRY REMOVING THE CONFLICT -# BELOW AND ONLY TEMPORARY UNINSTALLING SFML TO BUILD/INSTALL DOLPHIN -conflicts=('dolphin-emu-git' 'sfml>=1.7' 'sfml-git') -install="${pkgname}.install" -source=('dolphin-emu.desktop' - 'unistd.diff' - 'Dolphin_Logo.png' - 'dolphin-emu.xml' - 'dolphin-emu_games.xml' - 'dolphin-emu_scan.sh') - -_gitroot=https://code.google.com/p/dolphin-emu/ -_gitname=dolphin-emu-3.0 - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin 3.0 - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - msg "Checking out at stable 3.0 branch" - git checkout 3.0 - - msg "GIT checkout done or server timeout" - - patch -Np2 < ${srcdir}/unistd.diff - - mkdir build && cd build - export CXXFLAGS="$CXXFLAGS -fpermissive" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}/dolphin-emu-3.0-build/build" - - make DESTDIR=${pkgdir} install - - mkdir -p "${pkgdir}"/usr/share/mythtv/themes/defaultmenu - mkdir -p "${pkgdir}"/usr/LH/bin - - install -Dm644 "${srcdir}/dolphin-emu.desktop" "${pkgdir}/usr/share/applications/dolphin-emu.desktop" - install -Dm644 "${srcdir}/Dolphin_Logo.png" "${pkgdir}/usr/share/pixmaps/dolphin-emu.png" - cp "${srcdir}/dolphin-emu.xml" "${pkgdir}/usr/share/mythtv/themes/defaultmenu" - cp "${srcdir}/dolphin-emu_games.xml" "${pkgdir}/usr/share/mythtv/themes/defaultmenu" - install -m755 "${srcdir}/dolphin-emu_scan.sh" "${pkgdir}/usr/LH/bin" -} - -# vim:set ts=2 sw=2 et: - -md5sums=('feed4580c2e6bfbc7f6c67dad861daae' - 'a463b96d02462b5f6b0894f6ced821ab' - 'd15c51f547b4bd47e510faac40bcc9d6' - 'ab7a9b9cfe03db65c881134c0f02bda0' - '1d03499e0abab56285bc97176d311bf1' - 'af44dd20626ce26d0a07dadc37c20233') diff --git a/abs/extra/community/dolphin-emu/__changelog b/abs/extra/community/dolphin-emu/__changelog deleted file mode 100644 index cdd8871..0000000 --- a/abs/extra/community/dolphin-emu/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -6/9/12 -chw- -Added install file, and mythtv menu files. diff --git a/abs/extra/community/dolphin-emu/dolphin-emu.desktop b/abs/extra/community/dolphin-emu/dolphin-emu.desktop deleted file mode 100644 index 96317d1..0000000 --- a/abs/extra/community/dolphin-emu/dolphin-emu.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Dolphin -Categories=Game;Emulator;GTK; -GenericName=GameCube and Wii Emulator -Comment=An emulator for the GameCube and Wii consoles -Exec=dolphin-emu -Icon=dolphin-emu -StartupNotify=false -Name[en_US]=Dolphin diff --git a/abs/extra/community/dolphin-emu/dolphin-emu.install b/abs/extra/community/dolphin-emu/dolphin-emu.install deleted file mode 100644 index 6acdd50..0000000 --- a/abs/extra/community/dolphin-emu/dolphin-emu.install +++ /dev/null @@ -1,36 +0,0 @@ -post_install() { - mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp - grep -v -e /mythmenu /tmp/game.xml > /tmp/game.xml.tmp - echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp - echo " <button>" >> /tmp/game.xml.tmp - echo " <type>MENU_GAME</type>" >> /tmp/game.xml.tmp - echo " <text>Dolphin Emulator</text>" >> /tmp/game.xml.tmp - echo " <action>MENU dolphin-emu.xml</action>" >> /tmp/game.xml.tmp - echo " </button>" >> /tmp/game.xml.tmp - echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp - echo "" >> /tmp/game.xml.tmp - echo "</mythmenu>" >> /tmp/game.xml.tmp - mv /tmp/game.xml.tmp /usr/share/mythtv/themes/defaultmenu/game.xml -} - -post_upgrade() { - mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp/game.xml.tmp - sed -e '/\#Dolphin-Emu/,/\#Dolphin-Emu/d' < /tmp/game.xml.tmp > /usr/share/mythtv/themes/defaultmenu/game.xml - mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp - grep -v -e /mythmenu /tmp/game.xml > /tmp/game.xml.tmp - echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp - echo " <button>" >> /tmp/game.xml.tmp - echo " <type>MENU_GAME</type>" >> /tmp/game.xml.tmp - echo " <text>Dolphin Emulator</text>" >> /tmp/game.xml.tmp - echo " <action>MENU dolphin-emu.xml</action>" >> /tmp/game.xml.tmp - echo " </button>" >> /tmp/game.xml.tmp - echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp - echo "" >> /tmp/game.xml.tmp - echo "</mythmenu>" >> /tmp/game.xml.tmp - mv /tmp/game.xml.tmp /usr/share/mythtv/themes/defaultmenu/game.xml -} - -post_remove() { - mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp/game.xml.tmp - sed -e '/\#Dolphin-Emu/,/\#Dolphin-Emu/d' < /tmp/game.xml.tmp > /usr/share/mythtv/themes/defaultmenu/game.xml -} diff --git a/abs/extra/community/dolphin-emu/dolphin-emu.xml b/abs/extra/community/dolphin-emu/dolphin-emu.xml deleted file mode 100644 index 5aaf1a1..0000000 --- a/abs/extra/community/dolphin-emu/dolphin-emu.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<mythmenu name="GAME"> - - <button> - <type>GAME</type> - <text>Scan for games</text> - <description></description> - <action>EXEC /usr/LH/bin/dolphin-emu_scan.sh</action> - </button> - - <button> - <type>GAME</type> - <text>Play Dolphin Games</text> - <description>Play video games</description> - <action>MENU dolphin-emu_games.xml</action> - </button> - -</mythmenu> diff --git a/abs/extra/community/dolphin-emu/dolphin-emu_games.xml b/abs/extra/community/dolphin-emu/dolphin-emu_games.xml deleted file mode 100644 index fdd19d9..0000000 --- a/abs/extra/community/dolphin-emu/dolphin-emu_games.xml +++ /dev/null @@ -1,7 +0,0 @@ -<mythmenu name="DOLPHIN"> - <button> - <type>MENU_DOLPHIN</type> - <text>Please scan for games</text> - <action>UPMENU</action> - </button> -</mythmenu> diff --git a/abs/extra/community/dolphin-emu/dolphin-emu_scan.sh b/abs/extra/community/dolphin-emu/dolphin-emu_scan.sh deleted file mode 100644 index 804553e..0000000 --- a/abs/extra/community/dolphin-emu/dolphin-emu_scan.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -#---------------------------------------------------------------------------- -. /etc/osd_cat.cfg || { - color=yellow - outline=2 - outlinecolour=black - shadow=0 - shadowcolour=black - font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" -} -#---------------------------------------------------------------------------- -EXTNS=('[eE][lL][fF]' '[dD][oO][lL]' '[gG][cC][mM]' '[iI][sS][oO]' '[cC][iI][sS][oO]' '[gG][cC][zZ]' '[wW][aA][dD]') -DIR=/myth/games/dolphin-emu/roms -rm -fr /tmp/dolphin* -echo -e "Scanning for games." | osd_cat --pos=middle --align=center --delay=2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & -for EXT in ${EXTNS[@]} -do - if [ -d "$DIR" ]; then - cd $DIR - ls *.$EXT >> /tmp/dolphin-emu.games - fi -done -sleep 3 -if [ -s /tmp/dolphin-emu.games ]; then - echo -e "Creating menu." | osd_cat --pos=middle --align=center --delay=2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & - sleep 3 -else - echo -e "No games detected. Ensure you have your files in $DIR." | osd_cat --pos=middle --align=center --delay=4 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & - sleep 5 - exit 0 -fi - -echo "<mythmenu name=\"DOLPHIN\">" > /tmp/dolphin-emu_games.xml - -while read line -do - echo " <button>" >> /tmp/dolphin-emu_games.xml - echo " <type>MENU_DOLPHIN</type>" >> /tmp/dolphin-emu_games.xml - echo " <text>$(echo "$line" | sed 's/.\{4\}$//')</text>" >> /tmp/dolphin-emu_games.xml - echo " <action>EXEC /usr/bin/dolphin-emu -b -e $DIR/$(echo "$line" | sed "s/'/\\\\'/g" | sed 's/ /\\ /g')</action>" >> /tmp/dolphin-emu_games.xml - echo " </button>" >> /tmp/dolphin-emu_games.xml -done < /tmp/dolphin-emu.games -echo "</mythmenu>" >> /tmp/dolphin-emu_games.xml -sudo mv /tmp/dolphin-emu_games.xml /usr/share/mythtv/themes/defaultmenu/ -echo -e "Menu created." | osd_cat --pos=middle --align=center --delay=2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & -sleep 2 diff --git a/abs/extra/community/dolphin-emu/unistd.diff b/abs/extra/community/dolphin-emu/unistd.diff deleted file mode 100644 index 2b39063..0000000 --- a/abs/extra/community/dolphin-emu/unistd.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dolphin-emu-3.0/Source/Core/Common/Src/CommonFuncs.h 2012-04-07 10:47:47.595151504 +0200 -+++ src/dolphin-emu-3.0-build/Source/Core/Common/Src/CommonFuncs.h 2012-04-07 10:53:25.371113081 +0200 -@@ -18,6 +18,8 @@ - #ifndef _COMMONFUNCS_H_ - #define _COMMONFUNCS_H_ - -+#include <unistd.h> -+ - #ifdef _WIN32 - #define SLEEP(x) Sleep(x) - #else diff --git a/abs/extra/community/enca/PKGBUILD b/abs/extra/community/enca/PKGBUILD index e398023..fdcea7c 100644 --- a/abs/extra/community/enca/PKGBUILD +++ b/abs/extra/community/enca/PKGBUILD @@ -1,17 +1,17 @@ -# $Id$ +# $Id: PKGBUILD 143739 2011-11-28 18:10:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Filip Dvorak <fila@pruda.com> pkgname=enca pkgver=1.13 -pkgrel=1 +pkgrel=2 pkgdesc="Charset analyser and converter" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/enca/" options=('!libtool') license=('GPL') -depends=('recode' 'sh') -source=(http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +depends=('recode' 'bash') +source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('762bead5d9a0a5e55024e1102baaa89d') build() { @@ -22,6 +22,11 @@ build() { --mandir=/usr/share/man \ --with-librecode=/usr \ --enable-external - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/community/flashplugin/PKGBUILD b/abs/extra/community/flashplugin/PKGBUILD index 92a7caa..59f78f5 100644 --- a/abs/extra/community/flashplugin/PKGBUILD +++ b/abs/extra/community/flashplugin/PKGBUILD @@ -1,15 +1,15 @@ -# $Id$ +# $Id: PKGBUILD 161290 2012-06-08 23:27:45Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=flashplugin _licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' -pkgver=11.2.202.228 +pkgver=11.2.202.236 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' arch=('i686' 'x86_64') -depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme') +depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme') optdepends=('libvdpau: GPU acceleration on Nvidia card') provides=('flashplayer') license=('custom') @@ -21,20 +21,19 @@ if [ "$CARCH" = "i686" ]; then source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz" "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" mms.cfg) - md5sums=('174a9e778a11559d65f66290b16e2088' + md5sums=('00b3dd02b9ac600272440ebadda724e1' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') elif [ "$CARCH" = "x86_64" ]; then source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" mms.cfg) - md5sums=('01e4ddb6e87ea8439f4955e83422f82e' + md5sums=('f3cec2b9b38bd58f5e20f543d957bc17' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') fi package () { - cd "$srcdir" install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so" if [ "$CARCH" = x86_64 ]; then install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" @@ -51,6 +50,6 @@ package () { install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf" install -Dm644 "$srcdir/mms.cfg" "$pkgdir/etc/adobe/mms.cfg" } -md5sums=('174a9e778a11559d65f66290b16e2088' +md5sums=('f3cec2b9b38bd58f5e20f543d957bc17' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') diff --git a/abs/extra/community/fluidsynth/PKGBUILD b/abs/extra/community/fluidsynth/PKGBUILD deleted file mode 100644 index 944222e..0000000 --- a/abs/extra/community/fluidsynth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 94804 2010-10-11 11:48:58Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=fluidsynth -pkgver=1.1.3 -pkgrel=1 -pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" -arch=(i686 x86_64) -url="http://www.fluidsynth.org/" -depends=('glib2' 'jack' 'dbus-core') -makedepends=('cmake' 'ladspa' 'doxygen') -optdepends=('bash: init script') -license=('LGPL') -backup=('etc/conf.d/fluidsynth') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - fluidsynth.conf - fluidsynthd) -md5sums=('0d3e3cc770b4da413010dfb7dfdce9c8' - '16c5f4d4cbdddc6c5fcbd4fd4cc142f1' - 'b296dbfb524c2164f552f68bd9abe2ec') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -Denable-ladspa=ON \ - -DLIB_SUFFIX="" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - install -Dm644 "$srcdir/fluidsynth.conf" \ - "$pkgdir/etc/conf.d/fluidsynth" - - install -Dm755 "$srcdir/fluidsynthd" \ - "$pkgdir/etc/rc.d/fluidsynth" -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/fluidsynth/fluidsynth.conf b/abs/extra/community/fluidsynth/fluidsynth.conf deleted file mode 100644 index 5267d58..0000000 --- a/abs/extra/community/fluidsynth/fluidsynth.conf +++ /dev/null @@ -1,2 +0,0 @@ -FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" -FSYNTH_SOUNDFONT=""
\ No newline at end of file diff --git a/abs/extra/community/fluidsynth/fluidsynthd b/abs/extra/community/fluidsynth/fluidsynthd deleted file mode 100644 index ca1e8fa..0000000 --- a/abs/extra/community/fluidsynth/fluidsynthd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth - -PID=`pidof -o %PPID /usr/bin/fluidsynth` -case "$1" in - start) - stat_busy "Starting Fluidsynth soundfont synthesizer" - [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/fluidsynth.pid - add_daemon fluidsynth - stat_done - fi - ;; - stop) - stat_busy "Stopping Fluidsynth soundfont synthesizer" - [ ! -z "$PID" ] && kill $PID &> /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/fluidsynth.pid - rm_daemon fluidsynth - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/community/fluxconf/PKGBUILD b/abs/extra/community/fluxconf/PKGBUILD deleted file mode 100644 index 9d9220f..0000000 --- a/abs/extra/community/fluxconf/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=fluxconf -pkgver=0.9.9 -pkgrel=1 -pkgdesc="Configuration utility for the Fluxbox windowmanager" -arch=(i686 x86_64) -depends=('gtk2') -source=(http://devaux.fabien.free.fr/flux/$pkgname-$pkgver.tar.gz) -url="http://devaux.fabien.free.fr/flux/" -md5sums=('ac37b12410daa06128f8eb29163a741d') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - /usr/bin/make || return 1 - /usr/bin/make prefix=$startdir/pkg/usr install - cd $startdir/pkg/usr/bin - /bin/ln -sf $pkgname fluxbare - /bin/ln -sf $pkgname fluxkeys - /bin/ln -sf $pkgname fluxmenu -} diff --git a/abs/extra/community/foldingathome/PKGBUILD b/abs/extra/community/foldingathome/PKGBUILD deleted file mode 100644 index 6f00936..0000000 --- a/abs/extra/community/foldingathome/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: Jason Taylor <jftaylor21@gmail.com> -# Contributor: seratne -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=foldingathome -pkgver=6.02 -pkgrel=7 -pkgdesc="Folding@Home is a distributed computing project which studies protein folding, misfolding, aggregation, and related diseases." -arch=('i686') -url="http://folding.stanford.edu/" -license=('custom') -depends=('bash') -backup=('etc/conf.d/foldingathome') -install=foldingathome.install -source=(http://www.stanford.edu/group/pandegroup/folding/release/FAH$pkgver-Linux.tgz - run) - -build() { - cd $startdir/src/ - - tar zxf FAH${pkgver}-Linux.tgz - - # At this stage, the mpiexec is not included because it requires x86_64. - install -D -c -m755 fah6 $startdir/pkg/usr/bin/fah6 || return 1 - install -D -m755 run $startdir/pkg/etc/sv/fah/run -} -md5sums=('112b3d66909050f1bb990993a1464cb9' - 'cefaf5ba2f3e2fe81533b5ee4795dc78') diff --git a/abs/extra/community/foldingathome/foldingathome.install b/abs/extra/community/foldingathome/foldingathome.install deleted file mode 100644 index 20e48d1..0000000 --- a/abs/extra/community/foldingathome/foldingathome.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - # Check for an R5.5 fah installation. - r5_fah_dir=/myth/folding@home - r6_fah_dir=/myth/foldingathome/$(hostname) - if [ -d "$r5_fah_dir" ] ; then - if [ -d "$r6_fah_dir" ] ; then - cat << 'EOM' - --> You have an R5.5 and an R6 folding directory at the same time! - --> you should manually delete the R5.5 directory: - --> $r5_fah_dir - --> The directroy used on R6 will be: - --> $r6_fah_dir -EOM - else - mkdir -p /myth/foldingathome - mv $r5_fah_dir $r6_fah_dir - fi - else - if [ ! -d "$r6_fah_dir" ] ; then - mkdir -p $r6_fah_dir - cat > $r6_fah_dir/client.cfg << 'EOM' -[settings] -username=LinHES -team=50975 -passkey= -asknet=no -bigpackets=normal -machineid=1 - -[http] -active=no -host=localhost -port=8080 -EOM - fi - fi - rm -fr $r6_fah_dir/index.html - ln -s $r6_fah_dir/MyFolding.html $r6_fah_dir/index.html - ln -s $r6_fah_dir /data/srv/httpd/htdocs/foldingathome - /sbin/add_service.sh fah -} - -pre_remove() { - sv stop fah - /sbin/remove_service.sh fah -} - diff --git a/abs/extra/community/foldingathome/run b/abs/extra/community/foldingathome/run deleted file mode 100644 index cd4a072..0000000 --- a/abs/extra/community/foldingathome/run +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions -stat_runit "Starting folding@home" - -FOLDING_DIR=/myth/foldingathome/$(hostname) - -if [ -d $FOLDING_DIR ] ; then - cd $FOLDING_DIR - # Ensure that the client configuration file has the same details as /etc/systemconfig - - source /etc/systemconfig - - if [ -n "$foldingusername" ] ; then - sed -i 's/username=.*$/username='$foldingusername'/g' $FOLDING_DIR/client.cfg - fi - - if [ -n "$foldingworksize" ] ; then - sed -i 's/bigpackets=.*$/bigpackets='$foldingworksize'/g' $FOLDING_DIR/client.cfg - fi - - # No need to direct output to a log file becase a log file - # will automatically be placed in $FOLDING_DIR - exec /usr/bin/fah6 &> /dev/null < /dev/null -fi diff --git a/abs/extra/community/fuzemux/PKGBUILD b/abs/extra/community/fuzemux/PKGBUILD deleted file mode 100644 index aa542a5..0000000 --- a/abs/extra/community/fuzemux/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Michael Hanson <hansonorders@verizon.net> -# Maintainer: Michael Hanson <hansonorders@verizon.net> -pkgname=fuzemux -pkgver=0.1.2 -pkgrel=1 -pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player" -arch=('i686' 'x86_64') -url="http://code.google.com/p/fuzemux" -license=('cc-by-sa-3.0') -source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}-fixed.tar.gz") -provides=('fuzemux') -replaces=('fuzemux-svn') -install=fuzemux.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install -} -md5sums=('6c7323e9b98620b39644e4d652b3f8ad') diff --git a/abs/extra/community/fuzemux/fuzemux.install b/abs/extra/community/fuzemux/fuzemux.install deleted file mode 100644 index 877ec1b..0000000 --- a/abs/extra/community/fuzemux/fuzemux.install +++ /dev/null @@ -1,5 +0,0 @@ -post_install() { - echo ">>>" - echo ">>> A user job script is supplied at /usr/LH/bin/myth2fuze" - echo ">>>" -} diff --git a/abs/extra/community/gnash/PKGBUILD b/abs/extra/community/gnash/PKGBUILD deleted file mode 100644 index daed440..0000000 --- a/abs/extra/community/gnash/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgbase=gnash -pkgname=(gnash-common gnash-gtk) -pkgver=0.8.8 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -makedepends=(curl giflib boost-libs libldap sdl agg libjpeg libpng libtool - speex fontconfig libva ffmpeg libxinerama - gstreamer0.10-base gstreamer0.10-ffmpeg - gtk2 libldap - pkgconfig boost) -options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2) -md5sums=('ce57f66e222f7eb1adf7f7b4a1274612') - -build() { - cd "$srcdir/gnash-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-plugins-install=system \ - --with-npapi-plugindir=/usr/lib/mozilla/plugins \ - --enable-gui=sdl,gtk \ - --enable-renderer=agg \ - --enable-media=gst,ffmpeg \ - --enable-hwaccel=vaapi - - make -} - -package_gnash-common() { - pkgdesc="A GNU Flash movie player" - depends=(curl giflib boost-libs libldap ffmpeg sdl agg libjpeg libpng - speex fontconfig libva libxinerama - gstreamer0.10-base gstreamer0.10-ffmpeg) - backup=(etc/gnashrc etc/gnashpluginrc) - - cd "$srcdir/gnash-$pkgver" - - make DESTDIR="$pkgdir" install - - mv "$pkgdir/usr/bin/gtk-gnash" "$srcdir" -} - -package_gnash-gtk() { - pkgdesc="A GNU Flash movie player" - depends=("gnash-common=$pkgver" gtk2 libldap) - - cd "$srcdir/gnash-$pkgver" - - make DESTDIR="$pkgdir" install-plugin - - install -D "$srcdir/gtk-gnash" "$pkgdir/usr/bin/gtk-gnash" -} diff --git a/abs/extra/community/gpac/PKGBUILD b/abs/extra/community/gpac/PKGBUILD deleted file mode 100644 index 69717e2..0000000 --- a/abs/extra/community/gpac/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: niQo -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gpac -pkgver=0.4.5 -pkgrel=7 -pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" -arch=('i686' 'x86_64') -url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \ - 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') -license=('LGPL') -options=('!makeflags') # Multiple build jobs aren't handled correctly -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - libpng14-infopp-null.patch) -md5sums=('755e8c438a48ebdb13525dd491f5b0d1' - '14d6483c9eb84434aea68596f243e0ca') - -build() { - cd ${srcdir}/${pkgname} - chmod +x configure - sed -i 's|--warn-common||' configure - sed -i 's#osmozilla##g' applications/Makefile - sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile - sed -i 's#ldconfig || true##g' Makefile - - #FS#14506 - sed -i 's#lib64#lib#g' configure - patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch - - # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined - # symbol: XvQueryExtension" with our LDFLAGS :\ - unset LDFLAGS - - ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make -} - -package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install install-lib -} diff --git a/abs/extra/community/gpac/libpng14-infopp-null.patch b/abs/extra/community/gpac/libpng14-infopp-null.patch deleted file mode 100644 index b024565..0000000 --- a/abs/extra/community/gpac/libpng14-infopp-null.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c ---- gpac.orig/src/media_tools/img.c 2010-01-24 19:03:28.000000000 +0200 -+++ gpac/src/media_tools/img.c 2010-01-24 19:04:07.000000000 +0200 -@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi - /* Allocate/initialize the image information data. REQUIRED */ - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) { -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - return GF_IO_ERR; - } - diff --git a/abs/extra/community/gstreamer0.10-base/PKGBUILD b/abs/extra/community/gstreamer0.10-base/PKGBUILD index 8b115a1..5bfea48 100644 --- a/abs/extra/community/gstreamer0.10-base/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-base/PKGBUILD @@ -1,46 +1,53 @@ -# $Id: PKGBUILD 87769 2010-08-18 09:20:05Z jgc $ +# $Id: PKGBUILD 153257 2012-03-12 15:48:41Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') -pkgver=0.10.30 +pkgver=0.10.36 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1' 'udev>=151' 'gobject-introspection') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2) -sha256sums=('63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7') +source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) +sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental --disable-gnome_vfs \ --with-package-name="GStreamer Base Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" || return 1 + --with-package-origin="http://www.archlinux.org/" - make || return 1 - sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile || return 1 + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-base-${pkgver}" + make check } package_gstreamer0.10-base() { pkgdesc="GStreamer Multimedia Framework Base plugin libraries" - depends=('gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'udev>=151') + depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') cd "${srcdir}/gst-plugins-base-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } package_gstreamer0.10-base-plugins() { pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)" - depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1') + depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') groups=('gstreamer0.10-plugins') cd "${srcdir}/gst-plugins-base-${pkgver}" - make -C gst-libs DESTDIR="${pkgdir}" install || return 1 - make -C ext DESTDIR="${pkgdir}" install || return 1 - make -C gst-libs DESTDIR="${pkgdir}" uninstall || return 1 + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall } diff --git a/abs/extra/community/gstreamer0.10-base/__changelog b/abs/extra/community/gstreamer0.10-base/__changelog new file mode 100644 index 0000000..05c3a3b --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/__changelog @@ -0,0 +1 @@ +removed jack and libpulse diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD index 7922430..e6a0dc3 100644 --- a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 72240 2010-03-13 20:27:01Z ibiru $ +# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-ffmpeg -pkgver=0.10.10 +pkgver=0.10.13 pkgrel=1 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64') license=('GPL') -depends=('gstreamer0.10-base>=0.10.30' 'bzip2') -makedepends=('pkgconfig') +depends=('gstreamer0.10-base' 'bzip2') +makedepends=('pkgconfig' 'yasm' 'sdl') url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') -source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2) -sha256sums=('697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94') +options=('!libtool') +source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2 cmp_error.patch) build() { cd "${srcdir}/gst-ffmpeg-${pkgver}" + patch -Np1 < $srcdir/cmp_error.patch unset CFLAGS unset CXXFLAGS - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" + make } + package() { cd "${srcdir}/gst-ffmpeg-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - rm -f ${pkgdir}/usr/lib/gstreamer-0.10/*.{l,}a + + make DESTDIR="${pkgdir}" install } +md5sums=('7f5beacaf1312db2db30a026b36888c4' + 'eebcd022f3057c65fb3d0320831af6fe') diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch b/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch new file mode 100644 index 0000000..602a57f --- /dev/null +++ b/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch @@ -0,0 +1,39 @@ +=================================================================== +--- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 ++++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 +@@ -398,7 +398,7 @@ + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +@@ -446,7 +446,7 @@ + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ + : "memory"\ + );\ + tmp += 4;\ +@@ -823,7 +823,7 @@ + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +@@ -878,7 +878,7 @@ + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" diff --git a/abs/extra/community/gstreamer0.10-good/PKGBUILD b/abs/extra/community/gstreamer0.10-good/PKGBUILD index a77d52d..1f3b841 100644 --- a/abs/extra/community/gstreamer0.10-good/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-good/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 87774 2010-08-18 09:32:26Z jgc $ +# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.24 +pkgver=0.10.31 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.30' 'libavc1394>=0.5.3-3' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-6' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.1' 'wavpack>=4.60.1' 'taglib>=1.6.3' 'libsoup-gnome>=2.30.1' 'libv4l>=0.6.4' 'libcaca>=0.99.beta17' 'bzip2>=1.0.5' 'gtk2>=2.20.1') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'udev') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) -sha256sums=('f274aac9c5b8efc66833c33cfad353209c785ac111465b37146680ee0de2d0be') +source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) +sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') build() { cd "${srcdir}/gst-plugins-good-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --disable-schemas-install \ --disable-hal \ + --disable-esd \ + --disable-pusle \ + --disable-jack \ --with-package-name="GStreamer Good Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" @@ -26,10 +31,14 @@ build() { sed -e 's/gst sys ext/gst/' -i Makefile } +_check() { + cd "${srcdir}/gst-plugins-good-${pkgver}" + make check +} + package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.30' 'bzip2>=1.0.5') + depends=('gstreamer0.10-base>=0.10.34' 'bzip2') pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - conflicts=('gstreamer0.10-bad<=0.10.17') cd "${srcdir}/gst-plugins-good-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install @@ -37,16 +46,16 @@ package_gstreamer0.10-good() { } package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-6' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.1' 'wavpack>=4.60.1' 'taglib>=1.6.3' 'libsoup-gnome>=2.30.1' 'libv4l>=0.6.3' 'libcaca>=0.99.beta17' 'libpng>=1.4.1' 'libjpeg>=8.0.1') + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'udev') pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup') - conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup') + replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') + conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') install=gstreamer0.10-good-plugins.install cd "${srcdir}/gst-plugins-good-${pkgver}" - make -C sys DESTDIR="${pkgdir}" install || return 1 + make -C sys DESTDIR="${pkgdir}" install make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" || return 1 + install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" } diff --git a/abs/extra/community/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/abs/extra/community/gstreamer0.10-good/gstreamer0.10-good-plugins.install index bcb0039..e343bee 100644 --- a/abs/extra/community/gstreamer0.10-good/gstreamer0.10-good-plugins.install +++ b/abs/extra/community/gstreamer0.10-good/gstreamer0.10-good-plugins.install @@ -6,12 +6,12 @@ post_install() { pre_upgrade() { if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - pre_remove $1 + pre_remove fi } post_upgrade() { - post_install $1 + post_install } pre_remove() { diff --git a/abs/extra/community/gstreamer0.10-python/PKGBUILD b/abs/extra/community/gstreamer0.10-python/PKGBUILD index c9cb0db..2af9448 100644 --- a/abs/extra/community/gstreamer0.10-python/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-python/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 94427 2010-10-07 08:56:26Z remy $ +# $Id: PKGBUILD 147133 2012-01-22 11:30:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-python -pkgver=0.10.18 -pkgrel=3 +pkgver=0.10.22 +pkgrel=1 pkgdesc="Python bindings for GStreamer 0.10" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.28') +depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.32') makedepends=('pkgconfig') options=('!libtool') source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2) -sha256sums=('21a6a13736bd4c2cdcbde7d9c2791f1e47085d161eda84f8ee901bb744ddb897') +md5sums=('937152fe896241f827689f4b53e79b22') build() { cd "${srcdir}/gst-python-${pkgver}" + export PYTHON=python2 sed -i -e 's%^#!.*env python$%#!/usr/bin/env python2%' examples/* gst/extend/*.py ./configure --prefix=/usr make diff --git a/abs/extra/community/gstreamer0.10/PKGBUILD b/abs/extra/community/gstreamer0.10/PKGBUILD index 0a52614..07299a4 100644 --- a/abs/extra/community/gstreamer0.10/PKGBUILD +++ b/abs/extra/community/gstreamer0.10/PKGBUILD @@ -1,32 +1,40 @@ -# $Id: PKGBUILD 87764 2010-08-18 09:05:27Z jgc $ +# $Id: PKGBUILD 153252 2012-03-12 14:53:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 -pkgver=0.10.30 +pkgver=0.10.36 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('libxml2>=2.7.7' 'glib2>=2.24.1') +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2) -sha256sums=('e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a') +source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) +md5sums=('15389c73e091b1dda915279c388b9cb2') build() { cd "${srcdir}/gstreamer-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" + --with-package-origin="http://www.archlinux.org/" \ + --enable-gtk-doc --disable-static make } + +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + package() { cd "${srcdir}/gstreamer-${pkgver}" make DESTDIR="${pkgdir}" install - cd "${pkgdir}/usr/bin" #Remove unversioned gst-* binaries to get rid of conflicts + cd "${pkgdir}/usr/bin" for bins in `ls *-0.10`; do rm -f ${bins/-0.10/} done diff --git a/abs/extra/community/gtkglext/PKGBUILD b/abs/extra/community/gtkglext/PKGBUILD deleted file mode 100644 index a310af6..0000000 --- a/abs/extra/community/gtkglext/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 9958 2008-08-21 02:56:50Z eric $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=gtkglext -pkgver=1.2.0 -pkgrel=1 -pkgdesc="opengl extensions for gtk2" -arch=('i686' 'x86_64') -url="http://gtkglext.sourceforge.net/" -depends=('gtk2' 'pango') -makedepends=('gcc>=4.0.3') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/gtkglext/$pkgname-$pkgver.tar.bz2") # $pkgname-$pkgver-pangox.patch) -md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4') - -build() { - cd $startdir/src/$pkgname-$pkgver - # fix "undefined reference to `pango_x_font*" trouble - #cat $startdir/src/$pkgname-$pkgver-pangox.patch | patch -p1 || return 1 - autoconf --force - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install -} diff --git a/abs/extra/community/gtkglext/gtkglext-1.0.6-pangox.patch b/abs/extra/community/gtkglext/gtkglext-1.0.6-pangox.patch deleted file mode 100644 index 8cd589e..0000000 --- a/abs/extra/community/gtkglext/gtkglext-1.0.6-pangox.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- gtkglext-1.0.6/configure.in 2005-09-10 16:45:06.000000000 +0200 -+++ gtkglext-1.0.6.az/configure.in 2005-09-10 16:46:01.000000000 +0200 -@@ -59,6 +59,10 @@ - m4_define([pango_pkg], [pango]) - m4_define([pango_required_version], [1.0.0]) - -+# Pangox -+m4_define([pangox_pkg], [pangox]) -+m4_define([pangox_required_version], [1.0.0]) -+ - # PangoFT2 - m4_define([pangoft2_pkg], [pangoft2]) - m4_define([pangoft2_required_version], [1.0.0]) -@@ -345,6 +349,7 @@ - gtk_pkg >= gtk_required_version \ - gdk_pkg >= gdk_required_version \ - pango_pkg >= pango_required_version \ -+pangox_pkg >= pango_required_version \ - gmodule_pkg >= gmodule_required_version \ - ]) - -@@ -789,7 +794,7 @@ - # CFLAGS and LIBS - ################################################## - --GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg" -+GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg" - GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS" - GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS" - GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`" diff --git a/abs/extra/community/ircii/PKGBUILD b/abs/extra/community/ircii/PKGBUILD deleted file mode 100644 index 2eb8ad6..0000000 --- a/abs/extra/community/ircii/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -# Contributor: Mateusz Herych <heniekk@gmail.com> -pkgname=ircii -pkgver=20060725 -pkgrel=1 -pkgdesc="IRC Client" -arch=('i686') -url="http://www.eterna.com.au/ircii/" -license=('BSD') -source=(ftp://ircii.warped.com/pub/ircII/ircii-$pkgver.tar.bz2) -md5sums=('280ae54367627591c1c43c765eb9d59b') -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 -} diff --git a/abs/extra/community/js/PKGBUILD b/abs/extra/community/js/PKGBUILD deleted file mode 100644 index d55295c..0000000 --- a/abs/extra/community/js/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -pkgname=js -pkgver=1.7.0 -pkgrel=1 -epoch=1 -pkgdesc="Mozilla's C implementation of JavaScript." -arch=("i686" "x86_64") -url="http://www.mozilla.org/js/spidermonkey/" -license=('MPL' 'GPL' 'LGPL') -depends=('nspr') -options=('!makeflags') -replaces=('spidermonkey') -conflicts=('spidermonkey') -source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \ - "spidermonkey-1.7-threadsafe.patch" "spidermonkey-Makefile.patch") -md5sums=('5571134c3863686b623ebe4e6b1f6fe6' - 'b2ef9be017b6aa1857354b5223975a4f' - '161d4c0f2c604d15cba29dab60b1f7a7') - -build() { - cd "$srcdir/js/src" - patch -p0 < "$srcdir/spidermonkey-Makefile.patch" || return 1 - sed -i 's|include|include/js|' rules.mk || return 1 - # fix for the lib location - [ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1) - # patch Makefile for threadsafe support with native nspr - patch -p2 -i "$srcdir/spidermonkey-1.7-threadsafe.patch" || return 1 - # FS#16673 - export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8" - # build - threadsafe - make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST="$pkgdir/usr" all export || return 1 -} diff --git a/abs/extra/community/js/spidermonkey-1.7-threadsafe.patch b/abs/extra/community/js/spidermonkey-1.7-threadsafe.patch deleted file mode 100644 index da6c78d..0000000 --- a/abs/extra/community/js/spidermonkey-1.7-threadsafe.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- js/src/Makefile.ref.orig 2008-05-28 19:51:32.000000000 -0400 -+++ js/src/Makefile.ref 2008-05-28 19:52:17.000000000 -0400 -@@ -63,11 +63,11 @@ - - ifdef JS_THREADSAFE - DEFINES += -DJS_THREADSAFE --INCLUDES += -I$(DIST)/include/nspr -+INCLUDES += -I/usr/include/nspr - ifdef USE_MSVC - OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib - else --OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX) -+OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr${NSPR_LIBSUFFIX} - endif - endif - diff --git a/abs/extra/community/js/spidermonkey-Makefile.patch b/abs/extra/community/js/spidermonkey-Makefile.patch deleted file mode 100644 index abf1f31..0000000 --- a/abs/extra/community/js/spidermonkey-Makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ -*** Makefile.ref.orig 2009-02-16 09:56:29.000000000 -0600 ---- Makefile.ref 2009-02-16 09:58:59.000000000 -0600 -*************** -*** 169,184 **** ---- 169,185 ---- - jstypes.h \ - jsprvtd.h \ - jspubtd.h \ - jsregexp.h \ - jsscan.h \ - jsscope.h \ - jsscript.h \ - jsstr.h \ -+ jsutil.h \ - jsxdrapi.h \ - jsxml.h \ - $(NULL) - - API_HFILES = \ - jsapi.h \ - jsdbgapi.h \ - $(NULL) diff --git a/abs/extra/community/libcec/PKGBUILD b/abs/extra/community/libcec/PKGBUILD deleted file mode 100644 index e4b9821..0000000 --- a/abs/extra/community/libcec/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> -# Contributor: Philippe Cherel <philippe.cherel@mayenne.org> - -pkgname=libcec -pkgver=1.5.2 -pkgrel=1 -pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" -arch=('i686' 'x86_64') -url="https://github.com/Pulse-Eight/libcec" -license=('GPL') -depends=('udev') -source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-00a02d1 -sha256sums=('93990024d01da7c66e2c78ca23919fd83137f6b944a2dc82fb5cc6d58a46742f') -options=(!libtool) - -build() { - mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" - autoreconf -vif - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/abs/extra/community/libdnet/PKGBUILD b/abs/extra/community/libdnet/PKGBUILD deleted file mode 100644 index 70cf6e4..0000000 --- a/abs/extra/community/libdnet/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 27071 2010-09-17 12:26:08Z schuay $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: James Fryman <jfryman@gmail.com> - -pkgname=libdnet -pkgver=1.12 -pkgrel=5 -pkgdesc="A simplified, portable interface to several low-level networking routines" -arch=(i686 x86_64) -makedepends=(python2) -optdepends=(python2) -install=(libdnet.install) -license=("BSD") -url="http://code.google.com/p/libdnet/" -options=('!libtool') -source=(http://libdnet.googlecode.com/files/libdnet-$pkgver.tgz) -md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9') - -build() { - mkdir -p $pkgdir/usr/bin - - [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC - - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make && make DESTDIR=$pkgdir install - - cd python && \ - python2 setup.py install --root=$pkgdir - - install -D -m0644 ../LICENSE $pkgdir/usr/share/licenses/libdnet/license - mv $pkgdir/usr/man $startdir/pkg/usr/share/ -} diff --git a/abs/extra/community/libdnet/libdnet.install b/abs/extra/community/libdnet/libdnet.install deleted file mode 100644 index cb8146f..0000000 --- a/abs/extra/community/libdnet/libdnet.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - /sbin/ldconfig -} diff --git a/abs/extra/community/libelf/PKGBUILD b/abs/extra/community/libelf/PKGBUILD deleted file mode 100644 index 18bd118..0000000 --- a/abs/extra/community/libelf/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 20525 2008-12-05 13:31:11Z jgc $ -# Maintainer: arjan <arjan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=libelf -pkgver=0.8.13 -pkgrel=1 -pkgdesc="libelf is a free ELF object file access library" -arch=('i686' 'x86_64') -license=('GPL') -source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz) -url="http://directory.fsf.org/libs/misc/libelf.html" -depends=('glibc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-shared \ - --enable-gnu-names --enable-compat || return 1 - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install || return 1 -} -md5sums=('4136d7b4c04df68b686570afa26988ac') diff --git a/abs/extra/community/libmodplug/PKGBUILD b/abs/extra/community/libmodplug/PKGBUILD deleted file mode 100644 index 3065783..0000000 --- a/abs/extra/community/libmodplug/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> - -pkgname=libmodplug -pkgver=0.8.8.3 -pkgrel=1 -pkgdesc="A MOD playing library" -arch=('i686' 'x86_64') -url="http://modplug-xmms.sourceforge.net/" -license=('custom') -depends=('gcc-libs') -options=('!libtool') -source=("http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz") -md5sums=('8a9c713f0f56894163ddc61f9a0d1f71') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/abs/extra/community/libnetfilter_queue/PKGBUILD b/abs/extra/community/libnetfilter_queue/PKGBUILD deleted file mode 100644 index 0240b96..0000000 --- a/abs/extra/community/libnetfilter_queue/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> -# Maintainer: Filip Wojciechowski, filip at loka dot pl - -pkgname=libnetfilter_queue -pkgver=1.0.0 -pkgrel=1 -pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter" -arch=('i686' 'x86_64') -url="http://www.netfilter.org/projects/libnetfilter_queue/index.html" -license=('GPL') -depends=(libnfnetlink) -makedepends=(pkgconfig) -options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('af6a9ea350f63a13609bc3b47b5c395c') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install -} diff --git a/abs/extra/community/libnfnetlink/PKGBUILD b/abs/extra/community/libnfnetlink/PKGBUILD deleted file mode 100644 index 7577f65..0000000 --- a/abs/extra/community/libnfnetlink/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> -# Maintainer: Filip Wojciechowski, filip at loka dot pl -pkgname=libnfnetlink -pkgver=1.0.0 -pkgrel=1 -pkgdesc="low-level library for netfilter related kernel/userspace communication" -depends=(glibc) -url="http://www.netfilter.org/projects/libnfnetlink/index.html" -license=('GPL') -arch=('i686' 'x86_64') -options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('016fdec8389242615024c529acc1adb8') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/extra/community/libnfs/PKGBUILD b/abs/extra/community/libnfs/PKGBUILD deleted file mode 100644 index 687a416..0000000 --- a/abs/extra/community/libnfs/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> - -pkgname=libnfs -pkgver=1.3.0 -pkgrel=1 -pkgdesc="client library for accessing NFS shares" -arch=('i686' 'x86_64') -url="https://github.com/sahlberg/libnfs" -license=('GPL') -depends=('glibc') -source=("$pkgname-$pkgver.tar.gz::https://github.com/sahlberg/libnfs/tarball/$pkgname-$pkgver") -_srcfolder=sahlberg-libnfs-47e5a2c -sha256sums=('0acda3029db699c3978684080843f71d222ad35b30a2ff0d220d144e98854948') -options=(!libtool) - -build() { - mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" - - autoreconf -vif - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/abs/extra/community/libshairport/PKGBUILD b/abs/extra/community/libshairport/PKGBUILD deleted file mode 100644 index 293e1cc..0000000 --- a/abs/extra/community/libshairport/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> - -pkgname=libshairport -_developer='amejia1' -_version=1.2.1 -_commithash='aeb4987' -pkgver=${_version} -pkgrel=2 -pkgdesc="emulates an AirPort Express" -arch=('i686' 'x86_64') -url='https://github.com/amejia1/libshairport' -license=('GPL') -depends=('openssl' 'libao') -source=("$pkgname-$pkgver.tar.gz::https://github.com/amejia1/libshairport/tarball/$_commithash") -sha256sums=('003c65f56123a7cb090b2d7249f0facbef668f7db6048f4b458713892a6911ca') -options=(!libtool) - -_srcfolder=$_developer-$pkgname-$_commithash - -build() { - mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" - autoreconf -vif - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/abs/extra/community/libstdc++5/PKGBUILD b/abs/extra/community/libstdc++5/PKGBUILD deleted file mode 100644 index 00bee17..0000000 --- a/abs/extra/community/libstdc++5/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libstdc++5 -pkgver=3.3.6 -pkgrel=2 -pkgdesc="GNU Standard C++ library version 3" -arch=(i686 x86_64) -url="http://gcc.gnu.org" -depends=('gcc-libs') -makedepends=('binutils' 'gcc') -options=(!libtool) -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 gcc-3.4.3-no_multilib_amd64.patch) -md5sums=(18c52e6fb8966b7700665dca289d077f 6b3d00b8d079805be1b895f7f6ce47a0 \ - 088e0807e677010cafe4e590e8711be1) - -build(){ - export MAKEFLAGS="-j1" - export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||') - export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||') - cd ${startdir}/src/gcc-${pkgver} - - if [ "$CARCH" = "x86_64" ]; then - patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1 - fi - - # No fixincludes - sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - mkdir ../gcc-build - cd ../gcc-build - ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \ - --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \ - --disable-multilib --libdir=/usr/lib - make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || return 1 - make DESTDIR=${startdir}/pkg install-target-libstdc++-v3 || return 1 - - # Remove includefiles and libs provided by gcc - rm -rf ${startdir}/pkg/usr/{include,share/locale} - rm -f ${startdir}/pkg/usr/lib/*.a - rm -f ${startdir}/pkg/usr/lib/libstdc++.so -} diff --git a/abs/extra/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch b/abs/extra/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch deleted file mode 100644 index dce10d4..0000000 --- a/abs/extra/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc/config/i386/t-linux64.orig 2003-06-28 00:19:59.000000000 +0000 -+++ gcc/config/i386/t-linux64 2003-06-28 00:20:07.000000000 +0000 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 ../lib -+MULTILIB_OSDIRNAMES = . ../lib - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/abs/extra/community/libtorrent-rasterbar/PKGBUILD b/abs/extra/community/libtorrent-rasterbar/PKGBUILD index dc719f9..ea71f07 100644 --- a/abs/extra/community/libtorrent-rasterbar/PKGBUILD +++ b/abs/extra/community/libtorrent-rasterbar/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 100316 2010-11-22 16:29:19Z ibiru $ +# $Id: PKGBUILD 163820 2012-07-20 21:36:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Andrea Scarpino <bash.lnx@gmail.com> pkgname=libtorrent-rasterbar -pkgver=0.15.4 -pkgrel=3 +pkgver=0.16.2 +pkgrel=1 +epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64') license=('custom') -depends=('boost-libs>=1.44.0' 'python2') +depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') -source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('58750b3a246d056335745f9e805bb949') +options=('!libtool' '!emptydirs') +source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha1sums=('04da641d21d0867fc103f4f57ffd41b3fce19ead') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-python-binding \ - --with-boost-filesystem=mt \ - --with-boost-thread=mt + cd $pkgname-$pkgver + PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \ + --enable-python-binding \ + --with-libgeoip=system make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } - diff --git a/abs/extra/community/libtorrent-rasterbar/__changelog b/abs/extra/community/libtorrent-rasterbar/__changelog deleted file mode 100644 index 6528095..0000000 --- a/abs/extra/community/libtorrent-rasterbar/__changelog +++ /dev/null @@ -1 +0,0 @@ -change boost-lib dep to >=1.44 diff --git a/abs/extra/community/lua/PKGBUILD b/abs/extra/community/lua/PKGBUILD deleted file mode 100644 index 9b30c5b..0000000 --- a/abs/extra/community/lua/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 86292 2010-07-28 06:43:46Z juergen $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=lua -pkgver=5.1.4 -pkgrel=6 -pkgdesc="A powerful light-weight programming language designed for extending applications." -arch=('i686' 'x86_64') -url="http://www.lua.org/" -depends=('readline' 'ncurses') -license=('MIT') -options=('!makeflags') -source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz http://www.lua.org/ftp/patch-lua-5.1.4-2 lua-arch.patch lua-5.1-cflags.diff) -md5sums=('d0870f2de55d59c1c8419f36e8fac150' '1239310e0c4a581c7831e596f95cc6cd'\ - '6c5953f63904bf20a0183cdab05b80de' '249582bf1fd861ccf492d2c35a9fe732') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/lua-arch.patch" - patch -i ${srcdir}/patch-lua-5.1.4-2 -d src -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff - [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ - linux install || return 1 - install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" - - # Install the documentation - mkdir -p "${pkgdir}/usr/share/doc/lua" - cp -R doc/* "${pkgdir}/usr/share/doc/lua" -} diff --git a/abs/extra/community/lua/lua-5.1-cflags.diff b/abs/extra/community/lua/lua-5.1-cflags.diff deleted file mode 100644 index db658ae..0000000 --- a/abs/extra/community/lua/lua-5.1-cflags.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ---- lua-5.1.orig/src/Makefile 2006-02-16 16:45:09.000000000 +0100 -+++ lua-5.1/src/Makefile 2006-03-01 14:55:29.000000000 +0100 -@@ -8,7 +8,8 @@ - PLAT= none - - CC= gcc --CFLAGS= -O2 -Wall $(MYCFLAGS) -+CFLAGS ?= -O2 -Wall -+CFLAGS += $(MYCFLAGS) - AR= ar rcu - RANLIB= ranlib - RM= rm -f diff --git a/abs/extra/community/lua/lua-arch.patch b/abs/extra/community/lua/lua-arch.patch deleted file mode 100644 index cc1f3ce..0000000 --- a/abs/extra/community/lua/lua-arch.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc ---- lua-5.1.orig/etc/lua.pc 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/etc/lua.pc 2006-03-21 11:52:05.000000000 +0100 -@@ -6,7 +6,7 @@ - V= 5.1 - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= /usr - INSTALL_BIN= ${prefix}/bin - INSTALL_INC= ${prefix}/include - INSTALL_LIB= ${prefix}/lib -diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ---- lua-5.1.orig/src/Makefile 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/src/Makefile 2006-03-21 11:52:09.000000000 +0100 -@@ -23,6 +23,7 @@ - PLATS= aix ansi bsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -51,6 +52,10 @@ - $(AR) $@ $? - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS) -+ ln -s $@.5.1 $@ -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h ---- lua-5.1.orig/src/luaconf.h 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/src/luaconf.h 2006-03-21 11:52:05.000000000 +0100 -@@ -82,7 +82,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ diff --git a/abs/extra/community/mediatomb/PKGBUILD b/abs/extra/community/mediatomb/PKGBUILD deleted file mode 100644 index 606314a..0000000 --- a/abs/extra/community/mediatomb/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id$ -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Nikhil Bysani <nikron@gmail.com> -# Contributor: Mika Hynnä <igheax@gmail.com> -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> - -pkgname=mediatomb -pkgver=0.12.1 -pkgrel=5 -pkgdesc="Free UPnP/DLNA media server" -arch=('i686' 'x86_64') -url="http://mediatomb.cc/" -license=('GPL') -depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib') -backup=('etc/conf.d/mediatomb') -install=mediatomb.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'mediatomb.rc' - 'mediatomb.conf' - 'gcc46.patch' - 'tonewjs.patch') -md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' - 'aa1191ec508d8bd4b3b9a5fe48efc079' - 'bec297e4178332a26b42bbde873b94cd' - '0ae34c0d73b76e3d215887834c3c08cf' - 'd9e02a9956eecf5ff645bddf6dac0331') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/gcc46.patch - patch -Np1 -i $srcdir/tonewjs.patch - - ./configure --prefix=/usr \ - --disable-mysql \ - --enable-libmagic \ - --enable-libjs \ - --enable-ffmpeg - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" - install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" - install -d "$pkgdir/var/lib/mediatomb" -} diff --git a/abs/extra/community/mediatomb/gcc46.patch b/abs/extra/community/mediatomb/gcc46.patch deleted file mode 100644 index 0f4fe49..0000000 --- a/abs/extra/community/mediatomb/gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/zmm/object.h -+++ b/src/zmm/object.h -@@ -33,6 +33,7 @@ - #define __ZMM_OBJECT_H__ - - #include <new> // for size_t -+#include <cstddef> - #include "atomic.h" - - namespace zmm diff --git a/abs/extra/community/mediatomb/mediatomb.conf b/abs/extra/community/mediatomb/mediatomb.conf deleted file mode 100644 index 798018d..0000000 --- a/abs/extra/community/mediatomb/mediatomb.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Parameters to be passed to mediatomb -# - -# Port to listen on -MT_PORT='50500' - -# User and group to run as -MT_USER='nobody' -MT_GROUP='nobody' - -# Location of the PID file -MT_PIDFILE='/var/run/mediatomb.pid' - -# Location of the log file -MT_LOGFILE='/var/log/mediatomb.log' - -# Location of the config file/database -MT_HOME='/var/lib/mediatomb' -MT_CFGDIR='.mediatomb' - -# User defined command line options -MT_OPTIONS='' diff --git a/abs/extra/community/mediatomb/mediatomb.install b/abs/extra/community/mediatomb/mediatomb.install deleted file mode 100644 index 56f6ef9..0000000 --- a/abs/extra/community/mediatomb/mediatomb.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo 'Warning: the MediaTomb web interface exposes your filesystem to the network' - echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file' -} - -post_upgrade() { - # TODO: disable next update - post_install -} diff --git a/abs/extra/community/mediatomb/mediatomb.rc b/abs/extra/community/mediatomb/mediatomb.rc deleted file mode 100644 index 7b93012..0000000 --- a/abs/extra/community/mediatomb/mediatomb.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/mediatomb - -MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \ - -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS" - -case "$1" in - start) - stat_busy "Starting Mediatomb UPnP Media Server" - - chown "$MT_USER:$MT_GROUP" "$MT_HOME" - - if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then - rm -f "$MT_PIDFILE" - fi - - PID="$(cat "$MT_PIDFILE" 2> /dev/null)" - - if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then - add_daemon mediatomb - stat_done - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping Mediatomb UPnP Media Server" - - PID="$(cat "$MT_PIDFILE" 2> /dev/null)" - - if [ -n "$PID" ] && kill "$PID" &> /dev/null; then - rm -f "$MT_PIDFILE" - rm_daemon mediatomb - stat_done - else - stat_fail - fi - ;; - - restart) - "$0" stop - sleep 1 - "$0" start - ;; - - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/extra/community/mediatomb/tonewjs.patch b/abs/extra/community/mediatomb/tonewjs.patch deleted file mode 100644 index 1159685..0000000 --- a/abs/extra/community/mediatomb/tonewjs.patch +++ /dev/null @@ -1,564 +0,0 @@ -diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in ---- mediatomb-0.12.1-back/build/Makefile.in.tonewjs 2010-04-08 00:40:15.000000000 +0200 -+++ mediatomb-0.12.1-back/build/Makefile.in 2011-04-19 17:17:01.343509944 +0200 -@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = -fpermissive @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@ - DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@ -diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc ---- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs 2011-04-18 13:10:48.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/import_script.cc 2011-04-18 13:29:36.000000000 +0200 -@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime> - try - { - load(scriptPath); -- root = JS_NewScriptObject(cx, script); -- JS_AddNamedRoot(cx, &root, "ImportScript"); -+ root = JS_NewObject(cx, NULL, script, NULL); -+ JS_AddNamedObjectRoot(cx, &root, "ImportScript"); - } - catch (Exception ex) - { -@@ -117,7 +117,7 @@ ImportScript::~ImportScript() - #endif - - if (root) -- JS_RemoveRoot(cx, &root); -+ JS_RemoveObjectRoot(cx, &root); - - #ifdef JS_THREADSAFE - JS_EndRequest(cx); -diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc ---- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200 -@@ -49,7 +49,7 @@ using namespace zmm; - extern "C" { - - JSBool --js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_print(JSContext *cx, uintN argc, jsval *argv) - { - uintN i; - JSString *str; -@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u - if (!str) - return JS_TRUE; - argv[i] = STRING_TO_JSVAL(str); -- log_js("%s\n", JS_GetStringBytes(str)); -+ char * log_str = JS_EncodeString(cx, str); -+ log_js("%s\n", log_str); -+ JS_free(cx, log_str); - } - return JS_TRUE; - } - - JSBool --js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_copyObject(JSContext *cx, uintN argc, jsval *argv) - { - jsval arg; - JSObject *js_cds_obj; - JSObject *js_cds_clone_obj; - -- Script *self = (Script *)JS_GetPrivate(cx, obj); -+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); - - try - { -@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o - - self->cdsObject2jsObject(cds_obj, js_cds_clone_obj); - -- *rval = OBJECT_TO_JSVAL(js_cds_clone_obj); -+ JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj)); - - return JS_TRUE; - -@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o - } - - JSBool --js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_addCdsObject(JSContext *cx, uintN argc, jsval *argv) - { - try - { -@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject - Ref<StringConverter> p2i; - Ref<StringConverter> i2i; - -- Script *self = (Script *)JS_GetPrivate(cx, obj); -+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); - - if (self == NULL) - { -@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject - if (!str) - path = _("/"); - else -- path = JS_GetStringBytes(str); -+ path = JS_EncodeString(cx, str); - - JSString *cont = JS_ValueToString(cx, argv[2]); - if (cont) - { -- containerclass = JS_GetStringBytes(cont); -+ containerclass = JS_EncodeString(cx, cont); - if (!string_ok(containerclass) || containerclass == "undefined") - containerclass = nil; - } - - if (self->whoami() == S_PLAYLIST) -- js_orig_obj = self->getObjectProperty(obj, _("playlist")); -+ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist")); - else if (self->whoami() == S_IMPORT) -- js_orig_obj = self->getObjectProperty(obj, _("orig")); -+ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig")); - - if (js_orig_obj == NULL) - { -@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject - JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length()); - if (!str2) - return JS_TRUE; -- *rval = STRING_TO_JSVAL(str2); -- -+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); - return JS_TRUE; - } - catch (ServerShutdownException se) -@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject - return JS_TRUE; - } - --static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr) -+static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr) - { - try - { -@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS - { - str = JS_ValueToString(cx, argv[0]); - if (str) -- result = JS_GetStringBytes(str); -+ result = JS_EncodeString(cx, str); - } - - if (result != nil) -@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS - JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length()); - if (!str2) - return JS_TRUE; -- *rval = STRING_TO_JSVAL(str2); -+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); - } - } - catch (ServerShutdownException se) -@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS - } - - --JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, F2I); -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I); - } - --JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, M2I); --} -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); } - --JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, P2I); -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I); - } - --JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, J2I); -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I); - } - - } // extern "C" -diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h ---- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs 2010-03-25 15:58:05.000000000 +0100 -+++ mediatomb-0.12.1-back/src/scripting/js_functions.h 2011-04-18 13:59:29.000000000 +0200 -@@ -40,18 +40,18 @@ - extern "C" { - - /// \brief Log output. --JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_print(JSContext *cx, uintN argc, jsval *argv); - - /// \brief Adds an object to the database. --JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv); - - /// \brief Makes a copy of an CDS object. --JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv); - --JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); --JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); --JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); --JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv); -+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv); -+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv); -+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv); - - } // extern "C" - -diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc ---- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs 2011-04-18 13:34:14.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc 2011-04-18 13:51:59.000000000 +0200 -@@ -46,9 +46,9 @@ using namespace zmm; - extern "C" { - - static JSBool --js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_readln(JSContext *cx, uintN argc, jsval *argv) - { -- PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj); -+ PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); - - String line; - -@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, - - JSString *jsline = JS_NewStringCopyZ(cx, line.c_str()); - -- *rval = STRING_TO_JSVAL(jsline); -+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline)); - - return JS_TRUE; - } -@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri - - String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); - load(scriptPath); -- root = JS_NewScriptObject(cx, script); -- JS_AddNamedRoot(cx, &root, "PlaylistScript"); -+ root = JS_NewObject(cx, NULL, script, NULL); -+ JS_AddNamedObjectRoot(cx, &root, "PlaylistScript"); - } - catch (Exception ex) - { -@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr - #endif - - if (root) -- JS_RemoveRoot(cx, &root); -+ JS_RemoveObjectRoot(cx, &root); - - #ifdef JS_THREADSAFE - JS_EndRequest(cx); -diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc ---- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs 2011-04-18 13:53:07.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/script.cc 2011-04-19 18:26:34.460338804 +0200 -@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj - str = JS_ValueToString(cx, val); - if (! str) - return nil; -- return JS_GetStringBytes(str); -+ return JS_EncodeString(cx, str); - } - - int Script::getBoolProperty(JSObject *obj, String name) -@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function - try - { - common_script = _load(common_scr_path); -- common_root = JS_NewScriptObject(cx, common_script); -- JS_AddNamedRoot(cx, &common_root, "common-script"); -+ common_root = JS_NewObject(cx, NULL, common_script, NULL); -+ JS_AddNamedObjectRoot(cx, &common_root, "common-script"); - _execute(common_script); - } - catch (Exception e) - { - if (common_root) -- JS_RemoveRoot(cx, &common_root); -+ JS_RemoveObjectRoot(cx, &common_root); - - log_js("Unable to load %s: %s\n", common_scr_path.c_str(), - e.getMessage().c_str()); -@@ -460,7 +460,7 @@ Script::~Script() - JS_BeginRequest(cx); - #endif - if (common_root) -- JS_RemoveRoot(cx, &common_root); -+ JS_RemoveObjectRoot(cx, &common_root); - - /* - * scripts are unrooted and will be cleaned up by GC -@@ -504,11 +504,11 @@ void Script::initGlobalObject() - static JSClass global_class = - { - "global", /* name */ -- JSCLASS_HAS_PRIVATE, /* flags */ -+ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */ - JS_PropertyStub, /* add property */ - JS_PropertyStub, /* del property */ - JS_PropertyStub, /* get property */ -- JS_PropertyStub, /* set property */ -+ JS_StrictPropertyStub, /* set property */ - JS_EnumerateStandardClasses, /* enumerate */ - JS_ResolveStub, /* resolve */ - JS_ConvertStub, /* convert */ -@@ -517,7 +517,7 @@ void Script::initGlobalObject() - }; - - /* create the global object here */ -- glob = JS_NewObject(cx, &global_class, NULL, NULL); -+ glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL); - if (! glob) - throw _Exception(_("Scripting: could not initialize glboal class")); - -@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS - throw _Exception(_("Scripting: JS_DefineFunctions failed")); - } - --JSScript *Script::_load(zmm::String scriptPath) -+JSObject *Script::_load(zmm::String scriptPath) - { - if (glob == NULL) - initGlobalObject(); - -- JSScript *scr; -+ JSObject *scr; - - String scriptText = read_text_file(scriptPath); - -@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri - - void Script::load(zmm::String scriptPath) - { -- if (script) -- JS_DestroyScript(cx, script); -- - script = _load((scriptPath)); - } - - --void Script::_execute(JSScript *scr) -+void Script::_execute(JSObject *scr) - { - jsval ret_val; - -@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec - JSObject *js_meta = getObjectProperty(js, _("meta")); - if (js_meta) - { -- JS_AddNamedRoot(cx, &js_meta, "meta"); -+ JS_AddNamedObjectRoot(cx, &js_meta, "meta"); - /// \todo: only metadata enumerated in MT_KEYS is taken - for (int i = 0; i < M_MAX; i++) - { -@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec - } - } - } -- JS_RemoveRoot(cx, &js_meta); -+ JS_RemoveObjectRoot(cx, &js_meta); - } - - // stuff that has not been exported to js -diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h ---- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs 2011-04-18 12:56:14.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/script.h 2011-04-18 12:56:51.000000000 +0200 -@@ -66,8 +66,8 @@ public: - JSRuntime *rt; - JSContext *cx; - JSObject *glob; -- JSScript *script; -- JSScript *common_script; -+ JSObject *script; -+ JSObject *common_script; - - public: - Script(zmm::Ref<Runtime> runtime); -@@ -115,8 +115,8 @@ private: - JSObject *common_root; - - void initGlobalObject(); -- JSScript *_load(zmm::String scriptPath); -- void _execute(JSScript *scr); -+ JSObject *_load(zmm::String scriptPath); -+ void _execute(JSObject *scr); - zmm::Ref<StringConverter> _p2i; - zmm::Ref<StringConverter> _j2i; - zmm::Ref<StringConverter> _f2i; ---- mediatomb-0.12.1/configure.tonewjs 2011-07-04 20:20:00.290227110 +1200 -+++ mediatomb-0.12.1/configure 2011-07-04 20:20:28.186894644 +1200 -@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" - - else - -- LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS" -- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 --$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } --if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then -+ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS" -+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 -+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } -+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmozjs $LIBS" -+LIBS="-lmozjs185 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_mozjs_JS_NewObject=yes -+ ac_cv_lib_mozjs185_JS_NewObject=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mozjs_JS_NewObject=no -+ ac_cv_lib_mozjs185_JS_NewObject=no - fi - - rm -rf conftest.dSYM -@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 --$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } --if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 -+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } -+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then - -- JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs" -- MOZLIB=mozjs -+ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185" -+ MOZLIB=mozjs185 - - else - -@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" - else - - unset ac_cv_lib_smjs_JS_NewObject -- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 --$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } --if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 -+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } -+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmozjs $LIBS" -+LIBS="-lmozjs185 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_mozjs_JS_NewObject=yes -+ ac_cv_lib_mozjs185_JS_NewObject=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mozjs_JS_NewObject=no -+ ac_cv_lib_mozjs185_JS_NewObject=no - fi - - rm -rf conftest.dSYM -@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 --$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } --if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 -+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } -+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then - -- MOZLIB=mozjs -- JS_LIBS="-lmozjs" -+ MOZLIB=mozjs185 -+ JS_LIBS="-lmozjs185" - - else - -@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" - - else - -- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs" -- unset ac_cv_lib_mozjs_JS_NewObject -- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 --$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } --if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then -+ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185" -+ unset ac_cv_lib_mozjs185_JS_NewObject -+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 -+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } -+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmozjs $LIBS" -+LIBS="-lmozjs185 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_mozjs_JS_NewObject=yes -+ ac_cv_lib_mozjs185_JS_NewObject=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mozjs_JS_NewObject=no -+ ac_cv_lib_mozjs185_JS_NewObject=no - fi - - rm -rf conftest.dSYM -@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 --$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } --if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 -+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } -+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then - -- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs" -- MOZLIB=mozjs -+ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185" -+ MOZLIB=mozjs185 - - else - diff --git a/abs/extra/community/mmv/PKGBUILD b/abs/extra/community/mmv/PKGBUILD deleted file mode 100644 index 0ccec1b..0000000 --- a/abs/extra/community/mmv/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: blue_lizard lizard@blue.dyn-o-saur.com - -pkgname=mmv -pkgver=1.01b.orig -pkgrel=1 -pkgdesc="multiple move files" -depends=('glibc' 'sed') -conflicts=() -backup=() -source=(http://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz http://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b-14.diff.gz) -md5sums=('1b2135ab2f17bdfa9e08debbb3c46ad8' 'a69eff7501e63c0bd1fcd231bf6949f1') -url="http://linux.maruhn.com/sec/mmv.html" -license="GPL" -install=$pkgname.install -arch=('i686') - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../mmv_1.01b-14.diff - cat Makefile | sed -e "s/LDFLAGS.\s=-s -N/LDFLAGS =-s/g" > /tmp/Makefile - mv /tmp/Makefile ./ - make || return 1 - mkdir -p $startdir/pkg/usr/bin - mkdir -p $startdir/pkg/usr/man/man1 - make DESTDIR=$startdir/pkg install - chmod 644 $startdir/pkg/usr/man/man1/mmv.1 - cd $startdir/pkg/usr/bin - ln -s mmv mcp - ln -s mmv mad - ln -s mmv mln - cd $startdir/pkg/usr/man/man1/ - ln -s mmv.1 mcp.1 - ln -s mmv.1 mad.1 - ln -s mmv.1 mln.1 -} diff --git a/abs/extra/community/mmv/mmv.install b/abs/extra/community/mmv/mmv.install deleted file mode 100644 index 9b23e48..0000000 --- a/abs/extra/community/mmv/mmv.install +++ /dev/null @@ -1,19 +0,0 @@ -# arg 1: the new package version -post_install() { - echo ">>>" - echo ">>>" - echo ">>>" - echo ">>> many thanks to the debian people who provide the sources" - echo ">>>" -} - -# arg 1: the old package version -post_remove() { - echo ">>>" - echo ">>>" - echo ">>>" -} - -op=$1 -shift -$op $* diff --git a/abs/extra/community/moblock/MoBlock-nfq.sh.patch b/abs/extra/community/moblock/MoBlock-nfq.sh.patch deleted file mode 100644 index f9136c3..0000000 --- a/abs/extra/community/moblock/MoBlock-nfq.sh.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- MoBlock-0.8/MoBlock-nfq.sh.orig 2008-11-30 03:44:02.000000000 -0500 -+++ MoBlock-0.8/MoBlock-nfq.sh 2008-12-01 18:56:15.000000000 -0500 -@@ -3,14 +3,10 @@ - # MoBlock.sh - MoBlock start script - # --------------------------------- - --ACTIVATE_CHAINS=1 --WHITE_TCP_IN="" --WHITE_UDP_IN="" --WHITE_TCP_OUT="" --WHITE_UDP_OUT="" --WHITE_TCP_FORWARD="" --WHITE_UDP_FORWARD="" -+# Some configuration options have been moved to an external conf file -+# This should make maintenance and upgrading easier - -+. /etc/moblock/config - - PIDF=/var/run/moblock.pid - -@@ -78,6 +74,17 @@ - iptables -I MOBLOCK_FW -p udp --dport $PORT -j ACCEPT - done - -+# For added IP whitelisting support -+ -+for IP in $WHITE_IP_OUT; do -+ iptables -I MOBLOCK_OUT -p all -m iprange --dst-range $IP -j ACCEPT -+done -+for IP in $WHITE_IP_IN; do -+ iptables -I MOBLOCK_IN -p all -m iprange --src-range $IP -j ACCEPT -+done -+for IP in $WHITE_IP_FW; do -+ iptables -I MOBLOCK_FW -p all -m iprange --dst-range $IP -j ACCEPT -+done - - # Loopback traffic fix - -@@ -85,7 +92,8 @@ - iptables -I OUTPUT -p all -o lo -j ACCEPT - - # Here you can change block list and log files --./moblock -p /etc/guarding.p2p ./moblock.log -+#./moblock -p /etc/guarding.p2p ./moblock.log -+/usr/bin/moblock -p /etc/moblock/banned.list /var/log/moblock.log >/dev/null 2>&1 - - # On exit delete the rules we added - -@@ -108,3 +116,4 @@ - if [ -f $PIDF ]; then - rm $PIDF; - fi -+ diff --git a/abs/extra/community/moblock/PKGBUILD b/abs/extra/community/moblock/PKGBUILD deleted file mode 100755 index 0f3ff26..0000000 --- a/abs/extra/community/moblock/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> -# Maintainer: Filip Wojciechowski, filip at loka dot pl - -pkgname=moblock -pkgver=0.9rc2 -pkgrel=9 -pkgdesc="Console application that blocks connections from/to hosts listed in a file in peerguardian format" -arch=('i686' 'x86_64') -url="http://moblock.berlios.de/" -license=('GPL') -depends=(libnetfilter_queue iptables) -backup=(etc/moblock/config) -install=moblock.install -source=(http://download.berlios.de/moblock/MoBlock-0.8-i586.tar.bz2 \ - moblock_0.9_rc2.patch \ - MoBlock-nfq.sh.patch \ - moblock_include.patch \ - config \ - moblock-update \ - moblock \ - moblock.logrotate) - -build() { - cd ${srcdir}/MoBlock-0.8 - - # patch to update moblock to the latest cvs version - patch -Np1 -i ../moblock_0.9_rc2.patch || return 1 - # add IP whitelisting and move configs to a separate conf file - patch -Np1 -i ../MoBlock-nfq.sh.patch || return 1 - # necessary to make moblock build with recent kernels - patch -Np1 -i ../moblock_include.patch || return 1 - - # change the CFLAGS for both i686 and x84_64 builds - sed -i "s#-Wall -O.*-ffast-math#$CFLAGS#g" Makefile - - # build - make || return 1 -} - -package() { - cd ${srcdir}/MoBlock-0.8 - #move the files - install -D -m 755 ./MoBlock-nfq.sh ${pkgdir}/usr/bin/moblock-nfq || return 1 - install -D -m 744 ./moblock ${pkgdir}/usr/bin/moblock || return 1 - install -D -m 755 ../moblock-update ${pkgdir}/usr/bin/moblock-update || return 1 - install -D -m 744 ../moblock ${pkgdir}/etc/rc.d/moblock || return 1 - install -D -m 644 ../config ${pkgdir}/etc/moblock/config || return 1 - install -D -m 644 ../moblock.logrotate ${pkgdir}/etc/logrotate.d/moblock || return 1 -} -md5sums=('199967adb48b153be90db10fe21325c5' - 'e4e33c515677fa53eaca4616591d4e44' - 'e9f3c6b09f5e07dee948450780340ea3' - 'b23b5214965df59632de5cec317ddbde' - '840bb52a99529305e49212a69c9ced8a' - '49a16feb221d4d912cc7200313517f7b' - '1bdc949fcff0ce751a5096e489061513' - 'a8285fd3e68043cd8d21993d3dbbf9d4') diff --git a/abs/extra/community/moblock/config b/abs/extra/community/moblock/config deleted file mode 100644 index 7d7c287..0000000 --- a/abs/extra/community/moblock/config +++ /dev/null @@ -1,30 +0,0 @@ -# Original MoBlock configuration options from MoBlock-nfq.sh file -ACTIVATE_CHAINS=1 -WHITE_TCP_IN="" -WHITE_UDP_IN="" -WHITE_TCP_OUT="" # Add "http https" here to prevent moblock from blocking webpages -WHITE_UDP_OUT="" -WHITE_TCP_FORWARD="" -WHITE_UDP_FORWARD="" - -# Added IP whitelisting support -WHITE_IP_IN="" -WHITE_IP_OUT="" -WHITE_IP_FW="" - -# Individual lists can be disabled by prefixing them with '!' -# Bluetack blacklists (http://www.bluetack.co.uk) -BLUETACK=(level1 level2 !level3 !edu ads-trackers-and-bad-pr0n bogon spyware spider Microsoft !proxy hijacked templist !rangetest dshield) - -# blocklist.org lists (currently doesn't work) -#BLOCKLIST=(p2p gov spy ads edu) - -# backup lists (might be outdated) -#PHOENIXLABS=(!p2b.p2b edu.txt spider.txt spyware.txt level1.txt !level2.txt !level3.txt) - -# Change to 'yes' if you want to backup up the old list before writing -# a new one. Only one backup copy will be kept. -BACKUP_OLD_LIST="no" - -# Options passed to wget -WGET_OPTS="-q" diff --git a/abs/extra/community/moblock/moblock b/abs/extra/community/moblock/moblock deleted file mode 100755 index d88bd2e..0000000 --- a/abs/extra/community/moblock/moblock +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting MoBlock" - if [ ! -f /var/run/moblock.pid ] - then - /usr/bin/moblock-nfq & - if [ $? -gt 0 ] - then - stat_fail - else - add_daemon moblock - stat_done - fi - else - stat_fail - fi - ;; - update) - stat_busy "Updating MoBlock block list..." - error=0 - /usr/bin/moblock-update || error=1 - stat_busy "Updating MoBlock block list" - if [ $error -eq 1 ]; then - stat_fail - else - stat_done - fi - ;; - stats) - stat_busy "Logging stats to /var/log/MoBlock.stats" - PID=`cat /var/run/moblock.pid 2>/dev/null` - if [ ! -z "$PID" ]; then - /bin/kill -USR2 $PID - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping MoBlock" - PID=`cat /var/run/moblock.pid 2>/dev/null` - if [ ! -z "$PID" ]; then - /bin/kill $PID - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon moblock - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|update|stats}" -esac diff --git a/abs/extra/community/moblock/moblock-update b/abs/extra/community/moblock/moblock-update deleted file mode 100755 index aae861d..0000000 --- a/abs/extra/community/moblock/moblock-update +++ /dev/null @@ -1,174 +0,0 @@ -#!/bin/bash - -. /etc/moblock/config - -CONF_DIR=/etc/moblock -TEMP_DIR=$(/usr/bin/mktemp -t -d moblock-updateXXXXXXXX) -LIST_FILE=banned.list - -USECOLOR="no" -. /etc/rc.d/functions -PREFIX_REG=" >" -PREFIX_HL="::" - -function extract() -{ - /usr/bin/find $TEMP_DIR -type f -name '*.gz' -o -name '*.zip' |\ - while read N - do - case "$N" in - *.zip) /usr/bin/unzip -oqq "$N" 2>/dev/null - if [ $? -gt 0 ]; then - rm -f "$N" - return 1 - else - rm -f "$N" - fi - ;; - *.gz) /bin/gunzip -f "$N" 2>/dev/null - if [ $? -gt 0 ]; then - rm -f "$N" - return 1 - fi - ;; - *) continue - ;; - esac - done - return 0 -} - -cd $TEMP_DIR - -printf "${C_SEPARATOR} ------------------------------\n" -printhl "Downloading and extracting files:\n" - -# Bluetack lists (with fallback) -for i in ${BLUETACK[@]} -do - if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then - stat_busy "BLUETACK '${i}'... " - /usr/bin/wget ${WGET_OPTS} "http://www.bluetack.co.uk/config/${i}.gz" && extract - if [ $? -gt 0 ] || [ ! -f ${i} ]; then - stat_fail - bfile=$i - if [ "$bfile" = "ads-trackers-and-bad-pr0n" ]; then - bfile="ads" - elif [ "$bfile" = "Microsoft" ];then - bfile="microsoft" - fi - stat_busy "[!!] BLUETACK '${i}' (fallback link)... " - /usr/bin/wget ${WGET_OPTS} "http://list.iblocklist.com/?list=bt_${bfile%%-*}" -O "${i}.gz" && extract - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - else - stat_done - fi - fi -done - -# Blocklist lists -for i in ${BLOCKLIST[@]} -do - if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then - stat_busy "BLOCKLIST '${i}'... " - /usr/bin/wget ${WGET_OPTS} "blocklist.org/${i}.p2b.gz" && extract - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi -done - -# Old phoenixlabs.org lists -for i in ${PHOENIXLABS[@]} -do - if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then - stat_busy "PHOENIXLABS '${i}'... " - /usr/bin/wget ${WGET_OPTS} "fox.phoenixlabs.org/${i}" && extract - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi -done - -if [ $(/bin/cat "$TEMP_DIR"/* | /usr/bin/wc -l) -eq 0 ]; then - printf "\n" - printhl "ERROR: No files were downloaded" - printf "${C_SEPARATOR} ------------------------------\n" - exit 1 -fi - -# Check files -printsep -printhl "Checking integrity of downloaded files:\n" - -/usr/bin/find -type f | while read N -do - stat_busy "File '$(echo $N | /bin/awk -F/ '{print $NF}')'... " - scan1=$(/bin/cat "$N" | /usr/bin/wc -l) - scan2=$(/bin/egrep -o ":[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" "$N" | /usr/bin/wc -l) - if [ $scan1 -eq $scan2 ]; then - stat_done - else - if [ $scan2 -gt 0 ]; then - if [ $scan1 -gt $scan2 ]; then - stat_append "$(($scan1-$scan2)) of $scan1 entries failed validation; keeping the file" - stat_done - fi - else - stat_fail - stat_busy "[!!] Removing corrupted file... " - rm "$N" 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - stat_done - fi - fi - fi -done - -printsep -printhl "Saving the list:\n" - -# Make backup -if [ "$BACKUP_OLD_LIST" = "yes" ] && [ -f "$CONF_DIR"/"$LIST_FILE" ]; then - stat_busy "Backing up old list to '$CONF_DIR/$LIST_FILE.gz'... " - /bin/gzip -f "$CONF_DIR"/"$LIST_FILE" 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi -fi - -# Save the list -stat_busy "Saving new list to '$CONF_DIR/$LIST_FILE'... " -/bin/cat "$TEMP_DIR"/* > "$CONF_DIR"/"$LIST_FILE" 2>&1 -if [ $? -gt 0 ]; then - stat_fail - exit 1 -else - stat_done - printf "\n" - printhl "Saved `cat "$CONF_DIR"/"$LIST_FILE" | wc -l` ranges" - printf "${C_SEPARATOR} ------------------------------\n" -fi - -rm -rf "$TEMP_DIR" - -# Restart MoBlock -if [ -f /var/run/moblock.pid ]; then - /bin/kill -HUP `cat /var/run/moblock.pid` >/dev/null 2>&1 -fi - -exit 0 - diff --git a/abs/extra/community/moblock/moblock.install b/abs/extra/community/moblock/moblock.install deleted file mode 100644 index 6afe1d5..0000000 --- a/abs/extra/community/moblock/moblock.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - #clean up after an old hack - if [ -h /usr/lib/libnfnetlink.so.1 ]; then - rm /usr/lib/libnfnetlink.so.1 - fi - echo "" - echo ">>> moblock-update script no longer uses /var/spool/moblock" - echo ">>> as a temporary directory. You can safely delete it." - echo "" -} - -post_upgrade() { - #clean up after an old hack - if [ -h /usr/lib/libnfnetlink.so.1 ]; then - rm /usr/lib/libnfnetlink.so.1 - fi - echo "" - echo ">>> moblock-update script no longer uses /var/spool/moblock" - echo ">>> as a temporary directory. You can safely delete it." - echo "" -} - -op=$1 -shift -$op $* - diff --git a/abs/extra/community/moblock/moblock.logrotate b/abs/extra/community/moblock/moblock.logrotate deleted file mode 100644 index 6ed64bb..0000000 --- a/abs/extra/community/moblock/moblock.logrotate +++ /dev/null @@ -1,11 +0,0 @@ -"/var/log/moblock.log" /var/log/MoBlock.stats { - daily - missingok - notifempty - sharedscripts - postrotate - /usr/bin/test -f /var/run/moblock.pid && /bin/kill -HUP `cat /var/run/moblock.pid 2>/dev/null` 2>/dev/null || exit 0 - endscript - compress -} - diff --git a/abs/extra/community/moblock/moblock_0.9_rc2.patch b/abs/extra/community/moblock/moblock_0.9_rc2.patch deleted file mode 100644 index 69994ff..0000000 --- a/abs/extra/community/moblock/moblock_0.9_rc2.patch +++ /dev/null @@ -1,912 +0,0 @@ -diff -Naur MoBlock-0.8_orig/Changelog MoBlock-0.8/Changelog ---- MoBlock-0.8_orig/Changelog 2006-03-22 12:44:31.000000000 -0500 -+++ MoBlock-0.8/Changelog 2008-02-10 11:56:08.000000000 -0500 -@@ -4,6 +4,23 @@ - - --- - -+0.9: - fix for kernel 2.6.23 -+ - support for MARKing packets instead of DROPping or -+ ACCEPTing -+ - example start script that REJECTs packets instead of -+ DROPping. -+ - Integrated a patch from David Walluck for proper loading -+ of p2b files (version 2) -+ - command line options for logging to syslog, stdout -+ and log timestamping -+ - fixed loading pg1 lists with comments (lines starting -+ with '#') -+ - fixed a bug in ranges merge -+ - applied patch 2223 by badfish99: "IPs logged with bytes -+ reversed on big-endian m/c" -+ -+--- -+ - 0.8: - support for NFQUEUE-ing from iptables FORWARD chain (thx to - hyakki for suggestions and testing!) - - included patches from Maximilian Mehnert to support log file -diff -Naur MoBlock-0.8_orig/Makefile MoBlock-0.8/Makefile ---- MoBlock-0.8_orig/Makefile 2006-03-22 12:44:31.000000000 -0500 -+++ MoBlock-0.8/Makefile 2007-11-22 08:10:44.000000000 -0500 -@@ -1,4 +1,3 @@ -- - # To use the old-soon-to-be-deprecated libipq interface - # uncomment the following line and comment the NFQUEUE one, - # then comment the gcc line with netfilter_queue and -@@ -7,7 +6,7 @@ - #QUEUE_LIB=LIBIPQ - QUEUE_LIB=NFQUEUE - --CFLAGS=-Wall -O2 -march=i586 -mtune=i686 -fomit-frame-pointer -ffast-math \ -+CFLAGS=-Wall -O3 -march=i586 -mtune=i686 -fomit-frame-pointer -ffast-math \ - -D_GNU_SOURCE -D$(QUEUE_LIB) -L/usr/include/libipq - CC=gcc - -diff -Naur MoBlock-0.8_orig/MoBlock-nfq-reject.sh MoBlock-0.8/MoBlock-nfq-reject.sh ---- MoBlock-0.8_orig/MoBlock-nfq-reject.sh 1969-12-31 19:00:00.000000000 -0500 -+++ MoBlock-0.8/MoBlock-nfq-reject.sh 2007-11-22 08:10:44.000000000 -0500 -@@ -0,0 +1,104 @@ -+#!/bin/sh -+# -+# MoBlock.sh - MoBlock start script -+# --------------------------------- -+ -+ACTIVATE_CHAINS=1 -+WHITE_TCP_IN="" -+WHITE_UDP_IN="" -+WHITE_TCP_OUT="" -+WHITE_UDP_OUT="" -+WHITE_TCP_FORWARD="" -+WHITE_UDP_FORWARD="" -+REJECT_MARK="10" -+ -+PIDF=/var/run/moblock.pid -+ -+FNAME=`basename $0 .sh` -+MODE=`echo $FNAME|awk -F- '{print $2}'` -+ -+if [ -f $PIDF ]; then -+ PID=`cat $PIDF` -+ if [ `ps -p $PID|wc -l` -gt 1 ]; then -+ echo "$0: $PIDF exists and processs seems to be running. Exiting." -+ exit 1; -+ fi; -+fi; -+ -+if [ $MODE == "ipq" ]; then -+ modprobe ip_queue -+ TARGET="QUEUE" -+elif [ $MODE == "nfq" ]; then -+ modprobe ipt_NFQUEUE -+ TARGET="NFQUEUE" -+fi; -+ -+modprobe ipt_state -+ -+# Filter all traffic, edit for your needs -+ -+iptables -N MOBLOCK_IN -+iptables -N MOBLOCK_OUT -+iptables -N MOBLOCK_FW -+ -+if [ $ACTIVATE_CHAINS -eq 1 ]; then -+ iptables -I INPUT -p all -m state --state NEW -j MOBLOCK_IN -+ iptables -I OUTPUT -p all -m state --state NEW -j MOBLOCK_OUT -+ iptables -I FORWARD -p all -m state --state NEW -j MOBLOCK_FW -+fi; -+ -+ -+iptables -I MOBLOCK_IN -p all -j $TARGET -+ -+iptables -I MOBLOCK_OUT -p all -j $TARGET -+ -+iptables -I MOBLOCK_FW -p all -j $TARGET -+ -+for PORT in $WHITE_TCP_OUT; do -+ iptables -I MOBLOCK_OUT -p tcp --dport $PORT -j ACCEPT -+done -+for PORT in $WHITE_UDP_OUT; do -+ iptables -I MOBLOCK_OUT -p udp --dport $PORT -j ACCEPT -+done -+ -+for PORT in $WHITE_TCP_IN; do -+ iptables -I MOBLOCK_IN -p tcp --dport $PORT -j ACCEPT -+done -+for PORT in $WHITE_UDP_IN; do -+ iptables -I MOBLOCK_IN -p udp --dport $PORT -j ACCEPT -+done -+ -+for PORT in $WHITE_TCP_FORWARD; do -+ iptables -I MOBLOCK_FW -p tcp --dport $PORT -j ACCEPT -+done -+for PORT in $WHITE_UDP_FORWARD; do -+ iptables -I MOBLOCK_FW -p udp --dport $PORT -j ACCEPT -+done -+ -+iptables -I OUTPUT -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT -+iptables -I FORWARD -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT -+ -+# Here you can change block list and log files -+./moblock -d /etc/ipfilter.dat -t -s -r $REJECT_MARK ./moblock.log -+ -+# On exit delete the rules we added -+ -+if [ $ACTIVATE_CHAINS -eq 1 ]; then -+ iptables -D INPUT -p all -m state --state NEW -j MOBLOCK_IN -+ iptables -D OUTPUT -p all -m state --state NEW -j MOBLOCK_OUT -+ iptables -D FORWARD -p all -m state --state NEW -j MOBLOCK_FW -+fi; -+ -+iptables -D OUTPUT -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT -+iptables -D FORWARD -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT -+ -+iptables -F MOBLOCK_IN -+iptables -X MOBLOCK_IN -+iptables -F MOBLOCK_OUT -+iptables -X MOBLOCK_OUT -+iptables -F MOBLOCK_FW -+iptables -X MOBLOCK_FW -+ -+if [ -f $PIDF ]; then -+ rm $PIDF; -+fi -diff -Naur MoBlock-0.8_orig/MoBlock.c MoBlock-0.8/MoBlock.c ---- MoBlock-0.8_orig/MoBlock.c 2006-03-22 12:44:31.000000000 -0500 -+++ MoBlock-0.8/MoBlock.c 2008-02-10 11:56:08.000000000 -0500 -@@ -35,6 +35,8 @@ - #include <linux/netfilter_ipv4.h>
- #include <signal.h>
- #include <regex.h>
-+#include <time.h>
-+#include <syslog.h>
-
- // in Makefile define LIBIPQ to use soon-to-be-deprecated ip_queue,
- // NFQUEUE for ipt_NFQUEUE (from kernel 2.6.14)
-@@ -46,7 +48,7 @@ - #include <libnetfilter_queue/libnetfilter_queue.h>
- #endif
-
--#define MB_VERSION "0.8"
-+#define MB_VERSION "0.9rc2"
-
- #define BUFSIZE 2048
- #define PAYLOADSIZE 21
-@@ -58,6 +60,9 @@ - #define SRC_ADDR(payload) (*(in_addr_t *)((payload)+12))
- #define DST_ADDR(payload) (*(in_addr_t *)((payload)+16))
-
-+#define likely(x) __builtin_expect((x),1)
-+#define unlikely(x) __builtin_expect((x),0)
-+
- // rbt datatypes/functions
-
- typedef enum {
-@@ -96,7 +101,8 @@ - char filename[100];
- } blocklist_info;
-
--int merged_ranges=0, skipped_ranges=0;
-+u_int32_t merged_ranges=0, skipped_ranges=0, accept_mark=0, reject_mark=0;
-+u_int8_t log2syslog=0, log2file=0, log2stdout=0, timestamp=0;
-
- #ifdef LIBIPQ
- static void die(struct ipq_handle *h)
-@@ -112,11 +118,13 @@ - static char buf[2][ sizeof("aaa.bbb.ccc.ddd") ];
- static short int index=0;
-
-+ ip = ntohl(ip);
-+
- sprintf(buf[index],"%d.%d.%d.%d",
-- (ip) & 0xff,
-- (ip >> 8) & 0xff,
-+ (ip >> 24) & 0xff,
- (ip >> 16) & 0xff,
-- (ip >> 24) & 0xff);
-+ (ip >> 8) & 0xff,
-+ (ip) & 0xff);
-
- if (index) {
- index=0;
-@@ -134,10 +142,38 @@ - fflush(stdout);
- }
-
-+void log_action(char *msg)
-+{
-+ char timestr[30];
-+ time_t tv;
-+
-+ if (timestamp) {
-+ tv = time(NULL);
-+ strncpy(timestr, ctime(&tv), 19);
-+ timestr[19] = '\0';
-+ strcat(timestr, "| ");
-+ }
-+ else strcpy(timestr, "");
-+
-+ if (log2syslog) {
-+ syslog(LOG_INFO, msg);
-+ }
-+
-+ if (log2file) {
-+ fprintf(logfile,"%s%s",timestr,msg);
-+ fflush(logfile);
-+ }
-+
-+ if (log2stdout) {
-+ fprintf(stdout,"%s%s",timestr,msg);
-+ }
-+}
-+
- inline void ranged_insert(char *name,char *ipmin,char *ipmax)
- {
- recType tmprec;
- int ret;
-+ char msgbuf[255];
-
- if ( strlen(name) > (BNAME_LEN-1) ) {
- strncpy(tmprec.blockname, name, BNAME_LEN);
-@@ -149,10 +185,11 @@ - if ( (ret=insert(ntohl(inet_addr(ipmin)),&tmprec)) != STATUS_OK )
- switch(ret) {
- case STATUS_MEM_EXHAUSTED:
-- fprintf(logfile,"Error inserting range, MEM_EXHAUSTED.\n");
-+ log_action("Error inserting range, MEM_EXHAUSTED.\n");
- break;
- case STATUS_DUPLICATE_KEY:
-- fprintf(logfile,"Duplicated range ( %s )\n",name);
-+ sprintf(msgbuf,"Duplicated range ( %s )\n",name);
-+ log_action(msgbuf);
- break;
- case STATUS_MERGED:
- merged_ranges++;
-@@ -161,8 +198,9 @@ - skipped_ranges++;
- break;
- default:
-- fprintf(logfile,"Unexpected return value from ranged_insert()!\n");
-- fprintf(logfile,"Return value was: %d\n",ret);
-+ log_action("Unexpected return value from ranged_insert()!\n");
-+ sprintf(msgbuf,"Return value was: %d\n",ret);
-+ log_action(msgbuf);
- break;
- }
- }
-@@ -177,15 +215,19 @@ - regex_t regmain;
- regmatch_t matches[4];
- int i;
-+ char msgbuf[255];
-
- regcomp(®main, "^(.*)[:]([0-9.]*)[-]([0-9.]*)$", REG_EXTENDED);
-
- fp=fopen(filename,"r");
- if ( fp == NULL ) {
-- fprintf(logfile,"Error opening %s, aborting...\n", filename);
-+ sprintf(msgbuf,"Error opening %s, aborting...\n", filename);
-+ log_action(msgbuf);
- exit(-1);
- }
- while ( (count=getline(&line,&len,fp)) != -1 ) {
-+ if ( line[0] == '#' ) //comment line, skip
-+ continue;
- for(i=count-1; i>=0; i--) {
- if ((line[i] == '\r') || (line[i] == '\n') || (line[i] == ' ')) {
- line[i] = 0;
-@@ -207,36 +249,78 @@ - line+matches[3].rm_so);
- ntot++;
- } else {
-- fprintf(logfile,"Short guarding.p2p line %s, skipping it...\n", line);
-+ sprintf(msgbuf,"Short guarding.p2p line %s, skipping it...\n", line);
-+ log_action(msgbuf);
- }
- }
- if (line)
- free(line);
- fclose(fp);
-- fprintf(logfile,"Ranges loaded: %d\n",ntot);
-- printf("* Ranges loaded: %d\n",ntot);
-+ sprintf(msgbuf, "* Ranges loaded: %d\n", ntot);
-+ log_action(msgbuf);
-+ if ( !log2stdout )
-+ printf(msgbuf);
- }
-
--void loadlist_pg2(char *filename) // experimental, no check for list sanity
-+void loadlist_pg2(char *filename) // supports only v2 files
- {
- FILE *fp;
-- int i,retval,ntot=0;
-- char name[100],ipmin[16]; // hope we don't have a list with longer names...
-+ int i, j, c, retval=0, ntot=0;
-+ char name[100],ipmin[16], msgbuf[255]; // hope we don't have a list with longer names...
- uint32_t start_ip, end_ip;
- struct in_addr startaddr,endaddr;
-+ size_t s;
-
- fp=fopen(filename,"r");
- if ( fp == NULL ) {
-- fprintf(logfile,"Error opening %s, aborting...\n", filename);
-+ sprintf(msgbuf, "Error opening %s, aborting...\n", filename);
-+ log_action(msgbuf);
- exit(-1);
- }
-
-- fgetc(fp); // skip first 4 bytes, don't know what they are
-- fgetc(fp);
-- fgetc(fp);
-- retval=fgetc(fp);
-+ for (j=0; j<4; j++) {
-+ c=fgetc(fp);
-+ if ( c != 0xff ) {
-+ sprintf(msgbuf,"Byte %d: 0x%x != 0xff, aborting...\n", j+1, c);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-+ }
-+
-+ c=fgetc(fp);
-+ if ( c != 'P' ) {
-+ sprintf(msgbuf,"Byte 5: %c != P, aborting...\n", c);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-+
-+ c=fgetc(fp);
-+ if ( c != '2' ) {
-+ sprintf(msgbuf,"Byte 6: %c != 2, aborting...\n", c);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-
-- while ( retval != EOF ) {
-+ c=fgetc(fp);
-+ if ( c != 'B' ) {
-+ sprintf(msgbuf,"Byte 7: %c != B, aborting...\n", c);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-+
-+ c=fgetc(fp);
-+ if ( c != 0x02 ) {
-+ sprintf(msgbuf,"Byte 8: version: %d != 2, aborting...\n", c);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-+
-+ do {
- i=0;
- do {
- name[i]=fgetc(fp);
-@@ -244,9 +328,22 @@ - } while ( name[i-1] != 0x00 && name[i-1] != EOF);
- if ( name[i-1] != EOF ) {
- name[i-1]='\0';
-- fread(&start_ip,4,1,fp);
-- fread(&end_ip,4,1,fp);
-- startaddr.s_addr=start_ip;
-+ s=fread(&start_ip,4,1,fp);
-+ if ( s != 1 ) {
-+ sprintf(msgbuf,"Failed to read start IP: %d != 1, aborting...\n", (int)s);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-+ s=fread(&end_ip,4,1,fp);
-+ if ( s != 1 ) {
-+ sprintf(msgbuf,"Failed to read end IP: %d != 1, aborting...\n", (int)s);
-+ log_action(msgbuf);
-+ fclose(fp);
-+ exit(-1);
-+ }
-+
-+ startaddr.s_addr=start_ip;
- endaddr.s_addr=end_ip;
- strcpy(ipmin,inet_ntoa(startaddr));
- ranged_insert(name,ipmin,inet_ntoa(endaddr));
-@@ -255,22 +352,25 @@ - else {
- retval=EOF;
- }
-- }
-+ } while ( retval != EOF );
- fclose(fp);
-- fprintf(logfile,"Ranges loaded: %d\n",ntot);
-- printf("* Ranges loaded: %d\n",ntot);
-+ sprintf(msgbuf, "* Ranges loaded: %d\n",ntot);
-+ log_action(msgbuf);
-+ if ( !log2stdout )
-+ printf(msgbuf);
- }
-
- void loadlist_dat(char *filename)
- {
- FILE *fp;
- int ntot=0;
-- char readbuf[200], *name, start_ip[16], end_ip[16];
-+ char readbuf[200], *name, start_ip[16], end_ip[16], msgbuf[255];
- unsigned short ip1_0, ip1_1, ip1_2, ip1_3, ip2_0, ip2_1, ip2_2, ip2_3;
-
- fp=fopen(filename,"r");
- if ( fp == NULL ) {
-- fprintf(logfile,"Error opening %s, aborting...\n", filename);
-+ sprintf(msgbuf,"Error opening %s, aborting...\n", filename);
-+ log_action(msgbuf);
- exit(-1);
- }
-
-@@ -286,38 +386,45 @@ - ntot++;
- }
- fclose(fp);
-- fprintf(logfile,"Ranges loaded: %d\n",ntot);
-- printf("* Ranges loaded: %d\n",ntot);
-+ sprintf(msgbuf, "* Ranges loaded: %d\n", ntot);
-+ log_action(msgbuf);
-+ if ( !log2stdout )
-+ printf(msgbuf);
- }
-
- void reopen_logfile(void)
- {
-+ char msgbuf[255];
-+
- if (logfile != NULL) {
- fclose(logfile);
- logfile=NULL;
- }
- logfile=fopen(logfile_name,"a");
- if (logfile == NULL) {
-- fprintf(stderr, "Unable to open logfile %s\n", logfile_name);
-+ sprintf(msgbuf, "Unable to open logfile %s\n", logfile_name);
-+ log_action(msgbuf);
- exit(-1);
- }
-- fprintf(logfile, "Reopening logfile.\n");
-+ log_action("Reopening logfile.\n");
- }
-
- void my_sahandler(int sig)
- {
-+ char msgbuf[255];
-+
- switch( sig ) {
- case SIGUSR1:
-- fprintf(logfile,"Got SIGUSR1! Dumping stats...\n");
-+ log_action("Got SIGUSR1! Dumping stats...\n");
- ll_show(logfile);
- reopen_logfile();
- break;
- case SIGUSR2:
-- fprintf(logfile,"Got SIGUSR2! Dumping stats to /var/log/MoBlock.stats\n");
-+ log_action("Got SIGUSR2! Dumping stats to /var/log/MoBlock.stats\n");
- ll_log();
- break;
- case SIGHUP:
-- fprintf(logfile,"\nGot SIGHUP! Dumping and resetting stats, reloading blocklist\n\n");
-+ log_action("Got SIGHUP! Dumping and resetting stats, reloading blocklist\n");
- ll_log();
- ll_clear(); // clear stats list
- destroy_tree(); // clear loaded ranges
-@@ -332,17 +439,18 @@ - loadlist_pg2(blocklist_info.filename);
- break;
- default:
-- fprintf(logfile,"Unknown blocklist type while reloading list, contact the developer!\n");
-+ log_action("Unknown blocklist type while reloading list, contact the developer!\n");
- break;
- }
- reopen_logfile();
- break;
- case SIGTERM:
-- fprintf(logfile,"Got SIGTERM! Dumping stats and exiting.\n");
-+ log_action("Got SIGTERM! Dumping stats and exiting.\n");
- ll_log();
- exit(0);
- default:
-- fprintf(logfile,"Received signal = %d but not handled\n",sig);
-+ sprintf(msgbuf,"Received signal = %d but not handled\n",sig);
-+ log_action(msgbuf);
- break;
- }
- }
-@@ -378,7 +486,7 @@ - {
- int id=0, status=0;
- struct nfqnl_msg_packet_hdr *ph;
-- char *payload;
-+ char *payload, msgbuf[255];
- recType tmprec;
-
- ph = nfq_get_msg_packet_hdr(nfa);
-@@ -389,34 +497,78 @@ - switch (ph->hook) {
- case NF_IP_LOCAL_IN:
- if ( find(ntohl(SRC_ADDR(payload)),&tmprec) == STATUS_OK ) {
-+ // we drop the packet instead of rejecting
-+ // we don't want the other host to know we are alive
- status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);
-- fprintf(logfile,"Blocked IN: %s,hits: %d,SRC: %s\n",tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)));
-- } else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
-+ sprintf(msgbuf,"Blocked IN: %s,hits: %d,SRC: %s\n",tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)));
-+ log_action(msgbuf);
-+ }
-+ else if ( unlikely(accept_mark) ) {
-+ // we set the user-defined accept_mark and set NF_REPEAT verdict
-+ // it's up to other iptables rules to decide what to do with this marked packet
-+ status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);
-+ }
-+ else {
-+ // no accept_mark, just NF_ACCEPT the packet
-+ status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
-+ }
- break;
- case NF_IP_LOCAL_OUT:
- if ( find(ntohl(DST_ADDR(payload)),&tmprec) == STATUS_OK ) {
-- status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);
-- fprintf(logfile,"Blocked OUT: %s,hits: %d,DST: %s\n",tmprec.blockname,tmprec.hits,ip2str(DST_ADDR(payload)));
-- } else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
-+ if ( likely(reject_mark) ) {
-+ // we set the user-defined reject_mark and set NF_REPEAT verdict
-+ // it's up to other iptables rules to decide what to do with this marked packet
-+ status = nfq_set_verdict_mark(qh, id, NF_REPEAT, reject_mark, 0, NULL);
-+ }
-+ else {
-+ status = nfq_set_verdict(qh, id, NF_DROP, 0, NULL);
-+ }
-+ sprintf(msgbuf,"Blocked OUT: %s,hits: %d,DST: %s\n",tmprec.blockname,tmprec.hits,ip2str(DST_ADDR(payload)));
-+ log_action(msgbuf);
-+ }
-+ else if ( unlikely(accept_mark) ) {
-+ // we set the user-defined accept_mark and set NF_REPEAT verdict
-+ // it's up to other iptables rules to decide what to do with this marked packet
-+ status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);
-+ }
-+ else {
-+ // no accept_mark, just NF_ACCEPT the packet
-+ status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
-+ }
- break;
- case NF_IP_FORWARD:
- if ( find2(ntohl(SRC_ADDR(payload)), ntohl(DST_ADDR(payload)), &tmprec) == STATUS_OK ) {
-- status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);
-- fprintf(logfile,"Blocked FWD: %s,hits: %d,SRC: %s, DST: %s\n",
-+ if ( likely(reject_mark) ) {
-+ // we set the user-defined reject_mark and set NF_REPEAT verdict
-+ // it's up to other iptables rules to decide what to do with this marked packet
-+ status = nfq_set_verdict_mark(qh, id, NF_REPEAT, reject_mark, 0, NULL);
-+ }
-+ else {
-+ status = nfq_set_verdict(qh, id, NF_DROP, 0, NULL);
-+ }
-+ sprintf(msgbuf,"Blocked FWD: %s,hits: %d,SRC: %s, DST: %s\n",
- tmprec.blockname, tmprec.hits, ip2str(SRC_ADDR(payload)), ip2str(DST_ADDR(payload)));
-- fflush(logfile);
-- } else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
-+ log_action(msgbuf);
-+ }
-+ else if ( unlikely(accept_mark) ) {
-+ // we set the user-defined accept_mark and set NF_REPEAT verdict
-+ // it's up to other iptables rules to decide what to do with this marked packet
-+ status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);
-+ }
-+ else {
-+ // no accept_mark, just NF_ACCEPT the packet
-+ status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
-+ }
- break;
- default:
-- fprintf(logfile,"Not NF_LOCAL_IN/OUT/FORWARD packet!\n");
-+ log_action("Not NF_LOCAL_IN/OUT/FORWARD packet!\n");
- break;
- }
- }
- else {
-- fprintf(logfile,"NFQUEUE: can't get msg packet header.\n");
-+ log_action("NFQUEUE: can't get msg packet header.\n");
- return(1); // from nfqueue source: 0 = ok, >0 = soft error, <0 hard error
- }
-- fflush(logfile);
- return(0);
- }
- #endif
-@@ -492,46 +644,48 @@ - struct nfq_q_handle *qh;
- struct nfnl_handle *nh;
- int fd,rv;
-- char buf[BUFSIZE];
-+ char buf[BUFSIZE], msgbuf[255];
-
- h = nfq_open();
- if (!h) {
-- fprintf(logfile, "Error during nfq_open()\n");
-+ log_action("Error during nfq_open()\n");
- exit(-1);
- }
-
- if (nfq_unbind_pf(h, AF_INET) < 0) {
-- fprintf(logfile, "error during nfq_unbind_pf()\n");
-- exit(-1);
-+ log_action("error during nfq_unbind_pf()\n");
-+ //exit(-1);
- }
-
- if (nfq_bind_pf(h, AF_INET) < 0) {
-- fprintf(logfile, "Error during nfq_bind_pf()\n");
-+ log_action("Error during nfq_bind_pf()\n");
- exit(-1);
- }
-
-- fprintf(logfile,"NFQUEUE: binding to queue '%hd'\n", queuenum);
-+ sprintf(msgbuf,"NFQUEUE: binding to queue '%hd'\n", queuenum);
-+ log_action(msgbuf);
- qh = nfq_create_queue(h, queuenum, &nfqueue_cb, NULL);
- if (!qh) {
-- fprintf(logfile, "error during nfq_create_queue()\n");
-+ log_action("error during nfq_create_queue()\n");
- exit(-1);
- }
-
- if (nfq_set_mode(qh, NFQNL_COPY_PACKET, PAYLOADSIZE) < 0) {
-- fprintf(logfile, "can't set packet_copy mode\n");
-+ log_action("can't set packet_copy mode\n");
- exit(-1);
- }
-
- nh = nfq_nfnlh(h);
- fd = nfnl_fd(nh);
-
-- while ((rv = recv(fd, buf, sizeof(buf), 0)) && rv >= 0) {
-+ while ((rv = recv(fd, buf, sizeof(buf), 0)) >= 0) {
- nfq_handle_packet(h, buf, rv);
- }
-
-- printf("NFQUEUE: unbinding from queue 0\n");
-+ log_action("NFQUEUE: unbinding from queue 0\n");
- nfq_destroy_queue(qh);
- nfq_close(h);
-+ nfq_unbind_pf(h, AF_INET);
- return(0);
- #endif
-
-@@ -540,11 +694,16 @@ - void print_options(void)
- {
- printf("\nMoBlock %s by Morpheus",MB_VERSION);
-- printf("\nSyntax: MoBlock -dnp <blocklist> [-b] [-q 0-65535] <logfile>\n\n");
-+ printf("\nSyntax: MoBlock -dnp <blocklist> [-q 0-65535] <logfile>\n\n");
- printf("\t-d\tblocklist is an ipfilter.dat file\n");
- printf("\t-n\tblocklist is a peerguardian 2.x file (.p2b)\n");
- printf("\t-p\tblocklist is a peerguardian file (.p2p)\n");
- printf("\t-q\t0-65535 NFQUEUE number (as specified in --queue-num with iptables)\n");
-+ printf("\t-r MARK\tmark packet with MARK instead of DROP\n");
-+ printf("\t-a MARK\tmark packet with MARK instead of ACCEPT\n");
-+ printf("\t-l\tlog to stdout\n");
-+ printf("\t-s\tlog to syslog\n");
-+ printf("\t-t\tlog timestamping\n\n");
- }
-
- void on_quit()
-@@ -556,6 +715,7 @@ - {
- int ret=0;
- unsigned short int queuenum=0;
-+ char msgbuf[255];
-
- if (argc < 3) {
- print_options();
-@@ -591,10 +751,11 @@ - }
- logfile_name=malloc(strlen(argv[argc-1])+1);
- strcpy(logfile_name,argv[argc-1]);
-+ log2file = 1;
- printf("* Logging to %s\n",logfile_name);
-
- while (1) { //scan command line options
-- ret=getopt(argc, argv, "d:n:p:q:");
-+ ret=getopt(argc, argv, "d:n:p:q:a:r:stl");
- if ( ret == -1 ) break;
-
- switch (ret) {
-@@ -619,6 +780,28 @@ - case 'q':
- queuenum=(unsigned short int)atoi(optarg);
- break;
-+ case 'r':
-+ reject_mark=(u_int32_t)atoi(optarg);
-+ printf("* DROP MARK: %d\n", reject_mark);
-+ reject_mark=htonl(reject_mark);
-+ break;
-+ case 'a':
-+ accept_mark=(u_int32_t)atoi(optarg);
-+ printf("* ACCEPT MARK: %d\n", accept_mark);
-+ accept_mark=htonl(accept_mark);
-+ break;
-+ case 's':
-+ log2syslog = 1;
-+ printf("* Logging to syslog\n");
-+ break;
-+ case 't':
-+ timestamp = 1;
-+ printf("* Log timestamp enabled\n");
-+ break;
-+ case 'l':
-+ log2stdout = 1;
-+ printf("* Log to stdout enabled\n");
-+ break;
- case '?': // unknown option
- print_options();
- exit(-1);
-@@ -626,10 +809,14 @@ - }
- }
-
-- printf("* Merged ranges: %d\n", merged_ranges);
-- fprintf(logfile, "Merged ranges: %d\n", merged_ranges);
-- printf("* Skipped useless ranges: %d\n", skipped_ranges);
-- fprintf(logfile,"Skipped useless ranges: %d\n", skipped_ranges);
-+ sprintf(msgbuf, "* Merged ranges: %d\n", merged_ranges);
-+ log_action(msgbuf);
-+ if ( !log2stdout )
-+ printf(msgbuf);
-+ sprintf(msgbuf,"* Skipped useless ranges: %d\n", skipped_ranges);
-+ log_action(msgbuf);
-+ if ( !log2stdout )
-+ printf(msgbuf);
- fflush(NULL);
-
- netlink_loop(queuenum);
-diff -Naur MoBlock-0.8_orig/README MoBlock-0.8/README ---- MoBlock-0.8_orig/README 2006-03-22 12:44:31.000000000 -0500 -+++ MoBlock-0.8/README 2007-11-22 08:10:44.000000000 -0500 -@@ -1,5 +1,5 @@ - --MoBlock README v0.8 -+MoBlock README v0.9 - http://moblock.berlios.de - - .Introduction. -@@ -47,6 +47,22 @@ - ip_conntrack 40044 1 ipt_state - iptable_filter 2176 1 - ip_tables 17600 3 ipt_NFQUEUE,ipt_state,iptable_filter -+ -+ ...and these with kernel 2.6.23 using NFQUEUE interface: -+ -+ nfnetlink_queue 9344 1 -+ nfnetlink 4568 2 nfnetlink_queue -+ ipt_REJECT 3520 2 -+ xt_mark 1600 2 -+ nf_conntrack_ipv4 12424 5 -+ iptable_filter 2308 1 -+ ip_tables 10328 1 iptable_filter -+ xt_state 1984 5 -+ nf_conntrack 48356 2 nf_conntrack_ipv4,xt_state -+ xt_NFQUEUE 1664 3 -+ x_tables 11396 5 ipt_REJECT,xt_mark,ip_tables,xt_state,xt_NFQUEUE -+ -+ (notice that ipt_NFQUEUE has changed to xt_NFQUEUE, same thing for other modules too) - - 2) A valid guarding.p2p/ipfilter.dat/p2p.p2b host file in /etc ( /etc/guarding.p2p ). - MoBlock tries to skip malformed or duplicate ranges but -@@ -140,8 +156,18 @@ - To specify a NFQUEUE queue number: - - ./moblock -p /etc/guarding.p2p -q 5 MoBlock.log -+ -+ From version 0.9 MoBlock supports MARKing packets and RETURN them to -+ iptables, there's an example start script (MoBlock-nfq-reject.sh) that -+ uses this feature to REJECT packet instead of dropping them. It can help -+ in complex firewall configuration where you need more control of packets -+ flow after MoBlock inspection. -+ See the mentioned start script for reference, you can set the MARK value -+ for packets that MoBlock would drop (ip in list) with the "-r" command line -+ option and for packets that MoBlock would accept (ip not in list) with -+ the "-a" command line option. - -- To stop it: -+ To stop MoBlock: - - kill -TERM <MoBlockPid> - -@@ -149,7 +175,7 @@ - To obtain stats about blocked ranges while it's running: - - kill -USR1 <MoBlockPid> # write stats to logfile -- kill -USR2 <MoBlockPid> # write stats to /var/log/MoBlock.stats -+ kill -USR2 <MoBlockPid> # write stats to /var/log/MoBlock.stats - - ** NEW: to reload the blocklist while MoBlock is running send to it the - HUP signal: -@@ -168,7 +194,10 @@ - took some code and ideas from his FTwall - - Andrew de Quincey (adq at lidskialf dot net) for regular expressions - and command line args patch --- Maximilian Mehnert (clessing at freenet dot de) for logfile rotation -+- clessing at freenet dot de for logfile rotation - patches, pid file creation, start script, fixes/files for debian packaging -+- David Walluck, patch for proper loading of p2b files -+- jre, for continuing clessing work on debian packaging and many other -+ contributions - --Last Updated: 20/Mar/2006 -+Last Updated: 15/Oct/2007 -diff -Naur MoBlock-0.8_orig/rbt.c MoBlock-0.8/rbt.c ---- MoBlock-0.8_orig/rbt.c 2006-03-22 12:44:31.000000000 -0500 -+++ MoBlock-0.8/rbt.c 2008-02-10 11:56:08.000000000 -0500 -@@ -19,7 +19,7 @@ - #include <stdarg.h> - #include <time.h> - --#define RBT_VERSION 0.8 -+#define RBT_VERSION 0.9 - #define BNAME_LEN 80 - - /* implementation dependend declarations */ -@@ -421,7 +421,7 @@ - - statusEnum insert(keyType key, recType *rec) { - nodeType *current, *parent, *x; -- keyType tmpkey; -+ //keyType tmpkey; - recType tmprec; - int ret; - -@@ -433,6 +433,23 @@ - current = root; - parent = 0; - while (current != NIL) { -+ if (compEQ2(current->key, key, rec->ipmax)) { // current node key is inside new range to be inserted -+ strcpy(tmprec.blockname, rec->blockname); // block name from new range -+ if (compLT(current->rec.ipmax, rec->ipmax)) -+ tmprec.ipmax = rec->ipmax; -+ else tmprec.ipmax = current->rec.ipmax; -+ tmprec.hits = 0; -+ //printf("deleting node :%lu\n", current->key); -+ ret=delete(current->key); -+ if ( ret != STATUS_OK ) -+ return(ret); -+ ret=insert(key, &tmprec); -+ if ( ret == STATUS_OK ) { -+ printf("new merge\n"); -+ return(STATUS_MERGED); -+ } -+ else return(ret); -+ } - if (compEQ(key, current->key)) { - if ( rec->ipmax > current->rec.ipmax ) { - current->rec.ipmax=rec->ipmax; -@@ -458,7 +475,7 @@ - } - } - //check if higher ip (ipmax) is already in a range -- if (compEQ2(rec->ipmax,current->key,current->rec.ipmax)) { -+ /*if (compEQ2(rec->ipmax,current->key,current->rec.ipmax)) { - fprintf(logfile,"higher ip in range\n"); - tmpkey=key; - strcpy(tmprec.blockname,current->rec.blockname); -@@ -470,7 +487,7 @@ - if ( ret == STATUS_OK ) - return(STATUS_MERGED); - else return(ret); -- } -+ }*/ - parent = current; - current = compLT(key, current->key) ? - current->left : current->right; -@@ -495,7 +512,7 @@ - } else { - root = x; - } -- -+ //printf("new node, key: %lu, parent: %lu\n", x->key, parent ? parent->key : 0); - insertFixup(x); - lastFind = NULL; - diff --git a/abs/extra/community/moblock/moblock_include.patch b/abs/extra/community/moblock/moblock_include.patch deleted file mode 100644 index 644e824..0000000 --- a/abs/extra/community/moblock/moblock_include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- MoBlock-0.8/MoBlock.c.orig 2008-08-15 14:41:49.000000000 -0400 -+++ MoBlock-0.8/MoBlock.c 2008-08-15 14:43:45.000000000 -0400 -@@ -32,6 +32,7 @@ - #include <netinet/udp.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- #include <linux/netfilter_ipv4.h>
- #include <signal.h>
- #include <regex.h>
diff --git a/abs/extra/community/mobloquer/PKGBUILD b/abs/extra/community/mobloquer/PKGBUILD deleted file mode 100644 index b6254d5..0000000 --- a/abs/extra/community/mobloquer/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Daniele Marinello <marinz att email dot it> - -pkgname=mobloquer -pkgver=0.6 -pkgrel=6 -pkgdesc="A graphical front end for moblock" -arch=('i686' 'x86_64') -url="http://mobloquer.foutrelis.com/" -license=('GPL') -depends=('qt' 'blockcontrol') -source=(http://downloads.sourceforge.net/mobloquer/$pkgname-$pkgver.tar.gz) -md5sums=('6363ee4c42da1d85367fdd65d4bf42ca') - -build() { - - cd $startdir/src/$pkgname-$pkgver - - qmake - make || return 1 - - install -d ${pkgdir}/usr/share/applications ${pkgdir}/usr/bin ${pkgdir}/usr/share/pixmaps - install -m 644 -p $startdir/src/$pkgname-$pkgver/images/mobloquer.png $startdir/pkg/usr/share/pixmaps/ - install -m 644 -p $startdir/src/$pkgname-$pkgver/other/Mobloquer.desktop $startdir/pkg/usr/share/applications/ - install -m 755 -p $startdir/src/$pkgname-$pkgver/mobloquer $startdir/pkg/usr/bin/mobloquer -} - diff --git a/abs/extra/community/motion-svn/PKGBUILD b/abs/extra/community/motion-svn/PKGBUILD deleted file mode 100644 index dcbd162..0000000 --- a/abs/extra/community/motion-svn/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Contributor: Demind <demind@gmail.com> -pkgname=motion-svn -pkgver=1 -pkgrel=1 -pkgdesc="Motion is a software motion detector. It grabs images from video4linux devices and/or from webcams." -arch=('i686' 'x86_64') -url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -license=('GPL2') -depends=('zlib' 'libjpeg') -makedepends=('subversion') -provides=('motion') -conflicts=('motion') -install="motion-svn.install" -source=('rc.motion') -md5sums=('fc09828564850824f8549d258053e0b6') - -_svntrunk=http://www.lavrsen.dk/svn/motion/trunk/ -_svnmod=motion - -build() { - cd $startdir/src - - msg "Retrieving sources" - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - - [ -d ./$_svnmod-build ] && rm -fr ./$_svnmod-build - cp -r ./$_svnmod ./$_svnmod-build - cd ./$_svnmod-build - - msg "SVN checkout done or server timeout" - msg "Starting build" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc - - make || return 1 - make DESTDIR=$startdir/pkg/ install || return 1 - install -D -m755 $startdir/src/rc.motion $startdir/pkg/etc/rc.d/motion - rm -rf $startdir/src/$_svnmod-build -} - diff --git a/abs/extra/community/motion-svn/motion-svn.install b/abs/extra/community/motion-svn/motion-svn.install deleted file mode 100644 index f88a2fc..0000000 --- a/abs/extra/community/motion-svn/motion-svn.install +++ /dev/null @@ -1,11 +0,0 @@ -# arg 1: the new package version -post_install() { - echo "" - echo ">>> An example configuration has been saved to /etc/motion-dispatch.conf" -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" - -# vim:set ts=2 et: diff --git a/abs/extra/community/motion-svn/rc.motion b/abs/extra/community/motion-svn/rc.motion deleted file mode 100644 index 7dd027c..0000000 --- a/abs/extra/community/motion-svn/rc.motion +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/motion` -case "$1" in - start) - stat_busy "Starting Motion" - [ -z "$PID" ] && /usr/bin/motion - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon motion - stat_done - fi - ;; - stop) - stat_busy "Stopping Motion" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon motion - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/community/mozplugger-chromium/PKGBUILD b/abs/extra/community/mozplugger-chromium/PKGBUILD deleted file mode 100644 index 360fcad..0000000 --- a/abs/extra/community/mozplugger-chromium/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Giuseppe Borzi <gborzi@ieee.org> -# Contributor: fs4000 <matthias_dienstbier[at]yahoo[dot]de> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Todd Musall <tmusall@comcast.net> -pkgname=mozplugger-chromium -pkgver=1.14.4 -pkgrel=1 -pkgdesc="Mozilla multimedia plugin for Chromium" -arch=('x86_64' 'i686') -url="http://mozplugger.mozdev.org/" -license=('GPL') -depends=('libx11') -backup=('etc/mozpluggerrc') -conflicts=('mozplugger') -source=("http://mozplugger.mozdev.org/files/mozplugger-$pkgver.tar.gz") -sha256sums=('8343c4b107a18b05ef0bb789ab72e0276c979395fb56148fb531fa5c2319745a') - -build() { - cd "mozplugger-$pkgver" - - msg2 "Configuring..." - ./configure --prefix="$pkgdir/usr" --exec-prefix="$pkgdir/usr/bin" \ - --enable-always-xembed --sysconfdir="/etc" - msg2 "Building..." - make - gzip mozplugger.7 -} - -package() { - cd "mozplugger-$pkgver" - - msg2 "Packaging..." - install -Dm644 mozplugger.7.gz "$pkgdir/usr/share/man/man7/mozplugger.7.gz" - install -Dm644 mozpluggerrc "$pkgdir/etc/mozpluggerrc" - install -Dm644 mozplugger.so "$pkgdir/usr/lib/mozilla/plugins/mozplugger.so" - install -Dm755 mozplugger-controller "$pkgdir/usr/bin/mozplugger-controller" - install -Dm755 mozplugger-helper "$pkgdir/usr/bin/mozplugger-helper" - install -Dm755 mozplugger-linker "$pkgdir/usr/bin/mozplugger-linker" -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/mre/PKGBUILD b/abs/extra/community/mre/PKGBUILD deleted file mode 100644 index 4868d33..0000000 --- a/abs/extra/community/mre/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -pkgname=mre -pkgver=1.1.2 -pkgrel=6 -_kernver=2.6.36-LinHES -pkgdesc="Myth Recording Extender" -arch=('i686') -url="http://sourceforge.net/projects/mythtv-tools/" -license=('GPL-2') -depends=('peardb' 'pearlog') -source=('mre-1.1.2.tar.gz' 'patch.diff' 'run' 'mre.lr') -install=('mre.install') - -build() { - cd ${srcdir}/mre-1.1.2/ - patch -p0 < ../patch.diff - ./configure - make INST_ROOT=${pkgdir} install - cp ${srcdir}/mre-1.1.2/conf/mre.conf ${pkgdir}/etc/mre.conf - cp ${srcdir}/mre-1.1.2/test/test_title_subtitle.php\ - ${pkgdir}/usr/local/bin/ - chmod a+x ${pkgdir}/usr/local/bin/test_title_subtitle.php - rm -r ${pkgdir}/etc/init.d - mkdir -p ${pkgdir}/var/log/mre - chown root:log "${pkgdir}/var/log/mre" - touch ${pkgdir}/var/log/mre/mre.log - chown mythtv:mythtv "${pkgdir}/var/log/mre/mre.log" - mkdir -p ${pkgdir}/etc/sv/mre - cp ${srcdir}/run ${pkgdir}/etc/sv/mre/run - mkdir -p ${pkgdir}/etc/logrotate.d - cp ${srcdir}/mre.lr ${pkgdir}/etc/logrotate.d/mre.lr -} -md5sums=('8ab312e7597ae9413a57bd5e9a068096' - 'ed6cb9012c88d589e26132796132bf25' - '10e01d572b45ad718e49ff9ef5c230c5' - '6d71ab57afd974c5130c994b94e8746f') diff --git a/abs/extra/community/mre/mre-1.1.2.tar.gz b/abs/extra/community/mre/mre-1.1.2.tar.gz Binary files differdeleted file mode 100644 index 3846e4b..0000000 --- a/abs/extra/community/mre/mre-1.1.2.tar.gz +++ /dev/null diff --git a/abs/extra/community/mre/mre.install b/abs/extra/community/mre/mre.install deleted file mode 100755 index bb08427..0000000 --- a/abs/extra/community/mre/mre.install +++ /dev/null @@ -1,20 +0,0 @@ -# arg 1: the new package version -post_install() { - add_service.sh mre - sed -i.pacsave '/^open_basedir/s|$|:/var/log/mre:/usr/local/lib/mre|' /etc/php/php.ini -} - -post_upgrade() { - /bin/true -} - - -# arg 1: the old package version -post_remove() { - remove_service.sh mre - sed -i.pacsave '/^open_basedir/s|:/var/log/mre:/usr/local/lib/mre||' /etc/php/php.ini -} - -op=$1 -shift -$op $* diff --git a/abs/extra/community/mre/mre.lr b/abs/extra/community/mre/mre.lr deleted file mode 100644 index 3b54c23..0000000 --- a/abs/extra/community/mre/mre.lr +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/mre/mre.log { - copytruncate - daily - size 10M - missingok - rotate 7 - compress - notifempty -} diff --git a/abs/extra/community/mre/patch.diff b/abs/extra/community/mre/patch.diff deleted file mode 100644 index 38a501a..0000000 --- a/abs/extra/community/mre/patch.diff +++ /dev/null @@ -1,293 +0,0 @@ ---- ../mre-1.1.2/class/MythClient.php.original 2006-04-05 17:39:13.000000000 -0500 -+++ ../mre-1.1.2/class/MythClient.php 2010-05-14 10:16:54.000000000 -0500 -@@ -112,7 +112,7 @@ - return '0'; - } - foreach($out as $line) -- if(preg_match('/^Library API version: (.*)$/', $line, $matches)) -+ if(preg_match('/^Library API *: (.*)$/', $line, $matches)) - return $matches[1]; - return '0'; - } ---- ../mre-1.1.2/conf/mre.conf.in.original 2006-08-13 16:48:57.000000000 -0500 -+++ ../mre-1.1.2/conf/mre.conf.in 2010-05-04 00:25:26.000000000 -0500 -@@ -28,9 +28,9 @@ - ; *** Application settings - ; Unprivledged user to run as, if started as root - ; This script will not run as root --user = nobody -+user = mythtv - ; Run MRE as daemon? Requires pcntl_* functions built into PHP --daemon = true -+daemon = false - ; Number of minutes to sleep between runs - sleep = 5 - ; Logging level (0 = normal, 1 = +error, 2 = +warning, 3 = +debug) ---- ../mre-1.1.2/class/EventFactory.php.original 2006-09-22 10:18:07.000000000 -0500 -+++ ../mre-1.1.2/class/EventFactory.php 2010-08-28 00:02:37.000000000 -0500 -@@ -50,7 +50,7 @@ - $obj = new NHLEvent($data['subtitle']); break; - case 'MLB Baseball': - $obj = new MLBEvent($data['subtitle']); break; -- case 'NFL Football': -+ case ($data['title']=='NFL Football' || $data['title']=='NFL Preseason Football'): - $obj = new NFLEvent($data['subtitle']); break; - case 'College Football': - $obj = new NCAAFEvent($data['subtitle']); break; ---- ../mre-1.1.2/class/MLBEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/MLBEvent.php 2010-08-28 00:02:37.000000000 -0500 -@@ -27,7 +27,7 @@ - /** - * URL to grab game info from - */ -- const url = 'http://scores.espn.go.com/mlb/scoreboard'; -+ const url = 'http://sports.espn.go.com/mlb/bottomline/scores'; - - /** - * Class constructor. -@@ -43,41 +43,25 @@ - trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); - else - { -- $data = file(self::url); -- $games = array(); -- if($data !== FALSE) -- { -- // Split the huge string into individual game data -- foreach($data as $line) -- if(preg_match('/\<div id="allGames".*\>.*/', $line)) -- { -- while(($loc = strrpos($line, 'teamTop')) !== FALSE) -- { -- $games[] = substr($line, $loc); -- $line = substr($line, 0, $loc); -- } -- break; -- } -- if(!sizeof($games)) -- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); -- foreach($criteria as $term) -- { -- foreach($games as $game) -- { -- if(preg_match('/' . preg_quote($term) . '/', $game)) -- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) -- { -- $this->setStatus($matches[1]); -- if(preg_match('/^(Final|Postponed)/', $matches[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break 2; -- } -- } -+ $data = file(self::url); -+ if($data) -+ { -+ $data_array=explode("&", $data[0]); -+ foreach($data_array as $line) -+ { -+ $line=str_replace("%20", " ", $line); -+ $line=str_replace("Chicago Sox", "Chicago White Sox", $line); #Program guide gives Chicago White Sox, website gives Chicago Sox -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) -+ { -+ if((strpos($line,'FINAL'))or(strpos($line,'Postponed'))) -+ $this->setEventOver(TRUE); -+ else -+ $this->setEventOver(FALSE); -+ $this->setValid(TRUE); -+ break; -+ } - } -- } -+ } - } - if(!$this->isValid()) - trigger_error("Unable to find MLB info for '$gameInfo'! The MLB parser may need to be updated.", E_USER_WARNING); ---- ../mre-1.1.2/class/NFLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NFLEvent.php 2010-08-28 00:06:56.000000000 -0500 -@@ -27,7 +27,7 @@ - /** - * URL to grab game info from - */ -- const url = 'http://scores.espn.go.com/nfl/scoreboard'; -+ const url = 'http://sports.espn.go.com/nfl/bottomline/scores'; - - /** - * Class constructor. -@@ -44,33 +44,23 @@ - else - { - $data = file(self::url); -- $games = array(); -- if($data !== FALSE) -- { -- // Split the huge string into individual game data -- foreach($data as $line) -- if(preg_match('/\<td class="teamTop.*".*\>.*/', $line)) -- $games[] = $line; -- if(!sizeof($games)) -- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); -- foreach($criteria as $term) -- { -- foreach($games as $game) -- { -- if(preg_match('/' . preg_quote($term) . '/', $game)) -- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) -- { -- $this->setStatus($matches[1]); -- if(preg_match('/^(Final|Postponed)/', $matches[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break 2; -- } -- } -- } -- } -+ if($data) -+ { -+ $data_array=explode("&", $data[0]); -+ foreach($data_array as $line) -+ { -+ $line=str_replace("%20", " ", $line); -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) -+ { -+ if(strpos($line,'FINAL')) -+ $this->setEventOver(TRUE); -+ else -+ $this->setEventOver(FALSE); -+ $this->setValid(TRUE); -+ break; -+ } -+ } -+ } - } - if(!$this->isValid()) - trigger_error("Unable to find NFL info for '$gameInfo'! The NFL parser may need to be updated.", E_USER_WARNING); ---- ../mre-1.1.2/class/NBAEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NBAEvent.php 2010-08-28 00:09:50.000000000 -0500 -@@ -27,7 +27,7 @@ - /** - * URL to grab game info from - */ -- const url = 'http://scores.espn.go.com/nba/scoreboard'; -+ const url = 'http://sports.espn.go.com/nba/bottomline/scores'; - - /** - * Class constructor. -@@ -44,35 +44,23 @@ - else - { - $data = file(self::url); -- if($data !== FALSE) -- foreach($criteria as $term) -- { -- $status = ''; -- $i = 0; -- while($i < sizeof($data)) -- { -- if(preg_match('/' . preg_quote($term) . '/', $data[$i])) -- { -- $status = $data[$i]; -- break; -- } -- ++$i; -- } -- if($i == sizeof($data)) -- --$i; -- -- if(preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i], $match) || -- preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i-1], $match)) -- { -- $this->setStatus($match[1]); -- if(preg_match('/^Final/', $match[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break; -- } -+ if($data) -+ { -+ $data_array=explode("&", $data[0]); -+ foreach($data_array as $line) -+ { -+ $line=str_replace("%20", " ", $line); -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) -+ { -+ if(strpos($line,'FINAL')) -+ $this->setEventOver(TRUE); -+ else -+ $this->setEventOver(FALSE); -+ $this->setValid(TRUE); -+ break; -+ } - } -+ } - } - if(!$this->isValid()) - trigger_error("Unable to find NBA info for '$gameInfo'! The NBA parser may need to be updated.", E_USER_WARNING); ---- ../mre-1.1.2/class/NHLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NHLEvent.php 2010-08-28 00:09:04.000000000 -0500 -@@ -27,7 +27,7 @@ - /** - * URL to grab game info from - */ -- const url = 'http://scores.espn.go.com/nhl/scoreboard'; -+ const url = 'http://sports.espn.go.com/nhl/bottomline/scores'; - - /** - * Class constructor. -@@ -39,32 +39,29 @@ - parent::__construct(); - - $criteria = $this->generateSearchTerms($gameInfo); -+ - if(!sizeof($criteria)) - trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); - else - { - $data = file(self::url); -- if($data !== FALSE) -- foreach($criteria as $term) -- { -- $status = ''; -- foreach($data as $line) -- if(preg_match('/' . preg_quote($term) . '/', $line)) -- { -- $status = $line; -- break; -- } -- if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match)) -- { -- $this->setStatus($match[1]); -- if(preg_match('/^Final/', $match[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break; -- } -+ if($data) -+ { -+ $data_array=explode("&", $data[0]); -+ foreach($data_array as $line) -+ { -+ $line=str_replace("%20", " ", $line); -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) -+ { -+ if(strpos($line,'FINAL')) -+ $this->setEventOver(TRUE); -+ else -+ $this->setEventOver(FALSE); -+ $this->setValid(TRUE); -+ break; -+ } - } -+ } - } - if(!$this->isValid()) - trigger_error("Unable to find NHL info for '$gameInfo'! The NHL parser may need to be updated.", E_USER_WARNING);
\ No newline at end of file diff --git a/abs/extra/community/mre/run b/abs/extra/community/mre/run deleted file mode 100755 index 94381b3..0000000 --- a/abs/extra/community/mre/run +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions -stat_runit "Starting mythrecordingextender" - -export HOME=/home/mythtv - -sv start mythbackend || exit 1 -sleep 5 - -exec /usr/local/bin/mre.php diff --git a/abs/extra/community/mutagen/PKGBUILD b/abs/extra/community/mutagen/PKGBUILD new file mode 100644 index 0000000..5e3d7b0 --- /dev/null +++ b/abs/extra/community/mutagen/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 149368 2012-02-07 08:50:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=mutagen +pkgver=1.20 +pkgrel=4 +pkgdesc="An audio metadata tag reader and writer" +arch=('any') +url="http://code.google.com/p/mutagen/" +license=('GPL2') +depends=('python2') +source=(http://mutagen.googlecode.com/files/${pkgname}-${pkgver}.tar.gz{,.sig}) +sha1sums=('7a8c1918160e6b5d24acd146f57c08ed942a2fa8' + '046c2d763cd59f86ee920a6dc28a32f86b555473') + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py test +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py install --root="${pkgdir}" + install -d "${pkgdir}/usr/bin" + install -m755 tools/* "${pkgdir}/usr/bin" + sed -i 's|^#!.*/usr/bin/env.*python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/* \ + "${pkgdir}/usr/lib/python2.7/site-packages/mutagen/__init__.py" +} diff --git a/abs/extra/community/mythpywii/CONTROLS b/abs/extra/community/mythpywii/CONTROLS deleted file mode 100644 index d733964..0000000 --- a/abs/extra/community/mythpywii/CONTROLS +++ /dev/null @@ -1,25 +0,0 @@ - * Keypad : same as keypad on keyboard - * A : Enter (Accept, OK, next, .) - * Minus (-) : d (Delete) - * Home : escape (Exit to previous menu/exit mythfrontend) - * Plus (+) : p (Play/pause) - * 1 : Info - * 2 : Menu - * B + left : rewind to beginning of video - * B + twist wiimote : rewind (if twisted to the left) or fastforward - (otherwise) with speed dependant on twist amount. - * B + A + twist wiimote: timestretching . slower (if twisted left) or - faster (if twisted right) - -A comment on twisting: -Point the wii remote at the screen, and twist from the elbow so that it - continues to point at the screen. - -The maximum fastforward/rewind speed is 180x. The speeds are dictated by -mythfrontend itself. When you rotate the wiimote, you will feel a slight -vibration (0.05 seconds) to let you know you have gone up or down a speed -segment. To stop fastforwarding/rewinding, simply let go of B. - -Beware: there is no power saving built in. However you should be able to -turn the wiimote off (power button) when not in use, and turn it back on -by holding down 1 and 2 to make it sync. diff --git a/abs/extra/community/mythpywii/PKGBUILD b/abs/extra/community/mythpywii/PKGBUILD deleted file mode 100644 index 3d4cf92..0000000 --- a/abs/extra/community/mythpywii/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $ -# Maintainer: Cecil Watson<knoppmyth@gmail.com> - -pkgname=mythpywii -pkgver=17 -pkgrel=9 -pkgdesc="Control MythTV using Wiimote." -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.benjiegillam.com/" -depends=('bluez' 'python-pybluez' 'cwiid-git') -install=mythpywii.install -source=(http://www.benjiegillam.com/code/myth_py_wii.py \ - wiimote.rules mythpywii.install CONTROLS) - -build() { - - /bin/true - -} - -package() { - install -D -m755 ${srcdir}/myth_py_wii.py ${startdir}/pkg/usr/bin/myth_py_wii.py || return 1 - install -D -m644 ${srcdir}/wiimote.rules ${startdir}/pkg/etc/udev/rules.d/z90-wiimote.rules || return 1 - install -d -o mythtv -g mythtv ${startdir}/pkg/home/mythtv/.cwiid/wminput || return 1 - install -D -m755 -o mythtv -g mythtv /etc/cwiid/wminput/{acc_led,buttons,gamepad,neverball,nunchuk_stick2btn,acc_ptr,ir_ptr,nunchuk_acc_ptr} ${startdir}/pkg/home/mythtv/.cwiid/wminput || return 1 - install -D -m644 ${srcdir}/CONTROLS ${startdir}/pkg/usr/share/docs/mythpywii/CONTROLS || return 1 - cd ${startdir}/pkg/home/mythtv/.cwiid/wminput - ln -s acc_led default -} -md5sums=('52b756c403349640c3e66f485b6c0a54' - '0d817a971d414b9320587a4cf289386b' - '64fa8dbd324dac68f71753ebd828d358' - '0872cbdb3def3dd9aa2b97b191ad76d8') diff --git a/abs/extra/community/mythpywii/mythpywii.install b/abs/extra/community/mythpywii/mythpywii.install deleted file mode 100644 index 8d0b867..0000000 --- a/abs/extra/community/mythpywii/mythpywii.install +++ /dev/null @@ -1,59 +0,0 @@ -post_install() { - . /home/mythtv/.mythtv/mysql.txt - # Enable the Network Remote Control Interface for use with the wiimote. - # Get local machine's hostname - HOST=`cat /etc/hostname` - # Update mysql for Network Remote Control Support - mysql -u mythtv -pmythtv --host=${DBHostName} mythconverg -e \ - "UPDATE settings SET data = '1' WHERE value = 'NetworkControlEnabled' AND hostname = '${HOST}'"; - echo "------------------------------------------------------------" - echo "myth_py_wii.py expects the Network Control Port to be set to" - echo "mythtv's default port of 6546. It will not work if you have" - echo "changed it to something else." - echo "------------------------------------------------------------" - # Add myth_py_wii.py to ~/mythtv/.fluxbox/apps before LinHES-run - sed -i '/LinHES-run/ i [startup] {/usr/bin/myth_py_wii.py >/dev/null}' /home/mythtv/.fluxbox/apps - # udev needs to pick up our new rule for the mythpywii. - udevadm trigger --subsystem-match="misc" --subsystem-match="bluetooth" - # Add the uinput module - modprobe uinput - # Ensure this module is loaded across reboots - echo "# uinput is needed by mythpywii" >> /etc/modules.mythvantage - echo "uinput" >> /etc/modules.mythvantage - # Bring up the bluetooth interface -- udev will do this after reboot - /usr/sbin/hciconfig hci0 up - # Punting on the multiple bluetooth adapter question. - echo "It is assumed your bluetooth adapter will be hci0." - echo "If you have more than one bluetooth adapter, you" - echo "may need to edit /etc/udev/rules.d/z90-wiimote.rules" - echo "--------------------------------------------------------------" - echo "--------------------------------------------------------------" - # Unfortunately there does not seem to be a way to do this without - # the user manually intervening. - echo "To use your wiimote you will need to restart the frontend service." - echo "$ sudo sv restart frontend" - echo "or simply reboot your machine." - echo "--------------------------------------------------------------" - echo "--------------------------------------------------------------" - echo "After frontend restart, you should now be able to pair your" - echo "Wiimote with your bluetooth adapter by pressing 1 & 2 at the" - echo "same time. After a few seconds the wiimote should vibrate and the" - echo "LEDs will show [ # . . # ] where # is on and . is off." - echo "--------------------------------------------------------------" - echo "See /usr/share/docs/mythpywii/CONTROLS for more information." - echo "--------------------------------------------------------------" -} - -post_remove() { - . /home/mythtv/.mythtv/mysql.txt - # kill myth_py_wii.py - WIIPID=`pidof -o %PPID /usr/bin/myth_py_wii.py` - [ -n "$WIIPID" ] && kill $WIIPID - # Remove uinput - sed -i '/uinput/d' /etc/modules.mythvantage - # Remove line in .fluxbox/apps - sed -i '/myth_py_wii.py/d' /home/mythtv/.fluxbox/apps - # Remove network remote control support - mysql -u mythtv -pmythtv --host=${DBHostName} mythconverg -e \ - "UPDATE settings SET data = '0' WHERE value = 'NetworkControlEnabled' AND hostname = '${HOST}'"; -} diff --git a/abs/extra/community/mythpywii/wiimote.rules b/abs/extra/community/mythpywii/wiimote.rules deleted file mode 100644 index 4bb2d9d..0000000 --- a/abs/extra/community/mythpywii/wiimote.rules +++ /dev/null @@ -1,6 +0,0 @@ -# For Bluetooth/Wiimote - KERNEL=="uinput", MODE="0660", GROUP="mythtv" - -# Automaticly bring up/down the bluetooth interface - ACTION=="add", KERNEL=="hci%n", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig hci%n up" - ACTION=="remove", KERNEL=="hci%n", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig hci%n down" diff --git a/abs/extra/community/ncdu/PKGBUILD b/abs/extra/community/ncdu/PKGBUILD deleted file mode 100644 index a9f83e6..0000000 --- a/abs/extra/community/ncdu/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: lp76 <l.peduto@gmail.com> -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> -pkgname=ncdu -pkgver=1.7 -pkgrel=1 -pkgdesc="An NCurses version of the famous old 'du' unix command" -arch=('i686' 'x86_64') -url="http://dev.yorhel.nl/ncdu/" -license=('MIT') -depends=('ncurses') -source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz) -md5sums=('172047c29d232724cc62e773e82e592a') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/abs/extra/community/network-ups-tools/PKGBUILD b/abs/extra/community/network-ups-tools/PKGBUILD deleted file mode 100644 index 1644c2e..0000000 --- a/abs/extra/community/network-ups-tools/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 12757 2010-03-13 04:22:57Z dgriffiths $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> -# Contributor: Giuseppe Lucarelli <luk@rebelsoft.org> - -pkgname=network-ups-tools -pkgver=2.4.3 -pkgrel=5 -pkgdesc="NUT is a collection of programs for monitoring and administering UPS hardware" -arch=('i686' 'x86_64') -url="http://www.networkupstools.org/" -license=('GPL2') -depends=('openssl' 'hal' 'gd') -makedepends=('libusb') -backup=(etc/ups/{ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf}) -install=nut.install -source=(http://www.networkupstools.org/source/2.4/nut-$pkgver.tar.gz run.upsd finish.upsd) -options=('!emptydirs' '!libtool') - -build() { -cd $srcdir/nut-$pkgver -./configure --with-user=nut \ ---prefix=/usr \ ---datadir=/usr/share/ups \ ---sysconfdir=/etc/ups \ ---with-group=nut \ ---with-hal \ ---with-usb \ ---with-cgi \ ---with-cgipath=/usr/share/webapps/nut \ ---with-htmlpath=/usr/share/webapps/nut \ ---with-udev-dir=/etc/udev || return 1 - - make || return 1 - make DESTDIR=$pkgdir install - #ugly hack because --with-pkgconfig-dir doesn't work - install -D -m644 lib/libupsclient.pc $pkgdir/usr/lib/pkgconfig - - install -D -m644 conf/ups.conf.sample $pkgdir/etc/ups/ups.conf - install -D -m640 conf/upsd.conf.sample $pkgdir/etc/ups/upsd.conf - install -D -m640 conf/upsd.users.sample $pkgdir/etc/ups/upsd.users - install -D -m640 conf/upsmon.conf.sample $pkgdir/etc/ups/upsmon.conf - install -D -m644 conf/upssched.conf.sample $pkgdir/etc/ups/upssched.conf - install -D -m755 ../run.upsd $pkgdir/etc/sv/upsd/run || return 1 - install -D -m755 ../finish.upsd $pkgdir/etc/sv/upsd/finish || return 1 - - # Fix udev rules - sed -i "s|SYSFS|ATTRS|g" $pkgdir/etc/udev/rules.d/52-nut-usbups.rules - install -dm755 ${pkgdir}/lib - mv ${pkgdir}/etc/udev ${pkgdir}/lib -} -md5sums=('6f893b61b07915e7a139324fa3f79121' - 'd7af81650a966660f6fd41f957c66165' - 'd50f13385848a9bb8f8cbc9ee5dd9fd5') diff --git a/abs/extra/community/network-ups-tools/finish.upsd b/abs/extra/community/network-ups-tools/finish.upsd deleted file mode 100644 index 8eb335b..0000000 --- a/abs/extra/community/network-ups-tools/finish.upsd +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/upsd` - stat_runit "Stopping UPSd Daemon" - /usr/bin/upsdrvctl stop &> /dev/null - /usr/sbin/upsmon -c stop &> /dev/null - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon upsd - stat_done - fi diff --git a/abs/extra/community/network-ups-tools/nut.install b/abs/extra/community/network-ups-tools/nut.install deleted file mode 100644 index 1e6beee..0000000 --- a/abs/extra/community/network-ups-tools/nut.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - groupadd -g 55 nut &> /dev/null - useradd -u 55 -g nut -G tty -d /var/state/ups -s /bin/false nut >/dev/null 2>&1 - mkdir -p /var/state/ups/ - chmod 0770 /var/state/ups/ - chown root:nut /var/state/ups/ - chown root:nut /etc/ups/upsd.conf /etc/ups/upsd.users /etc/ups/upsmon.conf - echo ">>> Before starting your UPSd daemon, it is imperative" - echo ">>> that you read through and edit where needed these files:" - echo ">>> /etc/ups/{ups.conf,upsd.conf,upsmon.conf,upsd.users}" - echo ">>>" - echo ">>> Then add the the upsd service:" - echo ">>> $ sudo add_service.sh upsd" -} - -pre_remove() { - remove_service.sh upsd - userdel nut >/dev/null 2>&1 - groupdel nut >/dev/null 2>&1 - rm -rf /var/state/ups/ -} diff --git a/abs/extra/community/network-ups-tools/run.upsd b/abs/extra/community/network-ups-tools/run.upsd deleted file mode 100644 index 83be88d..0000000 --- a/abs/extra/community/network-ups-tools/run.upsd +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/upsd` - - stat_runit "Starting UPSd Daemon" - /usr/bin/upsdrvctl start &> /dev/null - [ -z "$PID" ] && /usr/sbin/upsd &>/dev/null - /usr/sbin/upsmon &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon upsd - stat_done - fi - - while [ -n $PID ] ; do - sleep 60 - done diff --git a/abs/extra/community/nvclock/PKGBUILD b/abs/extra/community/nvclock/PKGBUILD deleted file mode 100644 index d49f915..0000000 --- a/abs/extra/community/nvclock/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 23406 2009-01-09 22:39:57Z andyrtr $ -# Contributor: Markus Meissner <markus@meissna.de> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=nvclock -pkgver=0.8b4 -pkgrel=1 -pkgdesc="A small utility which allows users to overclock NVIDIA based video cards" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk2') -source=(http://www.linuxhardware.org/$pkgname/${pkgname}${pkgver}.tar.gz - nvclock-0.8b4-buildfix.patch) -url="http://www.linuxhardware.org/nvclock/" -md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11' - '1da24b50dd6a8c4704fa550a3e1a8b53') -options=('!makeflags') - -build(){ - cd ${srcdir}/$pkgname$pkgver - # build fix from Fedora - patch -Np1 -i $srcdir/nvclock-0.8b4-buildfix.patch || return 1 - sed -i 's:${prefix}/man:${prefix}\/share\/man:' ${srcdir}/$pkgname$pkgver/Makefile.in || return 1 - ./configure --prefix=/usr --bindir=/usr/bin - make || return 1 || return 1 - make DESTDIR=${pkgdir} install || return 1 -} diff --git a/abs/extra/community/nvclock/nvclock-0.8b4-buildfix.patch b/abs/extra/community/nvclock/nvclock-0.8b4-buildfix.patch deleted file mode 100644 index cdc9f5c..0000000 --- a/abs/extra/community/nvclock/nvclock-0.8b4-buildfix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in ---- nvclock0.8b4.orign/src/Makefile.in 2009-01-03 18:02:54.000000000 +0100 -+++ nvclock0.8b4/src/Makefile.in 2009-01-07 11:37:39.000000000 +0100 -@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app - install: install-recursive install-app - install-app: - mkdir -p $(bindir) -- $(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock -- $(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer -+ $(INSTALL) -c nvclock $(bindir)/nvclock -+ $(INSTALL) -c smartdimmer $(bindir)/smartdimmer - - - uninstall: uninstall-recursive uninstall-app - - diff --git a/abs/extra/community/nvidia-cg-toolkit/PKGBUILD b/abs/extra/community/nvidia-cg-toolkit/PKGBUILD deleted file mode 100644 index c3f896e..0000000 --- a/abs/extra/community/nvidia-cg-toolkit/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 64721 2012-02-18 02:42:09Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Adam Griffiths -# Contributor: Nick B <Shirakawasuna at gmail _dot_ com> -pkgname=nvidia-cg-toolkit -pkgver=3.1 -_date="February2012" -pkgrel=1 -pkgdesc="NVIDIA Cg libraries" -arch=('i686' 'x86_64') -url="http://developer.nvidia.com/object/cg_toolkit.html" -license=('custom') -depends=('glibc' 'mesa') -source=(http://developer.download.nvidia.com/cg/Cg_${pkgver}/Cg-${pkgver}_${_date}_${CARCH/i686/x86}.tgz) -[ "$CARCH" = "i686" ] && -md5sums=('af5a3bd72b213b20bf33cf104c83012d') -[ "$CARCH" = "x86_64" ] && -md5sums=('d50dc4e6c68bb93ccfd1a66c139dd6eb') - -build() { - return 0 -} - -package() { - install -Dm755 ${srcdir}/usr/bin/cgc ${pkgdir}/usr/bin/cgc - install -dm755 ${pkgdir}/usr/include/Cg - install -m644 ${srcdir}/usr/include/Cg/* ${pkgdir}/usr/include/Cg - install -dm755 ${pkgdir}/usr/lib - [ "$CARCH" = "i686" ] && install -m644 ${srcdir}/usr/lib/* ${pkgdir}/usr/lib - [ "$CARCH" = "x86_64" ] && install -m644 ${srcdir}/usr/lib64/* ${pkgdir}/usr/lib - install -Dm644 ${srcdir}/usr//local/Cg/docs/license.txt ${pkgdir}/usr/share/licenses/nvidia-cg-toolkit/license.txt - cp -r ${srcdir}/usr/local/Cg ${pkgdir}/usr/share/ - find $pkgdir/usr/share/ -type d -exec chmod -R 755 '{}' ';' - find $pkgdir/usr/share/ -type f -exec chmod -R 644 '{}' ';' -} - -# vim: sw=2:ts=2 et: diff --git a/abs/extra/community/nxtvepg/PKGBUILD b/abs/extra/community/nxtvepg/PKGBUILD deleted file mode 100644 index 5de6bc7..0000000 --- a/abs/extra/community/nxtvepg/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Contributor: Perry3D <perry3d at gmail dot com> -# Previous: Gilles CHAUVIN <gcnweb at gmail dot com> - -pkgname=nxtvepg -pkgver=2.8.1 -pkgrel=2 -pkgdesc="A decoder for nexTView EPG an Electronic TV Programme Guide" -url="http://nxtvepg.sf.net/" -license="GPL" -depends=('tcl>=8.5.0' 'tk' 'libxmu') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \ -tcl_85.patch \ -$pkgname-icon-16.png $pkgname-icon-32.png $pkgname-icon-48.png \ -$pkgname.desktop) -arch=('i686' 'x86_64') - -build() { - cd $startdir/src/$pkgname-$pkgver - - msg "Applying patch for tcl/tk8.5..." - patch -p0 < ../tcl_85.patch - - make || return 1 - - make prefix=$startdir/pkg/usr/ \ - bindir=$startdir/pkg/usr/bin \ - resdir=$startdir/pkg/usr/share/X11 \ - INST_DB_DIR=$startdir/pkg/var/tmp/nxtvdb \ - cfgdir=$startdir/pkg/usr/share/nxtvepg \ - install - - # Icons - for size in 16 32 48; do - install $startdir/src/$pkgname-icon-$size.png -D -m644 $startdir/pkg/usr/share/pixmaps/$pkgname-icon-$size.png - done - - # .desktop file - install $startdir/src/$pkgname.desktop -D -m644 $startdir/pkg/usr/share/applications/$pkgname.desktop -} -md5sums=('0811b1b95537b3cbab9f8d18d1501411' - 'db5e77089204aeb35e84c7f5505664a6' - '5f7c220d3355b6f043a2bdd5acec8608' - '8988d3f33a90bd99f9a61d8f7e4f46c3' - '26d86bd935df1dc9328f07b879f30de2' - '5d14ff096ef811ccb7dc330e5d3a76fd') diff --git a/abs/extra/community/nxtvepg/nxtvepg-icon-16.png b/abs/extra/community/nxtvepg/nxtvepg-icon-16.png Binary files differdeleted file mode 100644 index e6d8a85..0000000 --- a/abs/extra/community/nxtvepg/nxtvepg-icon-16.png +++ /dev/null diff --git a/abs/extra/community/nxtvepg/nxtvepg-icon-32.png b/abs/extra/community/nxtvepg/nxtvepg-icon-32.png Binary files differdeleted file mode 100644 index 9071f10..0000000 --- a/abs/extra/community/nxtvepg/nxtvepg-icon-32.png +++ /dev/null diff --git a/abs/extra/community/nxtvepg/nxtvepg-icon-48.png b/abs/extra/community/nxtvepg/nxtvepg-icon-48.png Binary files differdeleted file mode 100644 index a5f991b..0000000 --- a/abs/extra/community/nxtvepg/nxtvepg-icon-48.png +++ /dev/null diff --git a/abs/extra/community/nxtvepg/nxtvepg.desktop b/abs/extra/community/nxtvepg/nxtvepg.desktop deleted file mode 100644 index 6703dfc..0000000 --- a/abs/extra/community/nxtvepg/nxtvepg.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Comment=Electronic TV Programme Guide -Icon=/usr/share/pixmaps/nxtvepg-icon-48.png -Exec=nxtvepg -Name=nexTView EPG -GenericName=electronic TV Programme Guide -Terminal=false -Type=Application -Categories=Application;AudioVideo; diff --git a/abs/extra/community/nxtvepg/tcl_85.patch b/abs/extra/community/nxtvepg/tcl_85.patch deleted file mode 100644 index 9059a6c..0000000 --- a/abs/extra/community/nxtvepg/tcl_85.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig 2008-02-03 20:01:14.000000000 +0100 -+++ Makefile 2008-02-03 20:01:23.000000000 +0100 -@@ -58,8 +58,8 @@ - YACC = /usr/bin/yacc - - # select Tcl/Tk version (8.5 recommended due to modernized widget appearence) --TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh) --#TCL_VER = 8.5 -+#TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh) -+TCL_VER = 8.5 - - ifeq ($(shell test -d /usr/include/tcl$(TCL_VER) && echo YES),YES) - INCS += -I/usr/include/tcl$(TCL_VER) diff --git a/abs/extra/community/nzbperl/PKGBUILD b/abs/extra/community/nzbperl/PKGBUILD deleted file mode 100755 index bbfee00..0000000 --- a/abs/extra/community/nzbperl/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -#Contributor: Xavier Vierling <xavierling@free.fr> -pkgname=nzbperl -pkgver=0.6.8 -pkgrel=1 -pkgdesc="nzb based nntp/usenet downloader in perl" -arch=('i686' 'x86_64') -url="http://noisybox.net/computers/nzbperl/" -license="GPL" -depends=(perl-term-readkey perl-xml-dom uudeview) -source=(http://noisybox.net/computers/nzbperl/$pkgname-$pkgver.pl) -md5sums=('70e64b7cd4ff9c7c098bf8dffeb62578') - -build() { - cd $startdir/src - install -D nzbperl-$pkgver.pl $startdir/pkg/usr/bin/nzbperl -}
\ No newline at end of file diff --git a/abs/extra/community/openal/PKGBUILD b/abs/extra/community/openal/PKGBUILD deleted file mode 100644 index 6d6c669..0000000 --- a/abs/extra/community/openal/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 149424 2012-02-07 16:51:11Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributer: Jason Chu <jchu@xentac.net> - -pkgname=openal -pkgver=1.13 -pkgrel=4 -pkgdesc="A cross-platform 3D audio library" -arch=(i686 x86_64) -url="http://www.openal.org/" -license=(LGPL) -depends=(glibc) -makedepends=(alsa-lib sdl pkgconfig cmake) -options=('!libtool') -source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2) -md5sums=('58b7d2809790c70681b825644c5f3614') - -build() { - cd "$srcdir/$pkgname-soft-$pkgver/build" - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. - make -} - -package() { - cd "$srcdir/$pkgname-soft-$pkgver" - make -C build DESTDIR="$pkgdir/" install - install -Dm644 alsoftrc.sample "$pkgdir/etc/openal/alsoft.conf.sample" -} diff --git a/abs/extra/community/openal/__changelog b/abs/extra/community/openal/__changelog deleted file mode 100644 index 7f47556..0000000 --- a/abs/extra/community/openal/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -4/25/12 - chw - -Removed libpulse as a dep. diff --git a/abs/extra/community/opencl-headers/LICENSE.txt b/abs/extra/community/opencl-headers/LICENSE.txt deleted file mode 100644 index a89e4f5..0000000 --- a/abs/extra/community/opencl-headers/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ - * Copyright (c) 2008-2010 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/abs/extra/community/opencl-headers/PKGBUILD b/abs/extra/community/opencl-headers/PKGBUILD deleted file mode 100644 index 0a21ce2..0000000 --- a/abs/extra/community/opencl-headers/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 60629 2011-12-15 19:18:50Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Sylvain HENRY <hsyl20@yahoo.fr> - -pkgname=opencl-headers -pkgver=1.1.20110526 -_clbasever=1.1 -pkgrel=1 -epoch=1 -pkgdesc='OpenCL (Open Computing Language) header files' -arch=('any') -url='http://www.khronos.org/registry/cl/' -license=('custom') -optdepends=('libcl: OpenCL library') -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.src.tar.xz" - 'LICENSE.txt') -_headers=("http://www.khronos.org/registry/cl/api/${_clbasever}/cl_ext.h" - "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_gl_ext.h" - "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_gl.h" - "http://www.khronos.org/registry/cl/api/${_clbasever}/cl.h" - "http://www.khronos.org/registry/cl/api/${_clbasever}/cl.hpp" - "http://www.khronos.org/registry/cl/api/${_clbasever}/cl_platform.h" - "http://www.khronos.org/registry/cl/api/${_clbasever}/opencl.h") -sha1sums=('b9deedbae4f87fa0987ca7b2347f68d608284a02' - '98abb35b2eca82d0fc19db6d28fcc7bd20be0655') - -# source PKGBUILD && mksource -mksource() { - cd "${srcdir}" - _dirname=${pkgname}-${pkgver} - mkdir ${_dirname} - - pushd ${_dirname} - for _h in ${_headers[@]}; do - wget ${_h} - done - popd - - tar -cJv --exclude=CVS -f ${_dirname}.src.tar.xz ${_dirname} - rm -rf ${_dirname} -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -dm755 "${pkgdir}"/usr/include/CL - - for h in $(ls -1 *.h *.hpp); do - install -m 644 ${h} "${pkgdir}"/usr/include/CL/ - done - - install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/abs/extra/community/patchutils/PKGBUILD b/abs/extra/community/patchutils/PKGBUILD deleted file mode 100644 index 8aedbf0..0000000 --- a/abs/extra/community/patchutils/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ -# Contributor: Aurelien Foret <orelien@chez.com> -# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=patchutils -pkgver=0.3.2 -pkgrel=1 -pkgdesc="A small collection of programs that operate on patch files" -license=('GPL') -url="http://cyberelk.net/tim/patchutils/" -depends=('perl') -arch=('i686' 'x86_64') -source=(http://cyberelk.net/tim/data/patchutils/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('74607b4a28c9009c6aeeed0e91098917') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install -} diff --git a/abs/extra/community/peardb/PKGBUILD b/abs/extra/community/peardb/PKGBUILD deleted file mode 100755 index 01164eb..0000000 --- a/abs/extra/community/peardb/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=peardb -pkgver=1.7.13 -pkgrel=2 -arch=('i686') -pkgdesc="Pear Database Abstraction Layer" -url="http://pear.php.net/" -license=('GPL2') -replaces=('PearDB') -source=(http://download.pear.php.net/package/DB-${pkgver}.tgz) - -build() { - /bin/true -} - -package() { - mkdir -p ${pkgdir}/usr/share/pear/ - cp -r ${srcdir}/DB-$pkgver/DB* ${pkgdir}/usr/share/pear/ - mkdir -p ${pkgdir}/usr/share/pear/docs/DB/ - cp -r ${srcdir}/DB-$pkgver/doc/* ${pkgdir}/usr/share/pear/docs/DB/ - mkdir -p ${pkgdir}/usr/share/pear/tests/DB/ - cp -r ${srcdir}/DB-$pkgver/tests/* ${pkgdir}/usr/share/pear/tests/DB/ -} - -md5sums=('39b451245941a7059511a852f18b4946') diff --git a/abs/extra/community/pearlog/PKGBUILD b/abs/extra/community/pearlog/PKGBUILD deleted file mode 100755 index 31ad2b3..0000000 --- a/abs/extra/community/pearlog/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -pkgname=pearlog -pkgver=1.12.3 -pkgrel=1 -pkgdesc="Pear Logging Framework" -arch=('i686') -url="http://pear.php.net/" -license=('GPL2') -replaces=('PearLog') -source=(http://download.pear.php.net/package/Log-${pkgver}.tgz) - -build() { - /bin/true -} - -package() { - mkdir -p ${pkgdir}/usr/share/pear/ - cp -r ${srcdir}/Log-${pkgver}/Log* ${pkgdir}/usr/share/pear/ - mkdir -p ${pkgdir}/usr/share/pear/docs/Log - cp -r ${srcdir}/Log-${pkgver}/docs/* ${pkgdir}/usr/share/pear/docs/Log/ - mkdir -p ${pkgdir}/usr/share/pear/examples/Log - cp -r ${srcdir}/Log-${pkgver}/examples/* ${pkgdir}/usr/share/pear/examples/Log/ - mkdir -p ${pkgdir}/usr/share/pear/misc/Log - cp -r ${srcdir}/Log-${pkgver}/misc/* ${pkgdir}/usr/share/pear/misc/Log/ - mkdir -p ${pkgdir}/usr/share/pear/tests/Log - cp -r ${srcdir}/Log-${pkgver}/tests/* ${pkgdir}/usr/share/pear/tests/Log/ -} -md5sums=('9930cb6d52b3af2ca6a24db267e237f0') diff --git a/abs/extra/community/portaudio/PKGBUILD b/abs/extra/community/portaudio/PKGBUILD deleted file mode 100644 index 1872b94..0000000 --- a/abs/extra/community/portaudio/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 55258 2011-09-07 18:41:32Z ebelanger $ -# Based on 'portaudio' package - Eric Belanger <eric@archlinux.org> -# Last/Most-Recent Contributor: Darwin Bautista <djclue917@gmail.com> -# Maintainer: Bob Finch <w9ya@qrparci.net> - -pkgname=portaudio -pkgver=19_20110326 -pkgrel=1 -pkgdesc="A free, cross-platform, open source, audio I/O library" -arch=('i686' 'x86_64') -url="http://www.portaudio.com/" -license=('custom') -depends=('jack') -options=('!libtool') -source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz) -md5sums=('8f266ce03638419ef46e4efcb0fabde6') - -build() { - cd "$srcdir/$pkgname" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname" - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" -} diff --git a/abs/extra/community/powernowd/PKGBUILD b/abs/extra/community/powernowd/PKGBUILD deleted file mode 100644 index f784523..0000000 --- a/abs/extra/community/powernowd/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: kastor <kastor@fobos.org.ar> - -pkgname=powernowd -pkgver=1.00 -pkgrel=2 -pkgdesc="Program for powering down CPUs dynamicly" -arch=('i686' 'x86_64') -url="http://www.deater.net/john/powernowd.html" -license="GPL" -depends=('glibc') -source=(http://www.deater.net/john/$pkgname-$pkgver.tar.gz \ - run finish powernowd.install powernowd.conf.d) -install=($pkgname.install) - -build() { - cd $startdir/src/$pkgname-$pkgver - make || return 1 - install -D -m755 powernowd $startdir/pkg/usr/sbin/powernowd || return 1 - mkdir -p $startdir/pkg/etc/sv/powernowd || return 1 - install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/powernowd || return 1 - install -D -m755 $startdir/src/finish $startdir/pkg/etc/sv/powernowd || return 1 - install -D -m644 $startdir/src/powernowd.conf.d $startdir/pkg/etc/conf.d/powernowd || return 1 -} -md5sums=('abc48b690d104e9e71a85400ba19d799' - 'ffd9b939665f74dac2220b4311482e04' - '13c6591ffc27d0b16f41f7892671302f' - 'dcbf8e98425b208c29f4c06b687dd0d0' - 'c9385af22c7c74e6cd6bdc982f94644f') diff --git a/abs/extra/community/powernowd/finish b/abs/extra/community/powernowd/finish deleted file mode 100644 index 97e3034..0000000 --- a/abs/extra/community/powernowd/finish +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# AUR Credits: -# simple init script the ARCH-way for Powernowd -# Made by, CyberTron, packages@linuxportalen.com - -# Modifications by Alexander Baldeck <alexander@archlinux.org> - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/powernowd` - -[ -f /etc/conf.d/powernowd ] && source /etc/conf.d/powernowd - - stat_runit "Stopping Powernowd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/powernowd.pid - rm_daemon powernowd - stat_done - fi diff --git a/abs/extra/community/powernowd/powernowd.conf.d b/abs/extra/community/powernowd/powernowd.conf.d deleted file mode 100644 index 287c2bc..0000000 --- a/abs/extra/community/powernowd/powernowd.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# Configuration file for powernowd - -# If no options given, powernowd should be able to autodetect -# a sane setup. So most users will not have to put anything -# here. -OPTIONS="-d" diff --git a/abs/extra/community/powernowd/powernowd.install b/abs/extra/community/powernowd/powernowd.install deleted file mode 100644 index af218af..0000000 --- a/abs/extra/community/powernowd/powernowd.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - add_service.sh powernowd - - echo "Be sure to modprobe the proper module for your CPU and then add it - echo "to /etc/rc.conf in the MODULES section." - echo "i.e. for a Core2Duo modprobe/add acpi_cpufreq" - echo "Then restart the powernowd service: sudo sv restart powernowd" -} - -post_upgrade() { - echo "Be sure to modprobe the proper module for your CPU and then add it - echo "to /etc/rc.conf in the MODULES section." - echo "i.e. for a Core2Duo modprobe/add acpi_cpufreq" - echo "Then restart the powernowd service: sudo sv restart powernowd" -} - -pre_remove() { - remove_service.sh powernowd -} diff --git a/abs/extra/community/powernowd/run b/abs/extra/community/powernowd/run deleted file mode 100644 index 0e83b98..0000000 --- a/abs/extra/community/powernowd/run +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# AUR Credits: -# simple init script the ARCH-way for Powernowd -# Made by, CyberTron, packages@linuxportalen.com - -# Modifications by Alexander Baldeck <alexander@archlinux.org> - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/powernowd` - -[ -f /etc/conf.d/powernowd ] && source /etc/conf.d/powernowd - - stat_runit "Starting Powernowd" - [ -z "$PID" ] && /usr/sbin/powernowd $OPTIONS 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/powernowd.pid - add_daemon powernowd - stat_done - fi diff --git a/abs/extra/community/projectx/PKGBUILD b/abs/extra/community/projectx/PKGBUILD deleted file mode 100644 index 62092a4..0000000 --- a/abs/extra/community/projectx/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Contributer: Sebastian Sareyko <public@nooms.de> - -pkgname=projectx -pkgver=0.90.4.00 -pkgrel=8 -license=('GPL') -arch=('i686' 'x86_64') -pkgdesc="DVB demux tool for repairing and analyzing different stream types" -makedepends=('java-environment') -depends=('java-runtime') -url="http://sourceforge.net/projects/project-x" -source=(http://dl.sourceforge.net/sourceforge/project-x/ProjectX_Source_eng_$pkgver.zip \ - http://dl.sourceforge.net/sourceforge/project-x/ProjectX_LanguagePack_$pkgver.zip \ - projectx) - -md5sums=('92d7b5aea50b8811307f27b6e01ceb5c' - 'edfe8d04bd3d403eec4d9e27d1b976d2' - '0c88b15884a0c997e3386d15e207cd30') - -build() { - cd $startdir/src/ProjectX_Source_0.90.4 - - sed -i 's,^Exec=.*,Exec=projectx,' projectx.desktop - - mkdir -p build - - javac -encoding "ISO-8859-1" -O -g:none \ - -classpath lib/commons-net-1.3.0.jar:lib/jakarta-oro-2.0.8.jar \ - -d build @sources.lst || return 1 - - mv resources/* ./build - sed -i -e 's/ReleaseNotes_0.90.1.txt/ReleaseNotes_0.90.4.txt/' htmls/index.html - mv htmls build - mv ReadMe.txt build - mv ReleaseNotes_0.90.4.txt build - jar cvfm ProjectX.jar MANIFEST.MF -C build . - - install -D -m0755 $startdir/projectx $startdir/pkg/usr/bin/projectx - install -D -m0644 ProjectX.jar $startdir/pkg/opt/projectx/ProjectX.jar - install -D -m0644 lib/commons-net-1.3.0.jar \ - $startdir/pkg/opt/projectx/lib/commons-net-1.3.0.jar - install -D -m0644 lib/jakarta-oro-2.0.8.jar \ - $startdir/pkg/opt/projectx/lib/jakarta-oro-2.0.8.jar - install -D -m0644 projectx.desktop $startdir/pkg/usr/share/applications/projectx.desktop -} diff --git a/abs/extra/community/projectx/projectx b/abs/extra/community/projectx/projectx deleted file mode 100644 index 1d540bc..0000000 --- a/abs/extra/community/projectx/projectx +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ ! -d ~/.projectx ] ; then - mkdir ~/.projectx -fi - -if [ "$#" -eq 0 ] ; then - cd ~/.projectx -fi -java -jar /opt/projectx/ProjectX.jar "$@" diff --git a/abs/extra/community/smplayer/ChangeLog b/abs/extra/community/smplayer/ChangeLog deleted file mode 100644 index e8397b3..0000000 --- a/abs/extra/community/smplayer/ChangeLog +++ /dev/null @@ -1,74 +0,0 @@ -2010-02-23 Ionut Biru <ibiru@archlinux.org> - * smplayer 0.6.9-2 - * changed exec argument from %U to %F in smplayer.desktop - -2010-02-22 Ionut Biru <ibiru@archlinux.org> - * smplayer 0.6.9-1 - * Upstream update - -2009-07-25 Allan McRae <allan@archlinux.org> - * smplayer 0.6.8-1 - * Upstream update - -2009-03-13 Allan McRae <allan@archlinux.org> - * smplayer 0.6.7-1 - * Upstream update - -2009-01-01 Allan McRae <allan@archlinux.org> - * smplayer 0.6.6-1 - * Upstream update - -2008-11-14 Allan McRae <allan@archlinux.org> - * smplayer 0.6.5.1-1 - * Upstream update - -2008-10-27 Allan McRae <allan@archlinux.org> - * smplayer 0.6.4-1 - * Upstream update - -2008-09-27 Allan McRae <allan@archlinux.org> - * smplayer 0.6.3-1 - * Upstream update - -2008-06-21 Allan McRae <allan@archlinux.org> - - * smplayer 0.6.2-1 - * Upstream update - * Removed install message - -2008-06-21 Allan McRae <allan@archlinux.org> - - * smplayer 0.6.1-1 - * Upstream update - * Removed provides/conflicts/replaces - -2008-05-23 Eric Belanger <eric@archlinux.org> - - * smplayer 0.6.0-1 - * Upstream update - * Updated .install file - -2008-01-32 Varun Acharya <varun@archlinux.org> - - * smplayer-0.5.62-1 moved to extra, thanks molok - * PKGBUILD cleanup - -2007-11-27 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * smplayer-0.5.62-1 - * version bump - -2007-10-24 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * smplayer-0.5.61-1 - * build against qt4 - * removed post_upgrade message - -2007-07-12 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * smplayer-0.5.21-1 - * version bump - -2007-05-30 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - * smplayer-0.5.0-1 - * version bump diff --git a/abs/extra/community/smplayer/PKGBUILD b/abs/extra/community/smplayer/PKGBUILD deleted file mode 100644 index 0928e4b..0000000 --- a/abs/extra/community/smplayer/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> -# Contributor: shamrok <szamrok@gmail.com> - -pkgname=smplayer -pkgver=0.6.9 -pkgrel=3 -pkgdesc="A complete front-end for MPlayer" -arch=('i686' 'x86_64') -url="http://smplayer.sourceforge.net/" -license=('GPL') -depends=('qt>=4.7.1' 'mplayer') -source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dfe874b386509de5df78537489f95004') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # remove broken translation - sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro - - make PREFIX=/usr - make PREFIX=${pkgdir}/usr install - - install -dm755 ${pkgdir}/usr/share/pixmaps - ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \ - ${pkgdir}/usr/share/pixmaps/ - - sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop - sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \ - ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop -} - diff --git a/abs/extra/community/squeezeboxserver/PKGBUILD b/abs/extra/community/squeezeboxserver/PKGBUILD deleted file mode 100644 index 45db11f..0000000 --- a/abs/extra/community/squeezeboxserver/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: Anton Prins <uar at prinsonline dot demon dot nl> - -pkgname=squeezeboxserver -pkgver=7.4.1 -pkgrel=1 -pkgdesc="Powerful streaming audio server from Slim Devices" -depends=( -# unknown to me, default arch install + openssh handles it - ) - -source=(http://downloads.slimdevices.com/SqueezeboxServer_v${pkgver}/squeezeboxserver-${pkgver}.tgz - $pkgname.rc - $pkgname.conf.d - ) - -url="http://www.slimdevices.com/pi_features.html" -license=('GPL') -arch=('i686' 'x86_64') -install=squeezeboxserver.install - -#not sure how to handle the build number -28947? -build() { -cd $startdir/src/squeezeboxserver-${pkgver}-28947 || return 1 - -mkdir -p $startdir/pkg/home/squeezeboxserver || return 1 -cp -a * $startdir/pkg/home/squeezeboxserver || return 1 -install -D -m755 ../squeezeboxserver.rc $startdir/pkg/etc/rc.d/squeezeboxserver || return 1 -install -D -m644 ../squeezeboxserver.conf.d $startdir/pkg/etc/conf.d/squeezeboxserver || return 1 -mkdir $startdir/pkg/home/squeezeboxserver/prefs -} - -md5sums=('fa65636e7df75ae7af884a2efa184639' - '5e57982c257797badbf72c2ae04994f7' - 'aa65896541958e119e63ee7c96be39af') diff --git a/abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d b/abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d deleted file mode 100644 index d14a2e9..0000000 --- a/abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file for SqueezeCenter on Arch Linux. -# Save this as /etc/conf.d/squeezeboxserver - -# Enter space-delimited options on the following line. -# e.g. SQUEEZEBOXSERVER_OPTS="--diag --d_scan --d_command" -# See "/home/squeezeboxserver/slimserver.pl --help" for a full list of possible options. -SQUEEZEBOXSERVER_OPTS="" diff --git a/abs/extra/community/squeezeboxserver/squeezeboxserver.install b/abs/extra/community/squeezeboxserver/squeezeboxserver.install deleted file mode 100644 index 058de02..0000000 --- a/abs/extra/community/squeezeboxserver/squeezeboxserver.install +++ /dev/null @@ -1,56 +0,0 @@ -post_install() { -echo -n "adding squeezeboxserver user... " -useradd -c "SqueezeBoxServer" -g users -s /bin/false squeezeboxserver && echo "done." -passwd -l squeezeboxserver &>/dev/null - -chown -R squeezeboxserver:users /home/squeezeboxserver - -install -o squeezeboxserver -d /var/cache/squeezeboxserver -touch /var/log/squeezeboxserver.log -chown squeezeboxserver:users /var/log/squeezeboxserver.log - -cat << 'EOM' - -==> SqueezeBoxServer uses MySQL instead of sqlite. If you have MySQL up and running -==> you can configure SqueezeBoxServer to use that server as described here: -==> http://wiki.slimdevices.com/index.php/ExistingMySQLInstance - -==> PLEASE NOTE: SqueezeBoxServer should always be run as the user 'squeezeboxserver'. -==> This is easily done by adding squeezeboxserver to the DAEMONS array in rc.conf, -==> after network and mysql. - -==> Additional run-time options can be added to /etc/conf.d/squeezeboxserver. -==> Please refer to "/home/squeezeboxserver/slimserver.pl --help" for full details. - -EOM -} - -post_upgrade() { -chown -R squeezeboxserver:users /home/squeezeboxserver - -cat << 'EOM' - -==> SqueezeBoxServer uses MySQL instead of sqlite. If you have MySQL up and running -==> you can configure SqueezeBoxServer to use that server as described here: -==> http://wiki.slimdevices.com/index.php/ExistingMySQLInstance - -EOM -} - -pre_remove() { -# pre_remove gets called whenever post_remove is defined. -true -} - -post_remove() { -# post_remove doesn't start at a newline like the other post_* functions, -# so we'll have to make one for ourselves. -echo -n -e "\nremoving squeezeboxserver user... " -userdel squeezeboxserver && echo "done." - -rm -r /var/cache/squeezeboxserver /var/log/squeezeboxserver.log -} - -op=$1 -shift -$op $* diff --git a/abs/extra/community/squeezeboxserver/squeezeboxserver.rc b/abs/extra/community/squeezeboxserver/squeezeboxserver.rc deleted file mode 100644 index d33db16..0000000 --- a/abs/extra/community/squeezeboxserver/squeezeboxserver.rc +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/squeezeboxserver ] && . /etc/conf.d/squeezeboxserver - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -squeezehome=/home/squeezeboxserver -pidfile=/var/run/squeezeboxserver.pid -logfile=/var/log/squeezeboxserver.log -prefsdir=/home/squeezeboxserver/prefs -cachedir=/var/cache/squeezeboxserver - - -case "$1" in - start) - stat_busy "Starting SqueezeBoxServer" - cd $squeezehome - ./slimserver.pl --daemon --user squeezeboxserver --prefsdir $prefsdir \ - --cachedir $cachedir --pidfile $pidfile --logfile $logfile $SQUEEZEBOXSERVER_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon squeezeboxserver - stat_done - fi - ;; - stop) - stat_busy "Stopping SqueezeBoxServer" - kill `cat $pidfile` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon squeezeboxserver - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/extra/community/tig/PKGBUILD b/abs/extra/community/tig/PKGBUILD deleted file mode 100644 index 87e5e4d..0000000 --- a/abs/extra/community/tig/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Loui Chang <louipc dot ist at gmail company> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor: Nathan Jones <nathanj@insightbb.com> - -pkgname=tig -pkgver=0.18 -pkgrel=1 -pkgdesc="Text-mode interface for git" -depends=('git' 'ncurses') -url="http://jonas.nitro.dk/tig/" -license=('GPL') -arch=('i686' 'x86_64') -source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('4fa9e33c5daa76b6fed11e068405356f') - -build() { - cd "$srcdir"/$pkgname-$pkgver - - ./configure --prefix=/usr -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install install-doc-man - install -D -m644 contrib/tigrc "$pkgdir"/etc/tigrc.sample - install -D -m644 contrib/tig-completion.bash "$pkgdir"/etc/bash_completion.d/tig -} diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD deleted file mode 100644 index 4980466..0000000 --- a/abs/extra/community/transmission-cli/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 23076 2009-01-02 11:33:41Z alexanderf $ -# Maintainer: Alexander Fehr <pizzapunk gmail com> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=transmission-cli -pkgver=2.51 -pkgrel=1 -pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" -arch=('i686' 'x86_64') -url="http://www.transmissionbt.com/" -license=('MIT') -depends=('curl' 'libevent>=2.0.10') -makedepends=('intltool' 'libcroco') -replaces=('transmission') -backup=('etc/conf.d/transmissiond') -install=transmission-cli.install -source=(http://mirrors.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 - run.transmissiond - transmission-cli.install - transmission.include - transmissiond.conf) - -build() { - cd "$srcdir/transmission-$pkgver" - - ./configure --prefix=/usr --disable-gtk || return 1 - make || return 1 -} - -package() { - cd "$srcdir/transmission-$pkgver" - make DESTDIR="$pkgdir" install || return 1 - - mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1 - mkdir -p -m777 "$pkgdir/myth/transmission" || return 1 - install -D -m755 "$srcdir/run.transmissiond" "$pkgdir/etc/sv/transmissiond/run" || return 1 - install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" || return 1 - install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1 - install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1 -} -md5sums=('dfe2faeb2b76b43954ec943affef2133' - 'e876d24b99c401f782395b053976dffd' - 'ff22c13dbd52565f9e88b1de22514eb9' - 'b5a49ea375333cd0fee40f70dbac4c2e' - 'd05567c7a4f9df9f28602d1356d5c05c') diff --git a/abs/extra/community/transmission-cli/run.transmissiond b/abs/extra/community/transmission-cli/run.transmissiond deleted file mode 100755 index 792594a..0000000 --- a/abs/extra/community/transmission-cli/run.transmissiond +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/transmissiond - -CONFIGDIR=/home/$TRANS_USER/.config/transmission-daemon -PID=`pidof -o %PPID /usr/bin/transmission-daemon` -# Update the block lists - try to keep the bad guys out. - cd ${CONFIGDIR}/blocklists - if [ $? -eq 0 ]; then - find . -mtime +4 -type f -name level1 -exec rm {} \; - if [ ! -f ${CONFIGDIR}/blocklists/level1 ]; then - # update blocklist - # echo "updating blocklist, ~4MB" - wget -q -O level1.gz http://www.bluetack.co.uk/config/level1.gz - if [ -f level1.gz ]; then - gunzip level1.gz - if [ $? -eq 0 ]; then - chmod go+r level1 - else - rm -f level1* - fi - fi - fi - cd - 2>&1 >/dev/null - fi - stat_runit "Starting Transmission Daemon" - [ -z "$PID" ] && exec su -l -c "/usr/bin/nice -n 19 /usr/bin/transmission-daemon $TRANS_OPTS" $TRANS_USER 2>/dev/null diff --git a/abs/extra/community/transmission-cli/transmission-cli.install b/abs/extra/community/transmission-cli/transmission-cli.install deleted file mode 100644 index 088ecc6..0000000 --- a/abs/extra/community/transmission-cli/transmission-cli.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - /bin/echo 'include "/etc/transmission/transmission.include"' >> /etc/lighttpd/conf.include - killall -HUP lighttpd - - add_service.sh transmissiond - - cat << _EOF - - You can edit the user and options in /etc/conf.d/transmissiond. - - To access the web interface: - http://localhost/transmission - - Configuration file editing information can be found at: - http://trac.transmissionbt.com/wiki/ConfigFiles - -_EOF - -} - -pre_upgrade() { - rm -f /usr/share/man/man1/transmission* - -} - -pre_remove() { - remove_service.sh transmissiond -} diff --git a/abs/extra/community/transmission-cli/transmission.include b/abs/extra/community/transmission-cli/transmission.include deleted file mode 100644 index 5cbf399..0000000 --- a/abs/extra/community/transmission-cli/transmission.include +++ /dev/null @@ -1,15 +0,0 @@ -#Redirect from /transmission to /transmission/web -url.rewrite-once += ( "^/transmission[/]?$" => "/transmission/web" ) -$HTTP["url"] =~ "^/transmission/" { - #Serve static files from /usr/share/transmission - server.document-root = "/usr/share/" - #Forward RPC requests to the Transmission daemon - proxy.server = ( - "/transmission/rpc" => ( - ( - "host" => "127.0.0.1", - "port" => 9091 - ) - ) - ) -} diff --git a/abs/extra/community/transmission-cli/transmissiond.conf b/abs/extra/community/transmission-cli/transmissiond.conf deleted file mode 100644 index d642c01..0000000 --- a/abs/extra/community/transmission-cli/transmissiond.conf +++ /dev/null @@ -1,2 +0,0 @@ -TRANS_USER="mythtv" -TRANS_OPTS="-f -ep -w /myth/transmission" diff --git a/abs/extra/community/tre/PKGBUILD b/abs/extra/community/tre/PKGBUILD deleted file mode 100644 index 52fb147..0000000 --- a/abs/extra/community/tre/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: Igor Galic<i.galic@gmail.com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de -pkgname=tre -pkgver=0.8.0 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc="POSIX compliant regexp matching library. Includes agrep for aproximate grepping." -url="http://laurikari.net/tre/index.html" -depends=('glibc') -license=('custom:BSD') -source=(http://laurikari.net/tre/$pkgname-$pkgver.tar.bz2) -md5sums=('b4d3232593dadf6746f4727bdda20b41') -options=('!libtool') - -build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --enable-static || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -Dm644 ${srcdir}/$pkgname-$pkgver/LICENSE \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 - install -d ${pkgdir}/usr/share/doc/$pkgname - cd doc - for _i in default.css tre-api.html tre-syntax.html - do - install -Dm644 ${_i} ${pkgdir}/usr/share/doc/$pkgname/${_i} - done || return 1 -} diff --git a/abs/extra/community/twisted/PKGBUILD b/abs/extra/community/twisted/PKGBUILD deleted file mode 100644 index 13fca6b..0000000 --- a/abs/extra/community/twisted/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 94591 2010-10-08 12:55:33Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=twisted -pkgver=10.1.0 -pkgrel=3 -pkgdesc="Asynchronous networking framework written in Python." -arch=('i686' 'x86_64') -url="http://twistedmatrix.com/" -license=('MIT') -depends=('python2' 'pycrypto' 'zope-interface') -optdepends=('pyopenssl' - 'python-soappy:for twisted.web.soap') -install=twisted.install -source=(http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2) -md5sums=('04cca97506e830074cffc1965297da3f') -build() { - cd "${srcdir}/Twisted-${pkgver}" - - python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1 - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" - - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.6/site-packages/twisted/trial/test/scripttest.py - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.6/site-packages/twisted/mail/test/pop3testserver.py -} diff --git a/abs/extra/community/twisted/twisted.install b/abs/extra/community/twisted/twisted.install deleted file mode 100644 index 62a2cc5..0000000 --- a/abs/extra/community/twisted/twisted.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1 -} - -post_upgrade() { - post_install -} - -post_remove() { - find /usr/lib/python2.6/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f -} diff --git a/abs/extra/community/unrar/PKGBUILD b/abs/extra/community/unrar/PKGBUILD deleted file mode 100644 index 20d5213..0000000 --- a/abs/extra/community/unrar/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 72474 2010-03-16 19:39:31Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: dorphell <dorphell@gmx.net> - -pkgname=unrar -pkgver=3.9.10 -pkgrel=1 -pkgdesc="The RAR uncompression program" -arch=('i686' 'x86_64') -url="http://www.rarlab.com/rar_add.htm" -license=('custom') -depends=('gcc-libs') -source=(http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz) -md5sums=('3c130ae52ff9fece50af988c343e396d') - -build() { - cd "${srcdir}/${pkgname}" - - make -f makefile.unix - install -Dm755 unrar ${pkgdir}/usr/bin/unrar || return 1 - # install license - install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 -} diff --git a/abs/extra/community/unrar/unrar-3.5.2-optimalization-fix.patch b/abs/extra/community/unrar/unrar-3.5.2-optimalization-fix.patch deleted file mode 100644 index 2ed2e6e..0000000 --- a/abs/extra/community/unrar/unrar-3.5.2-optimalization-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur unrar.orig/makefile.unix unrar/makefile.unix ---- unrar.orig/makefile.unix 2005-05-27 21:53:56.000000000 +0000 -+++ unrar/makefile.unix 2005-05-27 21:54:16.000000000 +0000 -@@ -7,7 +7,7 @@ - - # Linux using GCC - CXX=g++ --CXXFLAGS=-O2 -+CXXFLAGS=${CFLAGS} - DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - STRIP=strip - diff --git a/abs/extra/community/uriparser/PKGBUILD b/abs/extra/community/uriparser/PKGBUILD deleted file mode 100644 index a44876f..0000000 --- a/abs/extra/community/uriparser/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> - pkgname=uriparser - pkgver=0.7.5 - pkgrel=1 - pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" - url="http://sourceforge.net/projects/uriparser/" - depends=(glibc) - makedepends=(doxygen) - source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) - md5sums=('4f4349085fe5de33bcae8d0f26649593') - arch=('i686' 'x86_64') - license="CUSTOM" - build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --disable-test - ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile - make || return 1 - touch ${srcdir}/$pkgname-$pkgver/doc/html/empty.gif - make DESTDIR=$startdir/pkg install || return 1 - install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 -} - diff --git a/abs/extra/community/uudeview/PKGBUILD b/abs/extra/community/uudeview/PKGBUILD deleted file mode 100644 index cdb3a81..0000000 --- a/abs/extra/community/uudeview/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD,v 1.5 2008/09/23 12:49:17 sergej Exp $ -# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> -# Maintainer: kmaster <kmaster12@sasktel.net> - -pkgname=uudeview -pkgver=0.5.20 -pkgrel=6 -pkgdesc="UUDeview helps transmitting & recieving binary files using mail or newsgroups. Includes library files." -arch=('i686' 'x86_64') -url="http://www.fpx.de/fp/Software/UUDeview/" -license=('GPL') -optdepends=('tk: for GUI') -source=(http://www.fpx.de/fp/Software/UUDeview/download/$pkgname-$pkgver.tar.gz) -md5sums=('0161abaec3658095044601eae82bbc5b') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install || return 1 - mkdir -p $startdir/pkg/usr/lib/uudeview && \ - mkdir -p $startdir/pkg/usr/include/uudeview || return 1 - - cd $startdir/src/uudeview-$pkgver/uulib - ./configure --prefix=/usr - make || return 1 - cp -v *.o $startdir/pkg/usr/lib/uudeview && \ - cp -v *.a $startdir/pkg/usr/lib/uudeview && \ - cp -v *.h $startdir/pkg/usr/include/uudeview -} diff --git a/abs/extra/community/video4fuze/PKGBUILD b/abs/extra/community/video4fuze/PKGBUILD deleted file mode 100644 index 35c1e85..0000000 --- a/abs/extra/community/video4fuze/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Contributor: Michael Hanson <hansonorders@verizon.net> -# Maintainer: Michael Hanson <hansonorders@verizon.net> -pkgname=video4fuze -pkgver=0.6 -pkgrel=1 -pkgdesc="A tool to make videos compatable with the San Disk Sana Fuze media player" -arch=('i686' 'x86_64') -url="http://code.google.com/p/video4fuze" -license=('GPL3' 'CC-BY-SA-3.0') -depends=('fuzemux' 'python2>=2.5' 'qt>=4.5' 'pyqt>=4.5' 'python-imaging' 'mplayer' 'ffmpeg-svn') -optdepends=('xterm') -source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}%2B.tar.gz") -provides=('video4fuze') -replaces=('video4fuze-svn') -install=video4fuze.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver}+ - - for file in GUI/*.py *.py *.pyw ; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' ${file} - done - - sed -i 's/^python/python2/g' dist/* - - lrelease video4fuze_e4x.pro - - python2 setup.py install --root="$pkgdir" || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver}+ - install -D -m644 README.txt ${pkgdir}/usr/share/doc/video4fuze/README || return 1 - chmod 755 ${pkgdir}/usr/share/video4fuze/*.py || return 1 - chmod 755 ${pkgdir}/usr/share/video4fuze/*.pyw || return 1 - chmod 755 ${pkgdir}/usr/share/video4fuze/GUI/*.py || return 1 -} -md5sums=('f19250f2e166e10e5b115e8bffdfee35') diff --git a/abs/extra/community/video4fuze/video4fuze.install b/abs/extra/community/video4fuze/video4fuze.install deleted file mode 100644 index d6e391f..0000000 --- a/abs/extra/community/video4fuze/video4fuze.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - ln -s /usr/share/video4fuze/video4fuze.pyw /usr/bin/video4fuze - ln -s /usr/share/video4fuze/fuze.py /usr/bin/fuze.py -} - -pre_remove() { - rm -f /usr/bin/video4fuze - rm -f /usr/bin/fuze.py -} diff --git a/abs/extra/community/vsftpd/PKGBUILD b/abs/extra/community/vsftpd/PKGBUILD deleted file mode 100644 index 78ba1c5..0000000 --- a/abs/extra/community/vsftpd/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=vsftpd -pkgver=2.3.4 -pkgrel=2 -pkgdesc="Very Secure FTP daemon" -arch=('i686' 'x86_64') -url="https://security.appspot.com/vsftpd.html" -license=('GPL2') -depends=('openssl') -backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') -install=vsftpd.install -source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" - 'vsftpd.xinetd' 'vsftpd.d' 'run') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # build-time config - sed \ - -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ - -i builddefs.h -# Below added for LinHES - mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise - install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/ - make CFLAGS="${CFLAGS}" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd" - install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf" - install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8" - install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5" - install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd" - install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd" - - install -d -m755 "${pkgdir}/usr/share/empty" -} -md5sums=('2ea5d19978710527bb7444d93b67767a' - 'b07fd4609c70063c1d6b20142910c1a6' - '60060a6c7db3b3b7baa1561a302e6923' - '8abbed7cc75f9a9d2944e0e83c8dd90d') diff --git a/abs/extra/community/vsftpd/__changelog b/abs/extra/community/vsftpd/__changelog deleted file mode 100644 index 82615f6..0000000 --- a/abs/extra/community/vsftpd/__changelog +++ /dev/null @@ -1 +0,0 @@ --Add back run file and modify PKGBUILD to install run diff --git a/abs/extra/community/vsftpd/run b/abs/extra/community/vsftpd/run deleted file mode 100644 index 1fd5202..0000000 --- a/abs/extra/community/vsftpd/run +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -exec 2>&1 -. /etc/profile -. /etc/systemconfig -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions - -stat_runit "Starting VSFTPD" -export HOME=/root - -# Start vsftpd -/usr/sbin/vsftpd /etc/vsftpd.conf diff --git a/abs/extra/community/vsftpd/vsftpd.d b/abs/extra/community/vsftpd/vsftpd.d deleted file mode 100644 index 2731085..0000000 --- a/abs/extra/community/vsftpd/vsftpd.d +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name & - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/abs/extra/community/vsftpd/vsftpd.install b/abs/extra/community/vsftpd/vsftpd.install deleted file mode 100644 index 48f134e..0000000 --- a/abs/extra/community/vsftpd/vsftpd.install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then - echo ">>> It appears that your current kernel has linux security" - echo ">>> capabilities built as a module. vsftpd requires this" - echo ">>> functionality to operate." - echo ">>>" - echo ">>> To activate the module, please load it now (modprobe capability)." - echo ">>> Also, you should add it to your MODULES array in rc.conf, so" - echo ">>> it will be activated automatically at boot-up." - fi -} - -post_upgrade() { - post_install $1 -} - diff --git a/abs/extra/community/vsftpd/vsftpd.xinetd b/abs/extra/community/vsftpd/vsftpd.xinetd deleted file mode 100644 index eff2eb3..0000000 --- a/abs/extra/community/vsftpd/vsftpd.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service ftp -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/vsftpd - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/abs/extra/community/wiiuse/PKGBUILD b/abs/extra/community/wiiuse/PKGBUILD deleted file mode 100644 index d8b1e2b..0000000 --- a/abs/extra/community/wiiuse/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -#Contributor:Andrea Tarocchi <valdar@email.it> -pkgname=wiiuse -pkgver=0.12 -pkgrel=2 -pkgdesc="Wiiuse is a library written in C that connects with several Nintendo Wii remotes." -arch=(i686 x86_64) -url="http://wiiuse.sourceforge.net/" -depends=('bluez') -license="GPL3" -install=wiiuse.install -postfix=_src.tar.gz -source=(http://downloads.sourceforge.net/sourceforge/wiiuse/wiiuse_v$pkgver\_src.tar.gz) - -md5sums=('29b555096f79dbd3fbc9b96b8d443083') - -build() { - cd $startdir/src/wiiuse_v$pkgver - make wiiuse || return 1 - -#installing - mkdir -p $startdir/pkg/usr/lib - mkdir -p $startdir/pkg/usr/include - - install -D -m644 ./src/release-`gcc -v 2>&1|grep ^Target:|cut -d' ' -f2`/libwiiuse.so $startdir/pkg/usr/lib - install -D -m644 ./src/wiiuse.h $startdir/pkg/usr/include -} diff --git a/abs/extra/community/wiiuse/wiiuse.install b/abs/extra/community/wiiuse/wiiuse.install deleted file mode 100644 index d856696..0000000 --- a/abs/extra/community/wiiuse/wiiuse.install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOF -Note: -==> for using this lib in your projects include wiiuse.h and link against libwiiuse.so -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -op=$1 -shift -$op $*
\ No newline at end of file diff --git a/abs/extra/community/zope-interface/PKGBUILD b/abs/extra/community/zope-interface/PKGBUILD deleted file mode 100644 index a2918bf..0000000 --- a/abs/extra/community/zope-interface/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 87850 2010-08-18 13:23:55Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=zope-interface -pkgver=3.5.3 -pkgrel=2 -pkgdesc="Separate distribution of the zope.interface package used in Zope 3." -license=('ZPL') -arch=('i686' 'x86_64') -url="http://www.zope.org/Products/ZopeInterface/" -depends=('python2') -source=(http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz) -md5sums=('1fdb9a77f92d3ada3e795a8c9b58d0c6') - -build() { - cd ${srcdir}/zope.interface-${pkgver} - python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 - # Blabla. - rm $pkgdir/usr/lib/python2.7/site-packages/zope/interface/README*.txt -} diff --git a/abs/extra/community/zvbi/PKGBUILD b/abs/extra/community/zvbi/PKGBUILD deleted file mode 100644 index 9bc150c..0000000 --- a/abs/extra/community/zvbi/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -pkgname=zvbi -pkgver=0.2.33 -pkgrel=3 -pkgdesc="VBI capture and decoding library" -url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" -arch=(i686 x86_64) -depends=('libpng' 'libx11') -license=('GPL') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2 - fix-includes.patch) -md5sums=('1741a6045c3eedfb611d645f2da69ac8' - '38766bc59e1571133d0399f0102da653') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-includes.patch" - ./configure --prefix=/usr --disable-static --mandir=/usr/share/man - make - make DESTDIR="${pkgdir}" install -} diff --git a/abs/extra/community/zvbi/fix-includes.patch b/abs/extra/community/zvbi/fix-includes.patch deleted file mode 100644 index 2825264..0000000 --- a/abs/extra/community/zvbi/fix-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add proper #includes so that we do not get undef errors to S_ISCHR -during linking. - -Signed-off-by: Alex Chiang <achiang@canonical.com> ---- ---- zvbi-0.2.33.orig/src/io-dvb.c -+++ zvbi-0.2.33/src/io-dvb.c -@@ -29,6 +29,8 @@ - #include <errno.h> - #include <sys/select.h> - #include <sys/ioctl.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #ifndef HAVE_S64_U64 - /* Linux 2.6.x asm/types.h defines __s64 and __u64 only ---- zvbi-0.2.33.orig/src/io-v4l.c -+++ zvbi-0.2.33/src/io-v4l.c -@@ -42,6 +42,7 @@ static const char rcsid [] = - #include <assert.h> - #include <sys/time.h> /* timeval */ - #include <sys/types.h> /* fd_set, uid_t */ -+#include <sys/stat.h> /* S_ISCHR */ - #include <sys/ioctl.h> /* for (_)videodev.h */ - #include <pthread.h> - ---- zvbi-0.2.33.orig/contrib/ntsc-cc.c -+++ zvbi-0.2.33/contrib/ntsc-cc.c -@@ -34,6 +34,7 @@ - #include <locale.h> - #include <sys/ioctl.h> - #include <sys/types.h> -+#include <sys/stat.h> - #include <sys/time.h> - #ifdef HAVE_GETOPT_LONG - # include <getopt.h> |
