[csw-devel] SF.net SVN: gar:[3604] csw/mgar/pkg/alpine
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Fri Mar 6 07:07:00 CET 2009
Revision: 3604
http://gar.svn.sourceforge.net/gar/?rev=3604&view=rev
Author: valholla
Date: 2009-03-06 06:06:59 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
check in working copy
Modified Paths:
--------------
csw/mgar/pkg/alpine/trunk/Makefile
csw/mgar/pkg/alpine/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/alpine/Makefile
csw/mgar/pkg/alpine/trunk/files/pubcookie.diff
Added: csw/mgar/pkg/alpine/Makefile
===================================================================
--- csw/mgar/pkg/alpine/Makefile (rev 0)
+++ csw/mgar/pkg/alpine/Makefile 2009-03-06 06:06:59 UTC (rev 3604)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Modified: csw/mgar/pkg/alpine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/alpine/trunk/Makefile 2009-03-06 04:15:24 UTC (rev 3603)
+++ csw/mgar/pkg/alpine/trunk/Makefile 2009-03-06 06:06:59 UTC (rev 3604)
@@ -1,5 +1,5 @@
GARNAME = alpine
-GARVERSION = 2.0
+GARVERSION = 2.00
CATEGORIES = apps
DESCRIPTION = Alpine Messaging System
@@ -12,8 +12,8 @@
is highly customizable through the use of the Alpine Setup command.
endef
-MASTER_SITES = http://www.washington.edu/alpine
-SPKG_SOURCE_URL = ftp://ftp.cac.washington.edu/alpine/
+MASTER_SITES = http://www.washington.edu/alpine/
+UPSTREAM_MASTER_SITES = ftp://ftp.cac.washington.edu/alpine/
DISTFILES = $(GARNAME).tar.bz2
PACKAGES = CSWalpine
@@ -24,8 +24,36 @@
# upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-#BUILD64 = 1
+## Needs gcc to compile imap support since ucbcc
+## does not work on the buildfarm. GCC 4 does not work
+## GCC4 thows the following errors:
+## warning: pointer targets in passing argument 2 of 'compare_cstring'
+## differ in signedness
+GARCOMPILER = GCC3
+# Patch for solaris explained in the following thread
+# http://mailman2.u.washington.edu/pipermail/alpine-info/2007-December/000047.html
+PATCHFILES = pubcookie.diff
+
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-quotas
+CONFIGURE_ARGS += --enable-from-encoding
+CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix)
+CONFIGURE_ARGS += --with-libintl-prefix=$(prefix)
+CONFIGURE_ARGS += --with-pubcookie
+CONFIGURE_ARGS += --with-system-pinerc=$(libdir)/pine.conf
+CONFIGURE_ARGS += --with-system-fixed-pinercc=$(libdir)/pine.conf.fixed
+CONFIGURE_ARGS += --with-ssl-dir=$(prefix)
+CONFIGURE_ARGS += --with-krb5-dir=$(prefix)
+CONFIGURE_ARGS += --with-ldap-dir=$(prefix)
+CONFIGURE_ARGS += --with-tcl-lib=$(libdir)/tcl8.4
+CONFIGURE_ARGS += --with-c-client-target=gso
+CONFIGURE_ARGS += --with-web-bin=$(libexecdir)/alpine/bin
+## Libs that are not get set correctly in Makefiles
+LIBS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv
+export LIBS
+
+TEST_TARGET = check
+
include gar/category.mk
Modified: csw/mgar/pkg/alpine/trunk/checksums
===================================================================
--- csw/mgar/pkg/alpine/trunk/checksums 2009-03-06 04:15:24 UTC (rev 3603)
+++ csw/mgar/pkg/alpine/trunk/checksums 2009-03-06 06:06:59 UTC (rev 3604)
@@ -0,0 +1,2 @@
+84e44cbf71ed674800a5d57eed9c1c52 download/alpine.tar.bz2
+750d6056b6d88022cbb465a9a40f741a download/pubcookie.diff
Added: csw/mgar/pkg/alpine/trunk/files/pubcookie.diff
===================================================================
--- csw/mgar/pkg/alpine/trunk/files/pubcookie.diff (rev 0)
+++ csw/mgar/pkg/alpine/trunk/files/pubcookie.diff 2009-03-06 06:06:59 UTC (rev 3604)
@@ -0,0 +1,160 @@
+--- alpine-2.00/web/src/pubcookie/wp_uidmapper.c.orig 2009-03-05 22:41:25.411701357 -0600
++++ alpine-2.00/web/src/pubcookie/wp_uidmapper.c 2009-03-05 22:42:00.628611160 -0600
+@@ -16,6 +16,10 @@
+ #include "id_table.h"
+ #include "wp_uidmapper_lib.h"
+
++#ifndef LOG_PERROR
++#define LOG_PERROR 0
++#endif
++
+
+ /* Makefile should #define:
+ *
+@@ -51,7 +55,7 @@
+
+ id_table_range *range;
+ id_table table;
+- struct sockaddr_un sun,rsun;
++ struct sockaddr_un lsun,rsun;
+ struct sigaction sa;
+ int is_err,i,ssock,uid;
+ unsigned int kbuf[WP_KEY_LEN];
+@@ -61,7 +65,9 @@
+ #ifndef DGRAM_MODE
+ int csock,rsun_len;
+ #endif
+- struct ucred cred;
++#ifdef SO_PEERCRED
++struct ucred cred;
++#endif
+
+ /*
+ * process command line arguments
+@@ -129,10 +135,10 @@
+ syslog(LOG_ERR,"%s: socket: %s\n",socketname,strerror(errno));
+ exit(1);
+ }
+- /* sun.sun_len = strlen(socketname) + 1; */
+- sun.sun_family = AF_UNIX;
+- strcpy(sun.sun_path,socketname);
+- if(bind(ssock,(struct sockaddr*)&sun,sizeof(sun))) {
++ /* lsun.sun_len = strlen(socketname) + 1; */
++ lsun.sun_family = AF_UNIX;
++ strcpy(lsun.sun_path,socketname);
++ if(bind(ssock,(struct sockaddr*)&lsun,sizeof(lsun))) {
+ syslog(LOG_ERR,"%s: bind: %s\n",socketname,strerror(errno));
+ exit(1);
+ }
+@@ -166,9 +172,14 @@
+ rmh.msg_namelen = sizeof(rsun);
+ rmh.msg_iov = riov;
+ rmh.msg_iovlen = 3;
++#ifdef VANILLA
+ rmh.msg_control = cbuf;
+ rmh.msg_controllen = riov[0].iov_len + riov[1].iov_len + riov[2].iov_len;
+ rmh.msg_flags = 0;
++#else
++ rmh.msg_accrights = NULL;
++ rmh.msg_accrightslen = 0;
++#endif
+
+ /* siov[0].iov_base */
+ /* siov[0].iov_len */
+@@ -176,9 +187,15 @@
+ smh.msg_namelen = 0;
+ smh.msg_iov = siov;
+ /* smh.msg_iovlen */
++#ifdef VANILLA
+ smh.msg_control = NULL;
+ smh.msg_controllen = 0;
+ smh.msg_flags = 0;
++#else
++ smh.msg_accrights = NULL;
++ smh.msg_accrightslen = 0;
++#endif
++
+
+ #ifndef DGRAM_MODE
+ csock = -1;
+@@ -196,6 +213,7 @@
+ syslog(LOG_ERR,"accept: %s\n",strerror(errno));
+ break;
+ }
++#ifdef SO_PEERCRED
+ if(debug >= 2) {
+ i = sizeof(cred);
+ if(getsockopt(csock,SOL_SOCKET,SO_PEERCRED,&cred,&i) == -1) {
+@@ -205,6 +223,7 @@
+ cred.pid,cred.uid,cred.gid);
+ }
+ }
++#endif
+ i = recvmsg(csock,&rmh,0);
+ #endif
+
+--- alpine-2.00/web/src/pubcookie/wp_uidmapper_lib.c.orig 2009-03-05 22:41:35.393957770 -0600
++++ alpine-2.00/web/src/pubcookie/wp_uidmapper_lib.c 2009-03-05 22:42:00.638013846 -0600
+@@ -23,7 +23,7 @@
+ struct iovec *in,int inlen,int *rinbytes) {
+ int sock,i;
+ struct msghdr mh;
+- struct sockaddr_un sun;
++ struct sockaddr_un lsun;
+
+ #ifdef DGRAM_MODE
+ sock = socket(AF_UNIX,SOCK_DGRAM,0);
+@@ -32,17 +32,23 @@
+ #endif
+ if(sock < 0) return -1;
+
+- sun.sun_family = AF_UNIX;
+- strcpy(sun.sun_path,sockname);
+- if(connect(sock,(struct sockaddr*)&sun,sizeof(sun))) return -1;
++ lsun.sun_family = AF_UNIX;
++ strcpy(lsun.sun_path,sockname);
++ if(connect(sock,(struct sockaddr*)&lsun,sizeof(lsun))) return -1;
+
+ mh.msg_name = NULL;
+ mh.msg_namelen = 0;
+ mh.msg_iov = out;
+ mh.msg_iovlen = outlen;
++#ifdef VANILLA
+ mh.msg_control = NULL;
+ mh.msg_controllen = 0;
+ mh.msg_flags = 0;
++#else
++ mh.msg_accrights = NULL;
++ mh.msg_accrightslen = 0;
++#endif
++
+
+ if((i = sendmsg(sock,&mh,0)) == -1) {
+ close(sock);
+@@ -53,7 +59,9 @@
+ if(in) {
+ mh.msg_iov = in;
+ mh.msg_iovlen = inlen;
++#ifdef VANILLA
+ mh.msg_flags = 0;
++#endif
+ if((i = recvmsg(sock,&mh,0)) == -1) {
+ close(sock);
+ return -1;
+--- alpine-2.00/web/src/pubcookie/id_table.c.orig 2009-03-05 22:41:42.220578266 -0600
++++ alpine-2.00/web/src/pubcookie/id_table.c 2009-03-05 22:42:00.624274635 -0600
+@@ -10,6 +10,14 @@
+ #include <dirent.h> /* opendir */
+ #include <unistd.h> /* stat */
+
++#ifndef VANILLA
++#include <strings.h> /* bzero */
++#include <limits.h> /* NAME_MAX */
++#ifndef NAME_MAX
++#define NAME_MAX 14
++#endif
++#endif
++
+ unsigned long hash_func(char *string,unsigned long num_buckets) {
+ unsigned long i;
+ char *p;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list