From bonivart at users.sourceforge.net Thu Oct 1 00:03:26 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 22:03:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6634] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 6634 http://gar.svn.sourceforge.net/gar/?rev=6634&view=rev Author: bonivart Date: 2009-09-30 22:03:26 +0000 (Wed, 30 Sep 2009) Log Message: ----------- pkgutil: split into two packages Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-30 20:38:57 UTC (rev 6633) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-30 22:03:26 UTC (rev 6634) @@ -12,8 +12,19 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +#DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) +PACKAGES = CSWpkgutil CSWpkgutilplus + +SPKG_DESC_CSWpkgutil = $(DESCRIPTION) +SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality + +REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg + +PKGFILES_CSWpkgutilplus = .*bldcat.* +PKGFILES_CSWpkgutilplus += .*chkcat.* + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 11:52:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 09:52:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6635] csw/mgar/pkg/bdb46/trunk Message-ID: Revision: 6635 http://gar.svn.sourceforge.net/gar/?rev=6635&view=rev Author: dmichelsen Date: 2009-10-01 09:52:37 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb46: Initial commit Added Paths: ----------- csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb46/trunk/checksums csw/mgar/pkg/bdb46/trunk/files/ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 Property Changed: ---------------- csw/mgar/pkg/bdb46/trunk/ Property changes on: csw/mgar/pkg/bdb46/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/bdb46/trunk/Makefile (from rev 6627, csw/mgar/pkg/bdb47/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,88 @@ +GARNAME = db +GARVERSION = 4.6.21 +CATEGORIES = lib + +DESCRIPTION = Berkeley DB 4.6 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) + +BUILD64 = 1 +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb46 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +NO_ISAEXEC = 1 + +PACKAGES = CSWbdb46 CSWbdb46devel CSWbdb46doc + +CATALOGNAME_CSWbdb46 = berkeleydb46 +CATALOGNAME_CSWbdb46devel = berkeleydb46_devel +CATALOGNAME_CSWbdb46doc = berkeleydb46_doc + +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* + +ARCHALL_CSWbdbdoc = 1 + +SPKG_DESC_CSWbdb46 = BerkeleyDB 4.6 embedded database libraries and utilities +SPKG_DESC_CSWbdb46devel = BerkeleyDB 4.6 development support +SPKG_DESC_CSWbdb46doc = BerkeleyDB 4.6 documentation + +REQUIRED_PKGS_CSWbdb46devel = CSWbdb46 + +LICENSE = LICENSE + +PKGFILES_CSWbdb46doc = /opt/csw/share/doc/.* + +PKGFILES_CSWbdb46devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/jdk1.6.0_07/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/bdb46/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb46/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb46/trunk/checksums 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,5 @@ +718082e7e35fc48478a2334b0bc4cd11 download/db-4.6.21.tar.gz +4878872edfc53c6ecb871b1062a4bdaf download/patch.4.6.21.1 +55074e53d3acae2dcbeae8322f96e522 download/patch.4.6.21.2 +7a6e11b54712caf752f9c4a52babe60c download/patch.4.6.21.3 +ae7d3d587355fe85b512ef09b9a77d19 download/patch.4.6.21.4 Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,90 @@ +*** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 +--- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 +*************** +*** 639,644 **** +--- 639,647 ---- + */ + #define MP_TRUNC_RECOVER 0x01 + ++ /* Private flags to DB_MPOOLFILE->close. */ ++ #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ ++ + #if defined(__cplusplus) + } + #endif +*** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 888,894 **** + * when we try to flush them. + */ + deleted = 0; +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +--- 888,895 ---- + * when we try to flush them. + */ + deleted = 0; +! if (!LF_ISSET(DB_MPOOL_NOLOCK)) +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +*************** +*** 909,921 **** + } + } + if (mfp->block_cnt == 0) { + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +--- 910,928 ---- + } + } + if (mfp->block_cnt == 0) { ++ /* ++ * We should never discard this mp file if our caller ++ * is holding the lock on it. See comment in ++ * __memp_sync_file. ++ */ ++ DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +*** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 +--- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 755,761 **** + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; +--- 755,762 ---- + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && +! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; + Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,27 @@ +*** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 +*************** +*** 249,256 **** + mtx_base = htab[0].mtx_hash; + } + + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, +--- 249,262 ---- + mtx_base = htab[0].mtx_hash; + } + ++ /* ++ * We preallocated all of the mutexes in a block, so for regions after ++ * the first, we skip mutexes in use in earlier regions. Each region ++ * has the same number of buckets and there are two mutexes per hash ++ * bucket (the bucket mutex and the I/O mutex). ++ */ + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets * 2; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,74 @@ +*** sequence/sequence.c +--- sequence/sequence.c +*************** +*** 196,202 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +--- 196,206 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 252,257 **** +--- 256,266 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 304,310 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 313,324 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(dbenv) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 713,718 **** +--- 727,738 ---- + + MUTEX_LOCK(dbenv, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(dbenv, "Sequence overflow"); + ret = EINVAL; Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,1414 @@ +*** dbinc/repmgr.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc/repmgr.h 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,41 **** +--- 36,55 ---- + #endif + + /* ++ * The (arbitrary) maximum number of outgoing messages we're willing to hold, on ++ * a queue per connection, waiting for TCP buffer space to become available in ++ * the kernel. Rather than exceeding this limit, we simply discard additional ++ * messages (since this is always allowed by the replication protocol). ++ * As a special dispensation, if a message is destined for a specific remote ++ * site (i.e., it's not a broadcast), then we first try blocking the sending ++ * thread, waiting for space to become available (though we only wait a limited ++ * time). This is so as to be able to handle the immediate flood of (a ++ * potentially large number of) outgoing messages that replication generates, in ++ * a tight loop, when handling PAGE_REQ, LOG_REQ and ALL_REQ requests. ++ */ ++ #define OUT_QUEUE_LIMIT 10 ++ ++ /* + * The system value is available from sysconf(_SC_HOST_NAME_MAX). + * Historically, the maximum host name was 256. + */ +*************** +*** 47,52 **** +--- 61,71 ---- + #define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20) + typedef char SITE_STRING_BUFFER[MAX_SITE_LOC_STRING+1]; + ++ /* Default timeout values, in seconds. */ ++ #define DB_REPMGR_DEFAULT_ACK_TIMEOUT (1 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_CONNECTION_RETRY (30 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_ELECTION_RETRY (10 * US_PER_SEC) ++ + struct __repmgr_connection; + typedef struct __repmgr_connection REPMGR_CONNECTION; + struct __repmgr_queue; typedef struct __repmgr_queue REPMGR_QUEUE; +*************** +*** 171,178 **** + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONNECTING 0x01 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x02 /* socket close pending */ + u_int32_t flags; + + /* +--- 190,198 ---- + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONGESTED 0x01 /* msg thread wait has exceeded timeout */ +! #define CONN_CONNECTING 0x02 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x04 /* socket close pending */ + u_int32_t flags; + + /* +*************** +*** 180,189 **** + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; + + /* + * Input: while we're reading a message, we keep track of what phase +--- 200,215 ---- + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. In some cases, if the queue +! * gets too long we wait until it's drained, and then append to it. +! * This condition variable's associated mutex is the normal per-repmgr +! * db_rep->mutex, because that mutex is always held anyway whenever the +! * output queue is consulted. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; ++ cond_var_t drained; ++ int blockers; /* ref count of msg threads waiting on us */ + + /* + * Input: while we're reading a message, we keep track of what phase +*** dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 1420,1425 **** +--- 1420,1428 ---- + #define __repmgr_wake_waiting_senders __repmgr_wake_waiting_senders at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_await_ack __repmgr_await_ack at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_compute_wait_deadline __repmgr_compute_wait_deadline at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_await_drain __repmgr_await_drain at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_alloc_cond __repmgr_alloc_cond at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_free_cond __repmgr_free_cond at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_init_sync __repmgr_init_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_close_sync __repmgr_close_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_net_init __repmgr_net_init at DB_VERSION_UNIQUE_NAME@ +*** dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 21,30 **** + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *, int)); +! void __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +--- 21,30 ---- + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *, int)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *)); +! int __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +*************** +*** 39,44 **** +--- 39,47 ---- + int __repmgr_wake_waiting_senders __P((DB_ENV *)); + int __repmgr_await_ack __P((DB_ENV *, const DB_LSN *)); + void __repmgr_compute_wait_deadline __P((DB_ENV*, struct timespec *, db_timeout_t)); ++ int __repmgr_await_drain __P((DB_ENV *, REPMGR_CONNECTION *, db_timeout_t)); ++ int __repmgr_alloc_cond __P((cond_var_t *)); ++ int __repmgr_free_cond __P((cond_var_t *)); + int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + int __repmgr_close_sync __P((DB_ENV *)); + int __repmgr_net_init __P((DB_ENV *, DB_REP *)); +*** repmgr/repmgr_method.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_method.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 196,204 **** + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = 1 * US_PER_SEC; /* 1 second */ +! db_rep->connection_retry_wait = 30 * US_PER_SEC; /* 30 seconds */ +! db_rep->election_retry_wait = 10 * US_PER_SEC; /* 10 seconds */ + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +--- 196,204 ---- + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = DB_REPMGR_DEFAULT_ACK_TIMEOUT; +! db_rep->connection_retry_wait = DB_REPMGR_DEFAULT_CONNECTION_RETRY; +! db_rep->election_retry_wait = DB_REPMGR_DEFAULT_ELECTION_RETRY; + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +*************** +*** 238,243 **** +--- 238,244 ---- + DB_ENV *dbenv; + { + DB_REP *db_rep; ++ REPMGR_CONNECTION *conn; + int ret; + + db_rep = dbenv->rep_handle; +*************** +*** 254,259 **** +--- 255,266 ---- + + if ((ret = __repmgr_signal(&db_rep->queue_nonempty)) != 0) + goto unlock; ++ ++ TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (conn->blockers > 0 && ++ ((ret = __repmgr_signal(&conn->drained)) != 0)) ++ goto unlock; ++ } + UNLOCK_MUTEX(db_rep->mutex); + + return (__repmgr_wake_main_thread(dbenv)); +*** repmgr/repmgr_msg.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_msg.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 183,192 **** + + /* + * Acknowledges a message. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + ack_message(dbenv, generation, lsn) +--- 183,188 ---- +*************** +*** 227,235 **** + rec2.size = 0; + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn, FALSE); + } + + UNLOCK_MUTEX(db_rep->mutex); +--- 223,236 ---- + rec2.size = 0; + + conn = site->ref.conn; ++ /* ++ * It's hard to imagine anyone would care about a lost ack if ++ * the path to the master is so congested as to need blocking; ++ * so pass "blockable" argument as FALSE. ++ */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2, FALSE)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn); + } + + UNLOCK_MUTEX(db_rep->mutex); +*** repmgr/repmgr_net.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_net.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 63,69 **** + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +--- 63,69 ---- + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, int)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +*************** +*** 73,85 **** + * __repmgr_send -- + * The send function for DB_ENV->rep_set_transport. + * +- * !!! +- * This is only ever called as the replication transport call-back, which means +- * it's either on one of our message processing threads or an application +- * thread. It mustn't be called from the select() thread, because we might call +- * __repmgr_bust_connection(..., FALSE) here, and that's not allowed in the +- * select() thread. +- * + * PUBLIC: int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, + * PUBLIC: const DB_LSN *, int, u_int32_t)); + */ +--- 73,78 ---- +*************** +*** 126,134 **** + } + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn, FALSE)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +--- 119,128 ---- + } + + conn = site->ref.conn; ++ /* Pass the "blockable" argument as TRUE. */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec, TRUE)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +*************** +*** 222,228 **** + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING)) + return (NULL); + return (site); + } +--- 216,222 ---- + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING|CONN_DEFUNCT)) + return (NULL); + return (site); + } +*************** +*** 235,244 **** + * + * !!! + * Caller must hold dbenv->mutex. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + __repmgr_send_broadcast(dbenv, control, rec, nsitesp, npeersp) +--- 229,234 ---- +*************** +*** 268,281 **** + !IS_VALID_EID(conn->eid)) + continue; + +! if ((ret = __repmgr_send_internal(dbenv, conn, &msg)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection( +! dbenv, conn, FALSE)) != 0) + return (ret); + } else + return (ret); +--- 258,277 ---- + !IS_VALID_EID(conn->eid)) + continue; + +! /* +! * Broadcast messages are either application threads committing +! * transactions, or replication status message that we can +! * afford to lose. So don't allow blocking for them (pass +! * "blockable" argument as FALSE). +! */ +! if ((ret = __repmgr_send_internal(dbenv, +! conn, &msg, FALSE)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) + return (ret); + } else + return (ret); +*************** +*** 301,339 **** + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, we simply drop +! * this message, and still return 0 even in this case. + */ + static int +! __repmgr_send_internal(dbenv, conn, msg) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; + { +! #define OUT_QUEUE_LIMIT 10 /* arbitrary, for now */ + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; + int ret; + size_t nw; + size_t total_written; + + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +--- 297,355 ---- + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *, int)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; ++ int blockable; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg, blockable)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, what shall we +! * do? If the caller doesn't mind blocking, we'll wait (a limited amount of +! * time) for the queue to drain. Otherwise we'll simply drop the message. This +! * is always allowed by the replication protocol. But in the case of a +! * multi-message response to a request like PAGE_REQ, LOG_REQ or ALL_REQ we +! * almost always get a flood of messages that instantly fills our queue, so +! * blocking improves performance (by avoiding the need for the client to +! * re-request). +! * +! * How long shall we wait? We could of course create a new timeout +! * configuration type, so that the application could set it directly. But that +! * would start to overwhelm the user with too many choices to think about. We +! * already have an ACK timeout, which is the user's estimate of how long it +! * should take to send a message to the client, have it be processed, and return +! * a message back to us. We multiply that by the queue size, because that's how +! * many messages have to be swallowed up by the client before we're able to +! * start sending again (at least to a rough approximation). + */ + static int +! __repmgr_send_internal(dbenv, conn, msg, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; ++ int blockable; + { +! DB_REP *db_rep; + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; ++ db_timeout_t drain_to; + int ret; + size_t nw; + size_t total_written; + ++ db_rep = dbenv->rep_handle; ++ + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +*************** +*** 344,358 **** + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (0); + } + } + + /* + * Send as much data to the site as we can, without blocking. Keep +--- 360,393 ---- + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); ++ if (conn->out_queue_length >= OUT_QUEUE_LIMIT && ++ blockable && !F_ISSET(conn, CONN_CONGESTED)) { ++ RPRINT(dbenv, (dbenv, ++ "block msg thread, await queue space")); ++ ++ if ((drain_to = db_rep->ack_timeout) == 0) ++ drain_to = DB_REPMGR_DEFAULT_ACK_TIMEOUT; ++ conn->blockers++; ++ ret = __repmgr_await_drain(dbenv, ++ conn, drain_to * OUT_QUEUE_LIMIT); ++ conn->blockers--; ++ if (db_rep->finished) ++ return (DB_TIMEOUT); ++ if (ret != 0) ++ return (ret); ++ if (STAILQ_EMPTY(&conn->outbound_queue)) ++ goto empty; ++ } + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (blockable ? DB_TIMEOUT : 0); + } + } ++ empty: + + /* + * Send as much data to the site as we can, without blocking. Keep +*************** +*** 498,521 **** + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. +! * +! * If the 'do_close' flag is true, we do the whole job; the clean-up includes +! * removing the struct from the list and freeing all its memory, so upon return +! * the caller must not refer to it any further. Otherwise, we merely mark the +! * connection for clean-up later by the main thread. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *, int)); + * + * !!! + * Caller holds mutex. + */ + int +! __repmgr_bust_connection(dbenv, conn, do_close) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +- int do_close; + { + DB_REP *db_rep; + int connecting, ret, eid; +--- 533,553 ---- + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. For now, just mark it as unusable; it will +! * be fully cleaned up in the top-level select thread, as soon as possible. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *)); + * + * !!! + * Caller holds mutex. ++ * ++ * Must be idempotent + */ + int +! __repmgr_bust_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + { + DB_REP *db_rep; + int connecting, ret, eid; +*************** +*** 526,537 **** + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! if (do_close) +! __repmgr_cleanup_connection(dbenv, conn); +! else { +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; +! } + + /* + * When we first accepted the incoming connection, we set conn->eid to +--- 558,566 ---- + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; + + /* + * When we first accepted the incoming connection, we set conn->eid to +*************** +*** 557,563 **** + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else if (!do_close) { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +--- 586,592 ---- + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +*************** +*** 568,577 **** + } + + /* +! * PUBLIC: void __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); + */ +! void + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +--- 597,610 ---- + } + + /* +! * PUBLIC: int __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); ++ * ++ * !!! ++ * Idempotent. This can be called repeatedly as blocking message threads (of ++ * which there could be multiples) wake up in case of error on the connection. + */ +! int + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 580,596 **** + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; + + db_rep = dbenv->rep_handle; + +! TAILQ_REMOVE(&db_rep->connections, conn, entries); + if (conn->fd != INVALID_SOCKET) { +! (void)closesocket(conn->fd); + #ifdef DB_WIN32 +! (void)WSACloseEvent(conn->event_object); + #endif + } + + /* + * Deallocate any input and output buffers we may have. + */ +--- 613,643 ---- + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; ++ int ret; + + db_rep = dbenv->rep_handle; + +! DB_ASSERT(dbenv, F_ISSET(conn, CONN_DEFUNCT) || db_rep->finished); +! + if (conn->fd != INVALID_SOCKET) { +! ret = closesocket(conn->fd); +! conn->fd = INVALID_SOCKET; +! if (ret == SOCKET_ERROR) { +! ret = net_errno; +! __db_err(dbenv, ret, "closing socket"); +! } + #ifdef DB_WIN32 +! if (!WSACloseEvent(conn->event_object) && ret != 0) +! ret = net_errno; + #endif ++ if (ret != 0) ++ return (ret); + } + ++ if (conn->blockers > 0) ++ return (__repmgr_signal(&conn->drained)); ++ ++ TAILQ_REMOVE(&db_rep->connections, conn, entries); + /* + * Deallocate any input and output buffers we may have. + */ +*************** +*** 614,620 **** +--- 661,669 ---- + __os_free(dbenv, out); + } + ++ ret = __repmgr_free_cond(&conn->drained); + __os_free(dbenv, conn); ++ return (ret); + } + + static int +*************** +*** 1063,1069 **** + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! __repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +--- 1112,1118 ---- + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! (void)__repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +*** repmgr/repmgr_posix.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_posix.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 21,26 **** +--- 21,28 ---- + size_t __repmgr_guesstimated_max = (128 * 1024); + #endif + ++ static int __repmgr_conn_work __P((DB_ENV *, ++ REPMGR_CONNECTION *, fd_set *, fd_set *, int)); + static int finish_connecting __P((DB_ENV *, REPMGR_CONNECTION *)); + + /* +*************** +*** 189,194 **** +--- 191,284 ---- + } + + /* ++ * PUBLIC: int __repmgr_await_drain __P((DB_ENV *, ++ * PUBLIC: REPMGR_CONNECTION *, db_timeout_t)); ++ * ++ * Waits for space to become available on the connection's output queue. ++ * Various ways we can exit: ++ * ++ * 1. queue becomes non-full ++ * 2. exceed time limit ++ * 3. connection becomes defunct (due to error in another thread) ++ * 4. repmgr is shutting down ++ * 5. any unexpected system resource failure ++ * ++ * In cases #3 and #5 we return an error code. Caller is responsible for ++ * distinguishing the remaining cases if desired. ++ * ++ * !!! ++ * Caller must hold repmgr->mutex. ++ */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ struct timespec deadline; ++ int ret; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __repmgr_compute_wait_deadline(dbenv, &deadline, timeout); ++ ++ ret = 0; ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ ret = pthread_cond_timedwait(&conn->drained, ++ &db_rep->mutex, &deadline); ++ switch (ret) { ++ case 0: ++ if (db_rep->finished) ++ goto out; /* #4. */ ++ /* ++ * Another thread could have stumbled into an error on ++ * the socket while we were waiting. ++ */ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ ret = DB_REP_UNAVAIL; /* #3. */ ++ goto out; ++ } ++ break; ++ case ETIMEDOUT: ++ F_SET(conn, CONN_CONGESTED); ++ ret = 0; ++ goto out; /* #2. */ ++ default: ++ goto out; /* #5. */ ++ } ++ } ++ /* #1. */ ++ ++ out: ++ return (ret); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_alloc_cond __P((cond_var_t *)); ++ * ++ * Initialize a condition variable (in allocated space). ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_init(c, NULL)); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_free_cond __P((cond_var_t *)); ++ * ++ * Clean up a previously initialized condition variable. ++ */ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_destroy(c)); ++ } ++ ++ /* + * PUBLIC: int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + * + * Allocate/initialize all data necessary for thread synchronization. This +*************** +*** 443,449 **** + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd, nready; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +--- 533,539 ---- + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +*************** +*** 477,482 **** +--- 567,575 ---- + * each one. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING)) { + FD_SET((u_int)conn->fd, &reads); + FD_SET((u_int)conn->fd, &writes); +*************** +*** 533,616 **** + return (ret); + } + } +- nready = ret; +- + LOCK_MUTEX(db_rep->mutex); + +- /* +- * The first priority thing we must do is to clean up any +- * pending defunct connections. Otherwise, if they have any +- * lingering pending input, we get very confused if we try to +- * process it. +- * +- * The TAILQ_FOREACH macro would be suitable here, except that +- * it doesn't allow unlinking the current element, which is +- * needed for cleanup_connection. +- */ +- for (conn = TAILQ_FIRST(&db_rep->connections); +- conn != NULL; +- conn = next) { +- next = TAILQ_NEXT(conn, entries); +- if (F_ISSET(conn, CONN_DEFUNCT)) +- __repmgr_cleanup_connection(dbenv, conn); +- } +- + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; +- if (nready == 0) +- continue; + + /* +! * Traverse the linked list. (Again, like TAILQ_FOREACH, except +! * that we need the ability to unlink an element along the way.) + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_CONNECTING)) { +! if (FD_ISSET((u_int)conn->fd, &reads) || +! FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = finish_connecting(dbenv, +! conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection( +! dbenv, conn, TRUE)) != 0) +! goto out; +! } else if (ret != 0) +! goto out; +! } +! continue; +! } +! +! /* +! * Here, the site is connected, and the FD_SET's are +! * valid. +! */ +! if (FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = __repmgr_write_some( +! dbenv, conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } +! +! if (!flow_control && +! FD_ISSET((u_int)conn->fd, &reads)) { +! if ((ret = __repmgr_read_from_site(dbenv, conn)) +! == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } + } + + /* +--- 626,650 ---- + return (ret); + } + } + LOCK_MUTEX(db_rep->mutex); + + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; + + /* +! * Examine each connection, to see what work needs to be done. +! * +! * The TAILQ_FOREACH macro would be suitable here, except that +! * it doesn't allow unlinking the current element, which is +! * needed for cleanup_connection. + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if ((ret = __repmgr_conn_work(dbenv, +! conn, &reads, &writes, flow_control)) != 0) +! goto out; + } + + /* +*************** +*** 637,642 **** +--- 671,719 ---- + } + + static int ++ __repmgr_conn_work(dbenv, conn, reads, writes, flow_control) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ fd_set *reads, *writes; ++ int flow_control; ++ { ++ int ret; ++ u_int fd; ++ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ /* ++ * Deferred clean-up, from an error that happened in another ++ * thread, while we were sleeping in select(). ++ */ ++ return (__repmgr_cleanup_connection(dbenv, conn)); ++ } ++ ++ ret = 0; ++ fd = (u_int)conn->fd; ++ ++ if (F_ISSET(conn, CONN_CONNECTING)) { ++ if (FD_ISSET(fd, reads) || FD_ISSET(fd, writes)) ++ ret = finish_connecting(dbenv, conn); ++ } else { ++ /* ++ * Here, the site is connected, and the FD_SET's are valid. ++ */ ++ if (FD_ISSET(fd, writes)) ++ ret = __repmgr_write_some(dbenv, conn); ++ ++ if (ret == 0 && !flow_control && FD_ISSET(fd, reads)) ++ ret = __repmgr_read_from_site(dbenv, conn); ++ } ++ ++ if (ret == DB_REP_UNAVAIL) { ++ if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) ++ return (ret); ++ ret = __repmgr_cleanup_connection(dbenv, conn); ++ } ++ return (ret); ++ } ++ ++ static int + finish_connecting(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 657,662 **** +--- 734,740 ---- + goto err_rpt; + } + ++ DB_ASSERT(dbenv, F_ISSET(conn, CONN_CONNECTING)); + F_CLR(conn, CONN_CONNECTING); + return (__repmgr_send_handshake(dbenv, conn)); + +*************** +*** 671,690 **** + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) + return (DB_REP_UNAVAIL); + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 749,773 ---- + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) { +! STAT(db_rep->region->mstat.st_connect_fail++); + return (DB_REP_UNAVAIL); ++ } + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. (Note that we don't have to worry about message threads +! * blocking on a full output queue: that can't happen when we're only +! * just connecting.) + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +*** repmgr/repmgr_sel.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_sel.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,45 **** + + /* + * PUBLIC: int __repmgr_accept __P((DB_ENV *)); +- * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). + */ + int + __repmgr_accept(dbenv) +--- 36,41 ---- +*************** +*** 133,139 **** + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + default: + return (ret); + } +--- 129,135 ---- + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn)); + default: + return (ret); + } +*************** +*** 254,263 **** + * starting with the "current" element of its address list and trying as many + * addresses as necessary until the list is exhausted. + * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- * + * PUBLIC: int __repmgr_connect_site __P((DB_ENV *, u_int eid)); + */ + int +--- 250,255 ---- +*************** +*** 332,338 **** + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con, TRUE)); + default: + return (ret); + } +--- 324,330 ---- + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con)); + default: + return (ret); + } +*************** +*** 437,443 **** + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! return (__repmgr_send_one(dbenv, conn, REPMGR_HANDSHAKE, &cntrl, &rec)); + } + + /* +--- 429,443 ---- + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! /* +! * It would of course be disastrous to block the select() thread, so +! * pass the "blockable" argument as FALSE. Fortunately blocking should +! * never be necessary here, because the hand-shake is always the first +! * thing we send. Which is a good thing, because it would be almost as +! * disastrous if we allowed ourselves to drop a handshake. +! */ +! return (__repmgr_send_one(dbenv, +! conn, REPMGR_HANDSHAKE, &cntrl, &rec, FALSE)); + } + + /* +*************** +*** 854,859 **** +--- 854,872 ---- + conn->out_queue_length--; + if (--msg->ref_count <= 0) + __os_free(dbenv, msg); ++ ++ /* ++ * We've achieved enough movement to free up at least ++ * one space in the outgoing queue. Wake any message ++ * threads that may be waiting for space. Clear the ++ * CONGESTED status so that when the queue reaches the ++ * high-water mark again, the filling thread will be ++ * allowed to try waiting again. ++ */ ++ F_CLR(conn, CONN_CONGESTED); ++ if (conn->blockers > 0 && ++ (ret = __repmgr_signal(&conn->drained)) != 0) ++ return (ret); + } + } + +*** repmgr/repmgr_util.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_util.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 103,108 **** +--- 103,113 ---- + db_rep = dbenv->rep_handle; + if ((ret = __os_malloc(dbenv, sizeof(REPMGR_CONNECTION), &c)) != 0) + return (ret); ++ if ((ret = __repmgr_alloc_cond(&c->drained)) != 0) { ++ __os_free(dbenv, c); ++ return (ret); ++ } ++ c->blockers = 0; + + c->fd = s; + c->flags = flags; +*** repmgr/repmgr_windows.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_windows.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 11,16 **** +--- 11,19 ---- + #define __INCLUDE_NETWORKING 1 + #include "db_int.h" + ++ /* Convert time-out from microseconds to milliseconds, rounding up. */ ++ #define DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t) (((t) + (US_PER_MS - 1)) / US_PER_MS) ++ + typedef struct __ack_waiter { + HANDLE event; + const DB_LSN *lsnp; +*************** +*** 120,136 **** + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret; +! DWORD timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + +- /* convert time-out from microseconds to milliseconds, rounding up */ + timeout = db_rep->ack_timeout > 0 ? +! ((db_rep->ack_timeout + (US_PER_MS - 1)) / US_PER_MS) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +--- 123,137 ---- + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret, timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + + timeout = db_rep->ack_timeout > 0 ? +! DB_TIMEOUT_TO_WINDOWS_TIMEOUT(db_rep->ack_timeout) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +*************** +*** 211,216 **** +--- 212,296 ---- + db_rep->waiters->first_free = slot; + } + ++ /* (See requirements described in repmgr_posix.c.) */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ db_timespec deadline, delta, now; ++ db_timeout_t t; ++ DWORD duration, ret; ++ int round_up; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __os_gettime(dbenv, &deadline); ++ DB_TIMEOUT_TO_TIMESPEC(timeout, &delta); ++ timespecadd(&deadline, &delta); ++ ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ if (!ResetEvent(conn->drained)) ++ return (GetLastError()); ++ ++ /* How long until the deadline? */ ++ __os_gettime(dbenv, &now); ++ if (timespeccmp(&now, &deadline, >=)) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } ++ delta = deadline; ++ timespecsub(&delta, &now); ++ round_up = TRUE; ++ DB_TIMESPEC_TO_TIMEOUT(t, &delta, round_up); ++ duration = DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t); ++ ++ ret = SignalObjectAndWait(db_rep->mutex, ++ conn->drained, duration, FALSE); ++ LOCK_MUTEX(db_rep->mutex); ++ if (ret == WAIT_FAILED) ++ return (GetLastError()); ++ else if (ret == WAIT_TIMEOUT) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } else ++ DB_ASSERT(dbenv, ret == WAIT_OBJECT_0); ++ ++ if (db_rep->finished) ++ return (0); ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ return (DB_REP_UNAVAIL); ++ } ++ return (0); ++ } ++ ++ /* ++ * Creates a manual reset event, which is usually our best choice when we may ++ * have multiple threads waiting on a single event. ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ HANDLE event; ++ ++ if ((event = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) ++ return (GetLastError()); ++ *c = event; ++ return (0); ++ } ++ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ if (CloseHandle(*c)) ++ return (0); ++ return (GetLastError()); ++ } ++ + /* + * Make resource allocation an all-or-nothing affair, outside of this and the + * close_sync function. db_rep->waiters should be non-NULL iff all of these +*************** +*** 488,493 **** +--- 568,576 ---- + * don't hurt anything flow-control-wise. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING) || + !STAILQ_EMPTY(&conn->outbound_queue) || + (!flow_control || !IS_VALID_EID(conn->eid))) { +*************** +*** 534,541 **** + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT)) +! __repmgr_cleanup_connection(dbenv, conn); + } + + /* +--- 617,626 ---- + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT) && +! (ret = __repmgr_cleanup_connection(dbenv, +! conn)) != 0) +! goto unlock; + } + + /* +*************** +*** 587,597 **** + return (ret); + } + +- /* +- * !!! +- * Only ever called on the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- */ + static int + handle_completion(dbenv, conn) + DB_ENV *dbenv; +--- 672,677 ---- +*************** +*** 651,660 **** + } + } + +! return (0); +! +! err: if (ret == DB_REP_UNAVAIL) +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + return (ret); + } + +--- 731,742 ---- + } + } + +! err: +! if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) +! return (ret); +! ret = __repmgr_cleanup_connection(dbenv, conn); +! } + return (ret); + } + +*************** +*** 708,714 **** + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 790,797 ---- + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 1 12:31:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 01 Oct 2009 10:31:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6636] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6636 http://gar.svn.sourceforge.net/gar/?rev=6636&view=rev Author: wahwah Date: 2009-10-01 10:31:33 +0000 (Thu, 01 Oct 2009) Log Message: ----------- cups: A better SAMPLECONF regex. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-01 09:52:37 UTC (rev 6635) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-01 10:31:33 UTC (rev 6636) @@ -140,7 +140,7 @@ SPKG_DESC_CSWcupsdev = CUPS header files # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html -SAMPLECONF = $(sysconfdir)/cups/cupsd.conf.CSW +SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 13:39:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 11:39:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6637] csw/mgar/pkg Message-ID: Revision: 6637 http://gar.svn.sourceforge.net/gar/?rev=6637&view=rev Author: dmichelsen Date: 2009-10-01 11:39:07 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb45: Fix package names Added Paths: ----------- csw/mgar/pkg/bdb45/ csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb45/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/bdb45/trunk/ Property changes on: csw/mgar/pkg/bdb45/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/bdb45/trunk/Makefile (from rev 6628, csw/mgar/pkg/bdb47/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-01 11:39:07 UTC (rev 6637) @@ -0,0 +1,88 @@ +GARNAME = db +GARVERSION = 4.5.20 +CATEGORIES = lib + +DESCRIPTION = Berkeley DB 4.5 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) + +BUILD64 = 1 +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb45 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +NO_ISAEXEC = 1 + +PACKAGES = CSWbdb45 CSWbdb45devel CSWbdb45doc + +CATALOGNAME_CSWbdb45 = berkeleydb45 +CATALOGNAME_CSWbdb45devel = berkeleydb45_devel +CATALOGNAME_CSWbdb45doc = berkeleydb45_doc + +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* + +ARCHALL_CSWbdbdoc = 1 + +SPKG_DESC_CSWbdb45 = BerkeleyDB 4.5 embedded database libraries and utilities +SPKG_DESC_CSWbdb45devel = BerkeleyDB 4.5 development support +SPKG_DESC_CSWbdb45doc = BerkeleyDB 4.5 documentation + +REQUIRED_PKGS_CSWbdb45devel = CSWbdb45 + +LICENSE = LICENSE + +PKGFILES_CSWbdb45doc = /opt/csw/share/doc/.* + +PKGFILES_CSWbdb45devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/jdk1.6.0_07/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 13:40:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 11:40:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6638] csw/mgar/pkg/bdb45/trunk Message-ID: Revision: 6638 http://gar.svn.sourceforge.net/gar/?rev=6638&view=rev Author: dmichelsen Date: 2009-10-01 11:40:12 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb45: Add missing files Added Paths: ----------- csw/mgar/pkg/bdb45/trunk/checksums csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 Added: csw/mgar/pkg/bdb45/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb45/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb45/trunk/checksums 2009-10-01 11:40:12 UTC (rev 6638) @@ -0,0 +1,3 @@ +b0f1c777708cb8e9d37fb47e7ed3312d download/db-4.5.20.tar.gz +a571e239b9041d7990df287cbc59ad6f download/patch.4.5.20.1 +b7a7086a067ba116f5a8464362c9a9a7 download/patch.4.5.20.2 Added: csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 =================================================================== --- csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 (rev 0) +++ csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 2009-10-01 11:40:12 UTC (rev 6638) @@ -0,0 +1,37 @@ +*** sequence/sequence.c.orig 27 Sep 2006 14:56:17 -0000 12.39 +--- sequence/sequence.c 26 Oct 2006 07:36:05 -0000 +*************** +*** 228,233 **** +--- 228,236 ---- + seq->seq_data.ulen = seq->seq_data.size = sizeof(seq->seq_record); + seq->seq_rp = &seq->seq_record; + ++ if ((ret = __dbt_usercopy(dbenv, keyp)) != 0) ++ goto err; ++ + memset(&seq->seq_key, 0, sizeof(DBT)); + if ((ret = __os_malloc(dbenv, keyp->size, &seq->seq_key.data)) != 0) + goto err; +*************** +*** 365,370 **** +--- 368,374 ---- + ret = t_ret; + + ENV_LEAVE(dbenv, ip); ++ __dbt_userfree(dbenv, keyp, NULL, NULL); + return (ret); + } + +*************** +*** 764,769 **** +--- 768,777 ---- + DBT *key; + { + SEQ_ILLEGAL_BEFORE_OPEN(seq, "DB_SEQUENCE->get_key"); ++ ++ if (F_ISSET(key, DB_DBT_USERCOPY)) ++ return (__db_retcopy(seq->seq_dbp->dbenv, key, ++ seq->seq_key.data, seq->seq_key.size, NULL, 0)); + + key->data = seq->seq_key.data; + key->size = key->ulen = seq->seq_key.size; Added: csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 =================================================================== --- csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 (rev 0) +++ csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 2009-10-01 11:40:12 UTC (rev 6638) @@ -0,0 +1,66 @@ +*** rep/rep_method.c.orig Fri Oct 20 08:34:06 2006 +--- rep/rep_method.c Fri Oct 27 12:09:04 2006 +*************** +*** 526,535 **** + * will allow the client to either perform recovery or + * simply join in. + */ +! if (announce) + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0); +! else + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0); + } +--- 526,537 ---- + * will allow the client to either perform recovery or + * simply join in. + */ +! if (announce) { +! if ((ret = __dbt_usercopy(dbenv, dbt)) != 0) +! goto err; + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0); +! } else + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0); + } +*************** +*** 553,558 **** +--- 555,561 ---- + } + if (pending_event != DB_EVENT_NO_SUCH_EVENT) + DB_EVENT(dbenv, pending_event, NULL); ++ __dbt_userfree(dbenv, dbt, NULL, NULL); + return (ret); + } + +*** rep/rep_record.c.orig Fri Oct 20 08:34:06 2006 +--- rep/rep_record.c Mon Nov 13 10:46:29 2006 +*************** +*** 163,168 **** +--- 163,176 ---- + return (EINVAL); + } + ++ if ((ret = __dbt_usercopy(dbenv, control)) != 0 || ++ (ret = __dbt_usercopy(dbenv, rec)) != 0) { ++ __dbt_userfree(dbenv, control, rec, NULL); ++ __db_errx(dbenv, ++ "DB_ENV->rep_process_message: error retrieving DBT contents"); ++ return ret; ++ } ++ + ret = 0; + db_rep = dbenv->rep_handle; + rep = db_rep->region; +*************** +*** 621,626 **** +--- 629,635 ---- + *ret_lsnp = rp->lsn; + ret = DB_REP_NOTPERM; + } ++ __dbt_userfree(dbenv, control, rec, NULL); + return (ret); + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 14:59:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 12:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6639] csw/mgar/pkg/bdb46/trunk/Makefile Message-ID: Revision: 6639 http://gar.svn.sourceforge.net/gar/?rev=6639&view=rev Author: dmichelsen Date: 2009-10-01 12:59:27 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb46: Fix ARCHALL for docs Modified Paths: -------------- csw/mgar/pkg/bdb46/trunk/Makefile Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-01 11:40:12 UTC (rev 6638) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-01 12:59:27 UTC (rev 6639) @@ -61,7 +61,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb46doc = 1 SPKG_DESC_CSWbdb46 = BerkeleyDB 4.6 embedded database libraries and utilities SPKG_DESC_CSWbdb46devel = BerkeleyDB 4.6 development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:04:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6640] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6640 http://gar.svn.sourceforge.net/gar/?rev=6640&view=rev Author: dmichelsen Date: 2009-10-01 13:04:23 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb47: Fix ARCHALL for docs Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 12:59:27 UTC (rev 6639) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 13:04:23 UTC (rev 6640) @@ -61,7 +61,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb47doc = 1 SPKG_DESC_CSWbdb47 = BerkeleyDB 4.7 embedded database libraries and utilities SPKG_DESC_CSWbdb47devel = BerkeleyDB 4.7 development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:05:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:05:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6641] csw/mgar/pkg/bdb45/trunk/Makefile Message-ID: Revision: 6641 http://gar.svn.sourceforge.net/gar/?rev=6641&view=rev Author: dmichelsen Date: 2009-10-01 13:05:12 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb45: Fix ARCHALL for docs Modified Paths: -------------- csw/mgar/pkg/bdb45/trunk/Makefile Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-01 13:04:23 UTC (rev 6640) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-01 13:05:12 UTC (rev 6641) @@ -61,7 +61,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb45doc = 1 SPKG_DESC_CSWbdb45 = BerkeleyDB 4.5 embedded database libraries and utilities SPKG_DESC_CSWbdb45devel = BerkeleyDB 4.5 development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 15:08:36 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:08:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6642] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 6642 http://gar.svn.sourceforge.net/gar/?rev=6642&view=rev Author: bonivart Date: 2009-10-01 13:08:36 +0000 (Thu, 01 Oct 2009) Log Message: ----------- geoip: update to 1.4.6, initial commit Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 13:05:12 UTC (rev 6641) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 13:08:36 UTC (rev 6642) @@ -15,34 +15,44 @@ REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip CATALOGNAME_CSWgeoip = geoip CATALOGNAME_CSWgeoipdevel = geoip_devel +SPKG_DESC_CSWgeoip = $(DESCRIPTION) +SPKG_DESC_CSWgeoipdevel = GeoIP C API development support +PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GCC4 +TEST_TARGET = check + +# Do not exclude static libs (needed for devel package) +MERGE_EXCLUDE_STATICLIBS = + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk -pre-configure-modulated: - @echo " ==> Pre-configure for $(GARNAME) (custom)" - @( cd $(WORKSRC) ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ; \ - cd apps ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ; \ - cd ../libGeoIP ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ; \ - cd ../test ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ) - @$(MAKECOOKIE) +#pre-configure-modulated: +# @echo " ==> Pre-configure for $(GARNAME) (custom)" +# @( cd $(WORKSRC) ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ; \ +# cd apps ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ; \ +# cd ../libGeoIP ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ; \ +# cd ../test ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ) +# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:10:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6643] csw/mgar/pkg/bdb47/trunk Message-ID: Revision: 6643 http://gar.svn.sourceforge.net/gar/?rev=6643&view=rev Author: dmichelsen Date: 2009-10-01 13:10:42 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb47: Fix patches Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb47/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 Removed Paths: ------------- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 4.6.21 +GARVERSION = 4.7.25 CATEGORIES = lib -DESCRIPTION = Berkeley DB 4.6 +DESCRIPTION = Berkeley DB 4.7 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,7 +30,7 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb46 +prefix = $(BUILD_PREFIX)/bdb47 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct Modified: csw/mgar/pkg/bdb47/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb47/trunk/checksums 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/checksums 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,5 +1,5 @@ -718082e7e35fc48478a2334b0bc4cd11 download/db-4.6.21.tar.gz -4878872edfc53c6ecb871b1062a4bdaf download/patch.4.6.21.1 -55074e53d3acae2dcbeae8322f96e522 download/patch.4.6.21.2 -7a6e11b54712caf752f9c4a52babe60c download/patch.4.6.21.3 -ae7d3d587355fe85b512ef09b9a77d19 download/patch.4.6.21.4 +ec2b87e833779681a0c3a814aa71359e download/db-4.7.25.tar.gz +5fdf101259e5164dea1c8c86214fde38 download/patch.4.7.25.1 +bd410a11c71fee52fddb6aa2d8d4f80c download/patch.4.7.25.2 +6fcd69f64f5b34bfe8f0a63cc2e402c1 download/patch.4.7.25.3 +c71830a1303cd34595ca655257196eec download/patch.4.7.25.4 Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,90 +0,0 @@ -*** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 ---- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 -*************** -*** 639,644 **** ---- 639,647 ---- - */ - #define MP_TRUNC_RECOVER 0x01 - -+ /* Private flags to DB_MPOOLFILE->close. */ -+ #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ -+ - #if defined(__cplusplus) - } - #endif -*** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 ---- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 -*************** -*** 888,894 **** - * when we try to flush them. - */ - deleted = 0; -! MUTEX_LOCK(dbenv, mfp->mutex); - if (F_ISSET(dbmfp, MP_MULTIVERSION)) - --mfp->multiversion; - if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { ---- 888,895 ---- - * when we try to flush them. - */ - deleted = 0; -! if (!LF_ISSET(DB_MPOOL_NOLOCK)) -! MUTEX_LOCK(dbenv, mfp->mutex); - if (F_ISSET(dbmfp, MP_MULTIVERSION)) - --mfp->multiversion; - if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { -*************** -*** 909,921 **** - } - } - if (mfp->block_cnt == 0) { - if ((t_ret = - __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) - ret = t_ret; - deleted = 1; - } - } -! if (!deleted) - MUTEX_UNLOCK(dbenv, mfp->mutex); - - done: /* Discard the DB_MPOOLFILE structure. */ ---- 910,928 ---- - } - } - if (mfp->block_cnt == 0) { -+ /* -+ * We should never discard this mp file if our caller -+ * is holding the lock on it. See comment in -+ * __memp_sync_file. -+ */ -+ DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); - if ((t_ret = - __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) - ret = t_ret; - deleted = 1; - } - } -! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) - MUTEX_UNLOCK(dbenv, mfp->mutex); - - done: /* Discard the DB_MPOOLFILE structure. */ -*** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 ---- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 -*************** -*** 755,761 **** - * This is important since we are called with the hash bucket - * locked. The mfp will get freed via the cleanup pass. - */ -! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) - ret = t_ret; - - --mfp->mpf_cnt; ---- 755,762 ---- - * This is important since we are called with the hash bucket - * locked. The mfp will get freed via the cleanup pass. - */ -! if (dbmfp != NULL && -! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) - ret = t_ret; - - --mfp->mpf_cnt; - Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,27 +0,0 @@ -*** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 ---- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 -*************** -*** 249,256 **** - mtx_base = htab[0].mtx_hash; - } - - if (mtx_base != MUTEX_INVALID) -! mtx_base += reginfo_off * htab_buckets; - - /* Allocate hash table space and initialize it. */ - if ((ret = __env_alloc(infop, ---- 249,262 ---- - mtx_base = htab[0].mtx_hash; - } - -+ /* -+ * We preallocated all of the mutexes in a block, so for regions after -+ * the first, we skip mutexes in use in earlier regions. Each region -+ * has the same number of buckets and there are two mutexes per hash -+ * bucket (the bucket mutex and the I/O mutex). -+ */ - if (mtx_base != MUTEX_INVALID) -! mtx_base += reginfo_off * htab_buckets * 2; - - /* Allocate hash table space and initialize it. */ - if ((ret = __env_alloc(infop, Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,74 +0,0 @@ -*** sequence/sequence.c ---- sequence/sequence.c -*************** -*** 196,202 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); - goto err; - } ---- 196,206 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 252,257 **** ---- 256,266 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(dbenv) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 304,310 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (__db_isbigendian()) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 313,324 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(dbenv) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (__db_isbigendian()) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 713,718 **** ---- 727,738 ---- - - MUTEX_LOCK(dbenv, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(dbenv) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(dbenv, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(dbenv, "Sequence overflow"); - ret = EINVAL; Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,1414 +0,0 @@ -*** dbinc/repmgr.h 2007-10-31 10:23:52.000000000 -0700 ---- dbinc/repmgr.h 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 36,41 **** ---- 36,55 ---- - #endif - - /* -+ * The (arbitrary) maximum number of outgoing messages we're willing to hold, on -+ * a queue per connection, waiting for TCP buffer space to become available in -+ * the kernel. Rather than exceeding this limit, we simply discard additional -+ * messages (since this is always allowed by the replication protocol). -+ * As a special dispensation, if a message is destined for a specific remote -+ * site (i.e., it's not a broadcast), then we first try blocking the sending -+ * thread, waiting for space to become available (though we only wait a limited -+ * time). This is so as to be able to handle the immediate flood of (a -+ * potentially large number of) outgoing messages that replication generates, in -+ * a tight loop, when handling PAGE_REQ, LOG_REQ and ALL_REQ requests. -+ */ -+ #define OUT_QUEUE_LIMIT 10 -+ -+ /* - * The system value is available from sysconf(_SC_HOST_NAME_MAX). - * Historically, the maximum host name was 256. - */ -*************** -*** 47,52 **** ---- 61,71 ---- - #define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20) - typedef char SITE_STRING_BUFFER[MAX_SITE_LOC_STRING+1]; - -+ /* Default timeout values, in seconds. */ -+ #define DB_REPMGR_DEFAULT_ACK_TIMEOUT (1 * US_PER_SEC) -+ #define DB_REPMGR_DEFAULT_CONNECTION_RETRY (30 * US_PER_SEC) -+ #define DB_REPMGR_DEFAULT_ELECTION_RETRY (10 * US_PER_SEC) -+ - struct __repmgr_connection; - typedef struct __repmgr_connection REPMGR_CONNECTION; - struct __repmgr_queue; typedef struct __repmgr_queue REPMGR_QUEUE; -*************** -*** 171,178 **** - #ifdef DB_WIN32 - WSAEVENT event_object; - #endif -! #define CONN_CONNECTING 0x01 /* nonblocking connect in progress */ -! #define CONN_DEFUNCT 0x02 /* socket close pending */ - u_int32_t flags; - - /* ---- 190,198 ---- - #ifdef DB_WIN32 - WSAEVENT event_object; - #endif -! #define CONN_CONGESTED 0x01 /* msg thread wait has exceeded timeout */ -! #define CONN_CONNECTING 0x02 /* nonblocking connect in progress */ -! #define CONN_DEFUNCT 0x04 /* socket close pending */ - u_int32_t flags; - - /* -*************** -*** 180,189 **** - * send() function's thread. But if TCP doesn't have enough network - * buffer space for us when we first try it, we instead allocate some - * memory, and copy the message, and then send it as space becomes -! * available in our main select() thread. - */ - OUT_Q_HEADER outbound_queue; - int out_queue_length; - - /* - * Input: while we're reading a message, we keep track of what phase ---- 200,215 ---- - * send() function's thread. But if TCP doesn't have enough network - * buffer space for us when we first try it, we instead allocate some - * memory, and copy the message, and then send it as space becomes -! * available in our main select() thread. In some cases, if the queue -! * gets too long we wait until it's drained, and then append to it. -! * This condition variable's associated mutex is the normal per-repmgr -! * db_rep->mutex, because that mutex is always held anyway whenever the -! * output queue is consulted. - */ - OUT_Q_HEADER outbound_queue; - int out_queue_length; -+ cond_var_t drained; -+ int blockers; /* ref count of msg threads waiting on us */ - - /* - * Input: while we're reading a message, we keep track of what phase -*** dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 ---- dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 -*************** -*** 1420,1425 **** ---- 1420,1428 ---- - #define __repmgr_wake_waiting_senders __repmgr_wake_waiting_senders at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_await_ack __repmgr_await_ack at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_compute_wait_deadline __repmgr_compute_wait_deadline at DB_VERSION_UNIQUE_NAME@ -+ #define __repmgr_await_drain __repmgr_await_drain at DB_VERSION_UNIQUE_NAME@ -+ #define __repmgr_alloc_cond __repmgr_alloc_cond at DB_VERSION_UNIQUE_NAME@ -+ #define __repmgr_free_cond __repmgr_free_cond at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_init_sync __repmgr_init_sync at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_close_sync __repmgr_close_sync at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_net_init __repmgr_net_init at DB_VERSION_UNIQUE_NAME@ -*** dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 ---- dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 -*************** -*** 21,30 **** - int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); - void __repmgr_stash_generation __P((DB_ENV *)); - int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); -! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *)); - int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); -! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *, int)); -! void __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); - int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); - int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); - int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); ---- 21,30 ---- - int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); - void __repmgr_stash_generation __P((DB_ENV *)); - int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); -! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *, int)); - int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); -! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *)); -! int __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); - int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); - int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); - int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); -*************** -*** 39,44 **** ---- 39,47 ---- - int __repmgr_wake_waiting_senders __P((DB_ENV *)); - int __repmgr_await_ack __P((DB_ENV *, const DB_LSN *)); - void __repmgr_compute_wait_deadline __P((DB_ENV*, struct timespec *, db_timeout_t)); -+ int __repmgr_await_drain __P((DB_ENV *, REPMGR_CONNECTION *, db_timeout_t)); -+ int __repmgr_alloc_cond __P((cond_var_t *)); -+ int __repmgr_free_cond __P((cond_var_t *)); - int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); - int __repmgr_close_sync __P((DB_ENV *)); - int __repmgr_net_init __P((DB_ENV *, DB_REP *)); -*** repmgr/repmgr_method.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_method.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 196,204 **** - int ret; - - /* Set some default values. */ -! db_rep->ack_timeout = 1 * US_PER_SEC; /* 1 second */ -! db_rep->connection_retry_wait = 30 * US_PER_SEC; /* 30 seconds */ -! db_rep->election_retry_wait = 10 * US_PER_SEC; /* 10 seconds */ - db_rep->config_nsites = 0; - db_rep->peer = DB_EID_INVALID; - db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; ---- 196,204 ---- - int ret; - - /* Set some default values. */ -! db_rep->ack_timeout = DB_REPMGR_DEFAULT_ACK_TIMEOUT; -! db_rep->connection_retry_wait = DB_REPMGR_DEFAULT_CONNECTION_RETRY; -! db_rep->election_retry_wait = DB_REPMGR_DEFAULT_ELECTION_RETRY; - db_rep->config_nsites = 0; - db_rep->peer = DB_EID_INVALID; - db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; -*************** -*** 238,243 **** ---- 238,244 ---- - DB_ENV *dbenv; - { - DB_REP *db_rep; -+ REPMGR_CONNECTION *conn; - int ret; - - db_rep = dbenv->rep_handle; -*************** -*** 254,259 **** ---- 255,266 ---- - - if ((ret = __repmgr_signal(&db_rep->queue_nonempty)) != 0) - goto unlock; -+ -+ TAILQ_FOREACH(conn, &db_rep->connections, entries) { -+ if (conn->blockers > 0 && -+ ((ret = __repmgr_signal(&conn->drained)) != 0)) -+ goto unlock; -+ } - UNLOCK_MUTEX(db_rep->mutex); - - return (__repmgr_wake_main_thread(dbenv)); -*** repmgr/repmgr_msg.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_msg.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 183,192 **** - - /* - * Acknowledges a message. -- * -- * !!! -- * Note that this cannot be called from the select() thread, in case we call -- * __repmgr_bust_connection(..., FALSE). - */ - static int - ack_message(dbenv, generation, lsn) ---- 183,188 ---- -*************** -*** 227,235 **** - rec2.size = 0; - - conn = site->ref.conn; - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, -! &control2, &rec2)) == DB_REP_UNAVAIL) -! ret = __repmgr_bust_connection(dbenv, conn, FALSE); - } - - UNLOCK_MUTEX(db_rep->mutex); ---- 223,236 ---- - rec2.size = 0; - - conn = site->ref.conn; -+ /* -+ * It's hard to imagine anyone would care about a lost ack if -+ * the path to the master is so congested as to need blocking; -+ * so pass "blockable" argument as FALSE. -+ */ - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, -! &control2, &rec2, FALSE)) == DB_REP_UNAVAIL) -! ret = __repmgr_bust_connection(dbenv, conn); - } - - UNLOCK_MUTEX(db_rep->mutex); -*** repmgr/repmgr_net.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_net.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 63,69 **** - static void setup_sending_msg - __P((struct sending_msg *, u_int, const DBT *, const DBT *)); - static int __repmgr_send_internal -! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *)); - static int enqueue_msg - __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); - static int flatten __P((DB_ENV *, struct sending_msg *)); ---- 63,69 ---- - static void setup_sending_msg - __P((struct sending_msg *, u_int, const DBT *, const DBT *)); - static int __repmgr_send_internal -! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, int)); - static int enqueue_msg - __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); - static int flatten __P((DB_ENV *, struct sending_msg *)); -*************** -*** 73,85 **** - * __repmgr_send -- - * The send function for DB_ENV->rep_set_transport. - * -- * !!! -- * This is only ever called as the replication transport call-back, which means -- * it's either on one of our message processing threads or an application -- * thread. It mustn't be called from the select() thread, because we might call -- * __repmgr_bust_connection(..., FALSE) here, and that's not allowed in the -- * select() thread. -- * - * PUBLIC: int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, - * PUBLIC: const DB_LSN *, int, u_int32_t)); - */ ---- 73,78 ---- -*************** -*** 126,134 **** - } - - conn = site->ref.conn; - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, -! control, rec)) == DB_REP_UNAVAIL && -! (t_ret = __repmgr_bust_connection(dbenv, conn, FALSE)) != 0) - ret = t_ret; - if (ret != 0) - goto out; ---- 119,128 ---- - } - - conn = site->ref.conn; -+ /* Pass the "blockable" argument as TRUE. */ - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, -! control, rec, TRUE)) == DB_REP_UNAVAIL && -! (t_ret = __repmgr_bust_connection(dbenv, conn)) != 0) - ret = t_ret; - if (ret != 0) - goto out; -*************** -*** 222,228 **** - if (site->state != SITE_CONNECTED) - return (NULL); - -! if (F_ISSET(site->ref.conn, CONN_CONNECTING)) - return (NULL); - return (site); - } ---- 216,222 ---- - if (site->state != SITE_CONNECTED) - return (NULL); - -! if (F_ISSET(site->ref.conn, CONN_CONNECTING|CONN_DEFUNCT)) - return (NULL); - return (site); - } -*************** -*** 235,244 **** - * - * !!! - * Caller must hold dbenv->mutex. -- * -- * !!! -- * Note that this cannot be called from the select() thread, in case we call -- * __repmgr_bust_connection(..., FALSE). - */ - static int - __repmgr_send_broadcast(dbenv, control, rec, nsitesp, npeersp) ---- 229,234 ---- -*************** -*** 268,281 **** - !IS_VALID_EID(conn->eid)) - continue; - -! if ((ret = __repmgr_send_internal(dbenv, conn, &msg)) == 0) { - site = SITE_FROM_EID(conn->eid); - nsites++; - if (site->priority > 0) - npeers++; - } else if (ret == DB_REP_UNAVAIL) { -! if ((ret = __repmgr_bust_connection( -! dbenv, conn, FALSE)) != 0) - return (ret); - } else - return (ret); ---- 258,277 ---- - !IS_VALID_EID(conn->eid)) - continue; - -! /* -! * Broadcast messages are either application threads committing -! * transactions, or replication status message that we can -! * afford to lose. So don't allow blocking for them (pass -! * "blockable" argument as FALSE). -! */ -! if ((ret = __repmgr_send_internal(dbenv, -! conn, &msg, FALSE)) == 0) { - site = SITE_FROM_EID(conn->eid); - nsites++; - if (site->priority > 0) - npeers++; - } else if (ret == DB_REP_UNAVAIL) { -! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) - return (ret); - } else - return (ret); -*************** -*** 301,339 **** - * intersperse writes that are part of two single messages. - * - * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, -! * PUBLIC: u_int, const DBT *, const DBT *)); - */ - int -! __repmgr_send_one(dbenv, conn, msg_type, control, rec) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - u_int msg_type; - const DBT *control, *rec; - { - struct sending_msg msg; - - setup_sending_msg(&msg, msg_type, control, rec); -! return (__repmgr_send_internal(dbenv, conn, &msg)); - } - - /* - * Attempts a "best effort" to send a message on the given site. If there is an -! * excessive backlog of message already queued on the connection, we simply drop -! * this message, and still return 0 even in this case. - */ - static int -! __repmgr_send_internal(dbenv, conn, msg) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - struct sending_msg *msg; - { -! #define OUT_QUEUE_LIMIT 10 /* arbitrary, for now */ - REPMGR_IOVECS iovecs; - SITE_STRING_BUFFER buffer; - int ret; - size_t nw; - size_t total_written; - - DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); - if (!STAILQ_EMPTY(&conn->outbound_queue)) { - /* ---- 297,355 ---- - * intersperse writes that are part of two single messages. - * - * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, -! * PUBLIC: u_int, const DBT *, const DBT *, int)); - */ - int -! __repmgr_send_one(dbenv, conn, msg_type, control, rec, blockable) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - u_int msg_type; - const DBT *control, *rec; -+ int blockable; - { - struct sending_msg msg; - - setup_sending_msg(&msg, msg_type, control, rec); -! return (__repmgr_send_internal(dbenv, conn, &msg, blockable)); - } - - /* - * Attempts a "best effort" to send a message on the given site. If there is an -! * excessive backlog of message already queued on the connection, what shall we -! * do? If the caller doesn't mind blocking, we'll wait (a limited amount of -! * time) for the queue to drain. Otherwise we'll simply drop the message. This -! * is always allowed by the replication protocol. But in the case of a -! * multi-message response to a request like PAGE_REQ, LOG_REQ or ALL_REQ we -! * almost always get a flood of messages that instantly fills our queue, so -! * blocking improves performance (by avoiding the need for the client to -! * re-request). -! * -! * How long shall we wait? We could of course create a new timeout -! * configuration type, so that the application could set it directly. But that -! * would start to overwhelm the user with too many choices to think about. We -! * already have an ACK timeout, which is the user's estimate of how long it -! * should take to send a message to the client, have it be processed, and return -! * a message back to us. We multiply that by the queue size, because that's how -! * many messages have to be swallowed up by the client before we're able to -! * start sending again (at least to a rough approximation). - */ - static int -! __repmgr_send_internal(dbenv, conn, msg, blockable) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - struct sending_msg *msg; -+ int blockable; - { -! DB_REP *db_rep; - REPMGR_IOVECS iovecs; - SITE_STRING_BUFFER buffer; -+ db_timeout_t drain_to; - int ret; - size_t nw; - size_t total_written; - -+ db_rep = dbenv->rep_handle; -+ - DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); - if (!STAILQ_EMPTY(&conn->outbound_queue)) { - /* -*************** -*** 344,358 **** - RPRINT(dbenv, (dbenv, "msg to %s to be queued", - __repmgr_format_eid_loc(dbenv->rep_handle, - conn->eid, buffer))); - if (conn->out_queue_length < OUT_QUEUE_LIMIT) - return (enqueue_msg(dbenv, conn, msg, 0)); - else { - RPRINT(dbenv, (dbenv, "queue limit exceeded")); - STAT(dbenv->rep_handle-> - region->mstat.st_msgs_dropped++); -! return (0); - } - } - - /* - * Send as much data to the site as we can, without blocking. Keep ---- 360,393 ---- - RPRINT(dbenv, (dbenv, "msg to %s to be queued", - __repmgr_format_eid_loc(dbenv->rep_handle, - conn->eid, buffer))); -+ if (conn->out_queue_length >= OUT_QUEUE_LIMIT && -+ blockable && !F_ISSET(conn, CONN_CONGESTED)) { -+ RPRINT(dbenv, (dbenv, -+ "block msg thread, await queue space")); -+ -+ if ((drain_to = db_rep->ack_timeout) == 0) -+ drain_to = DB_REPMGR_DEFAULT_ACK_TIMEOUT; -+ conn->blockers++; -+ ret = __repmgr_await_drain(dbenv, -+ conn, drain_to * OUT_QUEUE_LIMIT); -+ conn->blockers--; -+ if (db_rep->finished) -+ return (DB_TIMEOUT); -+ if (ret != 0) -+ return (ret); -+ if (STAILQ_EMPTY(&conn->outbound_queue)) -+ goto empty; -+ } - if (conn->out_queue_length < OUT_QUEUE_LIMIT) - return (enqueue_msg(dbenv, conn, msg, 0)); - else { - RPRINT(dbenv, (dbenv, "queue limit exceeded")); - STAT(dbenv->rep_handle-> - region->mstat.st_msgs_dropped++); -! return (blockable ? DB_TIMEOUT : 0); - } - } -+ empty: - - /* - * Send as much data to the site as we can, without blocking. Keep -*************** -*** 498,521 **** - - /* - * Abandons a connection, to recover from an error. Upon entry the conn struct -! * must be on the connections list. -! * -! * If the 'do_close' flag is true, we do the whole job; the clean-up includes -! * removing the struct from the list and freeing all its memory, so upon return -! * the caller must not refer to it any further. Otherwise, we merely mark the -! * connection for clean-up later by the main thread. - * - * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, -! * PUBLIC: REPMGR_CONNECTION *, int)); - * - * !!! - * Caller holds mutex. - */ - int -! __repmgr_bust_connection(dbenv, conn, do_close) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; -- int do_close; - { - DB_REP *db_rep; - int connecting, ret, eid; ---- 533,553 ---- - - /* - * Abandons a connection, to recover from an error. Upon entry the conn struct -! * must be on the connections list. For now, just mark it as unusable; it will -! * be fully cleaned up in the top-level select thread, as soon as possible. - * - * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, -! * PUBLIC: REPMGR_CONNECTION *)); - * - * !!! - * Caller holds mutex. -+ * -+ * Must be idempotent - */ - int -! __repmgr_bust_connection(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - { - DB_REP *db_rep; - int connecting, ret, eid; -*************** -*** 526,537 **** - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); - eid = conn->eid; - connecting = F_ISSET(conn, CONN_CONNECTING); -! if (do_close) -! __repmgr_cleanup_connection(dbenv, conn); -! else { -! F_SET(conn, CONN_DEFUNCT); -! conn->eid = -1; -! } - - /* - * When we first accepted the incoming connection, we set conn->eid to ---- 558,566 ---- - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); - eid = conn->eid; - connecting = F_ISSET(conn, CONN_CONNECTING); -! -! F_SET(conn, CONN_DEFUNCT); -! conn->eid = -1; - - /* - * When we first accepted the incoming connection, we set conn->eid to -*************** -*** 557,563 **** - dbenv, ELECT_FAILURE_ELECTION)) != 0) - return (ret); - } -! } else if (!do_close) { - /* - * One way or another, make sure the main thread is poked, so - * that we do the deferred clean-up. ---- 586,592 ---- - dbenv, ELECT_FAILURE_ELECTION)) != 0) - return (ret); - } -! } else { - /* - * One way or another, make sure the main thread is poked, so - * that we do the deferred clean-up. -*************** -*** 568,577 **** - } - - /* -! * PUBLIC: void __repmgr_cleanup_connection - * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); - */ -! void - __repmgr_cleanup_connection(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; ---- 597,610 ---- - } - - /* -! * PUBLIC: int __repmgr_cleanup_connection - * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); -+ * -+ * !!! -+ * Idempotent. This can be called repeatedly as blocking message threads (of -+ * which there could be multiples) wake up in case of error on the connection. - */ -! int - __repmgr_cleanup_connection(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; -*************** -*** 580,596 **** - QUEUED_OUTPUT *out; - REPMGR_FLAT *msg; - DBT *dbt; - - db_rep = dbenv->rep_handle; - -! TAILQ_REMOVE(&db_rep->connections, conn, entries); - if (conn->fd != INVALID_SOCKET) { -! (void)closesocket(conn->fd); - #ifdef DB_WIN32 -! (void)WSACloseEvent(conn->event_object); - #endif - } - - /* - * Deallocate any input and output buffers we may have. - */ ---- 613,643 ---- - QUEUED_OUTPUT *out; - REPMGR_FLAT *msg; - DBT *dbt; -+ int ret; - - db_rep = dbenv->rep_handle; - -! DB_ASSERT(dbenv, F_ISSET(conn, CONN_DEFUNCT) || db_rep->finished); -! - if (conn->fd != INVALID_SOCKET) { -! ret = closesocket(conn->fd); -! conn->fd = INVALID_SOCKET; -! if (ret == SOCKET_ERROR) { -! ret = net_errno; -! __db_err(dbenv, ret, "closing socket"); -! } - #ifdef DB_WIN32 -! if (!WSACloseEvent(conn->event_object) && ret != 0) -! ret = net_errno; - #endif -+ if (ret != 0) -+ return (ret); - } - -+ if (conn->blockers > 0) -+ return (__repmgr_signal(&conn->drained)); -+ -+ TAILQ_REMOVE(&db_rep->connections, conn, entries); - /* - * Deallocate any input and output buffers we may have. - */ -*************** -*** 614,620 **** ---- 661,669 ---- - __os_free(dbenv, out); - } - -+ ret = __repmgr_free_cond(&conn->drained); - __os_free(dbenv, conn); -+ return (ret); - } - - static int -*************** -*** 1063,1069 **** - - while (!TAILQ_EMPTY(&db_rep->connections)) { - conn = TAILQ_FIRST(&db_rep->connections); -! __repmgr_cleanup_connection(dbenv, conn); - } - - for (i = 0; i < db_rep->site_cnt; i++) { ---- 1112,1118 ---- - - while (!TAILQ_EMPTY(&db_rep->connections)) { - conn = TAILQ_FIRST(&db_rep->connections); -! (void)__repmgr_cleanup_connection(dbenv, conn); - } - - for (i = 0; i < db_rep->site_cnt; i++) { -*** repmgr/repmgr_posix.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_posix.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 21,26 **** ---- 21,28 ---- - size_t __repmgr_guesstimated_max = (128 * 1024); - #endif - -+ static int __repmgr_conn_work __P((DB_ENV *, -+ REPMGR_CONNECTION *, fd_set *, fd_set *, int)); - static int finish_connecting __P((DB_ENV *, REPMGR_CONNECTION *)); - - /* -*************** -*** 189,194 **** ---- 191,284 ---- - } - - /* -+ * PUBLIC: int __repmgr_await_drain __P((DB_ENV *, -+ * PUBLIC: REPMGR_CONNECTION *, db_timeout_t)); -+ * -+ * Waits for space to become available on the connection's output queue. -+ * Various ways we can exit: -+ * -+ * 1. queue becomes non-full -+ * 2. exceed time limit -+ * 3. connection becomes defunct (due to error in another thread) -+ * 4. repmgr is shutting down -+ * 5. any unexpected system resource failure -+ * -+ * In cases #3 and #5 we return an error code. Caller is responsible for -+ * distinguishing the remaining cases if desired. -+ * -+ * !!! -+ * Caller must hold repmgr->mutex. -+ */ -+ int -+ __repmgr_await_drain(dbenv, conn, timeout) -+ DB_ENV *dbenv; -+ REPMGR_CONNECTION *conn; -+ db_timeout_t timeout; -+ { -+ DB_REP *db_rep; -+ struct timespec deadline; -+ int ret; -+ -+ db_rep = dbenv->rep_handle; -+ -+ __repmgr_compute_wait_deadline(dbenv, &deadline, timeout); -+ -+ ret = 0; -+ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { -+ ret = pthread_cond_timedwait(&conn->drained, -+ &db_rep->mutex, &deadline); -+ switch (ret) { -+ case 0: -+ if (db_rep->finished) -+ goto out; /* #4. */ -+ /* -+ * Another thread could have stumbled into an error on -+ * the socket while we were waiting. -+ */ -+ if (F_ISSET(conn, CONN_DEFUNCT)) { -+ ret = DB_REP_UNAVAIL; /* #3. */ -+ goto out; -+ } -+ break; -+ case ETIMEDOUT: -+ F_SET(conn, CONN_CONGESTED); -+ ret = 0; -+ goto out; /* #2. */ -+ default: -+ goto out; /* #5. */ -+ } -+ } -+ /* #1. */ -+ -+ out: -+ return (ret); -+ } -+ -+ /* -+ * PUBLIC: int __repmgr_alloc_cond __P((cond_var_t *)); -+ * -+ * Initialize a condition variable (in allocated space). -+ */ -+ int -+ __repmgr_alloc_cond(c) -+ cond_var_t *c; -+ { -+ return (pthread_cond_init(c, NULL)); -+ } -+ -+ /* -+ * PUBLIC: int __repmgr_free_cond __P((cond_var_t *)); -+ * -+ * Clean up a previously initialized condition variable. -+ */ -+ int -+ __repmgr_free_cond(c) -+ cond_var_t *c; -+ { -+ return (pthread_cond_destroy(c)); -+ } -+ -+ /* - * PUBLIC: int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); - * - * Allocate/initialize all data necessary for thread synchronization. This -*************** -*** 443,449 **** - REPMGR_RETRY *retry; - db_timespec timeout; - fd_set reads, writes; -! int ret, flow_control, maxfd, nready; - u_int8_t buf[10]; /* arbitrary size */ - - flow_control = FALSE; ---- 533,539 ---- - REPMGR_RETRY *retry; - db_timespec timeout; - fd_set reads, writes; -! int ret, flow_control, maxfd; - u_int8_t buf[10]; /* arbitrary size */ - - flow_control = FALSE; -*************** -*** 477,482 **** ---- 567,575 ---- - * each one. - */ - TAILQ_FOREACH(conn, &db_rep->connections, entries) { -+ if (F_ISSET(conn, CONN_DEFUNCT)) -+ continue; -+ - if (F_ISSET(conn, CONN_CONNECTING)) { - FD_SET((u_int)conn->fd, &reads); - FD_SET((u_int)conn->fd, &writes); -*************** -*** 533,616 **** - return (ret); - } - } -- nready = ret; -- - LOCK_MUTEX(db_rep->mutex); - -- /* -- * The first priority thing we must do is to clean up any -- * pending defunct connections. Otherwise, if they have any -- * lingering pending input, we get very confused if we try to -- * process it. -- * -- * The TAILQ_FOREACH macro would be suitable here, except that -- * it doesn't allow unlinking the current element, which is -- * needed for cleanup_connection. -- */ -- for (conn = TAILQ_FIRST(&db_rep->connections); -- conn != NULL; -- conn = next) { -- next = TAILQ_NEXT(conn, entries); -- if (F_ISSET(conn, CONN_DEFUNCT)) -- __repmgr_cleanup_connection(dbenv, conn); -- } -- - if ((ret = __repmgr_retry_connections(dbenv)) != 0) - goto out; -- if (nready == 0) -- continue; - - /* -! * Traverse the linked list. (Again, like TAILQ_FOREACH, except -! * that we need the ability to unlink an element along the way.) - */ - for (conn = TAILQ_FIRST(&db_rep->connections); - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if (F_ISSET(conn, CONN_CONNECTING)) { -! if (FD_ISSET((u_int)conn->fd, &reads) || -! FD_ISSET((u_int)conn->fd, &writes)) { -! if ((ret = finish_connecting(dbenv, -! conn)) == DB_REP_UNAVAIL) { -! if ((ret = -! __repmgr_bust_connection( -! dbenv, conn, TRUE)) != 0) -! goto out; -! } else if (ret != 0) -! goto out; -! } -! continue; -! } -! -! /* -! * Here, the site is connected, and the FD_SET's are -! * valid. -! */ -! if (FD_ISSET((u_int)conn->fd, &writes)) { -! if ((ret = __repmgr_write_some( -! dbenv, conn)) == DB_REP_UNAVAIL) { -! if ((ret = -! __repmgr_bust_connection(dbenv, -! conn, TRUE)) != 0) -! goto out; -! continue; -! } else if (ret != 0) -! goto out; -! } -! -! if (!flow_control && -! FD_ISSET((u_int)conn->fd, &reads)) { -! if ((ret = __repmgr_read_from_site(dbenv, conn)) -! == DB_REP_UNAVAIL) { -! if ((ret = -! __repmgr_bust_connection(dbenv, -! conn, TRUE)) != 0) -! goto out; -! continue; -! } else if (ret != 0) -! goto out; -! } - } - - /* ---- 626,650 ---- - return (ret); - } - } - LOCK_MUTEX(db_rep->mutex); - - if ((ret = __repmgr_retry_connections(dbenv)) != 0) - goto out; - - /* -! * Examine each connection, to see what work needs to be done. -! * -! * The TAILQ_FOREACH macro would be suitable here, except that -! * it doesn't allow unlinking the current element, which is -! * needed for cleanup_connection. - */ - for (conn = TAILQ_FIRST(&db_rep->connections); - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if ((ret = __repmgr_conn_work(dbenv, -! conn, &reads, &writes, flow_control)) != 0) -! goto out; - } - - /* -*************** -*** 637,642 **** ---- 671,719 ---- - } - - static int -+ __repmgr_conn_work(dbenv, conn, reads, writes, flow_control) -+ DB_ENV *dbenv; -+ REPMGR_CONNECTION *conn; -+ fd_set *reads, *writes; -+ int flow_control; -+ { -+ int ret; -+ u_int fd; -+ -+ if (F_ISSET(conn, CONN_DEFUNCT)) { -+ /* -+ * Deferred clean-up, from an error that happened in another -+ * thread, while we were sleeping in select(). -+ */ -+ return (__repmgr_cleanup_connection(dbenv, conn)); -+ } -+ -+ ret = 0; -+ fd = (u_int)conn->fd; -+ -+ if (F_ISSET(conn, CONN_CONNECTING)) { -+ if (FD_ISSET(fd, reads) || FD_ISSET(fd, writes)) -+ ret = finish_connecting(dbenv, conn); -+ } else { -+ /* -+ * Here, the site is connected, and the FD_SET's are valid. -+ */ -+ if (FD_ISSET(fd, writes)) -+ ret = __repmgr_write_some(dbenv, conn); -+ -+ if (ret == 0 && !flow_control && FD_ISSET(fd, reads)) -+ ret = __repmgr_read_from_site(dbenv, conn); -+ } -+ -+ if (ret == DB_REP_UNAVAIL) { -+ if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) -+ return (ret); -+ ret = __repmgr_cleanup_connection(dbenv, conn); -+ } -+ return (ret); -+ } -+ -+ static int - finish_connecting(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; -*************** -*** 657,662 **** ---- 734,740 ---- - goto err_rpt; - } - -+ DB_ASSERT(dbenv, F_ISSET(conn, CONN_CONNECTING)); - F_CLR(conn, CONN_CONNECTING); - return (__repmgr_send_handshake(dbenv, conn)); - -*************** -*** 671,690 **** - "connecting to %s", __repmgr_format_site_loc(site, buffer)); - - /* If we've exhausted the list of possible addresses, give up. */ -! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) - return (DB_REP_UNAVAIL); - - /* - * This is just like a little mini-"bust_connection", except that we - * don't reschedule for later, 'cuz we're just about to try again right -! * now. - * - * !!! - * Which means this must only be called on the select() thread, since - * only there are we allowed to actually close a connection. - */ - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! __repmgr_cleanup_connection(dbenv, conn); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); ---- 749,773 ---- - "connecting to %s", __repmgr_format_site_loc(site, buffer)); - - /* If we've exhausted the list of possible addresses, give up. */ -! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) { -! STAT(db_rep->region->mstat.st_connect_fail++); - return (DB_REP_UNAVAIL); -+ } - - /* - * This is just like a little mini-"bust_connection", except that we - * don't reschedule for later, 'cuz we're just about to try again right -! * now. (Note that we don't have to worry about message threads -! * blocking on a full output queue: that can't happen when we're only -! * just connecting.) - * - * !!! - * Which means this must only be called on the select() thread, since - * only there are we allowed to actually close a connection. - */ - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) -! return (ret); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); -*** repmgr/repmgr_sel.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_sel.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 36,45 **** - - /* - * PUBLIC: int __repmgr_accept __P((DB_ENV *)); -- * -- * !!! -- * Only ever called in the select() thread, since we may call -- * __repmgr_bust_connection(..., TRUE). - */ - int - __repmgr_accept(dbenv) ---- 36,41 ---- -*************** -*** 133,139 **** - case 0: - return (0); - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, conn, TRUE)); - default: - return (ret); - } ---- 129,135 ---- - case 0: - return (0); - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, conn)); - default: - return (ret); - } -*************** -*** 254,263 **** - * starting with the "current" element of its address list and trying as many - * addresses as necessary until the list is exhausted. - * -- * !!! -- * Only ever called in the select() thread, since we may call -- * __repmgr_bust_connection(..., TRUE). -- * - * PUBLIC: int __repmgr_connect_site __P((DB_ENV *, u_int eid)); - */ - int ---- 250,255 ---- -*************** -*** 332,338 **** - case 0: - break; - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, con, TRUE)); - default: - return (ret); - } ---- 324,330 ---- - case 0: - break; - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, con)); - default: - return (ret); - } -*************** -*** 437,443 **** - - DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); - -! return (__repmgr_send_one(dbenv, conn, REPMGR_HANDSHAKE, &cntrl, &rec)); - } - - /* ---- 429,443 ---- - - DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); - -! /* -! * It would of course be disastrous to block the select() thread, so -! * pass the "blockable" argument as FALSE. Fortunately blocking should -! * never be necessary here, because the hand-shake is always the first -! * thing we send. Which is a good thing, because it would be almost as -! * disastrous if we allowed ourselves to drop a handshake. -! */ -! return (__repmgr_send_one(dbenv, -! conn, REPMGR_HANDSHAKE, &cntrl, &rec, FALSE)); - } - - /* -*************** -*** 854,859 **** ---- 854,872 ---- - conn->out_queue_length--; - if (--msg->ref_count <= 0) - __os_free(dbenv, msg); -+ -+ /* -+ * We've achieved enough movement to free up at least -+ * one space in the outgoing queue. Wake any message -+ * threads that may be waiting for space. Clear the -+ * CONGESTED status so that when the queue reaches the -+ * high-water mark again, the filling thread will be -+ * allowed to try waiting again. -+ */ -+ F_CLR(conn, CONN_CONGESTED); -+ if (conn->blockers > 0 && -+ (ret = __repmgr_signal(&conn->drained)) != 0) -+ return (ret); - } - } - -*** repmgr/repmgr_util.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_util.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 103,108 **** ---- 103,113 ---- - db_rep = dbenv->rep_handle; - if ((ret = __os_malloc(dbenv, sizeof(REPMGR_CONNECTION), &c)) != 0) - return (ret); -+ if ((ret = __repmgr_alloc_cond(&c->drained)) != 0) { -+ __os_free(dbenv, c); -+ return (ret); -+ } -+ c->blockers = 0; - - c->fd = s; - c->flags = flags; -*** repmgr/repmgr_windows.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_windows.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 11,16 **** ---- 11,19 ---- - #define __INCLUDE_NETWORKING 1 - #include "db_int.h" - -+ /* Convert time-out from microseconds to milliseconds, rounding up. */ -+ #define DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t) (((t) + (US_PER_MS - 1)) / US_PER_MS) -+ - typedef struct __ack_waiter { - HANDLE event; - const DB_LSN *lsnp; -*************** -*** 120,136 **** - { - DB_REP *db_rep; - ACK_WAITER *me; -! DWORD ret; -! DWORD timeout; - - db_rep = dbenv->rep_handle; - - if ((ret = allocate_wait_slot(dbenv, &me)) != 0) - goto err; - -- /* convert time-out from microseconds to milliseconds, rounding up */ - timeout = db_rep->ack_timeout > 0 ? -! ((db_rep->ack_timeout + (US_PER_MS - 1)) / US_PER_MS) : INFINITE; - me->lsnp = lsnp; - if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, - FALSE)) == WAIT_FAILED) { ---- 123,137 ---- - { - DB_REP *db_rep; - ACK_WAITER *me; -! DWORD ret, timeout; - - db_rep = dbenv->rep_handle; - - if ((ret = allocate_wait_slot(dbenv, &me)) != 0) - goto err; - - timeout = db_rep->ack_timeout > 0 ? -! DB_TIMEOUT_TO_WINDOWS_TIMEOUT(db_rep->ack_timeout) : INFINITE; - me->lsnp = lsnp; - if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, - FALSE)) == WAIT_FAILED) { -*************** -*** 211,216 **** ---- 212,296 ---- - db_rep->waiters->first_free = slot; - } - -+ /* (See requirements described in repmgr_posix.c.) */ -+ int -+ __repmgr_await_drain(dbenv, conn, timeout) -+ DB_ENV *dbenv; -+ REPMGR_CONNECTION *conn; -+ db_timeout_t timeout; -+ { -+ DB_REP *db_rep; -+ db_timespec deadline, delta, now; -+ db_timeout_t t; -+ DWORD duration, ret; -+ int round_up; -+ -+ db_rep = dbenv->rep_handle; -+ -+ __os_gettime(dbenv, &deadline); -+ DB_TIMEOUT_TO_TIMESPEC(timeout, &delta); -+ timespecadd(&deadline, &delta); -+ -+ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { -+ if (!ResetEvent(conn->drained)) -+ return (GetLastError()); -+ -+ /* How long until the deadline? */ -+ __os_gettime(dbenv, &now); -+ if (timespeccmp(&now, &deadline, >=)) { -+ F_SET(conn, CONN_CONGESTED); -+ return (0); -+ } -+ delta = deadline; -+ timespecsub(&delta, &now); -+ round_up = TRUE; -+ DB_TIMESPEC_TO_TIMEOUT(t, &delta, round_up); -+ duration = DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t); -+ -+ ret = SignalObjectAndWait(db_rep->mutex, -+ conn->drained, duration, FALSE); -+ LOCK_MUTEX(db_rep->mutex); -+ if (ret == WAIT_FAILED) -+ return (GetLastError()); -+ else if (ret == WAIT_TIMEOUT) { -+ F_SET(conn, CONN_CONGESTED); -+ return (0); -+ } else -+ DB_ASSERT(dbenv, ret == WAIT_OBJECT_0); -+ -+ if (db_rep->finished) -+ return (0); -+ if (F_ISSET(conn, CONN_DEFUNCT)) -+ return (DB_REP_UNAVAIL); -+ } -+ return (0); -+ } -+ -+ /* -+ * Creates a manual reset event, which is usually our best choice when we may -+ * have multiple threads waiting on a single event. -+ */ -+ int -+ __repmgr_alloc_cond(c) -+ cond_var_t *c; -+ { -+ HANDLE event; -+ -+ if ((event = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) -+ return (GetLastError()); -+ *c = event; -+ return (0); -+ } -+ -+ int -+ __repmgr_free_cond(c) -+ cond_var_t *c; -+ { -+ if (CloseHandle(*c)) -+ return (0); -+ return (GetLastError()); -+ } -+ - /* - * Make resource allocation an all-or-nothing affair, outside of this and the - * close_sync function. db_rep->waiters should be non-NULL iff all of these -*************** -*** 488,493 **** ---- 568,576 ---- - * don't hurt anything flow-control-wise. - */ - TAILQ_FOREACH(conn, &db_rep->connections, entries) { -+ if (F_ISSET(conn, CONN_DEFUNCT)) -+ continue; -+ - if (F_ISSET(conn, CONN_CONNECTING) || - !STAILQ_EMPTY(&conn->outbound_queue) || - (!flow_control || !IS_VALID_EID(conn->eid))) { -*************** -*** 534,541 **** - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if (F_ISSET(conn, CONN_DEFUNCT)) -! __repmgr_cleanup_connection(dbenv, conn); - } - - /* ---- 617,626 ---- - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if (F_ISSET(conn, CONN_DEFUNCT) && -! (ret = __repmgr_cleanup_connection(dbenv, -! conn)) != 0) -! goto unlock; - } - - /* -*************** -*** 587,597 **** - return (ret); - } - -- /* -- * !!! -- * Only ever called on the select() thread, since we may call -- * __repmgr_bust_connection(..., TRUE). -- */ - static int - handle_completion(dbenv, conn) - DB_ENV *dbenv; ---- 672,677 ---- -*************** -*** 651,660 **** - } - } - -! return (0); -! -! err: if (ret == DB_REP_UNAVAIL) -! return (__repmgr_bust_connection(dbenv, conn, TRUE)); - return (ret); - } - ---- 731,742 ---- - } - } - -! err: -! if (ret == DB_REP_UNAVAIL) { -! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) -! return (ret); -! ret = __repmgr_cleanup_connection(dbenv, conn); -! } - return (ret); - } - -*************** -*** 708,714 **** - } - - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! __repmgr_cleanup_connection(dbenv, conn); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); ---- 790,797 ---- - } - - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) -! return (ret); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,75 @@ +*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 +--- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 +*************** +*** 187,193 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +--- 187,197 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 244,249 **** +--- 248,258 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 296,302 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 305,316 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(env) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(env, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 707,712 **** +--- 721,733 ---- + + MUTEX_LOCK(env, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(env, "Sequence overflow"); + ret = EINVAL; Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,71 @@ +Index: lock/lock.c +=================================================================== +RCS file: /a/CVSROOT/db/lock/lock.c,v +retrieving revision 12.61 +diff -c -r12.61 lock.c +*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 +--- lock/lock.c 19 Aug 2008 17:28:24 -0000 +*************** +*** 1278,1287 **** + SH_TAILQ_REMOVE( + <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); + if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { +! LOCK_REGION_LOCK(env); + __env_alloc_free(<->reginfo, + SH_DBT_PTR(&sh_obj->lockobj)); +! LOCK_REGION_UNLOCK(env); + } + SH_TAILQ_INSERT_HEAD( + &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); +--- 1278,1289 ---- + SH_TAILQ_REMOVE( + <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); + if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { +! if (region->part_t_size != 1) +! LOCK_REGION_LOCK(env); + __env_alloc_free(<->reginfo, + SH_DBT_PTR(&sh_obj->lockobj)); +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + } + SH_TAILQ_INSERT_HEAD( + &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); +*************** +*** 1470,1484 **** + if (obj->size <= sizeof(sh_obj->objdata)) + p = sh_obj->objdata; + else { +! LOCK_REGION_LOCK(env); + if ((ret = + __env_alloc(<->reginfo, obj->size, &p)) != 0) { + __db_errx(env, + "No space for lock object storage"); +! LOCK_REGION_UNLOCK(env); + goto err; + } +! LOCK_REGION_UNLOCK(env); + } + + memcpy(p, obj->data, obj->size); +--- 1472,1492 ---- + if (obj->size <= sizeof(sh_obj->objdata)) + p = sh_obj->objdata; + else { +! /* +! * If we have only one partition, the region is locked. +! */ +! if (region->part_t_size != 1) +! LOCK_REGION_LOCK(env); + if ((ret = + __env_alloc(<->reginfo, obj->size, &p)) != 0) { + __db_errx(env, + "No space for lock object storage"); +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + goto err; + } +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + } + + memcpy(p, obj->data, obj->size); Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,314 @@ +*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 +--- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 +*************** +*** 121,127 **** + DB_LOCKTAB *lt; + db_timespec now; + locker_info *idmap; +! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; + u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; + u_int32_t lock_max, txn_max; + int ret, status; +--- 121,127 ---- + DB_LOCKTAB *lt; + db_timespec now; + locker_info *idmap; +! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; + u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; + u_int32_t lock_max, txn_max; + int ret, status; +*************** +*** 133,139 **** + if (IS_REP_CLIENT(env)) + atype = DB_LOCK_MINWRITE; + +! free_me = NULL; + + lt = env->lk_handle; + if (rejectp != NULL) +--- 133,140 ---- + if (IS_REP_CLIENT(env)) + atype = DB_LOCK_MINWRITE; + +! copymap = tmpmap = NULL; +! deadlist = NULL; + + lt = env->lk_handle; + if (rejectp != NULL) +*************** +*** 179,189 **** + memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); + + if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) +! goto err1; + + /* Find a deadlock. */ + if ((ret = +! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) + return (ret); + + /* +--- 180,190 ---- + memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); + + if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) +! goto err; + + /* Find a deadlock. */ + if ((ret = +! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) + return (ret); + + /* +*************** +*** 204,211 **** + txn_max = TXN_MAXIMUM; + + killid = BAD_KILLID; +! free_me = deadp; +! for (; *deadp != NULL; deadp++) { + if (rejectp != NULL) + ++*rejectp; + killid = (u_int32_t)(*deadp - bitmap) / nalloc; +--- 205,211 ---- + txn_max = TXN_MAXIMUM; + + killid = BAD_KILLID; +! for (deadp = deadlist; *deadp != NULL; deadp++) { + if (rejectp != NULL) + ++*rejectp; + killid = (u_int32_t)(*deadp - bitmap) / nalloc; +*************** +*** 342,352 **** + __db_msg(env, + "Aborting locker %lx", (u_long)idmap[killid].id); + } +! __os_free(env, tmpmap); +! err1: __os_free(env, copymap); +! +! err: if (free_me != NULL) +! __os_free(env, free_me); + __os_free(env, bitmap); + __os_free(env, idmap); + +--- 342,353 ---- + __db_msg(env, + "Aborting locker %lx", (u_long)idmap[killid].id); + } +! err: if(copymap != NULL) +! __os_free(env, copymap); +! if (deadlist != NULL) +! __os_free(env, deadlist); +! if(tmpmap != NULL) +! __os_free(env, tmpmap); + __os_free(env, bitmap); + __os_free(env, idmap); + +*************** +*** 360,365 **** +--- 361,377 ---- + + #define DD_INVALID_ID ((u_int32_t) -1) + ++ /* ++ * __dd_build -- ++ * Build the lock dependency bit maps. ++ * Notes on syncronization: ++ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have ++ * a single partition. ++ * LOCK_LOCKERS is held while we are walking the lockers list and ++ * to single thread the use of lockerp->dd_id. ++ * LOCK_DD protects the DD list of objects. ++ */ ++ + static int + __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) + ENV *env; +*************** +*** 393,398 **** +--- 405,411 ---- + * In particular we do not build the conflict array and our caller + * needs to expect this. + */ ++ LOCK_SYSTEM_LOCK(lt, region); + if (atype == DB_LOCK_EXPIRE) { + skip: LOCK_DD(env, region); + op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); +*************** +*** 430,446 **** + OBJECT_UNLOCK(lt, region, indx); + } + UNLOCK_DD(env, region); + goto done; + } + + /* +! * We'll check how many lockers there are, add a few more in for +! * good measure and then allocate all the structures. Then we'll +! * verify that we have enough room when we go back in and get the +! * mutex the second time. + */ +! retry: count = region->stat.st_nlockers; + if (count == 0) { + *nlockers = 0; + return (0); + } +--- 443,460 ---- + OBJECT_UNLOCK(lt, region, indx); + } + UNLOCK_DD(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + goto done; + } + + /* +! * Allocate after locking the region +! * to make sure the structures are large enough. + */ +! LOCK_LOCKERS(env, region); +! count = region->stat.st_nlockers; + if (count == 0) { ++ UNLOCK_LOCKERS(env, region); + *nlockers = 0; + return (0); + } +*************** +*** 448,497 **** + if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) + __db_msg(env, "%lu lockers", (u_long)count); + +- count += 20; + nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; + +! /* +! * Allocate enough space for a count by count bitmap matrix. +! * +! * XXX +! * We can probably save the malloc's between iterations just +! * reallocing if necessary because count grew by too much. +! */ + if ((ret = __os_calloc(env, (size_t)count, +! sizeof(u_int32_t) * nentries, &bitmap)) != 0) + return (ret); + + if ((ret = __os_calloc(env, + sizeof(u_int32_t), nentries, &tmpmap)) != 0) { + __os_free(env, bitmap); + return (ret); + } + + if ((ret = __os_calloc(env, + (size_t)count, sizeof(locker_info), &id_array)) != 0) { + __os_free(env, bitmap); + __os_free(env, tmpmap); + return (ret); + } + + /* +- * Now go back in and actually fill in the matrix. +- */ +- if (region->stat.st_nlockers > count) { +- __os_free(env, bitmap); +- __os_free(env, tmpmap); +- __os_free(env, id_array); +- goto retry; +- } +- +- /* + * First we go through and assign each locker a deadlock detector id. + */ + id = 0; +- LOCK_LOCKERS(env, region); + SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { + if (lip->master_locker == INVALID_ROFF) { + lip->dd_id = id++; + id_array[lip->dd_id].id = lip->id; + switch (atype) { +--- 462,498 ---- + if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) + __db_msg(env, "%lu lockers", (u_long)count); + + nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; + +! /* Allocate enough space for a count by count bitmap matrix. */ + if ((ret = __os_calloc(env, (size_t)count, +! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { +! UNLOCK_LOCKERS(env, region); + return (ret); ++ } + + if ((ret = __os_calloc(env, + sizeof(u_int32_t), nentries, &tmpmap)) != 0) { ++ UNLOCK_LOCKERS(env, region); + __os_free(env, bitmap); + return (ret); + } + + if ((ret = __os_calloc(env, + (size_t)count, sizeof(locker_info), &id_array)) != 0) { ++ UNLOCK_LOCKERS(env, region); + __os_free(env, bitmap); + __os_free(env, tmpmap); + return (ret); + } + + /* + * First we go through and assign each locker a deadlock detector id. + */ + id = 0; + SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { + if (lip->master_locker == INVALID_ROFF) { ++ DB_ASSERT(env, id < count); + lip->dd_id = id++; + id_array[lip->dd_id].id = lip->id; + switch (atype) { +*************** +*** 510,516 **** + lip->dd_id = DD_INVALID_ID; + + } +- UNLOCK_LOCKERS(env, region); + + /* + * We only need consider objects that have waiters, so we use +--- 511,516 ---- +*************** +*** 669,675 **** + * status after building the bit maps so that we will not detect + * a blocked transaction without noting that it is already aborting. + */ +- LOCK_LOCKERS(env, region); + for (id = 0; id < count; id++) { + if (!id_array[id].valid) + continue; +--- 669,674 ---- +*************** +*** 738,743 **** +--- 737,743 ---- + id_array[id].in_abort = 1; + } + UNLOCK_LOCKERS(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + + /* + * Now we can release everything except the bitmap matrix that we +*************** +*** 839,844 **** +--- 839,845 ---- + ret = 0; + + /* We must lock so this locker cannot go away while we abort it. */ ++ LOCK_SYSTEM_LOCK(lt, region); + LOCK_LOCKERS(env, region); + + /* +*************** +*** 895,900 **** +--- 896,902 ---- + done: OBJECT_UNLOCK(lt, region, info->last_ndx); + err: + out: UNLOCK_LOCKERS(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + return (ret); + } + Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,183 @@ +*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 +--- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 374,379 **** +--- 374,380 ---- + #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) + #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) + #define IS_VALID_EID(e) ((e) >= 0) ++ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) + #define SELF_EID INT_MAX + + #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ +*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 +--- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 +*************** +*** 33,39 **** + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); + + /* + * __rep_elect -- +--- 33,39 ---- + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); + + /* + * __rep_elect -- +*************** +*** 55,61 **** + ENV *env; + LOG *lp; + REP *rep; +! int done, eid, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +--- 55,61 ---- + ENV *env; + LOG *lp; + REP *rep; +! int done, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +*************** +*** 181,188 **** + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, &eid, +! 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +--- 181,187 ---- + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +*************** +*** 286,296 **** + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +--- 285,295 ---- + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (!IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +*************** +*** 398,412 **** + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! if (eid != DB_EID_INVALID) +! goto edone; +! ret = DB_REP_UNAVAIL; +! break; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +--- 397,408 ---- + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! goto edone; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +*************** +*** 1050,1062 **** + ENV *env; + REP *rep; + { +- /* +- * We often come through here twice, sometimes even more. We mustn't +- * let the redundant calls affect stats counting. But rep_elect relies +- * on this first part for setting eidp. +- */ +- rep->master_id = rep->eid; +- + if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { + /* We've been through here already; avoid double counting. */ + return; +--- 1046,1051 ---- +*************** +*** 1093,1102 **** + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, eidp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int *eidp, full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +--- 1082,1091 ---- + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +*************** +*** 1174,1180 **** + F_CLR(rep, REP_F_EGENUPDATE); + ret = DB_REP_EGENCHG; + } else if (phase_over) { +- *eidp = rep->master_id; + done = 1; + ret = 0; + } +--- 1163,1168 ---- +*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 +--- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 100,105 **** +--- 100,107 ---- + control, rec, &nsites_sent, &npeers_sent)) != 0) + goto out; + } else { ++ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); ++ + /* + * If this is a request that can be sent anywhere, then see if + * we can send it to our peer (to save load on the master), but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:16:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:16:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6644] csw/mgar/pkg Message-ID: Revision: 6644 http://gar.svn.sourceforge.net/gar/?rev=6644&view=rev Author: dmichelsen Date: 2009-10-01 13:16:29 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb33: Initial commit Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb33/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb33/ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool Removed Paths: ------------- csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,5 +1,5 @@ GARNAME = db -GARVERSION = 4.2.52 +GARVERSION = 3.3.11 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -16,7 +16,7 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc +PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -27,13 +27,13 @@ PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) BUILD64 = 1 CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb42 +prefix = $(BUILD_PREFIX)/bdb33 docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -50,38 +50,38 @@ CONFIGURE_ARGS += --with-tcl=$(libdir) endif -FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb33/lib # bdb tests are *very* time consuming TEST_SCRIPTS = NO_ISAEXEC = 1 -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc +PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc -CATALOGNAME_CSWbdb42 = berkeleydb42 -CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel -CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc +CATALOGNAME_CSWbdb33 = berkeleydb33 +CATALOGNAME_CSWbdb33-devel = berkeleydb33_devel +CATALOGNAME_CSWbdb33-doc = berkeleydb33_doc -ARCHALL_CSWbdb42-doc = 1 +ARCHALL_CSWbdb33-doc = 1 -SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities -SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support -SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation +SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities +SPKG_DESC_CSWbdb33-devel = BerkeleyDB 3.3 development support +SPKG_DESC_CSWbdb33-doc = BerkeleyDB 3.3 documentation -REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42 -INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc +REQUIRED_PKGS_CSWbdb33-devel = CSWbdb33 +INCOMPATIBLE_PKGS_CSWbdb33-doc = CSWbdb33doc LICENSE = LICENSE # Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" +#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" +#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" -#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb42-doc = $(prefix)/docs/.* +#PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb33-doc = $(prefix)/docs/.* -PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/bdb33/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb42/trunk/checksums 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,7 +1,4 @@ -8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz -1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff -3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff -0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff -9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff -99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff -d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff +b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz +a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1 +fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2 +d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool Added: csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 (rev 0) +++ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 2009-10-01 13:16:29 UTC (rev 6644) @@ -0,0 +1,96 @@ +*** db185/db185.c 2001/04/10 20:43:53 11.18 +--- db185/db185.c 2001/07/30 14:12:47 +*************** +*** 40,47 **** +--- 40,52 ---- + + /* + * EXTERN: #define dbopen __db185_open ++ * EXTERN: #ifdef _DB185_INT_H_ + * EXTERN: DB185 *__db185_open + * EXTERN: __P((const char *, int, int, DBTYPE, const void *)); ++ * EXTERN: #else ++ * EXTERN: DB *__db185_open ++ * EXTERN: __P((const char *, int, int, DBTYPE, const void *)); ++ * EXTERN: #endif + */ + DB185 * + __db185_open(file, oflags, mode, type, openinfo) +*** db185/db185_int.in 2001/04/10 20:43:54 11.9 +--- db185/db185_int.in 2001/07/30 14:12:47 +*************** +*** 39,46 **** + * $Id: patch.3.3.11.1,v 1.1 2003/01/10 13:43:30 mao Exp $ + */ + +! #ifndef _DB_185_H_ +! #define _DB_185_H_ + + /* Routine flags. */ + #define R_CURSOR 1 /* del, put, seq */ +--- 39,46 ---- + * $Id: patch.3.3.11.1,v 1.1 2003/01/10 13:43:30 mao Exp $ + */ + +! #ifndef _DB185_INT_H_ +! #define _DB185_INT_H_ + + /* Routine flags. */ + #define R_CURSOR 1 /* del, put, seq */ +*** include_auto/db185_ext.in 2001/04/10 20:44:20 1.1 +--- include_auto/db185_ext.in 2001/07/30 14:12:48 +*************** +*** 3,11 **** + extern "C" { + #endif + #define dbopen __db185_open + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); + #if defined(__cplusplus) + } + #endif + +! #endif /* !_DB_185_H_ */ +--- 3,15 ---- + extern "C" { + #endif + #define dbopen __db185_open ++ #ifdef _DB185_INT_H_ + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #else ++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #endif + #if defined(__cplusplus) + } + #endif + +! #endif /* _DB_185_H_ or _DB185_INT_H_ */ +*** include_auto/db185_uext.in 2001/04/10 20:44:20 1.1 +--- include_auto/db185_uext.in 2001/07/30 14:12:48 +*************** +*** 3,12 **** + extern "C" { + #endif + #define dbopen __db185_open at DB_VERSION_UNIQUE_NAME@ + #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@ + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); + #if defined(__cplusplus) + } + #endif + +! #endif /* !_DB_185_H_ */ +--- 3,17 ---- + extern "C" { + #endif + #define dbopen __db185_open at DB_VERSION_UNIQUE_NAME@ ++ #ifdef _DB185_INT_H_ + #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@ + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #else ++ #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@ ++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #endif + #if defined(__cplusplus) + } + #endif + +! #endif /* _DB_185_H_ or _DB185_INT_H_ */ Added: csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 (rev 0) +++ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 2009-10-01 13:16:29 UTC (rev 6644) @@ -0,0 +1,15 @@ +*** build_vxworks/db.h.orig Mon Jul 30 09:49:54 2001 +--- build_vxworks/db.h Wed Dec 31 19:00:00 1969 +*************** +*** 32,37 **** +--- 32,41 ---- + extern "C" { + #endif + ++ #ifndef HAVE_VXWORKS ++ #define HAVE_VXWORKS 1 ++ #endif ++ + /* + * XXX + * Handle function prototypes and the keyword "const". This steps on name Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,36 +0,0 @@ -*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 ---- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 -*************** -*** 440,446 **** - c_mp->stat.st_pages--; - alloc_bhp = NULL; - R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); -- MUTEX_LOCK(dbenv, &hp->hash_mutex); - - /* - * We can't use the page we found in the pool if DB_MPOOL_NEW ---- 440,445 ---- -*************** -*** 455,460 **** ---- 454,462 ---- - b_incr = 0; - goto alloc; - } -+ -+ /* We can use the page -- get the bucket lock. */ -+ MUTEX_LOCK(dbenv, &hp->hash_mutex); - break; - case SECOND_MISS: - /* -*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 ---- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 -*************** -*** 285,290 **** ---- 285,291 ---- - bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) - if (bhp->priority != UINT32_T_MAX && - bhp->priority > MPOOL_BASE_DECREMENT) -+ bhp->priority -= MPOOL_BASE_DECREMENT; - MUTEX_UNLOCK(dbenv, &hp->hash_mutex); - } - } Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,45 +0,0 @@ -*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 ---- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 -*************** -*** 2216,2226 **** - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, obj->data, obj->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN(obj->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ ---- 2216,2227 ---- - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, \ -! (obj)->data, (obj)->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN((obj)->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ -*************** -*** 2339,2345 **** - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, obj); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; ---- 2340,2346 ---- - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, &obj[i]); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,247 +0,0 @@ ---- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 -+++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 -@@ -61,7 +61,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -94,7 +94,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - ---- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 -+++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 -@@ -57,7 +57,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -84,7 +84,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) { - dbenv.cleanup(); - } ---- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 -+++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 -@@ -14,15 +14,15 @@ - db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); - } - -- static Object initDbEnvRef0(DbEnv self, Object handle) { -+ static long initDbEnvRef0(DbEnv self, Object handle) { - return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); - } - -- static Object initDbRef0(Db self, Object handle) { -+ static long initDbRef0(Db self, Object handle) { - return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); - } - -- static void deleteRef0(Object ref) { -+ static void deleteRef0(long ref) { - db_javaJNI.deleteRef0(ref); - } - ---- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 -+++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 -@@ -45,9 +45,9 @@ - static native final void initialize(); - - public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; -- final static native Object initDbEnvRef0(long jarg1, Object jarg2); -- final static native Object initDbRef0(long jarg1, Object jarg2); -- final static native void deleteRef0(Object jarg1); -+ final static native long initDbEnvRef0(long jarg1, Object jarg2); -+ final static native long initDbRef0(long jarg1, Object jarg2); -+ final static native void deleteRef0(long jarg1); - final static native long getDbEnv0(long jarg1); - public final static native long new_Db(long jarg1, int jarg2) throws DbException; - public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; ---- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 -+++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 -@@ -53,7 +53,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -76,7 +76,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - public synchronized void close(int flags) throws DbException { -@@ -220,7 +220,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -245,7 +245,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) - dbenv.cleanup(); - dbenv = null; -@@ -503,46 +503,42 @@ - } - %} - --%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); --%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); --%native(deleteRef0) void deleteRef0(jobject ref); -+%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); -+%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); -+%native(deleteRef0) void deleteRef0(jlong ref); - %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); - - %{ --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -554,7 +550,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL ---- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 -+++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 -@@ -1192,40 +1192,36 @@ - } - - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -1237,7 +1233,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,36 +0,0 @@ -*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 ---- btree/bt_rec.c Tue Mar 22 09:42:11 2005 -*************** -*** 222,228 **** - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); ---- 222,228 ---- - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); -*************** -*** 294,300 **** - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; ---- 294,300 ---- - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 ---- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 -*************** -*** 553,560 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } ---- 553,563 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } Copied: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff) =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool (rev 0) +++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 13:16:29 UTC (rev 6644) @@ -0,0 +1,22 @@ +diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh +--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 ++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 +@@ -1298,7 +1298,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1309,9 +1309,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,22 +0,0 @@ -diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh ---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 -+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 -@@ -1298,7 +1298,7 @@ - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-xarch=*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1309,9 +1309,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 16:19:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 14:19:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6645] csw/mgar/pkg/bdb33/trunk Message-ID: Revision: 6645 http://gar.svn.sourceforge.net/gar/?rev=6645&view=rev Author: dmichelsen Date: 2009-10-01 14:19:31 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb33: Fix installation Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb33/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 13:16:29 UTC (rev 6644) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 14:19:31 UTC (rev 6645) @@ -29,7 +29,7 @@ PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) -BUILD64 = 1 +#BUILD64 = 1 CONFIGURE_SCRIPTS = dist @@ -74,6 +74,8 @@ LICENSE = LICENSE +INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir + # Leave the docs where they are for now #EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" #EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" Modified: csw/mgar/pkg/bdb33/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 13:16:29 UTC (rev 6644) +++ csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 14:19:31 UTC (rev 6645) @@ -1,4 +1,3 @@ b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1 fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2 -d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 13:16:29 UTC (rev 6644) +++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 14:19:31 UTC (rev 6645) @@ -1,22 +0,0 @@ -diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh ---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 -+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 -@@ -1298,7 +1298,7 @@ - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-xarch=*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1309,9 +1309,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 18:55:35 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 16:55:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6646] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6646 http://gar.svn.sourceforge.net/gar/?rev=6646&view=rev Author: bonivart Date: 2009-10-01 16:55:33 +0000 (Thu, 01 Oct 2009) Log Message: ----------- pkgutil: split work Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-01 14:19:31 UTC (rev 6645) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-01 16:55:33 UTC (rev 6646) @@ -12,15 +12,15 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -#DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) -DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) +DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +#DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) PACKAGES = CSWpkgutil CSWpkgutilplus SPKG_DESC_CSWpkgutil = $(DESCRIPTION) SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality -REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg +REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg CSWpkgutil PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* @@ -46,6 +46,7 @@ @ginstall -d $(DESTDIR)$(sysconfdir) @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)plus @ginstall -d $(DESTDIR)$(mandir)/man1 # @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @@ -57,6 +58,7 @@ @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ # @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-01 14:19:31 UTC (rev 6645) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-01 16:55:33 UTC (rev 6646) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc download/CSWpkgutil.gspec e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove -4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype +951b11e347d6f3f49cc8617ecab4ad62 download/CSWpkgutil.prototype 11c02a77d18f1fc11f23679b1b06efa8 download/pkgutil-1.7.zip Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-10-01 14:19:31 UTC (rev 6645) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-10-01 16:55:33 UTC (rev 6646) @@ -7,8 +7,6 @@ d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin -f none /opt/csw/bin/bldcat 755 root bin -f none /opt/csw/bin/chkcat 755 root bin d none /opt/csw/etc 0755 root bin f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin @@ -22,8 +20,6 @@ d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin f none /opt/csw/share/man/man1/pkgutil.1 644 root bin -f none /opt/csw/share/man/man1/bldcat.1 644 root bin -f none /opt/csw/share/man/man1/chkcat.1 644 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin f none /var/opt/csw/pkgutil/admin.CSW 644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 20:34:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 18:34:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6647] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6647 http://gar.svn.sourceforge.net/gar/?rev=6647&view=rev Author: dmichelsen Date: 2009-10-01 18:34:10 +0000 (Thu, 01 Oct 2009) Log Message: ----------- cswutils: Adjust binary name Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-01 16:55:33 UTC (rev 6646) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-01 18:34:10 UTC (rev 6647) @@ -66,5 +66,5 @@ $(DESTDIR)$(libdir)/opencsw/compare_pkgs.py @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/opencsw/opencsw_lib.py - @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/csw-pkg-diff + @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 21:24:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 19:24:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6648] csw/mgar/pkg/libpcap/trunk/Makefile Message-ID: Revision: 6648 http://gar.svn.sourceforge.net/gar/?rev=6648&view=rev Author: dmichelsen Date: 2009-10-01 19:24:43 +0000 (Thu, 01 Oct 2009) Log Message: ----------- libpcap: Remove specias ISAs and add link to generic shared lib Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 18:34:10 UTC (rev 6647) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 19:24:43 UTC (rev 6648) @@ -29,8 +29,8 @@ BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis -EXTRA_BUILD_ISAS_i386 = pentium pentium_pro+mmx +EXTRA_BUILD_ISAS_sparc = sparcv8plus +EXTRA_BUILD_ISAS_i386 = pentium TEST_TARGET = check @@ -51,10 +51,12 @@ TEST_SCRIPTS = MERGE_DIRS_isa-sparcv8plus = $(libdir) -MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) MERGE_DIRS_isa-pentium = $(libdir) -MERGE_DIRS_isa-pentium_pro+mmx = $(libdir) PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) include gar/category.mk + +post-install-modulated: + ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 21:25:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 19:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6649] csw/mgar/pkg/libpcap/trunk/Makefile Message-ID: Revision: 6649 http://gar.svn.sourceforge.net/gar/?rev=6649&view=rev Author: dmichelsen Date: 2009-10-01 19:25:35 +0000 (Thu, 01 Oct 2009) Log Message: ----------- libpcap: Add dependency Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 19:24:43 UTC (rev 6648) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 19:25:35 UTC (rev 6649) @@ -55,6 +55,8 @@ PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) +REQUIRED_PKGS_CSWlibpcapdevel = CSWlibpcap + include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 21:37:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 19:37:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6650] csw/mgar/pkg/tcpdump/trunk/Makefile Message-ID: Revision: 6650 http://gar.svn.sourceforge.net/gar/?rev=6650&view=rev Author: dmichelsen Date: 2009-10-01 19:37:14 +0000 (Thu, 01 Oct 2009) Log Message: ----------- tcpdump: Skip versioned tcpdump binary Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2009-10-01 19:25:35 UTC (rev 6649) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2009-10-01 19:37:14 UTC (rev 6650) @@ -19,15 +19,12 @@ SPKG_SOURCEURL = http://www.tcpdump.org/ -# Shared libraries patch -#PATCHFILES = solib.diff - # No test target for libpcap TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 -#INSTALL_OVERRIDE_DIRS = prefix exec_prefix includedir libdir mandir +EXTRA_MERGE_EXCLUDE_FILES = $(sbindir)/tcpdump\..* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 22:58:58 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 20:58:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6651] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 6651 http://gar.svn.sourceforge.net/gar/?rev=6651&view=rev Author: bonivart Date: 2009-10-01 20:58:55 +0000 (Thu, 01 Oct 2009) Log Message: ----------- geolitedb: update db Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2009-10-01 19:37:14 UTC (rev 6650) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2009-10-01 20:58:55 UTC (rev 6651) @@ -1,5 +1,5 @@ GARNAME = geolitedb -GARVERSION = 090422 +GARVERSION = 091001 CATEGORIES = net DESCRIPTION = geolite country database Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2009-10-01 19:37:14 UTC (rev 6650) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2009-10-01 20:58:55 UTC (rev 6651) @@ -1,2 +1,2 @@ -cd8d7820bebbb6f274fa426c12485f9e download/GeoIP.dat.gz ed834df1fb6cb5056f5310b98fc71811 download/COPYING +a8430b5dc9dee5ff81ac3ff1745097c6 download/GeoIP.dat.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 23:26:22 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 21:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6652] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 6652 http://gar.svn.sourceforge.net/gar/?rev=6652&view=rev Author: bonivart Date: 2009-10-01 21:26:22 +0000 (Thu, 01 Oct 2009) Log Message: ----------- geoip: update to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 20:58:55 UTC (rev 6651) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 21:26:22 UTC (rev 6652) @@ -11,48 +11,27 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWgeoip CSWgeoipdevel -REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib +REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip CATALOGNAME_CSWgeoip = geoip CATALOGNAME_CSWgeoipdevel = geoip_devel SPKG_DESC_CSWgeoip = $(DESCRIPTION) SPKG_DESC_CSWgeoipdevel = GeoIP C API development support -PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz GARCOMPILER = GCC4 TEST_TARGET = check +PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) + +EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$ + # Do not exclude static libs (needed for devel package) MERGE_EXCLUDE_STATICLIBS = CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw include gar/category.mk - -#pre-configure-modulated: -# @echo " ==> Pre-configure for $(GARNAME) (custom)" -# @( cd $(WORKSRC) ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ; \ -# cd apps ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ; \ -# cd ../libGeoIP ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ; \ -# cd ../test ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ) -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 10:30:21 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 08:30:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6653] csw/mgar/pkg Message-ID: Revision: 6653 http://gar.svn.sourceforge.net/gar/?rev=6653&view=rev Author: bonivart Date: 2009-10-02 08:30:19 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: initial commit Added Paths: ----------- csw/mgar/pkg/nicstat/ csw/mgar/pkg/nicstat/branches/ csw/mgar/pkg/nicstat/tags/ csw/mgar/pkg/nicstat/trunk/ csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums csw/mgar/pkg/nicstat/trunk/files/ Property changes on: csw/mgar/pkg/nicstat/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 08:30:19 UTC (rev 6653) @@ -0,0 +1,42 @@ +GARNAME = nicstat +GARVERSION = 1.20 +CATEGORIES = net + +DESCRIPTION = Network monitoring tool +define BLURB + Network monitoring tool +endef + +MASTER_SITES = http://blogs.sun.com/roller/resources/timc/nicstat/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://blogs.sun.com/timc/entry/nicstat_the_solaris_and_linux + +LICENSE = LICENSE.txt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +WORKSRC = $(WORKDIR) + +include gar/category.mk + +build-custom: + @echo " ==> Build $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + cp Makefile.Solaris Makefile ; \ + gmake ) + @$(MAKECOOKIE) + +install-custom: + @echo " ==> Install $(GARNAME) (custom)" + ( cd $(WORKSRC) ; \ + gmake BASEDIR=$(DESTDIR)/opt/csw install ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums (rev 0) +++ csw/mgar/pkg/nicstat/trunk/checksums 2009-10-02 08:30:19 UTC (rev 6653) @@ -0,0 +1 @@ +9cf3090944d01d6ad3c7cc9762207fea download/nicstat-1.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 10:42:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 08:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6654] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6654 http://gar.svn.sourceforge.net/gar/?rev=6654&view=rev Author: dmichelsen Date: 2009-10-02 08:42:18 +0000 (Fri, 02 Oct 2009) Log Message: ----------- cswutils: Relocate lib to /opt/csw/lib/python/opencsw Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 08:30:19 UTC (rev 6653) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 08:42:18 UTC (rev 6654) @@ -61,10 +61,10 @@ @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ - @ginstall -d $(DESTDIR)$(libdir)/opencsw + @ginstall -d $(DESTDIR)$(libdir)/python/opencsw @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/opencsw/compare_pkgs.py + $(DESTDIR)$(libdir)/python/opencsw/compare_pkgs.py @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/opencsw/opencsw_lib.py - @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg + $(DESTDIR)$(libdir)/python/opencsw/opencsw_lib.py + @ln -s ../lib/python/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 11:18:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:18:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6655] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6655 http://gar.svn.sourceforge.net/gar/?rev=6655&view=rev Author: bonivart Date: 2009-10-02 09:18:41 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: some fixes Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 08:42:18 UTC (rev 6654) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 09:18:41 UTC (rev 6655) @@ -26,17 +26,24 @@ WORKSRC = $(WORKDIR) +ifeq ($(shell uname -p), sparc) + MYARCH = -xarch=v8 +else + MYARCH = +endif + include gar/category.mk build-custom: @echo " ==> Build $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ - cp Makefile.Solaris Makefile ; \ + sed "s/CFLAGS =/CFLAGS = $(MYARCH) /" Makefile.Solaris > Makefile ; \ gmake ) @$(MAKECOOKIE) install-custom: @echo " ==> Install $(GARNAME) (custom)" - ( cd $(WORKSRC) ; \ + @( cd $(WORKSRC) ; \ gmake BASEDIR=$(DESTDIR)/opt/csw install ) + @cp $(WORKSRC)/enicstat $(DESTDIR)$(bindir) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:27:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:27:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6656] csw/mgar/pkg/bdb3/trunk Message-ID: Revision: 6656 http://gar.svn.sourceforge.net/gar/?rev=6656&view=rev Author: dmichelsen Date: 2009-10-02 09:27:59 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb3: Make package stub to CSWbdb33 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile csw/mgar/pkg/bdb3/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/bdb3/trunk/files/ Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:18:41 UTC (rev 6655) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:27:59 UTC (rev 6656) @@ -2,7 +2,7 @@ GARVERSION = 3.3.11 CATEGORIES = lib -DESCRIPTION = BerkeleyDB 3 +DESCRIPTION = Stub package as contents moved to CSWbdb33 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -13,40 +13,20 @@ (MSVC 4, 5 and 6). endef -MASTER_SITES = http://download.oracle.com/berkeley-db/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -# See http://www.sleepycat.com/update/4.1.25/patch.4.1.25.html -PATCHFILES = patch.$(GARVERSION).1 patch.$(GARVERSION).2 -PATCHDIRLEVEL = 0 - -LICENSE = LICENSE - PACKAGES = CSWbdb3 CATALOGNAME = berkeleydb3 -CONFIGURE_SCRIPTS = $(WORKSRC)/dist/configure -BUILD_SCRIPTS = $(WORKSRC)/dist/Makefile -INSTALL_SCRIPTS = $(WORKSRC)/dist/Makefile +REQUIRED_PKGS = CSWbdb33 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + TEST_SCRIPTS = -#NODIRPATHS = --prefix -CONFIGURE_ARGS = --prefix $(prefix) $(DIRPATHS) -CONFIGURE_ARGS += --enable-compat185 -CONFIGURE_ARGS += --enable-rpc -CONFIGURE_ARGS += --enable-cxx -CONFIGURE_ARGS += --enable-java -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) - -# The Makefile is too dumb for DESTDIR -INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir docdir - -# Include only the library and nothing else -EXTRA_PAX_ARGS = -s ",^\.\($(libdir)/libdb-3.3.so\)$$,\1," -s ",\..*,," - include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/bdb3/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb3/trunk/checksums 2009-10-02 09:18:41 UTC (rev 6655) +++ csw/mgar/pkg/bdb3/trunk/checksums 2009-10-02 09:27:59 UTC (rev 6656) @@ -1,3 +0,0 @@ -b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz -a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1 -fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:28:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:28:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6657] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 6657 http://gar.svn.sourceforge.net/gar/?rev=6657&view=rev Author: dmichelsen Date: 2009-10-02 09:28:43 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb3: Make stub ARCHALL=1 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:27:59 UTC (rev 6656) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:28:43 UTC (rev 6657) @@ -16,6 +16,7 @@ PACKAGES = CSWbdb3 CATALOGNAME = berkeleydb3 +ARCHALL = 1 REQUIRED_PKGS = CSWbdb33 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:33:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:33:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6658] csw/mgar/pkg/bdb4 Message-ID: Revision: 6658 http://gar.svn.sourceforge.net/gar/?rev=6658&view=rev Author: dmichelsen Date: 2009-10-02 09:33:12 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb4: Make package a stub to CSWbdb42 Added Paths: ----------- csw/mgar/pkg/bdb4/tags/legacy-4.1.25/ csw/mgar/pkg/bdb4/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bdb4/trunk/Makefile csw/mgar/pkg/bdb4/trunk/legacy/ Deleted: csw/mgar/pkg/bdb4/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile 2009-10-02 09:28:43 UTC (rev 6657) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2009-10-02 09:33:12 UTC (rev 6658) @@ -1,88 +0,0 @@ -GARNAME = db -GARVERSION = 4.2.52 -CATEGORIES = lib - -DESCRIPTION = This is a stub to BerkeleyDB 4.7 libraries from CSWbdb -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - - -REQUIRED_PKGS = CSWbdb - -PACKAGES = CSWbdb4 -CATALOGNAME = berkeleydb4 - -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom-$(GARCH) custom-all -TEST_SCRIPTS = - -ENABLE_CHECK = 0 - -include gar/category.mk - -install-custom-sparc: - ginstall -d $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 - ginstall -d $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s . sparcv8 - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s sparcv9 64 - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.2_g.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_load db_load - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_verify db_verify - -install-custom-i386: - ginstall -d $(DESTDIR)$(prefix)/bdb4/lib - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s . i386 - -install-custom-all: - ginstall -d $(DESTDIR)$(prefix)/bdb4/lib - ginstall -d $(DESTDIR)$(prefix)/bdb4/bin - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s . 32 - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb-4.so libdb-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.2_g.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_load db_load - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_verify db_verify Copied: csw/mgar/pkg/bdb4/trunk/Makefile (from rev 6657, csw/mgar/pkg/bdb3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2009-10-02 09:33:12 UTC (rev 6658) @@ -0,0 +1,33 @@ +GARNAME = db +GARVERSION = 4.2.52 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb42 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb4 +CATALOGNAME = berkeleydb4 + +ARCHALL = 1 +REQUIRED_PKGS = CSWbdb42 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(prefix) + ln -s bdb42 $(DESTDIR)$(prefix)/bdb4 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:37:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:37:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6659] csw/mgar/pkg/bdb/trunk Message-ID: Revision: 6659 http://gar.svn.sourceforge.net/gar/?rev=6659&view=rev Author: dmichelsen Date: 2009-10-02 09:37:43 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb: Make package a stub to CSWbdb47 Added Paths: ----------- csw/mgar/pkg/bdb/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bdb/trunk/Makefile Deleted: csw/mgar/pkg/bdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2009-10-02 09:33:12 UTC (rev 6658) +++ csw/mgar/pkg/bdb/trunk/Makefile 2009-10-02 09:37:43 UTC (rev 6659) @@ -1,90 +0,0 @@ -GARNAME = db -GARVERSION = 4.7.25 -CATEGORIES = lib - -DESCRIPTION = Berkeley DB 4.7 -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -MASTER_SITES = http://download.oracle.com/berkeley-db/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix - -PATCHDIR = $(WORKSRC)/.. -PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) - -BUILD64 = 1 -CONFIGURE_SCRIPTS = dist - -#prefix = $(BUILD_PREFIX)/bdb47 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-compat185 -CONFIGURE_ARGS += --enable-o_direct -CONFIGURE_ARGS += --enable-rpc -CONFIGURE_ARGS += --enable-cxx -CONFIGURE_ARGS += --enable-java - -# Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif - -# bdb tests are *very* time consuming -TEST_SCRIPTS = - -NO_ISAEXEC = 1 - -PACKAGES = CSWbdb CSWbdbdevel CSWbdbdoc - -CATALOGNAME_CSWbdb = berkeleydb -CATALOGNAME_CSWbdbdevel = berkeleydb_devel -CATALOGNAME_CSWbdbdoc = berkeleydb_doc - -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - -ARCHALL_CSWbdbdoc = 1 - -SPKG_DESC_CSWbdb = BerkeleyDB 4.7 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.7 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.7 documentation - -REQUIRED_PKGS_CSWbdbdevel = CSWbdb - -LICENSE = LICENSE - -PKGFILES_CSWbdbdoc = $(PKGFILES_DOC) - -PKGFILES_CSWbdbdevel = $(PKGFILES_DEVEL) - -include gar/category.mk - -LIBS += -lnsl -export LIBS - -PATH := /usr/jdk1.6.0_07/bin:$(PATH) -export PATH - -configure-dist: - @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/bdb/trunk/Makefile (from rev 6657, csw/mgar/pkg/bdb3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb/trunk/Makefile 2009-10-02 09:37:43 UTC (rev 6659) @@ -0,0 +1,34 @@ +GARNAME = db +GARVERSION = 4.7.25 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb47 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb +CATALOGNAME = berkeleydb + +REQUIRED_PKGS = CSWbdb47 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb47/lib/libdb-4.7.so $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) + ln -s ../../bdb47/lib/$(ISA_DEFAULT64)/libdb-4.7.so $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 12:44:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 10:44:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6660] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6660 http://gar.svn.sourceforge.net/gar/?rev=6660&view=rev Author: bonivart Date: 2009-10-02 10:44:37 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: more fixes Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 09:37:43 UTC (rev 6659) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 10:44:37 UTC (rev 6660) @@ -43,7 +43,10 @@ install-custom: @echo " ==> Install $(GARNAME) (custom)" - @( cd $(WORKSRC) ; \ - gmake BASEDIR=$(DESTDIR)/opt/csw install ) + @ginstall -d $(DESTDIR)$(bindir) + @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) @cp $(WORKSRC)/enicstat $(DESTDIR)$(bindir) + @chmod 755 $(DESTDIR)$(bindir)/?nicstat + @ginstall -d $(DESTDIR)$(mandir)/man1 + @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 13:00:33 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 11:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6661] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6661 http://gar.svn.sourceforge.net/gar/?rev=6661&view=rev Author: bonivart Date: 2009-10-02 11:00:27 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: remove enicstat Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 10:44:37 UTC (rev 6660) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 11:00:27 UTC (rev 6661) @@ -45,7 +45,6 @@ @echo " ==> Install $(GARNAME) (custom)" @ginstall -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) - @cp $(WORKSRC)/enicstat $(DESTDIR)$(bindir) @chmod 755 $(DESTDIR)$(bindir)/?nicstat @ginstall -d $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 13:04:44 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 11:04:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6662] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6662 http://gar.svn.sourceforge.net/gar/?rev=6662&view=rev Author: bonivart Date: 2009-10-02 11:04:40 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: one more fix Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 11:00:27 UTC (rev 6661) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 11:04:40 UTC (rev 6662) @@ -45,7 +45,6 @@ @echo " ==> Install $(GARNAME) (custom)" @ginstall -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) - @chmod 755 $(DESTDIR)$(bindir)/?nicstat @ginstall -d $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 2 14:00:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Oct 2009 12:00:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6663] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6663 http://gar.svn.sourceforge.net/gar/?rev=6663&view=rev Author: wahwah Date: 2009-10-02 12:00:32 +0000 (Fri, 02 Oct 2009) Log Message: ----------- puppet: support for pkgutil Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 11:04:40 UTC (rev 6662) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 12:00:32 UTC (rev 6663) @@ -52,6 +52,9 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet +PATCHFILES = 0001-pkgutil-provider.patch +PATCHFILES += 0002-pkgutil-specific-command-line-opts.patch + include gar/category.mk install-puppet: Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 11:04:40 UTC (rev 6662) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 12:00:32 UTC (rev 6663) @@ -1,4 +1,6 @@ -7331526709cf8cbce59421157068c184 download/cswpuppetd -066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd +cbf89ddcce76bfbce3b92aa4599f4e4c download/0001-pkgutil-provider.patch +4bf70f19b9a69bf00590d0e639f4e344 download/0002-pkgutil-specific-command-line-opts.patch +71174fc47265e5c81a0e32366563e5e4 download/cswpuppetd +fd5e49b7d2b7d288d5beb224d0cfa855 download/cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup 288d46dee00acad64d0f3ecc6d8ba6fa download/puppet-0.24.8.tgz Added: csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch 2009-10-02 12:00:32 UTC (rev 6663) @@ -0,0 +1,131 @@ +From e1c96e313d15f21857a2dd098534de374e8f765d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 2 Oct 2009 11:46:59 +0100 +Subject: [PATCH 1/2] pkgutil provider + +--- + lib/puppet/provider/package/pkgutil.rb | 112 ++++++++++++++++++++++++++++++++ + 1 files changed, 112 insertions(+), 0 deletions(-) + create mode 100755 lib/puppet/provider/package/pkgutil.rb + +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +new file mode 100755 +index 0000000..9242cb1 +--- /dev/null ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -0,0 +1,112 @@ ++# Packaging using Blastwave's pkgutil program. ++Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do ++ desc "Package management using ``pkgutil`` command on Solaris." ++ pkgutil = "pkgutil" ++ if FileTest.executable?("/opt/csw/bin/pkgutil") ++ pkgutil = "/opt/csw/bin/pkgutil" ++ end ++ ++ confine :operatingsystem => :solaris ++ ++ commands :pkgutil => pkgutil ++ ++ # This is so stupid, but then, so is blastwave. ++ ENV["PAGER"] = "/usr/bin/cat" ++ ++ def self.extended(mod) ++ unless command(:pkgutil) != "pkgutil" ++ raise Puppet::Error, ++ "The pkgutil command is missing; blastwave packaging unavailable" ++ end ++ end ++ ++ def self.instances(hash = {}) ++ blastlist(hash).collect do |bhash| ++ bhash.delete(:avail) ++ new(bhash) ++ end ++ end ++ ++ # Turn our blastwave listing into a bunch of hashes. ++ def self.blastlist(hash) ++ command = ["-c"] ++ ++ if hash[:justme] ++ command << hash[:justme] ++ end ++ ++ output = pkgutil command ++ ++ list = output.split("\n").collect do |line| ++ next if line =~ /^#/ ++ next if line =~ /^WARNING/ ++ next if line =~ /localrev\s+remoterev/ ++ ++ blastsplit(line) ++ end.reject { |h| h.nil? } ++ ++ if hash[:justme] ++ return list[0] ++ else ++ list.reject! { |h| ++ h[:ensure] == :absent ++ } ++ return list ++ end ++ ++ end ++ ++ # Split the different lines into hashes. ++ def self.blastsplit(line) ++ if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/ ++ hash = {} ++ hash[:name] = $1 ++ hash[:ensure] = if $2 == "[Not installed]" ++ :absent ++ else ++ $2 ++ end ++ hash[:avail] = $5 ++ ++ if hash[:avail] == "SAME" ++ hash[:avail] = hash[:ensure] ++ end ++ ++ # Use the name method, so it works with subclasses. ++ hash[:provider] = self.name ++ ++ return hash ++ else ++ Puppet.warning "Cannot match %s" % line ++ return nil ++ end ++ end ++ ++ def install ++ pkgutil "-y", :install, @resource[:name] ++ end ++ ++ # Retrieve the version from the current package file. ++ def latest ++ hash = self.class.blastlist(:justme => @resource[:name]) ++ hash[:avail] ++ end ++ ++ def query ++ if hash = self.class.blastlist(:justme => @resource[:name]) ++ hash ++ else ++ {:ensure => :absent} ++ end ++ end ++ ++ # Remove the old package, and install the new one ++ def update ++ pkgutil "-y", :upgrade, @resource[:name] ++ end ++ ++ def uninstall ++ pkgutil "-y", :remove, @resource[:name] ++ end ++end ++ +-- +1.6.3.2 + Added: csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch 2009-10-02 12:00:32 UTC (rev 6663) @@ -0,0 +1,39 @@ +From ff82126b6566776f7b988a84c00c7552edde9db1 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 2 Oct 2009 12:27:44 +0100 +Subject: [PATCH 2/2] pkgutil-specific command line opts + +--- + lib/puppet/provider/package/pkgutil.rb | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +index 9242cb1..8d8551b 100755 +--- a/lib/puppet/provider/package/pkgutil.rb ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + end + + def install +- pkgutil "-y", :install, @resource[:name] ++ pkgutil "-y", "--install", @resource[:name] + end + + # Retrieve the version from the current package file. +@@ -102,11 +102,11 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + + # Remove the old package, and install the new one + def update +- pkgutil "-y", :upgrade, @resource[:name] ++ pkgutil "-y", "--upgrade", @resource[:name] + end + + def uninstall +- pkgutil "-y", :remove, @resource[:name] ++ pkgutil "-y", "--remove", @resource[:name] + end + end + +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 2 14:09:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Oct 2009 12:09:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6664] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6664 http://gar.svn.sourceforge.net/gar/?rev=6664&view=rev Author: wahwah Date: 2009-10-02 12:09:39 +0000 (Fri, 02 Oct 2009) Log Message: ----------- puppet: Using one patch instead of two for pkgutil support Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 12:09:39 UTC (rev 6664) @@ -52,8 +52,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -PATCHFILES = 0001-pkgutil-provider.patch -PATCHFILES += 0002-pkgutil-specific-command-line-opts.patch +PATCHFILES = 0001-pkgutil-support.patch include gar/category.mk Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 12:09:39 UTC (rev 6664) @@ -1,5 +1,4 @@ -cbf89ddcce76bfbce3b92aa4599f4e4c download/0001-pkgutil-provider.patch -4bf70f19b9a69bf00590d0e639f4e344 download/0002-pkgutil-specific-command-line-opts.patch +abaa404420106f9f28e9e1218b4e365b download/0001-pkgutil-support.patch 71174fc47265e5c81a0e32366563e5e4 download/cswpuppetd fd5e49b7d2b7d288d5beb224d0cfa855 download/cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup Deleted: csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch 2009-10-02 12:09:39 UTC (rev 6664) @@ -1,131 +0,0 @@ -From e1c96e313d15f21857a2dd098534de374e8f765d Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Fri, 2 Oct 2009 11:46:59 +0100 -Subject: [PATCH 1/2] pkgutil provider - ---- - lib/puppet/provider/package/pkgutil.rb | 112 ++++++++++++++++++++++++++++++++ - 1 files changed, 112 insertions(+), 0 deletions(-) - create mode 100755 lib/puppet/provider/package/pkgutil.rb - -diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb -new file mode 100755 -index 0000000..9242cb1 ---- /dev/null -+++ b/lib/puppet/provider/package/pkgutil.rb -@@ -0,0 +1,112 @@ -+# Packaging using Blastwave's pkgutil program. -+Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do -+ desc "Package management using ``pkgutil`` command on Solaris." -+ pkgutil = "pkgutil" -+ if FileTest.executable?("/opt/csw/bin/pkgutil") -+ pkgutil = "/opt/csw/bin/pkgutil" -+ end -+ -+ confine :operatingsystem => :solaris -+ -+ commands :pkgutil => pkgutil -+ -+ # This is so stupid, but then, so is blastwave. -+ ENV["PAGER"] = "/usr/bin/cat" -+ -+ def self.extended(mod) -+ unless command(:pkgutil) != "pkgutil" -+ raise Puppet::Error, -+ "The pkgutil command is missing; blastwave packaging unavailable" -+ end -+ end -+ -+ def self.instances(hash = {}) -+ blastlist(hash).collect do |bhash| -+ bhash.delete(:avail) -+ new(bhash) -+ end -+ end -+ -+ # Turn our blastwave listing into a bunch of hashes. -+ def self.blastlist(hash) -+ command = ["-c"] -+ -+ if hash[:justme] -+ command << hash[:justme] -+ end -+ -+ output = pkgutil command -+ -+ list = output.split("\n").collect do |line| -+ next if line =~ /^#/ -+ next if line =~ /^WARNING/ -+ next if line =~ /localrev\s+remoterev/ -+ -+ blastsplit(line) -+ end.reject { |h| h.nil? } -+ -+ if hash[:justme] -+ return list[0] -+ else -+ list.reject! { |h| -+ h[:ensure] == :absent -+ } -+ return list -+ end -+ -+ end -+ -+ # Split the different lines into hashes. -+ def self.blastsplit(line) -+ if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/ -+ hash = {} -+ hash[:name] = $1 -+ hash[:ensure] = if $2 == "[Not installed]" -+ :absent -+ else -+ $2 -+ end -+ hash[:avail] = $5 -+ -+ if hash[:avail] == "SAME" -+ hash[:avail] = hash[:ensure] -+ end -+ -+ # Use the name method, so it works with subclasses. -+ hash[:provider] = self.name -+ -+ return hash -+ else -+ Puppet.warning "Cannot match %s" % line -+ return nil -+ end -+ end -+ -+ def install -+ pkgutil "-y", :install, @resource[:name] -+ end -+ -+ # Retrieve the version from the current package file. -+ def latest -+ hash = self.class.blastlist(:justme => @resource[:name]) -+ hash[:avail] -+ end -+ -+ def query -+ if hash = self.class.blastlist(:justme => @resource[:name]) -+ hash -+ else -+ {:ensure => :absent} -+ end -+ end -+ -+ # Remove the old package, and install the new one -+ def update -+ pkgutil "-y", :upgrade, @resource[:name] -+ end -+ -+ def uninstall -+ pkgutil "-y", :remove, @resource[:name] -+ end -+end -+ --- -1.6.3.2 - Deleted: csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch 2009-10-02 12:09:39 UTC (rev 6664) @@ -1,39 +0,0 @@ -From ff82126b6566776f7b988a84c00c7552edde9db1 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Fri, 2 Oct 2009 12:27:44 +0100 -Subject: [PATCH 2/2] pkgutil-specific command line opts - ---- - lib/puppet/provider/package/pkgutil.rb | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb -index 9242cb1..8d8551b 100755 ---- a/lib/puppet/provider/package/pkgutil.rb -+++ b/lib/puppet/provider/package/pkgutil.rb -@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d - end - - def install -- pkgutil "-y", :install, @resource[:name] -+ pkgutil "-y", "--install", @resource[:name] - end - - # Retrieve the version from the current package file. -@@ -102,11 +102,11 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d - - # Remove the old package, and install the new one - def update -- pkgutil "-y", :upgrade, @resource[:name] -+ pkgutil "-y", "--upgrade", @resource[:name] - end - - def uninstall -- pkgutil "-y", :remove, @resource[:name] -+ pkgutil "-y", "--remove", @resource[:name] - end - end - --- -1.6.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 2 14:10:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Oct 2009 12:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6665] csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support .patch Message-ID: Revision: 6665 http://gar.svn.sourceforge.net/gar/?rev=6665&view=rev Author: wahwah Date: 2009-10-02 12:10:14 +0000 (Fri, 02 Oct 2009) Log Message: ----------- puppet: Adding the pkgutil support patch Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch Added: csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch 2009-10-02 12:10:14 UTC (rev 6665) @@ -0,0 +1,130 @@ +From a910ce5c5ea0b626fc6676254d8fc00bd0b7325a Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 2 Oct 2009 13:08:19 +0100 +Subject: [PATCH] pkgutil support + +--- + lib/puppet/provider/package/pkgutil.rb | 111 ++++++++++++++++++++++++++++++++ + 1 files changed, 111 insertions(+), 0 deletions(-) + create mode 100755 lib/puppet/provider/package/pkgutil.rb + +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +new file mode 100755 +index 0000000..cde7482 +--- /dev/null ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -0,0 +1,111 @@ ++# Packaging using pkgutil from http://pkgutil.wikidot.com/ ++Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do ++ desc "Package management using ``pkgutil`` command on Solaris." ++ pkgutil = "pkgutil" ++ if FileTest.executable?("/opt/csw/bin/pkgutil") ++ pkgutil = "/opt/csw/bin/pkgutil" ++ end ++ ++ confine :operatingsystem => :solaris ++ ++ commands :pkgutil => pkgutil ++ ++ # This is so stupid, but then, so is Solaris. ++ ENV["PAGER"] = "/usr/bin/cat" ++ ++ def self.extended(mod) ++ unless command(:pkgutil) != "pkgutil" ++ raise Puppet::Error, ++ "The pkgutil command is missing; pkgutil packaging unavailable" ++ end ++ end ++ ++ def self.instances(hash = {}) ++ blastlist(hash).collect do |bhash| ++ bhash.delete(:avail) ++ new(bhash) ++ end ++ end ++ ++ # Turn our pkgutil listing into a bunch of hashes. ++ def self.blastlist(hash) ++ command = ["-c"] ++ ++ if hash[:justme] ++ command << hash[:justme] ++ end ++ ++ output = pkgutil command ++ ++ list = output.split("\n").collect do |line| ++ next if line =~ /^#/ ++ next if line =~ /^WARNING/ ++ next if line =~ /localrev\s+remoterev/ ++ ++ blastsplit(line) ++ end.reject { |h| h.nil? } ++ ++ if hash[:justme] ++ return list[0] ++ else ++ list.reject! { |h| ++ h[:ensure] == :absent ++ } ++ return list ++ end ++ ++ end ++ ++ # Split the different lines into hashes. ++ def self.blastsplit(line) ++ if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/ ++ hash = {} ++ hash[:name] = $1 ++ hash[:ensure] = if $2 == "[Not installed]" ++ :absent ++ else ++ $2 ++ end ++ hash[:avail] = $5 ++ ++ if hash[:avail] == "SAME" ++ hash[:avail] = hash[:ensure] ++ end ++ ++ # Use the name method, so it works with subclasses. ++ hash[:provider] = self.name ++ ++ return hash ++ else ++ Puppet.warning "Cannot match %s" % line ++ return nil ++ end ++ end ++ ++ def install ++ pkgutil "-y", "--install", @resource[:name] ++ end ++ ++ # Retrieve the version from the current package file. ++ def latest ++ hash = self.class.blastlist(:justme => @resource[:name]) ++ hash[:avail] ++ end ++ ++ def query ++ if hash = self.class.blastlist(:justme => @resource[:name]) ++ hash ++ else ++ {:ensure => :absent} ++ end ++ end ++ ++ # Remove the old package, and install the new one ++ def update ++ pkgutil "-y", "--upgrade", @resource[:name] ++ end ++ ++ def uninstall ++ pkgutil "-y", "--remove", @resource[:name] ++ end ++end +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:31:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:31:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6666] csw/mgar/pkg/bdb33/trunk/Makefile Message-ID: Revision: 6666 http://gar.svn.sourceforge.net/gar/?rev=6666&view=rev Author: dmichelsen Date: 2009-10-02 15:31:58 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb33: Relocate docs and add revision Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 12:10:14 UTC (rev 6665) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:31:58 UTC (rev 6666) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 3.3.11 +RELEASE = p2 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -76,12 +77,11 @@ INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir -# Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb33),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -#PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb33-doc = $(prefix)/docs/.* +PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL) @@ -101,3 +101,6 @@ gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:34:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:34:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6667] csw/mgar/pkg/bdb42/trunk/Makefile Message-ID: Revision: 6667 http://gar.svn.sourceforge.net/gar/?rev=6667&view=rev Author: dmichelsen Date: 2009-10-02 15:34:51 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb42: Relocate docs and add revision Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/Makefile Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 15:31:58 UTC (rev 6666) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 15:34:51 UTC (rev 6667) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 4.2.52 +RELEASE = p5 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -30,6 +31,7 @@ PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -55,8 +57,6 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc CATALOGNAME_CSWbdb42 = berkeleydb42 @@ -74,12 +74,11 @@ LICENSE = LICENSE -# Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb42),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb42-doc = $(prefix)/docs/.* +PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) @@ -99,3 +98,6 @@ gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:38:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:38:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6668] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6668 http://gar.svn.sourceforge.net/gar/?rev=6668&view=rev Author: dmichelsen Date: 2009-10-02 15:38:00 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb43: Relocate docs and add revision Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 15:34:51 UTC (rev 6667) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 15:38:00 UTC (rev 6668) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 4.3.29 +RELEASE = p1 CATEGORIES = lib DESCRIPTION = BerkeleyDB 4.3 libraries and utilities @@ -70,8 +71,11 @@ # bdb tests are time consuming TEST_SCRIPTS = -PKGFILES_CSWbdb43-doc = $(prefix)/docs/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb43-doc = $(PKGFILES_DOC) PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +90,5 @@ ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:46:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:46:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6669] csw/mgar/pkg/bdb33/trunk/Makefile Message-ID: Revision: 6669 http://gar.svn.sourceforge.net/gar/?rev=6669&view=rev Author: dmichelsen Date: 2009-10-02 15:46:53 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb33: Reorder Makefile Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:38:00 UTC (rev 6668) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) @@ -1,6 +1,5 @@ GARNAME = db GARVERSION = 3.3.11 -RELEASE = p2 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -17,20 +16,18 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) #BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -56,22 +53,22 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +PACKAGES = CSWbdb33 CSWbdb33devel CSWbdb33doc -PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc +CATALOGNAME_CSWbdb33 = berkeleydb33 +CATALOGNAME_CSWbdb33devel = berkeleydb33_devel +CATALOGNAME_CSWbdb33doc = berkeleydb33_doc -CATALOGNAME_CSWbdb33 = berkeleydb33 -CATALOGNAME_CSWbdb33-devel = berkeleydb33_devel -CATALOGNAME_CSWbdb33-doc = berkeleydb33_doc +ARCHALL_CSWbdb33doc = 1 -ARCHALL_CSWbdb33-doc = 1 +SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities +SPKG_DESC_CSWbdb33devel = BerkeleyDB 3.3 development support +SPKG_DESC_CSWbdb33doc = BerkeleyDB 3.3 documentation -SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities -SPKG_DESC_CSWbdb33-devel = BerkeleyDB 3.3 development support -SPKG_DESC_CSWbdb33-doc = BerkeleyDB 3.3 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb33-devel = CSWbdb33 -INCOMPATIBLE_PKGS_CSWbdb33-doc = CSWbdb33doc +REQUIRED_PKGS_CSWbdb33devel = CSWbdb33 +INCOMPATIBLE_PKGS_CSWbdb33doc = CSWbdb33doc LICENSE = LICENSE @@ -81,10 +78,9 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb33doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb33devel = $(PKGFILES_DEVEL) -PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 18:09:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 16:09:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6670] csw/mgar/pkg Message-ID: Revision: 6670 http://gar.svn.sourceforge.net/gar/?rev=6670&view=rev Author: dmichelsen Date: 2009-10-02 16:09:10 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb*: Homogenize Makefiles Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb48/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool Removed Paths: ------------- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -68,7 +68,6 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html REQUIRED_PKGS_CSWbdb33devel = CSWbdb33 -INCOMPATIBLE_PKGS_CSWbdb33doc = CSWbdb33doc LICENSE = LICENSE Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,6 +1,5 @@ GARNAME = db GARVERSION = 4.2.52 -RELEASE = p5 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -17,18 +16,15 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 NO_ISAEXEC = 1 @@ -57,31 +53,31 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc +PACKAGES = CSWbdb42 CSWbdb42devel CSWbdb42doc -CATALOGNAME_CSWbdb42 = berkeleydb42 -CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel -CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc +CATALOGNAME_CSWbdb42 = berkeleydb42 +CATALOGNAME_CSWbdb42devel = berkeleydb42_devel +CATALOGNAME_CSWbdb42doc = berkeleydb42_doc -ARCHALL_CSWbdb42-doc = 1 +ARCHALL_CSWbdb42doc = 1 -SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities -SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support -SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation +SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities +SPKG_DESC_CSWbdb42devel = BerkeleyDB 4.2 development support +SPKG_DESC_CSWbdb42doc = BerkeleyDB 4.2 documentation -REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42 -INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html +REQUIRED_PKGS_CSWbdb42devel = CSWbdb42 + LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb42),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb42doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb42devel = $(PKGFILES_DEVEL) -PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,36 @@ +*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 +--- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 +*************** +*** 440,446 **** + c_mp->stat.st_pages--; + alloc_bhp = NULL; + R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); +- MUTEX_LOCK(dbenv, &hp->hash_mutex); + + /* + * We can't use the page we found in the pool if DB_MPOOL_NEW +--- 440,445 ---- +*************** +*** 455,460 **** +--- 454,462 ---- + b_incr = 0; + goto alloc; + } ++ ++ /* We can use the page -- get the bucket lock. */ ++ MUTEX_LOCK(dbenv, &hp->hash_mutex); + break; + case SECOND_MISS: + /* +*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 +--- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 +*************** +*** 285,290 **** +--- 285,291 ---- + bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) + if (bhp->priority != UINT32_T_MAX && + bhp->priority > MPOOL_BASE_DECREMENT) ++ bhp->priority -= MPOOL_BASE_DECREMENT; + MUTEX_UNLOCK(dbenv, &hp->hash_mutex); + } + } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,36 +0,0 @@ -*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 ---- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 -*************** -*** 440,446 **** - c_mp->stat.st_pages--; - alloc_bhp = NULL; - R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); -- MUTEX_LOCK(dbenv, &hp->hash_mutex); - - /* - * We can't use the page we found in the pool if DB_MPOOL_NEW ---- 440,445 ---- -*************** -*** 455,460 **** ---- 454,462 ---- - b_incr = 0; - goto alloc; - } -+ -+ /* We can use the page -- get the bucket lock. */ -+ MUTEX_LOCK(dbenv, &hp->hash_mutex); - break; - case SECOND_MISS: - /* -*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 ---- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 -*************** -*** 285,290 **** ---- 285,291 ---- - bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) - if (bhp->priority != UINT32_T_MAX && - bhp->priority > MPOOL_BASE_DECREMENT) -+ bhp->priority -= MPOOL_BASE_DECREMENT; - MUTEX_UNLOCK(dbenv, &hp->hash_mutex); - } - } Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,45 @@ +*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 +--- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 +*************** +*** 2216,2226 **** + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, obj->data, obj->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN(obj->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +--- 2216,2227 ---- + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, \ +! (obj)->data, (obj)->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN((obj)->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +*************** +*** 2339,2345 **** + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, obj); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; +--- 2340,2346 ---- + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, &obj[i]); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,45 +0,0 @@ -*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 ---- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 -*************** -*** 2216,2226 **** - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, obj->data, obj->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN(obj->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ ---- 2216,2227 ---- - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, \ -! (obj)->data, (obj)->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN((obj)->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ -*************** -*** 2339,2345 **** - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, obj); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; ---- 2340,2346 ---- - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, &obj[i]); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,247 @@ +--- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 ++++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 +@@ -61,7 +61,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -94,7 +94,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + +--- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 ++++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 +@@ -57,7 +57,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -84,7 +84,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) { + dbenv.cleanup(); + } +--- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 ++++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 +@@ -14,15 +14,15 @@ + db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); + } + +- static Object initDbEnvRef0(DbEnv self, Object handle) { ++ static long initDbEnvRef0(DbEnv self, Object handle) { + return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); + } + +- static Object initDbRef0(Db self, Object handle) { ++ static long initDbRef0(Db self, Object handle) { + return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); + } + +- static void deleteRef0(Object ref) { ++ static void deleteRef0(long ref) { + db_javaJNI.deleteRef0(ref); + } + +--- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 ++++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 +@@ -45,9 +45,9 @@ + static native final void initialize(); + + public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; +- final static native Object initDbEnvRef0(long jarg1, Object jarg2); +- final static native Object initDbRef0(long jarg1, Object jarg2); +- final static native void deleteRef0(Object jarg1); ++ final static native long initDbEnvRef0(long jarg1, Object jarg2); ++ final static native long initDbRef0(long jarg1, Object jarg2); ++ final static native void deleteRef0(long jarg1); + final static native long getDbEnv0(long jarg1); + public final static native long new_Db(long jarg1, int jarg2) throws DbException; + public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; +--- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 ++++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 +@@ -53,7 +53,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -76,7 +76,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + public synchronized void close(int flags) throws DbException { +@@ -220,7 +220,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -245,7 +245,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) + dbenv.cleanup(); + dbenv = null; +@@ -503,46 +503,42 @@ + } + %} + +-%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); +-%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); +-%native(deleteRef0) void deleteRef0(jobject ref); ++%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); ++%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); ++%native(deleteRef0) void deleteRef0(jlong ref); + %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); + + %{ +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -554,7 +550,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL +--- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 ++++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 +@@ -1192,40 +1192,36 @@ + } + + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -1237,7 +1233,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,247 +0,0 @@ ---- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 -+++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 -@@ -61,7 +61,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -94,7 +94,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - ---- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 -+++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 -@@ -57,7 +57,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -84,7 +84,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) { - dbenv.cleanup(); - } ---- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 -+++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 -@@ -14,15 +14,15 @@ - db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); - } - -- static Object initDbEnvRef0(DbEnv self, Object handle) { -+ static long initDbEnvRef0(DbEnv self, Object handle) { - return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); - } - -- static Object initDbRef0(Db self, Object handle) { -+ static long initDbRef0(Db self, Object handle) { - return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); - } - -- static void deleteRef0(Object ref) { -+ static void deleteRef0(long ref) { - db_javaJNI.deleteRef0(ref); - } - ---- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 -+++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 -@@ -45,9 +45,9 @@ - static native final void initialize(); - - public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; -- final static native Object initDbEnvRef0(long jarg1, Object jarg2); -- final static native Object initDbRef0(long jarg1, Object jarg2); -- final static native void deleteRef0(Object jarg1); -+ final static native long initDbEnvRef0(long jarg1, Object jarg2); -+ final static native long initDbRef0(long jarg1, Object jarg2); -+ final static native void deleteRef0(long jarg1); - final static native long getDbEnv0(long jarg1); - public final static native long new_Db(long jarg1, int jarg2) throws DbException; - public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; ---- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 -+++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 -@@ -53,7 +53,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -76,7 +76,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - public synchronized void close(int flags) throws DbException { -@@ -220,7 +220,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -245,7 +245,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) - dbenv.cleanup(); - dbenv = null; -@@ -503,46 +503,42 @@ - } - %} - --%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); --%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); --%native(deleteRef0) void deleteRef0(jobject ref); -+%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); -+%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); -+%native(deleteRef0) void deleteRef0(jlong ref); - %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); - - %{ --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -554,7 +550,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL ---- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 -+++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 -@@ -1192,40 +1192,36 @@ - } - - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -1237,7 +1233,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,36 @@ +*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 +--- btree/bt_rec.c Tue Mar 22 09:42:11 2005 +*************** +*** 222,228 **** + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +--- 222,228 ---- + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +*************** +*** 294,300 **** + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; +--- 294,300 ---- + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,36 +0,0 @@ -*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 ---- btree/bt_rec.c Tue Mar 22 09:42:11 2005 -*************** -*** 222,228 **** - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); ---- 222,228 ---- - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); -*************** -*** 294,300 **** - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; ---- 294,300 ---- - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,24 @@ +*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 +--- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 +*************** +*** 553,560 **** + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } +--- 553,563 ---- + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != +! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); +! } + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 ---- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 -*************** -*** 553,560 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } ---- 553,563 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } Copied: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,22 @@ +diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh +--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 ++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 +@@ -1298,7 +1298,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1309,9 +1309,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,22 +0,0 @@ -diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh ---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 -+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 -@@ -1298,7 +1298,7 @@ - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-xarch=*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1309,9 +1309,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,6 +1,5 @@ GARNAME = db GARVERSION = 4.3.29 -RELEASE = p1 CATEGORIES = lib DESCRIPTION = BerkeleyDB 4.3 libraries and utilities @@ -20,32 +19,13 @@ PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix -PACKAGES = CSWbdb43 CSWbdb43-devel CSWbdb43-doc - -CATALOGNAME_CSWbdb43 = berkeleydb43 -CATALOGNAME_CSWbdb43-devel = berkeleydb43_devel -CATALOGNAME_CSWbdb43-doc = berkeleydb43_doc - -SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 -SPKG_DESC_CSWbdb43-devel = BerkeleyDB 4.3 development support -SPKG_DESC_CSWbdb43-doc = BerkeleyDB 4.3 documentation - -SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html - -REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 - -INCOMPATIBLE_PKGS_CSWbdb43-doc = CSWbdb43doc - -LICENSE = LICENSE - -ARCHALL_CSWbdb43-doc = 1 - BUILD64 = 1 NO_ISAEXEC = 1 @@ -71,12 +51,30 @@ # bdb tests are time consuming TEST_SCRIPTS = +PACKAGES = CSWbdb43 CSWbdb43devel CSWbdb43doc + +CATALOGNAME_CSWbdb43 = berkeleydb43 +CATALOGNAME_CSWbdb43devel = berkeleydb43_devel +CATALOGNAME_CSWbdb43doc = berkeleydb43_doc + +ARCHALL_CSWbdb43doc = 1 + +SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 +SPKG_DESC_CSWbdb43devel = BerkeleyDB 4.3 development support +SPKG_DESC_CSWbdb43doc = BerkeleyDB 4.3 documentation + +SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html + +REQUIRED_PKGS_CSWbdb43devel = CSWbdb43 + +LICENSE = LICENSE + EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb43-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb43doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -90,5 +88,10 @@ ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -16,20 +16,18 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -55,34 +53,31 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +PACKAGES = CSWbdb44 CSWbdb44devel CSWbdb44doc -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc +CATALOGNAME_CSWbdb44 = berkeleydb44 +CATALOGNAME_CSWbdb44devel = berkeleydb44_devel +CATALOGNAME_CSWbdb44doc = berkeleydb44_doc -CATALOGNAME_CSWbdb44 = berkeleydb44 -CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel -CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc +ARCHALL_CSWbdb44doc = 1 -ARCHALL_CSWbdb44-doc = 1 +SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities +SPKG_DESC_CSWbdb44devel = BerkeleyDB 4.4 development support +SPKG_DESC_CSWbdb44doc = BerkeleyDB 4.4 documentation -SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities -SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support -SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 -INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc +REQUIRED_PKGS_CSWbdb44devel = CSWbdb44 LICENSE = LICENSE -# Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb44),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb44-doc = $(prefix)/docs/.* +PKGFILES_CSWbdb44doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL) -PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl @@ -99,3 +94,6 @@ gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,27 @@ +*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 +--- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 +*************** +*** 411,416 **** +--- 411,422 ---- + DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) + goto err; + #endif ++ ++ mpf = array->mpfarray[offset].mpf; ++ /* This extent my already be marked for delete and closed. */ ++ if (mpf == NULL) ++ goto err; ++ + /* + * The log must be flushed before the file is deleted. We depend on + * the log record of the last delete to recreate the file if we crash. +*************** +*** 418,424 **** + if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) + goto err; + +- mpf = array->mpfarray[offset].mpf; + (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); + /* Someone could be real slow, let them close it down. */ + if (array->mpfarray[offset].pinref != 0) +--- 424,429 ---- Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,27 +0,0 @@ -*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 ---- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 -*************** -*** 411,416 **** ---- 411,422 ---- - DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) - goto err; - #endif -+ -+ mpf = array->mpfarray[offset].mpf; -+ /* This extent my already be marked for delete and closed. */ -+ if (mpf == NULL) -+ goto err; -+ - /* - * The log must be flushed before the file is deleted. We depend on - * the log record of the last delete to recreate the file if we crash. -*************** -*** 418,424 **** - if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) - goto err; - -- mpf = array->mpfarray[offset].mpf; - (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); - /* Someone could be real slow, let them close it down. */ - if (array->mpfarray[offset].pinref != 0) ---- 424,429 ---- Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,29 @@ +*** txn/txn.c.orig Tue Nov 1 06:50:03 2005 +--- txn/txn.c Tue Jan 31 15:05:13 2006 +*************** +*** 1049,1060 **** +--- 1049,1062 ---- + return (ret); + memcpy(txn->name, name, len); + ++ TXN_SYSTEM_LOCK(dbenv); + if (td->name != INVALID_ROFF) { + __db_shalloc_free( + &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); + td->name = INVALID_ROFF; + } + if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { ++ TXN_SYSTEM_UNLOCK(dbenv); + __db_err(dbenv, + "Unable to allocate memory for transaction name"); + +*************** +*** 1063,1068 **** +--- 1065,1071 ---- + + return (ret); + } ++ TXN_SYSTEM_UNLOCK(dbenv); + td->name = R_OFFSET(&mgr->reginfo, p); + memcpy(p, name, len); + Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,29 +0,0 @@ -*** txn/txn.c.orig Tue Nov 1 06:50:03 2005 ---- txn/txn.c Tue Jan 31 15:05:13 2006 -*************** -*** 1049,1060 **** ---- 1049,1062 ---- - return (ret); - memcpy(txn->name, name, len); - -+ TXN_SYSTEM_LOCK(dbenv); - if (td->name != INVALID_ROFF) { - __db_shalloc_free( - &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); - td->name = INVALID_ROFF; - } - if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { -+ TXN_SYSTEM_UNLOCK(dbenv); - __db_err(dbenv, - "Unable to allocate memory for transaction name"); - -*************** -*** 1063,1068 **** ---- 1065,1071 ---- - - return (ret); - } -+ TXN_SYSTEM_UNLOCK(dbenv); - td->name = R_OFFSET(&mgr->reginfo, p); - memcpy(p, name, len); - Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,49 @@ +*** db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 +--- db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 +*************** +*** 579,589 **** + flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { + if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) + return (ret); +! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) + return (ret); + +! switch (ret = +! opd->c_am_get(opd, key, data, flags, NULL)) { + case 0: + goto done; + case DB_NOTFOUND: +--- 579,590 ---- + flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { + if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) + return (ret); +! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) +! opd = cp->opd; +! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) + return (ret); + +! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { + case 0: + goto done; + case DB_NOTFOUND: +*************** +*** 596,607 **** +--- 597,614 ---- + if ((ret = __db_c_close(opd)) != 0) + goto err; + opd = NULL; ++ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) ++ cp->opd = NULL; + break; + } + goto err; + default: + goto err; + } ++ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { ++ if ((ret = __db_c_close(cp->opd)) != 0) ++ goto err; ++ cp->opd = NULL; + } + + /* Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,49 +0,0 @@ -*** db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 ---- db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 -*************** -*** 579,589 **** - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = -! opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: ---- 579,590 ---- - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -! opd = cp->opd; -! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: -*************** -*** 596,607 **** ---- 597,614 ---- - if ((ret = __db_c_close(opd)) != 0) - goto err; - opd = NULL; -+ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -+ cp->opd = NULL; - break; - } - goto err; - default: - goto err; - } -+ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { -+ if ((ret = __db_c_close(cp->opd)) != 0) -+ goto err; -+ cp->opd = NULL; - } - - /* Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,24 @@ +*** mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 +--- mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 +*************** +*** 587,594 **** + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_MAX; +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); + hp->hash_priority = + SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; + } +--- 587,597 ---- + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_MAX; +! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != +! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); +! } + hp->hash_priority = + SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; + } Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 ---- mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 -*************** -*** 587,594 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } ---- 587,597 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,13 +0,0 @@ -diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh ---- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 -+++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 -@@ -1552,9 +1552,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Copied: csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,13 @@ +diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh +--- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 ++++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 +@@ -1552,9 +1552,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,18 +19,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb45 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -45,34 +48,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb45 CSWbdb45devel CSWbdb45doc CATALOGNAME_CSWbdb45 = berkeleydb45 CATALOGNAME_CSWbdb45devel = berkeleydb45_devel CATALOGNAME_CSWbdb45doc = berkeleydb45_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb45doc = 1 SPKG_DESC_CSWbdb45 = BerkeleyDB 4.5 embedded database libraries and utilities SPKG_DESC_CSWbdb45devel = BerkeleyDB 4.5 development support SPKG_DESC_CSWbdb45doc = BerkeleyDB 4.5 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb45devel = CSWbdb45 LICENSE = LICENSE -PKGFILES_CSWbdb45doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb45doc = $(PKGFILES_DOC) PKGFILES_CSWbdb45devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +84,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,18 +19,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb46 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -45,34 +48,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb46 CSWbdb46devel CSWbdb46doc CATALOGNAME_CSWbdb46 = berkeleydb46 CATALOGNAME_CSWbdb46devel = berkeleydb46_devel CATALOGNAME_CSWbdb46doc = berkeleydb46_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb46doc = 1 SPKG_DESC_CSWbdb46 = BerkeleyDB 4.6 embedded database libraries and utilities SPKG_DESC_CSWbdb46devel = BerkeleyDB 4.6 development support SPKG_DESC_CSWbdb46doc = BerkeleyDB 4.6 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb46devel = CSWbdb46 LICENSE = LICENSE -PKGFILES_CSWbdb46doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb46doc = $(PKGFILES_DOC) PKGFILES_CSWbdb46devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +84,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,8 +19,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. @@ -28,9 +26,13 @@ PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb47 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -45,34 +47,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb47 CSWbdb47devel CSWbdb47doc CATALOGNAME_CSWbdb47 = berkeleydb47 CATALOGNAME_CSWbdb47devel = berkeleydb47_devel CATALOGNAME_CSWbdb47doc = berkeleydb47_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb47doc = 1 SPKG_DESC_CSWbdb47 = BerkeleyDB 4.7 embedded database libraries and utilities SPKG_DESC_CSWbdb47devel = BerkeleyDB 4.7 development support SPKG_DESC_CSWbdb47doc = BerkeleyDB 4.7 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb47devel = CSWbdb47 LICENSE = LICENSE -PKGFILES_CSWbdb47doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +83,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,18 +19,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb48 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -46,34 +49,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb48 CSWbdb48devel CSWbdb48doc CATALOGNAME_CSWbdb48 = berkeleydb48 CATALOGNAME_CSWbdb48devel = berkeleydb48_devel CATALOGNAME_CSWbdb48doc = berkeleydb48_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb48doc = 1 SPKG_DESC_CSWbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities SPKG_DESC_CSWbdb48devel = BerkeleyDB 4.8 development support SPKG_DESC_CSWbdb48doc = BerkeleyDB 4.8 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb48devel = CSWbdb48 LICENSE = LICENSE -PKGFILES_CSWbdb48doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb48doc = $(PKGFILES_DOC) PKGFILES_CSWbdb48devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -87,3 +85,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 18:21:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 16:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6671] csw/mgar/pkg Message-ID: Revision: 6671 http://gar.svn.sourceforge.net/gar/?rev=6671&view=rev Author: dmichelsen Date: 2009-10-02 16:21:09 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb*: Further homogenizations Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct CONFIGURE_ARGS += --enable-rpc @@ -43,10 +42,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb33/lib Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct CONFIGURE_ARGS += --enable-rpc @@ -43,10 +42,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct CONFIGURE_ARGS += --enable-rpc @@ -43,10 +42,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb44/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 18:23:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 16:23:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6672] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6672 http://gar.svn.sourceforge.net/gar/?rev=6672&view=rev Author: dmichelsen Date: 2009-10-02 16:22:59 +0000 (Fri, 02 Oct 2009) Log Message: ----------- cswutils: Change Python path from opencsw to csw Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 16:22:59 UTC (rev 6672) @@ -61,10 +61,10 @@ @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ - @ginstall -d $(DESTDIR)$(libdir)/python/opencsw + @ginstall -d $(DESTDIR)$(libdir)/python/csw @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/opencsw/compare_pkgs.py + $(DESTDIR)$(libdir)/python/csw/compare_pkgs.py @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/opencsw/opencsw_lib.py - @ln -s ../lib/python/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg + $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py + @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 21:59:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 19:59:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6673] csw/mgar/pkg/libpopt/trunk Message-ID: Revision: 6673 http://gar.svn.sourceforge.net/gar/?rev=6673&view=rev Author: dmichelsen Date: 2009-10-02 19:59:54 +0000 (Fri, 02 Oct 2009) Log Message: ----------- libpopt: Update version to 1.15, some tests failing, upstream notified Modified Paths: -------------- csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libpopt/trunk/checksums Modified: csw/mgar/pkg/libpopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-02 16:22:59 UTC (rev 6672) +++ csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-02 19:59:54 UTC (rev 6673) @@ -1,5 +1,5 @@ GARNAME = popt -GARVERSION = 1.14 +GARVERSION = 1.15 CATEGORIES = lib DESCRIPTION = Popt is a C library for parsing command line parameters Modified: csw/mgar/pkg/libpopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libpopt/trunk/checksums 2009-10-02 16:22:59 UTC (rev 6672) +++ csw/mgar/pkg/libpopt/trunk/checksums 2009-10-02 19:59:54 UTC (rev 6673) @@ -1 +1 @@ -4f90a07316eb825604dd10ae4f9f3f04 download/popt-1.14.tar.gz +c61ef795fa450eb692602a661ec8d7f1 download/popt-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 2 23:05:18 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:05:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6674] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6674 http://gar.svn.sourceforge.net/gar/?rev=6674&view=rev Author: skayser Date: 2009-10-02 21:05:18 +0000 (Fri, 02 Oct 2009) Log Message: ----------- sudosh2: update TODOs, add SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-10-02 19:59:54 UTC (rev 6673) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-10-02 21:05:18 UTC (rev 6674) @@ -1,5 +1,7 @@ # TODO/Issues # - Submit 001- (DESTDIR) and 002- (man page) patches upstream +# - clearenvironment is not documented in sudosh.conf(5), others? +# - add /opt/csw/bin/sudosh to /etc/shells in postinstall GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps @@ -21,6 +23,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SPKG_SOURCEURL = http://sudosh2.sf.net sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 23:35:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6675] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6675 http://gar.svn.sourceforge.net/gar/?rev=6675&view=rev Author: dmichelsen Date: 2009-10-02 21:35:11 +0000 (Fri, 02 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Major upgrade for PLATFORM support Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.lib.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -11,16 +11,29 @@ # Pick up user information -include $(HOME)/.garrc +-include /etc/opt/csw/garrc -include /opt/csw/etc/garrc -MODULATION ?= global-$(GARCH) +THISHOST := $(shell uname -n) + +# On these platforms packages are built. +# They will include binaries for all ISAs that are specified for the platform. +PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 + +# This is the platform we are currently building. It is either set when +# invoked from "gmake platforms" or when you build a package on a host +# that is suitable for the platform. +# If there are no platform hosts defined the feature is disabled. +PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P))) + +MODULATION ?= global FILEDIR ?= files -DOWNLOADDIR ?= download -PARTIALDIR ?= $(DOWNLOADDIR)/partial -WORKROOTDIR ?= work +WORKROOTDIR ?= $(if $(PLATFORM),work/$(PLATFORM),work) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) -COOKIEROOTDIR ?= cookies +DOWNLOADDIR ?= $(WORKROOTDIR)/download +PARTIALDIR ?= $(DOWNLOADDIR)/partial +COOKIEROOTDIR ?= $(WORKROOTDIR)/cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) WORKSRC ?= $(WORKDIR)/$(DISTNAME) @@ -135,7 +148,7 @@ DESTROOT ?= $(HOME) # This is the directory from where the package is build from -PKGROOT ?= $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH)) +PKGROOT ?= $(abspath $(WORKROOTDIR)/pkgroot) # Each ISA has a separate installation directory inside the # working directory for that package. The files are copied @@ -274,8 +287,6 @@ # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler $(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I)))) -THISHOST := $(shell uname -n) - # BUILDHOST_isa-$ISA is the name of the host where the compilation should take place # It defaults to the corresponding BUILD_(sparc|i386)-(32|64) # An empty string means "stay on the current host" Modified: csw/mgar/gar/v2-pbuild/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -139,10 +139,12 @@ # check a given file's checksum against $(CHECKSUM_FILE) and # error out if it mentions the file without an "OK". +# The removal of the download prefix is for legacy checksums. For newstyle +# checksums without path this is not necessary. checksum-%: $(CHECKSUM_FILE) @echo " ==> Running checksum on $*" - @if gegrep -- '/$*$$' $(CHECKSUM_FILE); then \ - if LC_ALL="C" LANG="C" gmd5sum -c $(CHECKSUM_FILE) 2>&1 | \ + @if gegrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ echo '(!!!) $* failed checksum test!' 1>&2; \ false; \ Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -165,8 +165,8 @@ echo THISHOST="$$(THISHOST)" echo "Building modulation on host '$$(BUILDHOST)'" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - ssh $$(BUILDHOST) "gmake -C $$(CURDIR) MODULATION=$(2) $(3) merge-modulated",\ - gmake MODULATION=$(2) $(3) merge-modulated\ + ssh $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule @@ -294,12 +294,15 @@ checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum @$(DONADA) +checksum-global: + @$(MAKE) -s ISA=global checksum + @$(MAKECOOKIE) + # The next rule handles the dependency from the modulated context to # the contextless checksumming. The rule is called when the cookie # to the global checksum is requested. If the global checksum has not run, # then run it. Otherwise it is silently accepted. -checksum-modulated: $(COOKIEDIR) - @$(MAKE) -s ISA=global checksum +checksum-modulated: $(if $(test ! -e $(COOKIEDIR)/build-global/checksum),checksum-global) @$(DONADA) # returns true if checksum has completed successfully, false @@ -308,11 +311,11 @@ @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) # makesum - Generate distinfo (only do this for your own ports!). -MAKESUM_TARGETS = $(addprefix $(DOWNLOADDIR)/,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) +MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) -makesum: fetch $(MAKESUM_TARGETS) +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) @if test "x$(MAKESUM_TARGETS)" != "x "; then \ - gmd5sum $(MAKESUM_TARGETS) > $(CHECKSUM_FILE) ; \ + (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ cat $(CHECKSUM_FILE) ; \ fi @@ -618,6 +621,25 @@ _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS) +define killprocandparent +cpids() { \ + P=$1 \ + PPIDS=$P \ + PP=`ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $P { print \\$1 }\"` \ + while [ -n "$PP" ]; do \ + PQ=$PP \ + PP= \ + for q in $PQ; do \ + PPIDS="$PPIDS $q" \ + PP=$PP\ `ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $q { print \\$1 }\"` \ + done \ + done \ + \ + echo $PPIDS \ +} +endef + + # The basic merge merges the compiles for all ISAs on the current architecture merge: checksum pre-merge merge-do merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) @@ -626,7 +648,7 @@ merge-sequential: $(foreach M,$(MODULATIONS),merge-$M) -merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid +merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid merge-parallel: merge-watch $(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\ $(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait @@ -643,7 +665,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) @@ -709,7 +731,7 @@ # cookie, but that would be lame and unportable). clean: $(addprefix clean-,$(MODULATIONS)) - @rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) + rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) clean-modulated: $(call _pmod,Cleaning ) @@ -742,7 +764,7 @@ spotless: imageclean @echo " ==> Removing $(DESTDIR)" - @-rm -rf $(DESTDIR) + @-rm -rf work # Print package dependencies PKGDEP_LIST = $(filter-out $(BUILDDEPS),$(DEPEND_LIST)) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -533,12 +533,11 @@ # On a normal packaging workflow this is not used. prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) -# On these platforms packages are built. -# They will include binaries for all ISAs that are specified for the platform. -PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 - +# Verify that the host on we are currently packaging is one of the platform +# hosts. If there are no platform hosts defined the test is skipped. validateplatform: - $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ + $(if $(strip $(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\ + $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ $(warning ***)\ $(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\ $(foreach P,$(PACKAGING_PLATFORMS),\ @@ -546,13 +545,14 @@ )\ $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ $(warning ***)\ - ) + )) + @$(MAKECOOKIE) # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -package: validateplatform extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package - $(DONADA) +package: validateplatform checksum merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package + @$(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(if $(filter %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @@ -606,13 +606,26 @@ $(foreach P,$(PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) package;,\ - ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) package";\ + $(MAKE) PLATFORM=$P package;,\ + ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ ),\ $(error *** No host has been defined for platform $P)\ )\ ) +# Print relecant informations about the platform +platformenv: + @$(foreach P,$(PACKAGING_PLATFORMS),\ + echo "* Platform '$P'";\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + echo " - Package built on this host";,\ + echo " - Package built on host '$(PACKAGING_HOST_$P)'";\ + ),\ + echo "Package can not be built for this platform as there is no host defined";\ + )\ + ) + # dependb - update the dependency database # dependb: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 2 23:42:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:42:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6676] csw/mgar/pkg Message-ID: Revision: 6676 http://gar.svn.sourceforge.net/gar/?rev=6676&view=rev Author: skayser Date: 2009-10-02 21:42:03 +0000 (Fri, 02 Oct 2009) Log Message: ----------- pylxml: initial commit Added Paths: ----------- csw/mgar/pkg/pylxml/ csw/mgar/pkg/pylxml/branches/ csw/mgar/pkg/pylxml/tags/ csw/mgar/pkg/pylxml/trunk/ csw/mgar/pkg/pylxml/trunk/Makefile csw/mgar/pkg/pylxml/trunk/checksums csw/mgar/pkg/pylxml/trunk/files/ csw/mgar/pkg/pylxml/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/pylxml/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pylxml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pylxml/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pylxml/trunk/Makefile 2009-10-02 21:42:03 UTC (rev 6676) @@ -0,0 +1,37 @@ +# TODO +# - Move this to a pymodules/ subdirectory with the rest of the +# python modules (similar to the cpan directory). +GARNAME = pylxml +GARVERSION = 2.2.2 +CATEGORIES = python + +DESCRIPTION = Pythonic binding for the libxml2 and libxslt libraries +define BLURB + lxml is a Pythonic binding for the libxml2 and libxslt libraries. It is + unique in that it combines the speed and feature completeness of these + libraries with the simplicity of a native Python API, mostly compatible + but superior to the well-known ElementTree API. +endef + +SPKG_SOURCEURL = http://codespeak.net/lxml/ +MASTER_SITES = http://pypi.python.org/packages/source/l/lxml/ +DISTNAME = lxml-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +UFILES_REGEX = lxml-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWpylxml +CATALOGNAME = py_lxml + +REQUIRED_PKGS = CSWlibxml2 CSWlibxslt CSWzlib + +EXTRA_PAX_ARGS = '-s,CHANGES.txt,changelog,p' + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: DOCS=CHANGES.txt CREDITS.txt IDEAS.txt +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pylxml/trunk/checksums =================================================================== --- csw/mgar/pkg/pylxml/trunk/checksums (rev 0) +++ csw/mgar/pkg/pylxml/trunk/checksums 2009-10-02 21:42:03 UTC (rev 6676) @@ -0,0 +1 @@ +2f2fcb6aae51b5b417a3c0a6b256ec56 download/lxml-2.2.2.tar.gz Added: csw/mgar/pkg/pylxml/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pylxml/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pylxml/trunk/files/changelog.CSW 2009-10-02 21:42:03 UTC (rev 6676) @@ -0,0 +1,5 @@ +py_lxml (2.2.2,REV=2009.10.02) + + * Initial release. + + -- Sebastian Kayser Fri, 2 Oct 2009 23:31:04 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 23:47:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:47:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6677] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6677 http://gar.svn.sourceforge.net/gar/?rev=6677&view=rev Author: dmichelsen Date: 2009-10-02 21:47:51 +0000 (Fri, 02 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Use specific SSH instead of the first one in the path Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:42:03 UTC (rev 6676) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:47:51 UTC (rev 6677) @@ -52,6 +52,7 @@ PARALLELMODULATIONS ?= MULTITAIL ?= /opt/csw/bin/multitail TTY ?= /usr/bin/tty +SSH ?= /usr/bin/ssh # Outbound proxies http_proxy ?= Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:42:03 UTC (rev 6676) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:47:51 UTC (rev 6677) @@ -165,7 +165,7 @@ echo THISHOST="$$(THISHOST)" echo "Building modulation on host '$$(BUILDHOST)'" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - ssh $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:42:03 UTC (rev 6676) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:47:51 UTC (rev 6677) @@ -607,7 +607,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P package;,\ - ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ + $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ ),\ $(error *** No host has been defined for platform $P)\ )\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:27:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6678] csw/mgar/gar/v2-pbuild/gar.conf.mk Message-ID: Revision: 6678 http://gar.svn.sourceforge.net/gar/?rev=6678&view=rev Author: dmichelsen Date: 2009-10-03 08:27:25 +0000 (Sat, 03 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Use generic SSH Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:47:51 UTC (rev 6677) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-03 08:27:25 UTC (rev 6678) @@ -52,8 +52,12 @@ PARALLELMODULATIONS ?= MULTITAIL ?= /opt/csw/bin/multitail TTY ?= /usr/bin/tty -SSH ?= /usr/bin/ssh +# For platform hopping +# Use whatever SSH is found in the path. That is /opt/csw/bin/ssh for Solaris 8 and +# /usr/bin/ssh for Solaris 9+ and +SSH ?= ssh + # Outbound proxies http_proxy ?= ftp_proxy ?= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:47:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:47:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6679] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6679 http://gar.svn.sourceforge.net/gar/?rev=6679&view=rev Author: dmichelsen Date: 2009-10-03 08:47:27 +0000 (Sat, 03 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Merge in mGAR v2 r4932-6677 Modified Paths: -------------- csw/mgar/gar/v2-pbuild/bin/checkpkg csw/mgar/gar/v2-pbuild/bin/cswproto csw/mgar/gar/v2-pbuild/bin/depmaker csw/mgar/gar/v2-pbuild/bin/gitproxy csw/mgar/gar/v2-pbuild/bin/mkpackage csw/mgar/gar/v2-pbuild/categories/cpan/category.mk csw/mgar/gar/v2-pbuild/categories/x11/category.mk csw/mgar/gar/v2-pbuild/categories/xfce/category.mk csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.lib.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/v2-pbuild/categories/python/ csw/mgar/gar/v2-pbuild/categories/python/category.mk csw/mgar/gar/v2-pbuild/general-help Removed Paths: ------------- csw/mgar/gar/v2-pbuild/categories/python/category.mk Property Changed: ---------------- csw/mgar/gar/v2-pbuild/ Property changes on: csw/mgar/gar/v2-pbuild ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-pbuild/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,8 +1,8 @@ #!/bin/ksh -p -# checkpkg 1.46a (diff to 1.46: modified errmsg -> warnmsg on two places) +# checkpkg 1.50 (diff to 1.46a: check multiple package files) # This script examines a package that has been put together -# for submittal to the CSW archive +# for submittal to the CSW archive at opencsw.org # # It examines it for compliance with the packaging standards at # http://www.opencsw.org/standards/ @@ -29,10 +29,15 @@ rm -rf $EXTRACTDIR fi if [[ "$TMPARCHIVE" != "" ]] ; then - rm $TMPARCHIVE + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE fi } +cleanupset(){ + if [ "`echo $SETINF*`" != "$SETINF*" ]; then + rm $SETINF* + fi +} warnmsg(){ print WARNING: $* >/dev/fd/2 if [[ "$quit_on_warn" != "" ]] ; then @@ -45,6 +50,7 @@ errmsg(){ print ERROR: $* >/dev/fd/2 cleanup + cleanupset exit 1 } @@ -58,6 +64,12 @@ shift fi +# a unique filename for the list of package deps and libs we see in a 'set' +SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETLIBS=$SETINF.libs +SETDEPS=$SETINF.deps + + for f in "$@" do @@ -123,7 +135,6 @@ TMPFILE=$EXTRACTDIR/pkginfo - dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo) if [[ $? -ne 0 ]] ; then print ERROR: could not extract $f @@ -217,6 +228,13 @@ print ERROR: VERSION field not allowed to have '"-"' in it exit 1 ;; + *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) + : + ;; + *) + print ERROR: no REV=YYYY.MM.DD field in VERSION + exit 1 + ;; esac case $pkgarch in @@ -377,17 +395,19 @@ # man ld.so.1 for more info on this hack export LD_NOAUXFLTR=1 - listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/tmplist + listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist # have to do this for ldd to work. arrg. - if [ -s "$EXTRACTDIR/tmplist" ] ; then - chmod 0755 `cat $EXTRACTDIR/tmplist` + if [ -s "$EXTRACTDIR/elflist" ] ; then + chmod 0755 `cat $EXTRACTDIR/elflist` - #cat $EXTRACTDIR/tmplist| xargs ldd 2>/dev/null |fgrep '.so' | + #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/tmplist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + + print libraries used are: cat $EXTRACTDIR/liblist print "cross-referencing with depend file (May take a while)" @@ -399,6 +419,10 @@ #If these dont exist, it is Bad. touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs +# store things that look like shared objects from the package map for +# delayed library validation. +grep "\.so" $EXTRACTDIR/$pkgname/pkgmap >> $SETLIBS + if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then print print "Examining 'depend' file" @@ -416,11 +440,26 @@ exit 1 fi +#to retain a record of all packages currently being examined from $@ +echo $pkgname >> $SETDEPS + nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | sort >$EXTRACTDIR/deppkgs for dep in `cat $EXTRACTDIR/deppkgs` do - pkginfo $dep || warnmsg invalid package $dep specified + pkginfo $dep + if [[ $? -ne 0 ]]; then + #if we've already looked at the package named $dep, + #it'll be in the file. + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep + if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set + echo "Can't validate dependence on $dep. Storing for delayed validation." + #store for validation at the end. + echo "$dep $pkgname" >> $SETDEPS.missing + else + echo "Found $dep as part of the package set being evaluated." + fi + fi done egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | @@ -433,13 +472,20 @@ if [[ $? -eq 0 ]] ; then echo $lib provided by package itself continue + else + grep "[/=]$lib[ =]" $SETLIBS + if [[ $? -eq 0 ]]; then + echo "$lib provided by package set being evaluated." + continue + fi fi libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | sed 's/^.* \([^ ]*\)$/\1/' |sort -u` if [[ -z "$libpkg" ]] ; then - warnmsg cannot find package for $lib + echo "$lib $pkgname" >> $SETLIBS.missing + print Cannot find package providing $lib. Storing for delayed validation. else print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs fi @@ -458,19 +504,53 @@ if [[ "$basedir" != "" ]] ; then - print - print "Checking relocation ability..." - xargs strings <$EXTRACTDIR/tmplist | grep /opt/csw - if [[ $? -eq 0 ]] ; then - errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + print + if [[ -f $EXTRACTDIR/elflist ]] ; then + print "Checking relocation ability..." + xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + if [[ $? -eq 0 ]] ; then + errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + else + print trivial check passed + fi else - print trivial check passed + echo No relocation check done for non-binary relocatable package. fi fi + cleanup - print "" done + +if [ -s $SETDEPS.missing ]; then + print "Doing late evaluations of package dependencies." + while read mdep; do + dep=`echo $mdep | nawk '{print $1}'` + pkg=`echo $mdep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q $dep $SETDEPS + if [ $? -ne 0 ]; then + errmsg "Couldn't validate $dep as a dependency in package $pkg" + else + print "Validated $dep as a dependency for $pkg." + fi + done < $SETDEPS.missing +fi + +if [ -s $SETLIBS.missing ]; then + print "Doing late evaluations of package library dependencies." + while read ldep; do + lib=`echo $ldep | nawk '{print $1}'` + pkg=`echo $ldep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + if [ $? -ne 0 ]; then + errmsg "Couldn't find a package providing $lib" + else + print "A package in the set being evaluated provides $lib" + fi + done < $SETLIBS.missing +fi + +cleanupset Modified: csw/mgar/gar/v2-pbuild/bin/cswproto =================================================================== --- csw/mgar/gar/v2-pbuild/bin/cswproto 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/cswproto 2009-10-03 08:47:27 UTC (rev 6679) @@ -112,6 +112,8 @@ open F, $common || die "Couldn't open $common"; while () { chomp; next if /^\s*$/ or /^#/; + s/\+/\\+/g; + s/\-/\\-/g; my @c = split( m!/! ); my @pc = map { join( '/', @c[0..$_] ) } 1..$#c; $alldirs{$_} = 1 foreach (@pc); Modified: csw/mgar/gar/v2-pbuild/bin/depmaker =================================================================== --- csw/mgar/gar/v2-pbuild/bin/depmaker 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/depmaker 2009-10-03 08:47:27 UTC (rev 6679) @@ -27,12 +27,14 @@ my $do_script = 1; my $be_quiet = 0; my (@nodep, $rootdir); +my $text_files = 0; GetOptions( 'script!' => \$do_script, 'quiet|q' => \$be_quiet, 'root=s' => \$rootdir, 'nodep=s' => \@nodep, 'help|h' => \&usage, + 'text|t' => \$text_files, 'version|V' => sub { print STDERR "$self v$VERSION\n"; exit 2; @@ -43,7 +45,7 @@ my $nodep = join "|", @nodep; sub usage { - print STDERR "Usage: $self [--no/script] [--nodep ] [--root ] < path_list > depend\n"; + print STDERR "Usage: $self [--text] [--no/script] [--nodep ] [--root ] < path_list > depend\n"; exit 1; } @@ -111,6 +113,9 @@ $depfiles{$lib}++ if $lib; } } + elsif ($text_files and $ftype =~ /text/) { + $depfiles{$filesrc}++; + } } exit 0 unless scalar keys %depfiles; Modified: csw/mgar/gar/v2-pbuild/bin/gitproxy =================================================================== --- csw/mgar/gar/v2-pbuild/bin/gitproxy 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/gitproxy 2009-10-03 08:47:27 UTC (rev 6679) @@ -5,7 +5,7 @@ REMHOST=$1 REMPORT=$2 - set - $(echo "${http_proxy}" | sed 's/http//i' | tr -d '/' | tr ':' ' ') + set - $(echo "${http_proxy}" | gsed 's/http//i' | tr -d '/' | tr ':' ' ') PROXYHOST=$1 PROXYPORT=$2 Modified: csw/mgar/gar/v2-pbuild/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-pbuild/bin/mkpackage 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/mkpackage 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,4 +1,4 @@ -#!/bin/env perl -w +#!/opt/csw/bin/perl -w # # $Id$ # Modified: csw/mgar/gar/v2-pbuild/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-pbuild/categories/cpan/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/cpan/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -62,7 +62,7 @@ INSTALL_ENV += PERL5LIB=$(PERL5LIB) # Configure a target using Makefile.PL -PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor +PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS) configure-%/Makefile.PL: @echo " ==> Running Makefile.PL in $*" @( cd $* ; \ @@ -70,7 +70,7 @@ $(CONFIGURE_ARGS) $(PERL_CONFIGURE_ARGS) ) @$(MAKECOOKIE) -PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor +PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor $(EXTRA_PERLBUILD_CONFIGURE_ARGS) configure-%/Build.PL: @echo " ==> Running Build.PL in $*" @( cd $* ; \ Deleted: csw/mgar/gar/v2-pbuild/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/python/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,21 +0,0 @@ -# Add a dependency to CSWpython -_EXTRA_GAR_PKGS += CSWpython - -# Exclude egg-info files (only needed for easy_install) -_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* - -# Activate cswpycompile support to exclude .pyc and .pyo files from -# the package and compile them on installation. File exclusion is -# handled by gar.mk and cswclassutils integration by gar.pkg.mk -PYCOMPILE = 1 - -# Haven't seen a python module with a configure phase so far -CONFIGURE_SCRIPTS ?= - -# gar.lib.mk contains implicit targets for setup.py -BUILD_SCRIPTS ?= $(WORKSRC)/setup.py -INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py -INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix) -TEST_SCRIPTS ?= $(WORKSRC)/setup.py - -include gar/gar.mk Copied: csw/mgar/gar/v2-pbuild/categories/python/category.mk (from rev 6678, csw/mgar/gar/v2/categories/python/category.mk) =================================================================== --- csw/mgar/gar/v2-pbuild/categories/python/category.mk (rev 0) +++ csw/mgar/gar/v2-pbuild/categories/python/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -0,0 +1,21 @@ +# Add a dependency to CSWpython +_EXTRA_GAR_PKGS += CSWpython + +# Exclude egg-info files (only needed for easy_install) +_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* + +# Activate cswpycompile support to exclude .pyc and .pyo files from +# the package and compile them on installation. File exclusion is +# handled by gar.mk and cswclassutils integration by gar.pkg.mk +PYCOMPILE = 1 + +# Haven't seen a python module with a configure phase so far +CONFIGURE_SCRIPTS ?= + +# gar.lib.mk contains implicit targets for setup.py +BUILD_SCRIPTS ?= $(WORKSRC)/setup.py +INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py +INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix) +TEST_SCRIPTS ?= $(WORKSRC)/setup.py + +include gar/gar.mk Modified: csw/mgar/gar/v2-pbuild/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2-pbuild/categories/x11/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/x11/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,5 +1,6 @@ # X11 X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags Modified: csw/mgar/gar/v2-pbuild/categories/xfce/category.mk =================================================================== --- csw/mgar/gar/v2-pbuild/categories/xfce/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/xfce/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,6 +1,6 @@ # XFCE XFCE_ROOT = http://www.us.xfce.org -XFCE_VERSION ?= 4.4.1 +XFCE_VERSION ?= 4.6.1 XFCE_MIRROR = $(XFCE_ROOT)/archive/xfce-$(XFCE_VERSION)/src/ MASTER_SITES ?= $(XFCE_MIRROR) @@ -8,8 +8,6 @@ PKGDIST ?= $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(PKGDIST) -include gar/gar.mk - # Compiler options # Compiler options CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION @@ -18,13 +16,22 @@ LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib # pkg-config options -PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/lib/pkgconfig +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig # Configure common options CONFIGURE_ARGS = $(DIRPATHS) -# CONFIGURE_ARGS += --prefix=/opt/csw CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --enable-final CONFIGURE_ARGS += --enable-xinerama CONFIGURE_ARGS += --enable-dbus -# CONFIGURE_ARGS += --mandir=/opt/csw/share/man + +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + +include gar/gar.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -45,6 +45,8 @@ MANIFEST_FILE ?= manifest LOGDIR ?= log +ELISP_DIRS ?= $(datadir)/emacs/site-lisp $(EXTRA_ELISP_DIRS) + GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master @@ -400,9 +402,11 @@ # REQUESTED_ISAS contains all ISAs that should be built # NEEDED_ISAS contains all ISAs that must be build for this architecture to make the package # BUILD_ISAS contains all ISAs that can be built on the current kernel +# It is guaranteed that all BUILD_ISAS come first in NEEDED_ISAS # Set 'BUILD64 = 1' to build 64 bit versions automatically REQUESTED_ISAS ?= $(strip $(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)) -NEEDED_ISAS ?= $(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)) +NEEDED_ISAS ?= $(strip $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ + $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)))) BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS)) # Subdirectories for specialized binaries and libraries @@ -519,7 +523,7 @@ OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS) $(EXTRA_OPTFLAGS)) GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) -GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) +GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR)) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) @@ -542,9 +546,10 @@ # # Gnome +GNOME_PROJ ?= $(GARNAME) GNOME_ROOT = http://ftp.gnome.org/pub/GNOME/sources GNOME_SUBV = $(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}') -GNOME_MIRROR = $(GNOME_ROOT)/$(GARNAME)/$(GNOME_SUBV)/ +GNOME_MIRROR = $(GNOME_ROOT)/$(GNOME_PROJ)/$(GNOME_SUBV)/ # SourceForge SF_PROJ ?= $(GARNAME) Modified: csw/mgar/gar/v2-pbuild/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -68,7 +68,7 @@ # to update the code. # we possibly proxy the git:// references depending on GIT_USE_PROXY git-http//%: - @$git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ git remote add origin http://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) @@ -583,17 +583,17 @@ # just run make install and hope for the best. install-%/Makefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/makefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/GNUmakefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install @$(MAKECOOKIE) # Ruby makefiles @@ -732,6 +732,19 @@ gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ gxargs -r gzip --force +compile-elisp: + @(for d in $(ELISP_DIRS); do \ + echo " ===> Compiling .el files in $$d"; \ + cd $(PKGROOT)/$$d; \ + for f in `find . -name "*el"`; do \ + bf=`basename $$f`; \ + bd=`dirname $$f`; \ + cd $$bd; \ + emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ + cd $(PKGROOT)/$$d; \ + done; \ + done) + include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) # Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -515,7 +515,10 @@ @$(call _pmod,Reset install state) @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) + @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip + @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) + @rm -f $(COOKIEROOTDIR)/global/install-$(MODULATION) # merge in all isas to the package directory after installation @@ -544,9 +547,9 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= +MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) endif @@ -560,7 +563,7 @@ ) ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F"; then echo $$F; fi; \ + if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) ifneq ($(ISAEXEC_FILES),) @@ -581,11 +584,18 @@ # This can be defined in category.mk MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY) +# Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) +# during the merge phase. +_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py +MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) + MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la MERGE_EXCLUDE_BACKUPFILES ?= .*\~ MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) +# Exclude all other .pc-files apart from the default 32- and 64 bit versions +MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc) +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE) # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) @@ -599,7 +609,7 @@ # Exclude by replacing files with the empty string _INC_EXT_RULE = $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') # Replace files by itself terminating on first match -_INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)\$,\1,") +_INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)$$,\1,") # These are used during merge phase to determine the base installation directory MERGEBASE_$(bindir) ?= $(bindir_install) @@ -619,7 +629,7 @@ # has not, so we use this one for appending. -_PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS) +_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS) define killprocandparent cpids() { \ @@ -641,12 +651,12 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) -merge-sequential: $(foreach M,$(MODULATIONS),merge-$M) +merge-sequential: $(addprefix merge-,$(MODULATIONS)) merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid merge-parallel: merge-watch @@ -718,7 +728,7 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src - @rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge + @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -127,13 +127,22 @@ # 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED # 4. There is a svn binary and everything was committed -> r +ifndef SPKG_PACKAGER + $(warning Please set SPKG_PACKAGER in your .garrc file to your name) + SPKG_PACKAGER = Unknown +endif + +ifndef SPKG_EMAIL + $(warning Please set SPKG_EMAIL in your .garrc file to your email address) + SPKG_EMAIL = Unknown +endif + + SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES)) -SPKG_PACKAGER ?= Unknown SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) -SPKG_EMAIL ?= Unknown SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none @@ -141,7 +150,7 @@ SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) -SPKG_EXPORT ?= $(WORKDIR) +SPKG_EXPORT ?= $(HOME)/staging/build-$(shell date '+%d.%b.%Y') SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) @@ -152,17 +161,24 @@ # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES += $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf)) -SPKG_CLASSES += $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) -SPKG_CLASSES += $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ - $(foreach FILE,$(SAMPLECONF),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(INITMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ print join(" ", at F),"\n";' _EXTRA_GAR_PKGS += CSWcswclassutils +# Make sure the configuration files always have a .CSW suffix and rename the +# configuration files to this if necessary during merge. +_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") endif PKGGET_DESTDIR ?= @@ -211,7 +227,7 @@ # between the prefix and the suffix. # usage: $(call isadirs,,) # expands to // // ... -isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2)) +isadirs = $(foreach ISA,$(ISALIST),$(1)/$(subst +,\+,$(subst -,\-,$(ISA)))/$(2)) # This is a helper function just like isadirs, but also contains the # prefix and suffix without an ISA subdirectories inserted. @@ -441,6 +457,14 @@ $(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) endef +# Make sure every producable package contains specific descriptions. +# We explicitly ignore NOPACKAGE here to disallow circumventing the check. +$(foreach P,$(SPKG_SPECS),\ + $(foreach Q,$(filter-out $P,$(SPKG_SPECS)),\ + $(if $(shell if test "$(SPKG_DESC_$P)" = "$(SPKG_DESC_$Q)"; then echo ERROR; fi),\ + $(error The package descriptions for $P and $Q are identical, please make sure all package descriptions are unique by setting SPKG_DESC_ for each package) \ +))) + .PRECIOUS: $(WORKDIR)/%.pkginfo $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ @@ -552,10 +576,15 @@ # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. package: validateplatform checksum merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package + @echo + @echo "The following packages have been built:" + @echo + @$(foreach SPEC,$(_PKG_SPECS),echo $(SPEC);echo " $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz";) + @echo @$(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files -package-%: $(WORKDIR)/%.gspec $(if $(filter %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend +package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ Copied: csw/mgar/gar/v2-pbuild/general-help (from rev 6678, csw/mgar/gar/v2/general-help) =================================================================== --- csw/mgar/gar/v2-pbuild/general-help (rev 0) +++ csw/mgar/gar/v2-pbuild/general-help 2009-10-03 08:47:27 UTC (rev 6679) @@ -0,0 +1,4 @@ +Please go here for more detailed documentation: + + http://sourceforge.net/apps/trac/gar/wiki/GarRepository + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:52:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6680] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6680 http://gar.svn.sourceforge.net/gar/?rev=6680&view=rev Author: dmichelsen Date: 2009-10-03 08:52:20 +0000 (Sat, 03 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Activate checkpkg to check interdependencies Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:47:27 UTC (rev 6679) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:52:20 UTC (rev 6680) @@ -607,7 +607,7 @@ pkgcheck-%: @echo " ==> Checking compliance: $*" - @( LC_ALL=C checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 + @( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:52:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:52:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6681] csw/mgar/pkg/bdb42/trunk/checksums Message-ID: Revision: 6681 http://gar.svn.sourceforge.net/gar/?rev=6681&view=rev Author: dmichelsen Date: 2009-10-03 08:52:51 +0000 (Sat, 03 Oct 2009) Log Message: ----------- bdb42: Update checksum Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/checksums Modified: csw/mgar/pkg/bdb42/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb42/trunk/checksums 2009-10-03 08:52:20 UTC (rev 6680) +++ csw/mgar/pkg/bdb42/trunk/checksums 2009-10-03 08:52:51 UTC (rev 6681) @@ -1,7 +1,7 @@ -8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz -1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff -3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff -0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff -9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff -99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff -d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff +8b5cff6eb83972afdd8e0b821703c33c db-4.2.52.tar.gz +1227f5f9ff43d48b5b1759e113a1c2d7 patch.4.2.52.1 +3da7efd8d29919a9113e2f6f5166f5b7 patch.4.2.52.2 +0bf9ebbe852652bed433e522928d40ec patch.4.2.52.3 +9cfeff4dce0c11372c0b04b134f8faef patch.4.2.52.4 +99836f962361da8936219cc193edc7ed patch.4.2.52.5 +d49545b2691c511276b73bb6c3ec64c3 patch.64bit-libtool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:53:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:53:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6682] csw/mgar/pkg/bdb44/trunk/checksums Message-ID: Revision: 6682 http://gar.svn.sourceforge.net/gar/?rev=6682&view=rev Author: dmichelsen Date: 2009-10-03 08:53:21 +0000 (Sat, 03 Oct 2009) Log Message: ----------- bdb44: Update checksum Modified Paths: -------------- csw/mgar/pkg/bdb44/trunk/checksums Modified: csw/mgar/pkg/bdb44/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb44/trunk/checksums 2009-10-03 08:52:51 UTC (rev 6681) +++ csw/mgar/pkg/bdb44/trunk/checksums 2009-10-03 08:53:21 UTC (rev 6682) @@ -1,6 +1,6 @@ -d84dff288a19186b136b0daf7067ade3 download/db-4.4.20.tar.gz -66584d621355df055b6e05b4a02e9c3e download/patch.4.4.20.1.diff -85df93a0867f6cace3501671cdeb6ed1 download/patch.4.4.20.2.diff -88ee91889ebf5498b22b2e7bed945d41 download/patch.4.4.20.3.diff -c2ef7b3e59460c35950fab5f2faa3fc0 download/patch.4.4.20.4.diff -099621e0dad419188acd42c588242131 download/patch.4.4.20.5.diff +d84dff288a19186b136b0daf7067ade3 db-4.4.20.tar.gz +66584d621355df055b6e05b4a02e9c3e patch.4.4.20.1 +85df93a0867f6cace3501671cdeb6ed1 patch.4.4.20.2 +88ee91889ebf5498b22b2e7bed945d41 patch.4.4.20.3 +c2ef7b3e59460c35950fab5f2faa3fc0 patch.4.4.20.4 +099621e0dad419188acd42c588242131 patch.64bit-libtool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:26:53 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:26:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6683] csw/mgar/pkg Message-ID: Revision: 6683 http://gar.svn.sourceforge.net/gar/?rev=6683&view=rev Author: skayser Date: 2009-10-03 14:26:41 +0000 (Sat, 03 Oct 2009) Log Message: ----------- pysoappy: initial commit Added Paths: ----------- csw/mgar/pkg/pysoappy/ csw/mgar/pkg/pysoappy/branches/ csw/mgar/pkg/pysoappy/tags/ csw/mgar/pkg/pysoappy/trunk/ csw/mgar/pkg/pysoappy/trunk/Makefile csw/mgar/pkg/pysoappy/trunk/checksums csw/mgar/pkg/pysoappy/trunk/files/ csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/pysoappy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pysoappy/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysoappy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/Makefile 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,46 @@ +# TODO +# - Move this to a pymodules/ subdirectory with the rest of the +# python modules (similar to the cpan directory). +GARNAME = pysoappy +GARVERSION = 0.11.4 +CATEGORIES = python + +DESCRIPTION = SOAP library for python +define BLURB + This package contains the SOAPpy Python module, which implements a high- + level interface to Simple Object Access Protocol (SOAP) functions from + Python. It includes functionality for acting as a SOAP server, client, + or proxy, and includes both building and parsing functions. It has been + tested against a wide array of other SOAP clients and servers, and is a + very robust and well-rounded implementation of the SOAP protocol. + + SOAPpy is not actively supported by upstream anymore - please do not + consider to use it in new projects! All functions were merged into ZSI +endef + +SPKG_SOURCEURL = http://pywebsvcs.sourceforge.net/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = pywebsvcs +DISTNAME = SOAPpy-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +ARCHALL = 1 +PACKAGES = CSWpysoappy +CATALOGNAME = py_soappy +REQUIRED_PKGS = CSWpyfpconst CSWpyxml + +# import __future__ statements need to occur first within a file +# SyntaxError: from __future__ imports must occur at the beginning of the file +PATCHFILES = 001-place-import-future-first.patch + +# No tests available +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(WORKSRC)/docs/* $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pysoappy/trunk/checksums =================================================================== --- csw/mgar/pkg/pysoappy/trunk/checksums (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/checksums 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,2 @@ +fd1ea22ebacd98900074e8add1cf39fe download/001-place-import-future-first.patch +69a384d9a61b36325a97d81165668b39 download/SOAPpy-0.11.4.tar.gz Added: csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch =================================================================== --- csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,72 @@ +diff --git a/SOAPpy/Client.py b/SOAPpy/Client.py +index 15542b0..922e098 100644 +--- a/SOAPpy/Client.py ++++ b/SOAPpy/Client.py +@@ -39,12 +39,11 @@ + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import urllib + from types import * +diff --git a/SOAPpy/GSIServer.py b/SOAPpy/GSIServer.py +index 3c723e7..0c0876a 100644 +--- a/SOAPpy/GSIServer.py ++++ b/SOAPpy/GSIServer.py +@@ -42,12 +42,11 @@ GSIServer - Contributed by Ivan R. Judson + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: GSIServer.py,v 1.4 2004/02/04 03:21:02 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import re + import socket +diff --git a/SOAPpy/Server.py b/SOAPpy/Server.py +index d6efce2..1419790 100644 +--- a/SOAPpy/Server.py ++++ b/SOAPpy/Server.py +@@ -39,12 +39,11 @@ + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: Server.py,v 1.19 2004/04/27 15:23:46 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import re + import socket +diff --git a/SOAPpy/Types.py b/SOAPpy/Types.py +index cc8bc7b..f907dcf 100644 +--- a/SOAPpy/Types.py ++++ b/SOAPpy/Types.py +@@ -32,12 +32,11 @@ + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: Types.py,v 1.16 2004/04/14 03:42:50 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + import UserList + import base64 + import cgi Added: csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,5 @@ +pysoappy (0.11.4,REV=2009.10.03) + + * Initial release. + + -- Sebastian Kayser Sat, 3 Oct 2009 16:17:22 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:34:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:34:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6684] csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW Message-ID: Revision: 6684 http://gar.svn.sourceforge.net/gar/?rev=6684&view=rev Author: skayser Date: 2009-10-03 14:34:10 +0000 (Sat, 03 Oct 2009) Log Message: ----------- pysoappy: fix changelog.CSW Modified Paths: -------------- csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW 2009-10-03 14:26:41 UTC (rev 6683) +++ csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW 2009-10-03 14:34:10 UTC (rev 6684) @@ -1,4 +1,4 @@ -pysoappy (0.11.4,REV=2009.10.03) +py_soappy (0.11.4,REV=2009.10.03) * Initial release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:36:59 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6685] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 6685 http://gar.svn.sourceforge.net/gar/?rev=6685&view=rev Author: skayser Date: 2009-10-03 14:36:59 +0000 (Sat, 03 Oct 2009) Log Message: ----------- supybot: add REQUIRED_PKGS, description / SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:34:10 UTC (rev 6684) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:36:59 UTC (rev 6685) @@ -1,17 +1,23 @@ -# TODO -# - Check whether additional dependencies are needed GARNAME = supybot GARVERSION = 0.83.4.1 CATEGORIES = python DESCRIPTION = Robust, user-friendly, and extensible IRC bot -define BLURB + Supybot is a robust (it doesn't crash), user friendly (it's easy to + configure) and programmer friendly (plugins are *extremely* easy to + write) Python IRC bot. It aims to be an adequate replacement for most + existing IRC bots. It includes a very flexible and powerful ACL system + for controlling access to commands, as well as more than 50 builtin + plugins providing around 400 actual commands. endef +SPKG_SOURCEURL = http://sourceforge.net/projects/supybot/ MASTER_SITES = $(SF_MIRRORS) DISTNAME = Supybot-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +REQUIRED_PKGS = CSWpysqlite CSWtwisted + EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:38:31 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:38:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6686] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 6686 http://gar.svn.sourceforge.net/gar/?rev=6686&view=rev Author: skayser Date: 2009-10-03 14:38:31 +0000 (Sat, 03 Oct 2009) Log Message: ----------- supybot: fix BLURB Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:36:59 UTC (rev 6685) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:38:31 UTC (rev 6686) @@ -3,6 +3,7 @@ CATEGORIES = python DESCRIPTION = Robust, user-friendly, and extensible IRC bot +define BLURB Supybot is a robust (it doesn't crash), user friendly (it's easy to configure) and programmer friendly (plugins are *extremely* easy to write) Python IRC bot. It aims to be an adequate replacement for most This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:41:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:41:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6687] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 6687 http://gar.svn.sourceforge.net/gar/?rev=6687&view=rev Author: skayser Date: 2009-10-03 14:41:10 +0000 (Sat, 03 Oct 2009) Log Message: ----------- supybot: ARCHALL=1 Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:38:31 UTC (rev 6686) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:41:10 UTC (rev 6687) @@ -17,6 +17,7 @@ DISTNAME = Supybot-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +ARCHALL = 1 REQUIRED_PKGS = CSWpysqlite CSWtwisted EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Oct 3 17:15:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 03 Oct 2009 15:15:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6688] csw/mgar/pkg/cpan/Net-IP/trunk Message-ID: Revision: 6688 http://gar.svn.sourceforge.net/gar/?rev=6688&view=rev Author: bonivart Date: 2009-10-03 15:15:40 +0000 (Sat, 03 Oct 2009) Log Message: ----------- pm_netip: update build recipe Modified Paths: -------------- csw/mgar/pkg/cpan/Net-IP/trunk/Makefile csw/mgar/pkg/cpan/Net-IP/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec Modified: csw/mgar/pkg/cpan/Net-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/Makefile 2009-10-03 14:41:10 UTC (rev 6687) +++ csw/mgar/pkg/cpan/Net-IP/trunk/Makefile 2009-10-03 15:15:40 UTC (rev 6688) @@ -9,8 +9,9 @@ IPv6 addresses. endef -DISTFILES += $(call admfiles,CSWpmnetip,) +PACKAGES = CSWpmnetip +CATALOGNAME = pm_netip -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/checksums 2009-10-03 14:41:10 UTC (rev 6687) +++ csw/mgar/pkg/cpan/Net-IP/trunk/checksums 2009-10-03 15:15:40 UTC (rev 6688) @@ -1,2 +1 @@ -bdd199eae1946802858cc08707e71f24 download/CSWpmnetip.gspec a49c0b02a9b793ff60191cdafc0c202e download/Net-IP-1.25.tar.gz Deleted: csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec 2009-10-03 14:41:10 UTC (rev 6687) +++ csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec 2009-10-03 15:15:40 UTC (rev 6688) @@ -1,44 +0,0 @@ -%var bitname pm_netip -%var pkgname CSWpmnetip -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -Copyright (c) 1999-2000 by RIPE-NCC. All rights reserved. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. - -You should have received a copy of the Perl license along with -Perl; see the file README in Perl distribution. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -You should have received a copy of the Artistic License -along with Perl; see the file Artistic. - - NO WARRANTY - -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Oct 3 17:32:13 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 03 Oct 2009 15:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6689] csw/mgar/pkg/phpsysinfo/trunk/Makefile Message-ID: Revision: 6689 http://gar.svn.sourceforge.net/gar/?rev=6689&view=rev Author: bonivart Date: 2009-10-03 15:32:13 +0000 (Sat, 03 Oct 2009) Log Message: ----------- phpsysinfo: update recipe Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2009-10-03 15:15:40 UTC (rev 6688) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2009-10-03 15:32:13 UTC (rev 6689) @@ -2,9 +2,9 @@ GARVERSION = 2.5.4 CATEGORIES = utils -DESCRIPTION = displays information about the host being accessed +DESCRIPTION = Displays information about the host being accessed define BLURB - displays information about the host being accessed + Displays information about the host being accessed endef SF_PROJ = $(GARNAME) @@ -16,13 +16,13 @@ SPKG_DESC = $(DESCRIPTION) SPKG_SOURCEURL = http://phpsysinfo.sourceforge.net -REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 CSWcswclassutils +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 -SPKG_CLASSES_CSWphpsysinfo = none cswcpsampleconf - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +ARCHALL = 1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -30,9 +30,7 @@ WORKSRC = $(WORKDIR)/$(GARNAME) -PROTOTYPE_FILTER = awk ' \ -$$$$3 ~ /\/config.php.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -{ print }' +SAMPLECONF = .*config.php include gar/category.mk @@ -43,7 +41,7 @@ @ginstall -d $(DESTDIR)$(prefix)/share/www @cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www/phpsysinfo @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo ; \ - mv config.php.new config.php.CSW ; \ + mv config.php.new config.php ; \ mv COPYING $(DESTDIR)$(docdir)/$(GARNAME)/license ) @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo/includes/os ; \ gpatch < ../../../../../../../../../$(FILEDIR)/CSWphpsysinfo.class.SunOS.inc.php.p ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 3 19:17:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 03 Oct 2009 17:17:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6690] csw/mgar/pkg/x11 Message-ID: Revision: 6690 http://gar.svn.sourceforge.net/gar/?rev=6690&view=rev Author: wbonnet Date: 2009-10-03 17:17:41 +0000 (Sat, 03 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_bigreqsproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_bigreqsproto/ Removed Paths: ------------- csw/mgar/pkg/x11/bigreqsproto/ Modified: csw/mgar/pkg/x11/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile 2009-10-03 15:15:40 UTC (rev 6688) +++ csw/mgar/pkg/x11/x11_bigreqsproto/trunk/Makefile 2009-10-03 17:17:41 UTC (rev 6690) @@ -1,6 +1,8 @@ -GARNAME = bigreqsproto +PROTONAME = bigreqsproto +CATEGORIES = x11 +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) GARVERSION = 1.1.0 -CATEGORIES = x11 DESCRIPTION = Prototype headers for BigReqs extension to X11 define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11applewmproto +CATALOGNAME_CSWx11applewmproto = x11_applewmproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 3 20:55:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Oct 2009 18:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6691] csw/mgar/pkg/git/trunk Message-ID: Revision: 6691 http://gar.svn.sourceforge.net/gar/?rev=6691&view=rev Author: bdwalton Date: 2009-10-03 18:55:23 +0000 (Sat, 03 Oct 2009) Log Message: ----------- correct git registration in /etc/services postinstall Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-03 17:17:41 UTC (rev 6690) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-03 18:55:23 UTC (rev 6691) @@ -1 +1 @@ -6c2d8cf8dcdfc844ea32bc381f6a3bfd download/CSWgit.postinstall +b2f8cba4fea2abc0cab666bb8a523a1a download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-03 17:17:41 UTC (rev 6690) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-03 18:55:23 UTC (rev 6691) @@ -9,9 +9,9 @@ cp -p "$GC_OLD" "$GC_NEW" fi -/usr/xpg4/bin/grep -q CSWgit /etc/services +/usr/xpg4/bin/grep -q CSWgit /etc/inet/services if [ $? -ne 0 ]; then - echo <>/etc/services + cat <>/etc/inet/services git 9418/tcp # CSWgit: git transfer service git 9418/udp # CSWgit: git transfer service EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 3 22:28:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 03 Oct 2009 20:28:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6692] csw/mgar/pkg/x11 Message-ID: Revision: 6692 http://gar.svn.sourceforge.net/gar/?rev=6692&view=rev Author: wbonnet Date: 2009-10-03 20:28:43 +0000 (Sat, 03 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_compositeproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_compositeproto/ Removed Paths: ------------- csw/mgar/pkg/x11/compositeproto/ Modified: csw/mgar/pkg/x11/x11_compositeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/trunk/Makefile 2009-10-03 18:55:23 UTC (rev 6691) +++ csw/mgar/pkg/x11/x11_compositeproto/trunk/Makefile 2009-10-03 20:28:43 UTC (rev 6692) @@ -1,6 +1,8 @@ -GARNAME = compositeproto GARVERSION = 0.4 CATEGORIES = x11 +PROTONAME = compositeproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Composite protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Oct 4 00:09:49 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 22:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6693] csw/mgar/pkg Message-ID: Revision: 6693 http://gar.svn.sourceforge.net/gar/?rev=6693&view=rev Author: skayser Date: 2009-10-03 22:09:49 +0000 (Sat, 03 Oct 2009) Log Message: ----------- tmpreaper: initial commit Added Paths: ----------- csw/mgar/pkg/tmpreaper/ csw/mgar/pkg/tmpreaper/branches/ csw/mgar/pkg/tmpreaper/tags/ csw/mgar/pkg/tmpreaper/trunk/ csw/mgar/pkg/tmpreaper/trunk/Makefile csw/mgar/pkg/tmpreaper/trunk/checksums csw/mgar/pkg/tmpreaper/trunk/files/ csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch csw/mgar/pkg/tmpreaper/trunk/files/README.CSW csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/tmpreaper/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tmpreaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/Makefile 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,42 @@ +GARNAME = tmpreaper +GARVERSION = 1.6.13 +CATEGORIES = apps + +DESCRIPTION = Cleans up files in directories based on their age +define BLURB + This package provides a program that can be used to clean out + temporary-file directories. It recursively searches the directory, + refusing to chdir() across symlinks, and removes files that haven't been + accessed in a user-specified amount of time. You can specify a set of + files to protect from deletion with a shell pattern. It will not remove + files owned by the process EUID that have the `w' bit clear, unless you + ask it to, much like `rm -f'. `tmpreaper' will not remove symlinks, + sockets, fifos, or special files unless given a command line option + enabling it to. +endef + +SPKG_SOURCEURL = http://packages.debian.org/sid/tmpreaper +MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/t/tmpreaper/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = + +# getcwd() returns char*, fix return value comparison +PATCHFILES = 0001-fix-getcwd-comparison.patch +# Studio 11 does not know about statement expressions +PATCHFILES += 0002-provide-statement-expression-workaround.patch + +# Force zone-friendly dirs, while they have not yet become standard in GAR +sysconfdir=/etc/opt/csw +localstatedir=/var/opt/csw + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(FILEDIR)/README.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/tmpreaper/trunk/checksums =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/checksums (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/checksums 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,3 @@ +2ef1fd86b2350b7e8d95c587aa752eba download/0001-fix-getcwd-comparison.patch +64c57bd076a6bace6fa108ff750c7d53 download/0002-provide-statement-expression-workaround.patch +f5799a7f142f9fa49586ae3da2bba222 download/tmpreaper_1.6.13.tar.gz Added: csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,13 @@ +diff --git a/tmpreaper.c b/tmpreaper.c +index a6d172c..111c647 100644 +--- a/tmpreaper.c ++++ b/tmpreaper.c +@@ -356,7 +356,7 @@ cleanupDirectory (const char * dirname , + int l; + /* the admin will want to know where the problem lies */ + #ifdef NO_get_current_dir_name +- if (getcwd(path, PATH_MAX) < 0) ++ if (getcwd(path, PATH_MAX) == NULL) + /* too long even for PATH_MAX, show something anyway */ + #else + if ((path = get_current_dir_name()) < 0) Added: csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,26 @@ +diff --git a/tmpreaper.c b/tmpreaper.c +index 111c647..0a7005f 100644 +--- a/tmpreaper.c ++++ b/tmpreaper.c +@@ -688,12 +688,21 @@ main (int argc, + * Utilize GNU C dynamic array allocation and statement expressions to + * allocate an array to hold the --protect argument strings. + */ ++#ifdef __GNUC__ + char *protect_argv[ ({ int i; + int count = 0; + for (i = 1; i < argc; i++) + if (! strncmp (argv[i], "--protect", 9)) + count++; + ++count; }) ]; ++#else ++ int pi; ++ int pcount = 0; ++ for (pi = 1; pi < argc; pi++) ++ if (! strncmp (argv[pi], "--protect", 9)) pcount++; ++ ++pcount; ++ char *protect_argv[pcount]; ++#endif + + char **p = protect_argv; + Added: csw/mgar/pkg/tmpreaper/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/README.CSW 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,12 @@ +To get started, create a crontab entry such as the following: + +0 4 * * * /opt/csw/bin/tmpreaper --mtime-dir --symlinks 7d --protect '/tmp/.X*-{lock,unix,unix/*}' /tmp + + This will run every day at 04:00 AM, cleaning the /tmp directory of files + not accessed withing 7 days, including symlinks. Empty directories not + modified in the last 7 days will also be removed. The --protect option + causes tmpreaper to skip files with matching names. You can supply more + than one --protect option, and you can supply more than one directory + to be cleaned. + Feel free to adjust as you wish; see the manpage for options. You can use + the --test option to only show what would be done. Added: csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,6 @@ +tmpreaper (1.6.13,REV=2009.10.03) + + * Adopted and updated to 1.6.13 + * Added README.CSW with crontab example. + + -- Sebastian Kayser Sat, 3 Oct 2009 23:49:33 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 4 02:10:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 04 Oct 2009 00:10:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6694] csw/mgar/pkg/git/trunk Message-ID: Revision: 6694 http://gar.svn.sourceforge.net/gar/?rev=6694&view=rev Author: bdwalton Date: 2009-10-04 00:09:53 +0000 (Sun, 04 Oct 2009) Log Message: ----------- git: add a 'sign post' file after conditionally copying global gitconfig Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-03 22:09:49 UTC (rev 6693) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-04 00:09:53 UTC (rev 6694) @@ -1 +1 @@ -b2f8cba4fea2abc0cab666bb8a523a1a download/CSWgit.postinstall +5284f7f910e954f4fe2dcab32b750929 download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-03 22:09:49 UTC (rev 6693) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-04 00:09:53 UTC (rev 6694) @@ -7,6 +7,14 @@ if [ -f "$GC_OLD" -a ! -f "$GC_NEW" ]; then echo "Copying /opt/csw/etc/gitconfig to /etc/opt/csw/gitconfig" cp -p "$GC_OLD" "$GC_NEW" + cat < "$GC_OLD.THIS_LOCATION_IS_DEPRECATED" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. +Please make sure your configuration have been moved to /etc/opt/csw +and remove the old one from this location. + +EOF fi /usr/xpg4/bin/grep -q CSWgit /etc/inet/services This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 4 02:22:11 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 04 Oct 2009 00:22:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6695] csw/mgar/pkg/git/trunk Message-ID: Revision: 6695 http://gar.svn.sourceforge.net/gar/?rev=6695&view=rev Author: bdwalton Date: 2009-10-04 00:22:11 +0000 (Sun, 04 Oct 2009) Log Message: ----------- git: correct grammar in etc migration sign post file. Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-04 00:09:53 UTC (rev 6694) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-04 00:22:11 UTC (rev 6695) @@ -1 +1 @@ -5284f7f910e954f4fe2dcab32b750929 download/CSWgit.postinstall +0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-04 00:09:53 UTC (rev 6694) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-04 00:22:11 UTC (rev 6695) @@ -11,8 +11,8 @@ This location (/opt/csw/etc) is deprecated. Configuration files are currently being placed in /etc/opt/csw. -Please make sure your configuration have been moved to /etc/opt/csw -and remove the old one from this location. +Please make sure your configuration (gitconfig) was properly moved to +/etc/opt/csw and then remove the old one from this location. EOF fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 4 13:34:19 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 04 Oct 2009 11:34:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6696] csw/mgar/pkg Message-ID: Revision: 6696 http://gar.svn.sourceforge.net/gar/?rev=6696&view=rev Author: bonivart Date: 2009-10-04 11:34:11 +0000 (Sun, 04 Oct 2009) Log Message: ----------- cvsproxy: initial commit, lacks pre/post scripts Added Paths: ----------- csw/mgar/pkg/cvsproxy/ csw/mgar/pkg/cvsproxy/branches/ csw/mgar/pkg/cvsproxy/tags/ csw/mgar/pkg/cvsproxy/trunk/ csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/checksums csw/mgar/pkg/cvsproxy/trunk/files/ Property changes on: csw/mgar/pkg/cvsproxy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-10-04 11:34:11 UTC (rev 6696) @@ -0,0 +1,28 @@ +GARNAME = cvsproxy +GARVERSION = 1.0.1 +CATEGORIES = utils + +DESCRIPTION = Provides a CVS proxy +define BLURB + Provides a CVS proxy +endef + +MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-install-modulated: + @echo "==> Post-install fixes" + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/cvsproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/checksums (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/checksums 2009-10-04 11:34:11 UTC (rev 6696) @@ -0,0 +1 @@ +ceff47a655085497f5712e2da160c607 download/cvsproxy-1.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 4 15:50:05 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 04 Oct 2009 13:50:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6697] csw/mgar/pkg/cvsproxy/trunk Message-ID: Revision: 6697 http://gar.svn.sourceforge.net/gar/?rev=6697&view=rev Author: bonivart Date: 2009-10-04 13:50:05 +0000 (Sun, 04 Oct 2009) Log Message: ----------- cvsproxy: added pre/post scripts, some re-layout Modified Paths: -------------- csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl Modified: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-10-04 11:34:11 UTC (rev 6696) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-10-04 13:50:05 UTC (rev 6697) @@ -9,7 +9,12 @@ MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWcvsproxy.postinstall +DISTFILES += CSWcvsproxy.preremove +REQUIRED_PKGS = CSWtcpwrap +SPKG_SOURCEURL = http://www.sra.co.jp/people/m-kasahr/cvsproxy + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -25,4 +30,8 @@ @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + @mv $(DESTDIR)/opt/csw/libexec/cvsproxy $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp + @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @cp $(FILEDIR)/editconf.pl $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @mv $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp $(DESTDIR)/opt/csw/libexec/$(GARNAME)/cvsproxy @$(MAKECOOKIE) Modified: csw/mgar/pkg/cvsproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/checksums 2009-10-04 11:34:11 UTC (rev 6696) +++ csw/mgar/pkg/cvsproxy/trunk/checksums 2009-10-04 13:50:05 UTC (rev 6697) @@ -1 +1,3 @@ +5095049b846e80cbe0745d85929af2d9 download/CSWcvsproxy.postinstall +3ce92c760a74f36d40acc02eb5e8e275 download/CSWcvsproxy.preremove ceff47a655085497f5712e2da160c607 download/cvsproxy-1.0.1.tar.gz Added: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall 2009-10-04 13:50:05 UTC (rev 6697) @@ -0,0 +1,30 @@ +#!/bin/sh + +# Mostly copied from CSWfam + +set -e + +if [ "$PKG_ROOT_DIR" = "" ]; then + PKG_ROOT_DIR=/; +fi + +CSWROOT=$PKG_ROOT_DIR/opt/csw +EDITCONF=$CSWROOT/libexec/cvsproxy/editconf.pl + + +echo "Adding cvsproxy to /etc/services" +"$EDITCONF" "$PKG_ROOT_DIR/etc/services" add '^cvsproxy\b' \ + "cvsproxy 2401/tcp # Transparent CVS proxy" \ + "cvsproxy 2401/udp # Transparent CVS proxy" + +echo "Adding cvsproxy to inetd.conf" +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add 'Transparent CVS proxy' \ + "# Transparent CVS proxy" +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add '^cvsproxy\b' \ + "cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy" + + +echo "Restarting inetd..." +pkill -HUP inetd + +exit 0 Added: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove 2009-10-04 13:50:05 UTC (rev 6697) @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +if [ "$PKG_ROOT_DIR" = "" ]; then + PKG_ROOT_DIR=/; +fi + +EDITCONF="$PKG_ROOT_DIR/opt/csw/libexec/cvsproxy/editconf.pl" + +echo "Removing cvsproxy from /etc/services" +"$EDITCONF" "$PKG_ROOT_DIR/etc/services" remove '^cvsproxy' + +echo "Removing cvsproxy from inetd.conf" +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove '^cvsproxy' +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove 'Transparent CVS proxy' + +echo "Restarting inetd..." +pkill -HUP inetd + +exit 0 Added: csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl 2009-10-04 13:50:05 UTC (rev 6697) @@ -0,0 +1,440 @@ +#!/usr/bin/perl -w + +use strict; + +# $Id: editconf.perl,v 1.1 2000/05/19 22:44:34 rusty Exp $ +# +# This edits configuration files during software install/uninstall. +# Run with --help or see the text of the usage subroutine below for +# more information. +# +# Examples: +# +# Add fam to /etc/inetd.conf during install: +# editconf inetd.conf add '\bfam\b' \ +# "# fam, the File Alteration Monitor" \ +# "sgi_fam/1-2 stream rpc/tcp wait root /usr/local/bin/fam fam" +# +# Remove fam from /etc/inetd.conf during uninstall: +# editconf inetd.conf remove '\bfam\b' +# +# Add /usr/sysadm/lib to /etc/ld.so.conf# +# editconf ld.so.conf add '\bsysadm\b' /usr/sysadm/lib +# +# Add sysadmd to /usr/local/etc/tcpmux.conf: +# editconf tcpmux.conf add '\bsysadm\b' \ +# "# sysadmd, for system administration applications" \ +# "sgi_sysadm root /usr/sysadm/bin/sysadmd sysadmd" +# +# The main goal of this script is to "do no harm." We don't +# modify any files if it looks like we're going to mess with +# lines which have been edited by the user. The only time we +# change a file is when we're confident that we're adding new +# lines, or messing with lines which we ourselves added or +# removed during a previous invocation of the script. +# +# Well... that's not entirely true; the "remove" operation comments +# out any line that matches the given regexp. But it makes a backup! +# +# USING EDITCONF WITH AUTOMAKE AND RPM +# +# This prepends DESTDIR to the files it operates on (unless you pass +# it a file starting with \.{0,2}/, so it can be used during an +# automake "make install" into a non-root directory (as you would do +# while building an RPM package). Note that the file it attempts to +# operate on probably won't be present, though, so you'll probably +# need to ignore errors during the make install: +# +# make-install-hook: +# -$(EDITCONF) ld.so.conf add '\bsysadm\b' /usr/sysadm/lib +# +# This will probably fail when DESTDIR is set, as ld.so.conf probably +# doesn't exist under DESTDIR; the only reason to have this line in the +# Makefile.am is so that a normal "make install" will update the +# configuration files. +# +# In order to have your configuration files updated during the install/ +# uninstall of an rpm package, you'll need to add something like this +# to your spec file: +# +# # this is %preun rather than %postun because we want to use our +# # script before it gets uninstalled. +# %preun +# perl /usr/local/lib/fam/editconf.perl ld.so.conf remove '\bsysadm\b' +# +# +sub usage { + my($msg) = @_; + $msg && ($msg ne "help") && print STDERR "$msg\n\n"; + print STDERR <<"EOF"; +Usage: + $0 [options] file \"add\" regexp lines... + $0 [options] file \"remove\" regexp [comment] + $0 --help + +Options: + -n No-exec (don't change any files) + -v Verbose + -s Silent + -- End argument processing (in case your new config file lines + start with -) +EOF + + if($msg eq "help") { + print STDERR <<"EOF"; + +This edits configuration files. Given a file name, it looks +in a list of directories (see below) for the file. (If the file +name starts with "/" or ".", the path list is not searched.) +Once the file is found, the given regular expression is searched +for in the file to determine whether the option or service we're +adding/removing already exists. + +If we're adding new lines to the file, there are four possible +outcomes: + + - If the regexp isn't found in the file, we figure our lines + haven't been added before, and we add them. + + - If the regexp is found in the file, and indeed the exact lines + we were going to add are already there, we're happy, and we + don't change the file. + + - If the regexp is found in the file, and the lines we were going + to add are present but commented out, we uncomment them. + + - If the regexp is found in the file, but in lines which are + different than the lines we were going to add, we figure the + option or service we were going to add has already been configured + differently; in this case, we make our changes in a new copy + of the file and print a warning message saying that someone + should compare the two files. (We don't change the + configuration of the system in this case.) + +If we're removing lines from the file, there are two possible +outcomes: + + - If the regexp isn't found in the file, we're happy, and we + don't change the file. + + - If the regexp is found in the file, we make a backup of the + file, and comment out the lines containing the regexp in the + original file. + +EOF + print STDERR "Configuration file paths:\n"; + foreach (@::paths) { print STDERR " $_\n"; } + } + + exit 1; +} + + +# See if DESTDIR is set, to have us operate on files not in / +my $DESTDIR = $ENV{'DESTDIR'} ? $ENV{'DESTDIR'} : ""; + +# This is the list of places we'll look for the configuration file +# if we weren't given an absolute path. +@::paths = ("$DESTDIR/etc", "$DESTDIR/usr/etc", "$DESTDIR/usr/local/etc"); + +my $comment = '#'; +my $verbose = &splicegrep('^-v$', \@ARGV, '^--$'); +my $noexec = &splicegrep('^-n$', \@ARGV, '^--$'); +my $silent = &splicegrep('^-s$', \@ARGV, '^--$'); +&splicegrep('^--?h', \@ARGV, '^--$') && &usage("help"); +&splicegrep('^-', \@ARGV, '^--$') && &usage(); +&splicegrep('^--$', \@ARGV); + +my $file; # the name of the file passed on the command line +my $regexp; # the pattern passed on the command line +my $op; # the operation being performed (add|remove) + +($file = shift) || &usage("The config file name is required!"); +(($op = shift) && ($op =~ /^(add|remove)$/)) || &usage("\"add\" or \"remove\" is required!"); +($regexp = shift) || &usage("The regexp to search for is required!"); +my @lines = @ARGV; + + +# +# Does the file name start with /, ./, or ../? +# +if ($file =~ m#^\.{0,2}/#) { + # Danger! Not applying $DESTDIR to $path here! + &shaketh_thy_booty($op, $file, $regexp, @lines); + exit 0; +} +# +# No, so we'll search for the file name in the list of paths. +# +$verbose && $DESTDIR && print "Using DESTDIR \"$DESTDIR\"\n"; +my($p, $path); +foreach $p (@::paths) { + $path = "$p/$file"; + $verbose && print STDERR "Looking for $path...\n"; + if (-f $path) { + &shaketh_thy_booty($op, $path, $regexp, @lines); + exit 0; + } +} +die("Couldn't find $file in " . join(" ", @::paths) . "\n"); + + +# +# Once we know what file we're attacking, this does the actual work. +# +sub shaketh_thy_booty { # or is it "thine"? + my($op, $path, $regexp, @lines) = @_; + $noexec || -w $path || die("I don't have write permission on $path!\n"); + # Might as well snort it into memory. Hopefully it's a small file, ha ha. + open(CFG, "<$path") || die("Couldn't open $path for input!\n"); + my @wholefile = ; + close(CFG); + + my $matched = 0; + if (!grep /$regexp/, @wholefile) { + if ($op eq 'add') { + # It doesn't contain our regexp, so append our lines and + # exit happily. + if ($noexec) { + print "I would have added the following lines to $path:\n"; + foreach (@lines) { print "$_\n"; } + } else { + open(CFG, ">>$path") || die("Couldn't open $path for append!\n"); + $silent || print "Added the following lines to $path:\n"; + foreach (@lines) { + $silent || print "$_\n"; + print CFG "$_\n"; + } + $silent || print "(end of lines added to $path)\n"; + } + exit 0; + } elsif ($op eq 'remove') { + # It doesn't contain our regexp, so we don't need to remove it, + # so we're happy. + exit 0; + } else { die("bad op \"$op\""); } + } + + if ($op eq "remove") { + # Since we're still here, and we're removing this entry, comment out + # all lines matching our regexp. + if ($noexec) { + print "I would have commented out the following lines in $path:\n"; + grep { + /$regexp/ && print; + } @wholefile; + } else { + my $tmpnm = &tmpnam("$path.$$"); + my $comment_re = quotemeta $comment; + my @commented_out; + open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); + foreach (@wholefile) { + # We care if it matches, and isn't already commented out. + if ((/$regexp/) && (!/^$comment_re/)) { + push @commented_out, $_; + print CFG $comment; + } + print CFG; + } + if ($#commented_out == -1) { + # We didn't actually need to comment anything out! + # Apparently all the lines that matched our regexp were + # already commented out. + $verbose && print "All the lines matching our regexp were ", + "already commented out, so we're not doing ", + "anything!\n"; + unlink $tmpnm; + exit 0; + } +# $silent || print "Commented out the following lines in $path:\n"; +# $silent || grep { print; } @commented_out; +# $silent || print "(end of lines commented out in $path)\n"; + my $bak = &tmpnam("$path.O"); + rename($path, $bak) || die("Couldn't rename $path to $bak!\n"); + rename($tmpnm, $path) || die("Couldn't rename $tmpnm to $path!\n"); + $silent || print "Original file saved as $bak\n"; + } + exit 0; + } + + # just a sanity check... + ($op eq "add") || die("bad op \"\$op\""); + + # We're still here, so we found our regexp, which suggests that the + # entry we're adding might already be in the file. Do our new lines + # match existing lines exactly? + $verbose && print "The file contains our regular expression, so let's see ", + "if it has our lines...\n"; + $matched = 1; + my $re; + foreach (@lines) { + $re = quotemeta $_; + $verbose && print " Looking for \"$re\"\n"; + if (! grep /^$re$/, @wholefile) { + $verbose && print " Didn't find it!\n"; + $matched = 0; + last; + } + } + if ($matched) { + # The lines we would have added are already in the file, so + # we can all go home early. + $verbose && print "$path already contains the lines we would have ", + "added.\n"; + exit 0; + } + + # All right, we're still here, so let's see if the lines we would have + # added are in the file, but commented out. This is slightly complicated + # by the possibility that lines we're adding start with comments; if so, + # we don't want to require that they be preceded by another comment + # character. + $verbose && print "Let's see if it has our lines, but commented out...\n"; + $re = quotemeta $comment; + my @linesre = @lines; + grep { + # If it starts with a comment, require make an additional starting + # comment optional. (the ($re.*)? as opposed to $re.*) + $_ = (/^$re/) ? "^($re.*)?" . quotemeta $_ : "^$re.*" . quotemeta $_; + } @linesre; + $matched = 1; + foreach $re (@linesre) { + # This loop through @linesre isn't done in the grep above because + # we want that to iterate through every element, while this loop + # can bail as soon as it fails to find a line it's looking for. + $verbose && print " Looking for \"$re\"\n"; + # If you change this next line, make sure you make the same changes + # in the substitution below. + if (! grep /$re$/, @wholefile) { + $verbose && print " Didn't find it!\n"; + $matched = 0; + last; + } + } + if ($matched) { + # The lines we would have added are already in the file, but + # commented out. Let's uncomment them into a temp file, and then + # replace the existing file with the temp file. + if ($noexec) { + print "I would have uncommented the following lines in $path:\n"; + foreach (@lines) { print "$_\n"; } + exit 0; + } + # This is crude. For every line in the file, if it matches the + # commented-out version of any of the lines we're adding, replace + # it with the corresponding non-commented-out line. + my $idx; + foreach (@wholefile) { + foreach $idx (0..$#lines) { + s/$linesre[$idx]$/$lines[$idx]/ && last; + } + } + # isn't there a perl tmpnam? this open/die is stupid. + my $tmpnm = &tmpnam("$path.$$"); + open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); + print CFG @wholefile; + close(CFG) || die("Couldn't close $tmpnm after writing!\n"); + rename($tmpnm, $path) || die("Couldn't replace $path with $tmpnm " . + "after writing!\n"); + exit 0; + } + + # We're still here, so it looks like our configuration lines are in the + # file, but they're different than what we would have added. Nuts! + # Comment out everything matching our regexp and append our new lines, + # but do it into a new file so that we don't stomp any existing + # configuration. + my $tmpnm = &tmpnam("$path.N"); + if ($noexec) { + print "I would have copied $path to $tmpnm and commented out the following lines in $tmpnm:\n"; + grep { + /$regexp/ && print; + } @wholefile; + print "...and added the following lines to $tmpnm:\n"; + foreach (@lines) { print "$_\n"; } + exit 0; + } + grep { + /$regexp/ && ($_ = ($comment . $_)); + } @wholefile; + # Now append our new stuff + foreach (@lines) { + push @wholefile, "$_\n"; + } + open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); + print CFG @wholefile; + close(CFG) || die("Couldn't close $tmpnm after writing!\n"); + # Just for fun, if $path.N already existed, let's see if it's the + # same as what we just wrote. + &diff($tmpnm, "$path.N", \@wholefile) || ($tmpnm = "$path.N"); + + print STDERR <<"EOF"; + +********************************************************************** +Configuration changes to $file have not been made +automatically because there appears to be a conflict between the +file's current contents and the lines which would have been added. + +Original file: $path +New file: $tmpnm + +Please compare these two files and update the original file as needed. +********************************************************************** + +EOF + exit 0; +} + + +# Returns the array of elements matching the given re in the given array, +# and removes those elements from the array. If $bre is set, we only +# search through the array until an element matching $bre is encountered. +sub splicegrep { + my($re, $a, $bre) = @_; + my @ta = (); + my @ra = (); + my $skip = 0; + $a || ($a = \@ARGV); + # sub-optimal but our argv should be short + grep { + $bre && /$bre/ && ($skip = 1); + ((!$skip) && /$re/) ? push @ra, $_ : push @ta, $_; + } @{$a}; + @{$a} = @ta; + return @ra; +} + + +# This is kind of stupid. +sub tmpnam { + my($base) = @_; + my $hope = $base; + my $count = 0; + while(-e $hope) { + $hope = "$base$count"; + ++$count; + } + return $hope; +} + + +# Returns 0 if we know the two files are the same, 1 if we're not sure. +sub diff { + my($fn1, $fn2, $fc1) = @_; + ($fn1 eq $fn2) && return 0; # same file name! + my $sz1 = (stat $fn1)[7]; # size $sstuff[7]; # size + my $sz2 = (stat $fn2)[7]; # size $sstuff[7]; # size + $sz1 && ($sz1 != $sz2) && return 1; # different sizes; they're different + # Nuts, they're the same size, so we have to compare them. + open(FH2, "<$fn2") || return 1; + my @snort2 = ; + close(FH2); + # Same number of lines? + ($#snort2 == $#{$fc1}) || return 1; + my $i = $#snort2; + while ($i >= 0) { + ($snort2[$i] eq $fc1->[$i]) || return 1; + --$i; + } + return 0; +} Property changes on: csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 4 23:27:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 04 Oct 2009 21:27:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6698] csw/mgar/pkg/libtheora/trunk Message-ID: Revision: 6698 http://gar.svn.sourceforge.net/gar/?rev=6698&view=rev Author: dmichelsen Date: 2009-10-04 21:27:22 +0000 (Sun, 04 Oct 2009) Log Message: ----------- libtheora: Update to 1.1.1 Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile csw/mgar/pkg/libtheora/trunk/checksums Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 13:50:05 UTC (rev 6697) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:27:22 UTC (rev 6698) @@ -1,5 +1,5 @@ GARNAME = libtheora -GARVERSION = 1.0 +GARVERSION = 1.1.1 CATEGORIES = lib DESCRIPTION = Theora video codec support library Modified: csw/mgar/pkg/libtheora/trunk/checksums =================================================================== --- csw/mgar/pkg/libtheora/trunk/checksums 2009-10-04 13:50:05 UTC (rev 6697) +++ csw/mgar/pkg/libtheora/trunk/checksums 2009-10-04 21:27:22 UTC (rev 6698) @@ -1 +1 @@ -c963937053f45a7878954bed37ceb182 download/libtheora-1.0.tar.bz2 +292ab65cedd5021d6b7ddd117e07cd8e download/libtheora-1.1.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 4 23:31:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 04 Oct 2009 21:31:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6699] csw/mgar/pkg/libtheora/trunk/Makefile Message-ID: Revision: 6699 http://gar.svn.sourceforge.net/gar/?rev=6699&view=rev Author: dmichelsen Date: 2009-10-04 21:31:28 +0000 (Sun, 04 Oct 2009) Log Message: ----------- libtheora: Relocate documentation to standard location Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:27:22 UTC (rev 6698) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:31:28 UTC (rev 6699) @@ -32,4 +32,6 @@ TEST_TARGET = check +EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(GARNAME)-$(GARVERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),' + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 09:52:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 07:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6700] csw/mgar/pkg/libtheora/trunk/Makefile Message-ID: Revision: 6700 http://gar.svn.sourceforge.net/gar/?rev=6700&view=rev Author: dmichelsen Date: 2009-10-05 07:52:59 +0000 (Mon, 05 Oct 2009) Log Message: ----------- libtheora: Adjust upstream watch Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:31:28 UTC (rev 6699) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-05 07:52:59 UTC (rev 6700) @@ -22,7 +22,7 @@ CATALOGNAME = libtheora # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 10:12:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 08:12:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6701] csw/mgar/pkg/x11/libxpm/trunk/Makefile Message-ID: Revision: 6701 http://gar.svn.sourceforge.net/gar/?rev=6701&view=rev Author: dmichelsen Date: 2009-10-05 08:12:53 +0000 (Mon, 05 Oct 2009) Log Message: ----------- x11/libxpm: Add missing link Modified Paths: -------------- csw/mgar/pkg/x11/libxpm/trunk/Makefile Modified: csw/mgar/pkg/x11/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxpm/trunk/Makefile 2009-10-05 07:52:59 UTC (rev 6700) +++ csw/mgar/pkg/x11/libxpm/trunk/Makefile 2009-10-05 08:12:53 UTC (rev 6701) @@ -45,6 +45,10 @@ include gar/category.mk +post-install-modulated: + ln -s libXpm.so.4.11.0 $(DESTDIR)$(libdir)/libXpm.so.4.11 + @$(MAKECOOKIE) + post-merge: ifeq ($(GARCH),sparc) @ginstall -d $(PKGROOT)/opt/csw/lib/sparcv8plus+vis This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 10:27:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 08:27:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6702] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6702 http://gar.svn.sourceforge.net/gar/?rev=6702&view=rev Author: dmichelsen Date: 2009-10-05 08:27:21 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: More bugfixes towards release Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-05 08:12:53 UTC (rev 6701) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-05 08:27:21 UTC (rev 6702) @@ -294,24 +294,6 @@ # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler $(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I)))) -# BUILDHOST_isa-$ISA is the name of the host where the compilation should take place -# It defaults to the corresponding BUILD_(sparc|i386)-(32|64) -# An empty string means "stay on the current host" -define BUILDHOST -$(strip - $(if $(filter $1,$(ISALIST_sparcv9), - $(if $(BUILDHOST_sparc-$(MEMORYMODEL_$1)), - $(if $(eq $(BUILDHOST_sparc-$(MEMORYMODEL_$1)),$(THISHOST)),,$(BUILDHOST_sparc-$(MEMORYMODEL_$1))), - ), - $(if $(filter $1,$(ISALIST_amd64), - $(if $(BUILDHOST_i386-$(MEMORYMODEL_$1)), - $(if $(eq $(BUILDHOST_i386-$(MEMORYMODEL_$1)),$(THISHOST)),,$(BUILDHOST_i386-$(MEMORYMODEL_$1))), - ), - ), - ), -) -endef - # This is the memory model of the currently compiled architecture MEMORYMODEL = $(MEMORYMODEL_$(ISA)) Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 08:12:53 UTC (rev 6701) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 08:27:21 UTC (rev 6702) @@ -158,12 +158,7 @@ ) merge-$(2): BUILDHOST=$$(call modulation2host) merge-$(2): - echo modulation: $(2) - echo vars: $(3) - echo ISA: $$(ISA) - echo BUILDHOST="$$(BUILDHOST)" - echo THISHOST="$$(THISHOST)" - echo "Building modulation on host '$$(BUILDHOST)'" + @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ @@ -663,17 +658,17 @@ $(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\ $(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait $(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)`; stty sane; fi - $(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \ + $(_DBG_MERGE)$(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \ echo "Build error in modulation $M. Please see"; \ echo " $(WORKROOTDIR)/build-$M/build.log"; \ echo "for details:"; \ echo; \ tail -100 $(WORKROOTDIR)/build-$M/build.log; \ - exit `cat $(WORKROOTDIR)/build-$M/build.ret`; \ + exit "Return code: `cat $(WORKROOTDIR)/build-$M/build.ret`"; \ fi;) merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) -merge-watch: +merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 08:12:53 UTC (rev 6701) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 08:27:21 UTC (rev 6702) @@ -561,16 +561,14 @@ # hosts. If there are no platform hosts defined the test is skipped. validateplatform: $(if $(strip $(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\ - $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ - $(warning ***)\ + $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\ + @$(MAKECOOKIE),\ $(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\ $(foreach P,$(PACKAGING_PLATFORMS),\ $(warning *** - $P $(if $(PACKAGING_HOST_$P),to be build on host '$(PACKAGING_HOST_$P)',with no suitable host available))\ )\ - $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ - $(warning ***)\ - )) - @$(MAKECOOKIE) + $(error You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ + ),@$(MAKECOOKIE)) # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific @@ -635,12 +633,12 @@ $(foreach P,$(PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P package;,\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ + $(MAKE) PLATFORM=$P package && ,\ + $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ - ) + ) true # Print relecant informations about the platform platformenv: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 11:22:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 09:22:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6703] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 6703 http://gar.svn.sourceforge.net/gar/?rev=6703&view=rev Author: dmichelsen Date: 2009-10-05 09:22:58 +0000 (Mon, 05 Oct 2009) Log Message: ----------- libsdl: Add 64 bit and split off devel Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-05 08:27:21 UTC (rev 6702) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-05 09:22:58 UTC (rev 6703) @@ -11,13 +11,28 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibsdl) REQUIRED_PKGS = CSWiconv +SPKG_SOURCEURL = http://www.libsdl.org/ + +PACKAGES = CSWlibsdl CSWlibsdldevel + +CATALOGNAME_CSWlibsdl = libsdl +CATALOGNAME_CSWlibsdldevel = libsdl_devel + +SPKG_DESC_CSWlibsdl = Simple DirectMedia Layer library +SPKG_DESC_CSWlibsdldevel = Simple DirectMedia Layer library development files + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# needs esound in 64 bit +# make sure it binds completely against new X11 + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static +PKGFILES_CSWlibsdldevel = $(PKGFILES_DEVEL) + include gar/category.mk Deleted: csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec 2009-10-05 08:27:21 UTC (rev 6702) +++ csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec 2009-10-05 09:22:58 UTC (rev 6703) @@ -1,4 +0,0 @@ -%var bitname libsdl -%var pkgname CSWlibsdl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:17:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:17:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6704] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6704 http://gar.svn.sourceforge.net/gar/?rev=6704&view=rev Author: dmichelsen Date: 2009-10-05 12:17:49 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: More fixes towards release Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 09:22:58 UTC (rev 6703) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 12:17:49 UTC (rev 6704) @@ -75,37 +75,6 @@ include $(GARDIR)/gar.conf.mk include $(GARDIR)/gar.lib.mk -#################### DIRECTORY MAKERS #################### - -# This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: - @if test -d $@; then : ; else \ - ginstall -d $@; \ - echo "ginstall -d $@"; \ - fi - -# These stubs are wildcarded, so that the port maintainer can -# define something like "pre-configure" and it won't conflict, -# while the configure target can call "pre-configure" safely even -# if the port maintainer hasn't defined it. -# -# in addition to the pre- rules, the maintainer may wish -# to set a "pre-everything" rule, which runs before the first -# actual target. -pre-%: - @true - -post-%: - @true - -# Call any arbitrary rule recursively for all dependencies -deep-%: % - @for target in "" $(DEPEND_LIST) ; do \ - test -z "$$target" && continue ; \ - $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ - done - @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) - # ========================= MODULATIONS ======================== # The default is to modulate over ISAs @@ -137,7 +106,7 @@ define _modulate_target $(1)-$(2): - @gmake MODULATION=$(2) $(3) $(1)-modulated + @$(MAKE) MODULATION=$(2) $(3) $(1)-modulated @# This is MAKECOOKIE expanded to use the name of the rule explicily as the rule has @# not been evaluated yet. XXX: Use function _MAKECOOKIE for both @mkdir -p $(COOKIEDIR)/$(dir $(1)-$(2)) && date >> $(COOKIEDIR)/$(1)-$(2) @@ -147,7 +116,7 @@ define _modulate_target_nocookie $(1)-$(2): - @gmake -s MODULATION=$(2) $(3) $(1)-modulated + @$(MAKE) -s MODULATION=$(2) $(3) $(1)-modulated @# The next line has intentionally been left blank to explicitly terminate this make rule endef @@ -161,7 +130,7 @@ @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ - gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ + $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule @@ -218,7 +187,38 @@ $(eval $(call _modulate,$(MODULATORS))) +#################### DIRECTORY MAKERS #################### +# This is to make dirs as needed by the base rules +$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + ginstall -d $@; \ + echo "ginstall -d $@"; \ + fi + +# These stubs are wildcarded, so that the port maintainer can +# define something like "pre-configure" and it won't conflict, +# while the configure target can call "pre-configure" safely even +# if the port maintainer hasn't defined it. +# +# in addition to the pre- rules, the maintainer may wish +# to set a "pre-everything" rule, which runs before the first +# actual target. +pre-%: + @true + +post-%: + @true + +# Call any arbitrary rule recursively for all dependencies +deep-%: % + @for target in "" $(DEPEND_LIST) ; do \ + test -z "$$target" && continue ; \ + $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ + done + @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) + + # ========================= MAIN RULES ========================= # The main rules are the ones that the user can specify as a # target on the "make" command-line. Currently, they are: @@ -249,7 +249,9 @@ # prerequisite - Make sure that the system is in a sane state for building the package PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) -prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite +# Force to be called in global modulation +prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite) $(DONADA) prerequisitepkg-%: @@ -289,15 +291,15 @@ checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum @$(DONADA) -checksum-global: - @$(MAKE) -s ISA=global checksum - @$(MAKECOOKIE) +checksum-global: $(if $(filter global,$(MODULATION)),checksum) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global checksum) + @$(DONADA) # The next rule handles the dependency from the modulated context to # the contextless checksumming. The rule is called when the cookie # to the global checksum is requested. If the global checksum has not run, # then run it. Otherwise it is silently accepted. -checksum-modulated: $(if $(test ! -e $(COOKIEDIR)/build-global/checksum),checksum-global) +checksum-modulated: checksum-global @$(DONADA) # returns true if checksum has completed successfully, false @@ -331,6 +333,10 @@ extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) +extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global extract) + @$(MAKECOOKIE) + extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ @@ -736,7 +742,7 @@ # cookie, but that would be lame and unportable). clean: $(addprefix clean-,$(MODULATIONS)) - rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) + @rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) clean-modulated: $(call _pmod,Cleaning ) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 09:22:58 UTC (rev 6703) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:17:49 UTC (rev 6704) @@ -573,14 +573,18 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -package: validateplatform checksum merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package + +package: _package @echo @echo "The following packages have been built:" @echo - @$(foreach SPEC,$(_PKG_SPECS),echo $(SPEC);echo " $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz";) - @echo + @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow @$(DONADA) +_pkgshow: + @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) + # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" @@ -601,7 +605,7 @@ # pkgcheck - check if the package is compliant # pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS)) - $(DONADA) + @$(DONADA) pkgcheck-%: @echo " ==> Checking compliance: $*" @@ -633,12 +637,25 @@ $(foreach P,$(PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P package && ,\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package" && \ + $(MAKE) PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ ) true + @echo + @echo "The following packages have been built during this invocation:" + @echo + @$(foreach P,$(PACKAGING_PLATFORMS),\ + echo "* Platform $P\c";\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + echo " (built on this host)";\ + $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ + echo " (built on host '$(PACKAGING_HOST_$P)')";\ + $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + )\ + ) + #@$(MAKECOOKIE) # Print relecant informations about the platform platformenv: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:25:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6705] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6705 http://gar.svn.sourceforge.net/gar/?rev=6705&view=rev Author: dmichelsen Date: 2009-10-05 12:25:35 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Cosmetic addition Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:17:49 UTC (rev 6704) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:25:35 UTC (rev 6705) @@ -580,6 +580,7 @@ @echo "The following packages have been built:" @echo @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow + @echo @$(DONADA) _pkgshow: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:36:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:36:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6706] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6706 http://gar.svn.sourceforge.net/gar/?rev=6706&view=rev Author: dmichelsen Date: 2009-10-05 12:36:43 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Added replatforms Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:25:35 UTC (rev 6705) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:36:43 UTC (rev 6706) @@ -656,8 +656,10 @@ $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ )\ ) - #@$(MAKECOOKIE) + @$(MAKECOOKIE) +replatforms: spotless platforms + # Print relecant informations about the platform platformenv: @$(foreach P,$(PACKAGING_PLATFORMS),\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:44:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:44:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6707] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6707 http://gar.svn.sourceforge.net/gar/?rev=6707&view=rev Author: dmichelsen Date: 2009-10-05 12:44:12 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb47: Exclude old license Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 12:36:43 UTC (rev 6706) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 12:44:12 UTC (rev 6707) @@ -69,6 +69,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:20:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6708] csw/mgar/pkg/x11/libxaw/trunk/Makefile Message-ID: Revision: 6708 http://gar.svn.sourceforge.net/gar/?rev=6708&view=rev Author: dmichelsen Date: 2009-10-05 13:20:14 +0000 (Mon, 05 Oct 2009) Log Message: ----------- x11/libxaw: Add dependency Modified Paths: -------------- csw/mgar/pkg/x11/libxaw/trunk/Makefile Modified: csw/mgar/pkg/x11/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-10-05 12:44:12 UTC (rev 6707) +++ csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-10-05 13:20:14 UTC (rev 6708) @@ -25,8 +25,8 @@ SPKG_DESC_CSWlibxaw = X Athena Widgets SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files -REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt -REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpm +REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt CSWlibxpm +REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpmdevel BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:46:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:46:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6709] csw/mgar/pkg/bdb45/trunk/Makefile Message-ID: Revision: 6709 http://gar.svn.sourceforge.net/gar/?rev=6709&view=rev Author: dmichelsen Date: 2009-10-05 13:46:16 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb45: Remove extra license directory Modified Paths: -------------- csw/mgar/pkg/bdb45/trunk/Makefile Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-05 13:20:14 UTC (rev 6708) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-05 13:46:16 UTC (rev 6709) @@ -70,6 +70,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb45doc = $(PKGFILES_DOC) PKGFILES_CSWbdb45devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:47:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6710] csw/mgar/pkg/bdb46/trunk/Makefile Message-ID: Revision: 6710 http://gar.svn.sourceforge.net/gar/?rev=6710&view=rev Author: dmichelsen Date: 2009-10-05 13:47:15 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb46: Remove extra license directory Modified Paths: -------------- csw/mgar/pkg/bdb46/trunk/Makefile Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-05 13:46:16 UTC (rev 6709) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-05 13:47:15 UTC (rev 6710) @@ -70,6 +70,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb46doc = $(PKGFILES_DOC) PKGFILES_CSWbdb46devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:48:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:48:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6711] csw/mgar/pkg/bdb48/trunk/Makefile Message-ID: Revision: 6711 http://gar.svn.sourceforge.net/gar/?rev=6711&view=rev Author: dmichelsen Date: 2009-10-05 13:48:42 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb48: Remove extra license directory Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-05 13:47:15 UTC (rev 6710) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-05 13:48:42 UTC (rev 6711) @@ -71,6 +71,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb48doc = $(PKGFILES_DOC) PKGFILES_CSWbdb48devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 16:34:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 14:34:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6712] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6712 http://gar.svn.sourceforge.net/gar/?rev=6712&view=rev Author: dmichelsen Date: 2009-10-05 14:34:43 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Fix source packages on Solaris 8 Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 13:48:42 UTC (rev 6711) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 14:34:43 UTC (rev 6712) @@ -530,8 +530,10 @@ merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files - $(_DBG)(cd $(DOWNLOADDIR); pax -rH -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR)/files) - $(_DBG)(cd $(CURDIR); pax -rH -w -v Makefile checksums $(_SRCDIR)) + $(_DBG)-rm -f $(addprefix $(_SRCDIR)/files/,$(DISTFILES) $(PATCHFILES)) + $(_DBG)(cd $(DOWNLOADDIR); cp $(DISTFILES) $(PATCHFILES) $(_SRCDIR)/files) + $(_DBG)-rm -f $(addprefix $(_SRCDIR)/,Makefile checksums gar) + $(_DBG)(cd $(CURDIR); cp Makefile checksums $(_SRCDIR)) $(_DBG)ln -s ../gar/$(GARSYSTEMVERSION) $(_SRCDIR)/gar $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 16:46:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 14:46:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6713] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6713 http://gar.svn.sourceforge.net/gar/?rev=6713&view=rev Author: dmichelsen Date: 2009-10-05 14:46:03 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb47: Add release Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 14:34:43 UTC (rev 6712) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) @@ -24,6 +24,7 @@ PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 NO_ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Oct 5 21:25:17 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:25:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6714] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 6714 http://gar.svn.sourceforge.net/gar/?rev=6714&view=rev Author: rthurner Date: 2009-10-05 19:25:16 +0000 (Mon, 05 Oct 2009) Log Message: ----------- depend on python runtime as well Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-10-05 19:25:16 UTC (rev 6714) @@ -12,7 +12,7 @@ SPKG_DESC_CSWmercurial = Mercurial -REQUIRED_PKGS_CSWmercurial = CSWpython +REQUIRED_PKGS_CSWmercurial = CSWpython CSWpython-rt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 21:31:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:31:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6715] csw/mgar/pkg/x11 Message-ID: Revision: 6715 http://gar.svn.sourceforge.net/gar/?rev=6715&view=rev Author: wbonnet Date: 2009-10-05 19:31:28 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_damageproto/ Removed Paths: ------------- csw/mgar/pkg/x11/damageproto/ Modified: csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile 2009-10-05 19:31:28 UTC (rev 6715) @@ -1,6 +1,8 @@ -GARNAME = damageproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = damageproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Damage protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 21:47:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:47:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6716] csw/mgar/pkg/x11 Message-ID: Revision: 6716 http://gar.svn.sourceforge.net/gar/?rev=6716&view=rev Author: wbonnet Date: 2009-10-05 19:46:33 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_dmxproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_dmxproto/ Removed Paths: ------------- csw/mgar/pkg/x11/dmxproto/ Modified: csw/mgar/pkg/x11/x11_dmxproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_dmxproto/trunk/Makefile 2009-10-05 19:46:33 UTC (rev 6716) @@ -1,6 +1,8 @@ -GARNAME = dmxproto GARVERSION = 2.2.2 CATEGORIES = x11 +PROTONAME = dmxproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Distributed Multi-headed X protocol headers for X11 define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 21:57:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:57:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6717] csw/mgar/pkg/x11 Message-ID: Revision: 6717 http://gar.svn.sourceforge.net/gar/?rev=6717&view=rev Author: wbonnet Date: 2009-10-05 19:57:49 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_dri2proto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_dri2proto/ Removed Paths: ------------- csw/mgar/pkg/x11/dri2proto/ Modified: csw/mgar/pkg/x11/x11_dri2proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_dri2proto/trunk/Makefile 2009-10-05 19:57:49 UTC (rev 6717) @@ -1,6 +1,8 @@ -GARNAME = dri2proto GARVERSION = 2.1 CATEGORIES = x11 +PROTONAME = dri2proto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org DRI2 prototype headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:04:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6718] csw/mgar/pkg/x11 Message-ID: Revision: 6718 http://gar.svn.sourceforge.net/gar/?rev=6718&view=rev Author: wbonnet Date: 2009-10-05 20:04:33 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_evieextproto/ Removed Paths: ------------- csw/mgar/pkg/x11/evieextproto/ Modified: csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile 2009-10-05 20:04:33 UTC (rev 6718) @@ -1,6 +1,8 @@ -GARNAME = evieext GARVERSION = 1.1.0 CATEGORIES = x11 +PROTONAME = evieext +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org EvIE protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME)proto +CATALOGNAME_CSWx11$(PROTONAME)proto = x11_$(PROTONAME)proto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:13:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6719] csw/mgar/pkg/x11 Message-ID: Revision: 6719 http://gar.svn.sourceforge.net/gar/?rev=6719&view=rev Author: wbonnet Date: 2009-10-05 20:13:44 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_fixesproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_fixesproto/ Removed Paths: ------------- csw/mgar/pkg/x11/fixesproto/ Modified: csw/mgar/pkg/x11/x11_fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_fixesproto/trunk/Makefile 2009-10-05 20:13:44 UTC (rev 6719) @@ -1,6 +1,8 @@ -GARNAME = fixesproto GARVERSION = 4.0 CATEGORIES = x11 +PROTONAME = fixesproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X11 Fixes extension protocol specification define BLURB @@ -8,15 +10,17 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:21:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:21:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6720] csw/mgar/pkg/x11 Message-ID: Revision: 6720 http://gar.svn.sourceforge.net/gar/?rev=6720&view=rev Author: wbonnet Date: 2009-10-05 20:21:20 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_fontsproto/ Removed Paths: ------------- csw/mgar/pkg/x11/fontsproto/ Modified: csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontsproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile 2009-10-05 20:21:20 UTC (rev 6720) @@ -1,6 +1,8 @@ -GARNAME = fontsproto GARVERSION = 2.1.0 CATEGORIES = x11 +PROTONAME = fontsproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Fonts extension headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:26:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6721] csw/mgar/pkg/x11 Message-ID: Revision: 6721 http://gar.svn.sourceforge.net/gar/?rev=6721&view=rev Author: wbonnet Date: 2009-10-05 20:26:30 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_fontcacheproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_fontcacheproto/ Removed Paths: ------------- csw/mgar/pkg/x11/fontcacheproto/ Modified: csw/mgar/pkg/x11/x11_fontcacheproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_fontcacheproto/trunk/Makefile 2009-10-05 20:26:30 UTC (rev 6721) @@ -1,6 +1,8 @@ -GARNAME = fontcacheproto GARVERSION = 0.1.2 CATEGORIES = x11 +PROTONAME = fontcacheproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X11 Prototype headers for the Fontcache library define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:33:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6722] csw/mgar/pkg/x11 Message-ID: Revision: 6722 http://gar.svn.sourceforge.net/gar/?rev=6722&view=rev Author: wbonnet Date: 2009-10-05 20:33:15 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_printproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_printproto/ Removed Paths: ------------- csw/mgar/pkg/x11/printproto/ Modified: csw/mgar/pkg/x11/x11_printproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/printproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_printproto/trunk/Makefile 2009-10-05 20:33:15 UTC (rev 6722) @@ -1,6 +1,8 @@ -GARNAME = printproto GARVERSION = 1.0.4 CATEGORIES = x11 +PROTONAME = printproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Print extension headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:38:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:38:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6723] csw/mgar/pkg/x11 Message-ID: Revision: 6723 http://gar.svn.sourceforge.net/gar/?rev=6723&view=rev Author: wbonnet Date: 2009-10-05 20:38:22 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_randrproto/ Removed Paths: ------------- csw/mgar/pkg/x11/randrproto/ Modified: csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile 2009-10-05 20:38:22 UTC (rev 6723) @@ -1,6 +1,8 @@ -GARNAME = randrproto GARVERSION = 1.3.0 CATEGORIES = x11 +PROTONAME = randrproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Randr protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:43:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6724] csw/mgar/pkg/x11 Message-ID: Revision: 6724 http://gar.svn.sourceforge.net/gar/?rev=6724&view=rev Author: wbonnet Date: 2009-10-05 20:43:48 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_resourceproto/ Removed Paths: ------------- csw/mgar/pkg/x11/resourceproto/ Modified: csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/resourceproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile 2009-10-05 20:43:48 UTC (rev 6724) @@ -1,6 +1,8 @@ -GARNAME = resourceproto GARVERSION = 1.1.0 CATEGORIES = x11 +PROTONAME = resourceproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Resource protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:49:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:49:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6725] csw/mgar/pkg/x11 Message-ID: Revision: 6725 http://gar.svn.sourceforge.net/gar/?rev=6725&view=rev Author: wbonnet Date: 2009-10-05 20:49:38 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_trapproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_trapproto/ Removed Paths: ------------- csw/mgar/pkg/x11/trapproto/ Modified: csw/mgar/pkg/x11/x11_trapproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_trapproto/trunk/Makefile 2009-10-05 20:49:38 UTC (rev 6725) @@ -1,6 +1,8 @@ -GARNAME = trapproto GARVERSION = 3.4.3 CATEGORIES = x11 +PROTONAME = trapproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Trap protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 6 16:31:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Oct 2009 14:31:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6726] csw/mgar/pkg/libpopt/tags/popt-1.15, REV=2009.10.06/ Message-ID: Revision: 6726 http://gar.svn.sourceforge.net/gar/?rev=6726&view=rev Author: dmichelsen Date: 2009-10-06 14:31:37 +0000 (Tue, 06 Oct 2009) Log Message: ----------- popt: Tag as release 1.15,REV=2009.10.06 Added Paths: ----------- csw/mgar/pkg/libpopt/tags/popt-1.15,REV=2009.10.06/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 6 16:32:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Oct 2009 14:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6727] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6727 http://gar.svn.sourceforge.net/gar/?rev=6727&view=rev Author: dmichelsen Date: 2009-10-06 14:32:10 +0000 (Tue, 06 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Add submitpkg target Modified Paths: -------------- csw/mgar/gar/v2-pbuild/bin/checkpkg csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-06 14:31:37 UTC (rev 6726) +++ csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-06 14:32:10 UTC (rev 6727) @@ -543,6 +543,7 @@ print "Doing late evaluations of package library dependencies." while read ldep; do lib=`echo $ldep | nawk '{print $1}'` + [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS if [ $? -ne 0 ]; then Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-06 14:31:37 UTC (rev 6726) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-06 14:32:10 UTC (rev 6727) @@ -279,7 +279,7 @@ # The package may be generated during this build or already installed on the system. # /etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA l none SUNWcsr #perl -ane '$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){print join(" ",$$F[3..$$#F]),"\n";exit}'/dev/null | awk '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)') +#$(shell /usr/sbin/pkgchk -l -p $1 2>/dev/null | $(GAWK) '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)') # 'pkchk -l -p' doesn't work as it concatenates package names with more than 14 characters, # e. g. SUNWgnome-base-libs-develSUNWgnome-calculatorSUNWgnome-freedb-libsSUNWgnome-cd-burnerSUNWgnome-character-map define file2pkg @@ -374,7 +374,7 @@ $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ - echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \ + echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ ) \ )) >$@) @@ -675,6 +675,14 @@ )\ ) +submitpkg: submitpkg-default + +submitpkg-%: _PKGURL=$(shell svn info .. | $(GAWK) '$$1 == "URL:" { print $$2 }') +submitpkg-%: + @$(if $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),\ + $(error You have local files not in the repository. Please commit everything before submitting a package)) + $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION)$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION)$(SPKG_REVSTAMP) + # dependb - update the dependency database # dependb: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 6 16:59:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 06 Oct 2009 14:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6728] csw/mgar/pkg/urxvt/trunk Message-ID: Revision: 6728 http://gar.svn.sourceforge.net/gar/?rev=6728&view=rev Author: wahwah Date: 2009-10-06 14:59:08 +0000 (Tue, 06 Oct 2009) Log Message: ----------- urxvt: A workaround for a Solaris kernel bug: http://bugs.opensolaris.org/view_bug.do?bug_id=6268715 Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2009-10-06 14:32:10 UTC (rev 6727) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2009-10-06 14:59:08 UTC (rev 6728) @@ -20,6 +20,7 @@ MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += urxvt-wrapper # PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris8.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -33,7 +34,21 @@ GARCOMPILER = GNU -REQUIRED_PKGS_CSWurxvt = CSWfconfig CSWftype2 CSWlibxft2 CSWlibxrender CSWzlib +REQUIRED_PKGS_CSWurxvt = CSWbash +REQUIRED_PKGS_CSWurxvt += CSWfconfig +REQUIRED_PKGS_CSWurxvt += CSWftype2 +REQUIRED_PKGS_CSWurxvt += CSWlibxft2 +REQUIRED_PKGS_CSWurxvt += CSWlibxrender +REQUIRED_PKGS_CSWurxvt += CSWzlib TEST_SCRIPTS = +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)$(libexecdir) + for b in urxvt urxvtd urxvtc; do \ + mv $(DESTDIR)$(bindir)/$${b} $(DESTDIR)$(libexecdir); \ + ln -s ../libexec/urxvt-wrapper $(DESTDIR)$(bindir)/$${b}; \ + done + ginstall -m 755 $(FILEDIR)/urxvt-wrapper $(DESTDIR)$(libexecdir) + @$(MAKECOOKIE) + include gar/category.mk Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2009-10-06 14:32:10 UTC (rev 6727) +++ csw/mgar/pkg/urxvt/trunk/checksums 2009-10-06 14:59:08 UTC (rev 6728) @@ -1 +1,2 @@ 4cb9330e99fc0b0b05cebf3581557dd8 download/rxvt-unicode-9.06.tar.bz2 +d1fb3a5f721baf361574880f6cdc92be download/urxvt-wrapper Added: csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper =================================================================== --- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper (rev 0) +++ csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper 2009-10-06 14:59:08 UTC (rev 6728) @@ -0,0 +1,20 @@ +#!/opt/csw/bin/bash +# +# A workaround because of a Solaris 10 kernel bug: +# http://bugs.opensolaris.org/view_bug.do?bug_id=6268715 + +set -u + +executable=$(basename $0) +libexec="/opt/csw/libexec" +libexec_binary="${libexec}/${executable}" + +if [[ ! -r "${libexec_binary}" ]]; then + echo "Can't read ${libexec_binary}" + exit 1 +fi + +# The workaround itself: +export LIBEV_FLAGS=1 + +exec "${libexec_binary}" "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Oct 6 20:27:33 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 06 Oct 2009 18:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6729] csw/mgar/pkg/wget/trunk Message-ID: Revision: 6729 http://gar.svn.sourceforge.net/gar/?rev=6729&view=rev Author: idogan23 Date: 2009-10-06 18:27:32 +0000 (Tue, 06 Oct 2009) Log Message: ----------- wget: bump version to 1.12 Modified Paths: -------------- csw/mgar/pkg/wget/trunk/Makefile csw/mgar/pkg/wget/trunk/checksums Modified: csw/mgar/pkg/wget/trunk/Makefile =================================================================== --- csw/mgar/pkg/wget/trunk/Makefile 2009-10-06 14:59:08 UTC (rev 6728) +++ csw/mgar/pkg/wget/trunk/Makefile 2009-10-06 18:27:32 UTC (rev 6729) @@ -1,5 +1,5 @@ GARNAME = wget -GARVERSION = 1.11.4 +GARVERSION = 1.12 CATEGORIES = net DESCRIPTION = A network utility to retrieve files from the Web Modified: csw/mgar/pkg/wget/trunk/checksums =================================================================== --- csw/mgar/pkg/wget/trunk/checksums 2009-10-06 14:59:08 UTC (rev 6728) +++ csw/mgar/pkg/wget/trunk/checksums 2009-10-06 18:27:32 UTC (rev 6729) @@ -1 +1 @@ -f5076a8c2ec2b7f334cb6e3059820f9c download/wget-1.11.4.tar.bz2 +308a5476fc096a8a525d07279a6f6aa3 download/wget-1.12.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 20:44:49 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 18:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6730] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 6730 http://gar.svn.sourceforge.net/gar/?rev=6730&view=rev Author: valholla Date: 2009-10-06 18:44:49 +0000 (Tue, 06 Oct 2009) Log Message: ----------- fix required pkgs Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2009-10-06 18:27:32 UTC (rev 6729) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2009-10-06 18:44:49 UTC (rev 6730) @@ -33,8 +33,8 @@ SPKG_DESC_CSWsendmail = $(DESCRIPTION) CATALOGNAME_CSWsendmail = sendmail -REQUIRED_PKGS_CSWsendmail = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap -REQUIRED_PKGS_CSWsendmail = CSWcswclassutils +REQUIRED_PKGS_CSWsendmail = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap +REQUIRED_PKGS_CSWsendmail += CSWcswclassutils PROTOTYPE_FILTER = awk \ '$$$$2 ~/i.sol8/ { next } \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 21:42:24 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 19:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6731] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 6731 http://gar.svn.sourceforge.net/gar/?rev=6731&view=rev Author: valholla Date: 2009-10-06 19:42:24 +0000 (Tue, 06 Oct 2009) Log Message: ----------- update to latest version Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 18:44:49 UTC (rev 6730) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 19:42:24 UTC (rev 6731) @@ -1,5 +1,5 @@ GARNAME = libssh2 -GARVERSION = 1.2 +GARVERSION = 1.2.1 CATEGORIES = lib DESCRIPTION = A Library Implementing the SSH2 Protocol. Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2009-10-06 18:44:49 UTC (rev 6730) +++ csw/mgar/pkg/libssh2/trunk/checksums 2009-10-06 19:42:24 UTC (rev 6731) @@ -1 +1 @@ -751f4b5b5d8091f84cfe25fa52226cf9 download/libssh2-1.2.tar.gz +4ee0197947a3b8a4472328c346e1a0e4 download/libssh2-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:14:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6732] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: Revision: 6732 http://gar.svn.sourceforge.net/gar/?rev=6732&view=rev Author: valholla Date: 2009-10-06 20:14:12 +0000 (Tue, 06 Oct 2009) Log Message: ----------- don't test port conflict Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 19:42:24 UTC (rev 6731) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 20:14:12 UTC (rev 6732) @@ -27,6 +27,7 @@ BUILD64 = 1 NO_ISAEXEC = 1 +TEST_SCRIPTS = TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:19:29 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:19:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6733] csw/mgar/pkg/drupal/trunk/Makefile Message-ID: Revision: 6733 http://gar.svn.sourceforge.net/gar/?rev=6733&view=rev Author: valholla Date: 2009-10-06 20:19:29 +0000 (Tue, 06 Oct 2009) Log Message: ----------- update to 6.14 Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/Makefile Modified: csw/mgar/pkg/drupal/trunk/Makefile =================================================================== --- csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:14:12 UTC (rev 6732) +++ csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:19:29 UTC (rev 6733) @@ -1,5 +1,5 @@ GARNAME = drupal -GARVERSION = 6.12 +GARVERSION = 6.14 CATEGORIES = apps DESCRIPTION = An open source content management platform This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:20:32 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:20:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6734] csw/mgar/pkg/drupal/trunk/checksums Message-ID: Revision: 6734 http://gar.svn.sourceforge.net/gar/?rev=6734&view=rev Author: valholla Date: 2009-10-06 20:20:31 +0000 (Tue, 06 Oct 2009) Log Message: ----------- update to 6.14 Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/checksums Modified: csw/mgar/pkg/drupal/trunk/checksums =================================================================== --- csw/mgar/pkg/drupal/trunk/checksums 2009-10-06 20:19:29 UTC (rev 6733) +++ csw/mgar/pkg/drupal/trunk/checksums 2009-10-06 20:20:31 UTC (rev 6734) @@ -1,4 +1,4 @@ 53fd0059901ddea2bf62f920ee8a6cf6 download/README.CSW -82e2517f175320cffe20997333b3a33a download/drupal-6.12.tar.gz +014bb453a8d0adb0233c763e40d63859 download/drupal-6.14.tar.gz 26a7b490bfe0b52a9ff85880dd3aede1 download/httpd-drupal.conf.CSW 827f7d5f390a53577fc11ac17ad66651 download/uploaddir.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:48:26 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6735] csw/mgar/pkg/drupal/trunk/Makefile Message-ID: Revision: 6735 http://gar.svn.sourceforge.net/gar/?rev=6735&view=rev Author: valholla Date: 2009-10-06 20:48:26 +0000 (Tue, 06 Oct 2009) Log Message: ----------- fix location Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/Makefile Modified: csw/mgar/pkg/drupal/trunk/Makefile =================================================================== --- csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:20:31 UTC (rev 6734) +++ csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:48:26 UTC (rev 6735) @@ -40,7 +40,7 @@ REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5 -DRUPAL_INST_DIR = $(DESTDIR)$(docdir)/$(GARNAME)/$(GARVERSION) +DRUPAL_INST_DIR = $(DESTDIR)$(sharedstatedir)/$(GARNAME)/$(GARVERSION) DRUPAL_DOCFILES = CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt DRUPAL_DOCFILES += INSTALL.pgsql.txt INSTALL.txt LICENSE.txt DRUPAL_DOCFILES += MAINTAINERS.txt UPGRADE.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:52:14 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:52:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6736] csw/mgar/pkg/drupal/trunk/Makefile Message-ID: Revision: 6736 http://gar.svn.sourceforge.net/gar/?rev=6736&view=rev Author: valholla Date: 2009-10-06 20:52:14 +0000 (Tue, 06 Oct 2009) Log Message: ----------- fix depend Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/Makefile Modified: csw/mgar/pkg/drupal/trunk/Makefile =================================================================== --- csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:48:26 UTC (rev 6735) +++ csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:52:14 UTC (rev 6736) @@ -37,7 +37,7 @@ INSTALL_SCRIPTS = custom TEST_SCRIPTS = -REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring +REQUIRED_PKGS_CSWdrupal = CSWapache2 CSWphp5 CSWphp5gd CSWphp5mbstring REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5 DRUPAL_INST_DIR = $(DESTDIR)$(sharedstatedir)/$(GARNAME)/$(GARVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 04:58:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 02:58:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6737] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6737 http://gar.svn.sourceforge.net/gar/?rev=6737&view=rev Author: bdwalton Date: 2009-10-07 02:58:35 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cswclassutils: make prototype dynamic; add {i,r}.cswinetd Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd Removed Paths: ------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,11 +1,10 @@ GARNAME = cswclassutils -GARVERSION = 1.18 +GARVERSION = 1.19 CATEGORIES = utils DESCRIPTION = CSW class action utilities MASTER_SITES = -DISTFILES += $(call admfiles,CSWcswclassutils,prototype) ARCHALL = 1 @@ -14,23 +13,24 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -include gar/category.mk - -WORKSRC = $(WORKDIR) SPKG_SOURCEURL = http://www.opencsw.org -CASLIST = cswcpsampleconf cswpreserveconf cswinitsmf cswusergroup cswpycompile +CASLIST = $(foreach F,$(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +PROTOTYPE_FILTER = sed -e '/^d.*\/usr/d; /scripts/{ s/bin/sys/; }' + +include gar/category.mk + install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)/usr/sadm/install/scripts - @ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest - @ginstall -d $(DESTDIR)/var/opt/csw/svc/method - @cp $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample - @cp $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @cp $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license - @$(foreach CAS,$(CASLIST),cp $(FILEDIR)/CSW$(GARNAME).i.$(CAS) $(DESTDIR)/usr/sadm/install/scripts/i.$(CAS);cp $(FILEDIR)/CSW$(GARNAME).r.$(CAS) $(DESTDIR)/usr/sadm/install/scripts/r.$(CAS);) + @ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 0755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts + @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/manifest + @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method + @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample + @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW + @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license + @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,2 +0,0 @@ -38e0bf6e204e003254ed246df2b4e1f9 download/CSWcswclassutils.gspec -854d77b21b177b15fd2aac39339a0c8c download/CSWcswclassutils.prototype Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,11 +0,0 @@ -%var bitname cswclassutils -%var pkgname CSWcswclassutils -%var arch all -%include url file://%{PKGLIB}/csw_vars.gspec -%pkginfo url file://%{PKGLIB}/csw/pkginfo -%include url file://%{PKGLIB}/csw_prototype.gspec -%depend -%copyright - -Please see /opt/csw/share/doc/cswclassutils/license for license information. - Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-07 02:58:35 UTC (rev 6737) @@ -0,0 +1,119 @@ +#!/bin/sh +# +# i.cswinetd - Class action script for CSW inetd support +# +# Written and maintained by Ben Walton +# +# 2009-10-02 Initial release + +# set DEBUG to any value to enable trace outpu. +DEBUG= + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# Determine if we should import the file with inetconv +case "`uname -r`" in + 5.8|5.9) useinetconv=no;; + *) useinetconv=yes;; +esac + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + inetdsvc=`cat $dest` + set -- $inetdsvc + svcname=$1 + proto=$3 + + if [ -n "$DEBUG" ]; then + echo "svcname: $svcname; proto: $proto" + fi + + case "$svcname" in + */*) isrpc=yes;; + *) isrpc=no;; + esac + + # Determine if service should be started or not + daemon=yes + if [ "$autoenable_daemons" = "no" ]; then + daemon=no + fi + eval autoenable_service="\$autoenable_$svcname" + if [ "$autoenable_service" = "no" ]; then + daemon=no + elif [ "$autoenable_service" = "yes" ]; then + daemon=yes + fi + + # we won't register with inetd if the service name isn't registered + # in the global services file. + /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/inet/services + if [ $? -eq 0 ]; then + if [ -n "$DEBUG" ]; then + echo "Installing inetd service:" + echo "$inetdsvc" + fi + + if [ "$useinetconv" = "yes" ]; then + [ -n "$DEBUG" ] && echo "For solaris 10 (or newer)" + + outdir=/var/opt/csw/svc/manifest/network + if [ "$isrpc" = "yes" ]; then + outdir=$outdir/rpc + fi + manifest=$outdir/$svcname-$proto.xml + + echo "$inetdsvc" > /tmp/$svcname.$$ + + # we use -f to force any in the specified inetd to take precedence + /usr/sbin/inetconv -f -i /tmp/$svcname.$$ -o $outdir || exit 2 + if [ "$daemon" = "yes" ]; then + /usr/sbin/inetadm -e svc:/network/$svcname/$proto:default + else + /usr/sbin/inetadm -d svc:/network/$svcname/$proto:default + fi + + /usr/sbin/installf -c cswinetd $PKGINST $manifest f 644 root bin + /usr/bin/chmod 644 $manifest + /usr/bin/chown root:bin $manifest + + rm /tmp/$svcname.$$ + else + [ -n "$DEBUG" ] && echo "For solaris 8 or 9" + + inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf + + echo "Installing '$svcname' into inetd.conf." + echo "# $PKGINST: added by i.cswinetd" >> $inetdconf + if [ "$daemon" = "yes" ]; then + + echo "$inetdsvc" >> $inetdconf + /usr/bin/pkill -HUP inetd + else + echo "#$inetdsvc" >> $inetdconf + fi + fi + + if [ "$daemon" = "yes" ]; then + echo "Inetd service '$svcname' should be enabled by default." + else + echo "Inetd service '$svcname' should be disabled by default." + fi + else + echo "Service '$svcname' not found in /etc/inet/services. Won't setup inetd for it." + exit 2 + fi +done + +exit 0 Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,24 +0,0 @@ -i pkginfo=CSWcswclassutils.pkginfo -i copyright=CSWcswclassutils.copyright -d none /etc/opt/csw 0755 root bin -d none /etc/opt/csw/init.d 0755 root bin -f none /etc/opt/csw/init.d/csw.smf.sample 0755 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/svc 0755 root bin -d none /var/opt/csw/svc/manifest 0755 root bin -d none /var/opt/csw/svc/method 0755 root bin -f none /usr/sadm/install/scripts/i.cswusergroup 0555 root sys -f none /usr/sadm/install/scripts/r.cswusergroup 0555 root sys -f none /usr/sadm/install/scripts/i.cswinitsmf 0555 root sys -f none /usr/sadm/install/scripts/r.cswinitsmf 0555 root sys -f none /usr/sadm/install/scripts/i.cswcpsampleconf 0555 root sys -f none /usr/sadm/install/scripts/r.cswcpsampleconf 0555 root sys -f none /usr/sadm/install/scripts/i.cswpreserveconf 0555 root sys -f none /usr/sadm/install/scripts/r.cswpreserveconf 0555 root sys -f none /usr/sadm/install/scripts/i.cswpycompile 0555 root sys -f none /usr/sadm/install/scripts/r.cswpycompile 0555 root sys -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/cswclassutils 0755 root bin -f none /opt/csw/share/doc/cswclassutils/README.CSW 0444 root bin -f none /opt/csw/share/doc/cswclassutils/license 0444 root bin Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd 2009-10-07 02:58:35 UTC (rev 6737) @@ -0,0 +1,49 @@ +#!/bin/sh +# +# r.cswinetd - Class action script for CSW inetd support +# +# Written and maintained by Ben Walton +# +# 2009-10-02 Initial release + +case "`uname -r`" in + 5.8|5.9) useinetconv=no;; + *) useinetconv=yes; +esac + +while read dest; do + case "$dest" in + *xml) + # we know that this won't happen for sol8/9 + fmri=`/usr/sbin/svccfg inventory $dest | grep -v default` + echo "Disabling and removing $fmri" + inetadm -d $fmri + svccfg delete $fmri + ;; + *) + if [ "$useinetconv" = "no" ]; then + # sol 8 or 9 + + inetdconf=/etc/inet/inetd.conf + inetdsvc=`cat $dest` + set -- $inetdsvc + svcname=$1 + echo "Removing $svcname service from inetd.conf" + /usr/xpg4/bin/sed -e '/# CSWgitosis/{ +$!N +/^# CSWgitosis.*\n#git.*$/d +}' $inetdconf > $inetdconf.$$ && \ + mv $inetdconf.$$ $inetdconf && \ + + chown root:sys $inetdconf && \ + chmod 444 $inetdconf + + # even if the service was disabled, this shouldn't hurt + /usr/bin/pkill -HUP inetd + fi + ;; + esac + + echo $dest + rm -f $dest +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 12:03:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 10:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6738] csw/mgar/pkg/autoproject/trunk Message-ID: Revision: 6738 http://gar.svn.sourceforge.net/gar/?rev=6738&view=rev Author: wahwah Date: 2009-10-07 10:03:07 +0000 (Wed, 07 Oct 2009) Log Message: ----------- autoproject: Added a patch to make it work on Solaris Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile csw/mgar/pkg/autoproject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2009-10-07 02:58:35 UTC (rev 6737) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-10-07 10:03:07 UTC (rev 6738) @@ -22,9 +22,14 @@ SPKG_SOURCEURL = http://packages.debian.org/unstable/devel/autoproject MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/ DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz +PATCHFILES = 0001-gawk-and-ggrep.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL = 1 -REQUIRED_PKGS = CSWautomake +REQUIRED_PKGS = CSWautomake CSWbash CSWgawk CSWggrep TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +AWK=gawk +export AWK +GREP=ggrep +export GREP include gar/category.mk Modified: csw/mgar/pkg/autoproject/trunk/checksums =================================================================== --- csw/mgar/pkg/autoproject/trunk/checksums 2009-10-07 02:58:35 UTC (rev 6737) +++ csw/mgar/pkg/autoproject/trunk/checksums 2009-10-07 10:03:07 UTC (rev 6738) @@ -1,2 +1,2 @@ -c56275967bba34ce1864b3d917e08e55 download/autoproject_0.20-5.diff.gz +acbc54ffab66fd0e7e1820f280a454f1 download/0001-gawk-and-ggrep.patch 609369fa76391d58714059313b9c831c download/autoproject_0.20.orig.tar.gz Added: csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch =================================================================== --- csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch (rev 0) +++ csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch 2009-10-07 10:03:07 UTC (rev 6738) @@ -0,0 +1,123 @@ +From e740fa7364ce0c3a4e67474df83533aae4e85595 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 7 Oct 2009 10:56:16 +0100 +Subject: [PATCH] gawk and ggrep + +--- + autoproject.in | 25 +++++++++++++------------ + 1 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/autoproject.in b/autoproject.in +index d7d1ce8..faa67cc 100755 +--- a/autoproject.in ++++ b/autoproject.in +@@ -12,7 +12,8 @@ set -e + + prefix=@prefix@ + DATADIR=@datadir@ +-AWK=awk ++AWK=gawk ++GREP=ggrep + NAME= + EMAIL= + theoptions=a:d:e:i:l:n:o:p:vVh +@@ -67,7 +68,7 @@ while + DESCRIPTION="$OPTARG"; shift $two ;; + e|-e|--email) EMAIL="$OPTARG"; shift $two ;; + i|-i|--interface) +- if echo "$STDIFS"|grep -q -- " $OPTARG "; then ++ if echo "$STDIFS"|${GREP} -q -- " $OPTARG "; then + IFACE="$OPTARG"; shift $two; + else + echo "unrecognized interface $OPTARG"; +@@ -78,13 +79,13 @@ while + if [ "$OPTARG" = "" ]; then + SKELETONS=""; + else +- if (echo $OPTARG|grep ^/ >/dev/null); then true; \ ++ if (echo $OPTARG|${GREP} ^/ >/dev/null); then true; \ + else OPTARG=`pwd`/$OPTARG; fi + SKELETONS="$OPTARG $SKELETONS"; + fi; + shift $two;; + l|-l|--language) +- if echo "$STDLANGS"|grep -F -q -- " $OPTARG "; then ++ if echo "$STDLANGS"|${GREP} -F -q -- " $OPTARG "; then + PROJECT_LANG="$PROJECT_LANG $OPTARG "; shift $two; + else + echo "unrecognized language $OPTARG"; +@@ -94,7 +95,7 @@ while + n|-n|--name) + NAME=$OPTARG; shift $two ;; + o|-o|--option) +- if echo "$STDOPTS"|grep -q -- " $OPTARG "; then ++ if echo "$STDOPTS"|${GREP} -q -- " $OPTARG "; then + OPTS="$OPTS $OPTARG"; shift $two; + else + echo "unrecognized option $OPTARG"; +@@ -102,7 +103,7 @@ while + exit 1; + fi ;; + p|-p|--parser) +- if echo "$STDPARSERS"|grep -q -- " $OPTARG "; then ++ if echo "$STDPARSERS"|${GREP} -q -- " $OPTARG "; then + PARSER="$OPTARG"; shift $two; + else + echo "unrecognized parser generator $OPTARG"; +@@ -163,7 +164,7 @@ while [ $finished != yes ]; do + else + echo "$HELP"; + fi +- else if echo "$CHOICES" | grep -q -- " $ans "; then ++ else if echo "$CHOICES" | ${GREP} -q -- " $ans "; then + finished=yes; + else echo " unrecognized choice $ans"; fi; fi + done +@@ -251,7 +252,7 @@ fi + + echo "Please indicate which of the following standard options $NAME will use:" + for op in $STDOPTS; do +- if echo " $OPTS "|grep -q -- " $op "; then ++ if echo " $OPTS "|${GREP} -q -- " $op "; then + true; + else + echo -n " $op? [yN] "; read ans; +@@ -279,7 +280,7 @@ if [ "$AUTHOR" = "" ]; then + # Give NIS a try + AUTHOR=`ypmatch $USER passwd.byname|$AWK -F: '{ print $5; }'` + fi +- if echo $AUTHOR | grep -q -- "\,"; then ++ if echo $AUTHOR | ${GREP} -q -- "\,"; then + X=`expr index "$AUTHOR" ","` + X=`expr $X - 1` || true + AUTHOR=`expr substr "$AUTHOR" 1 $X` || true +@@ -325,7 +326,7 @@ cd "$NAME" + # Create a small awk script to select the appropriate options fragments + + for op in $STDOPTS; do +- if echo " $OPTS " | grep -q -- " $op " ; then ++ if echo " $OPTS " | ${GREP} -q -- " $op " ; then + # lines like "@item --output=@var{name}" are not special + cat >>optionsub <$i + if [ -x $DIR/$i ]; then chmod +x $i; fi +- PROCESSED=`awk "BEGIN{print $PROCESSED+1}"` ++ PROCESSED=`${AWK} "BEGIN{print $PROCESSED+1}"` + fi + done + fi +@@ -402,7 +403,7 @@ fi + + # insert language-specific macros into configure.in + insert(){ +-if echo "$PROJECT_LANG"|grep -F -q -- " $1 "; then ++if echo "$PROJECT_LANG"|${GREP} -F -q -- " $1 "; then + echo "using $1 - adding $2 to configure.in" + $AWK "{print}/^AC_PROG_CC/{print \"$2\"}" \ + configure.in >tmp && mv tmp configure.in +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 12:29:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 10:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6739] csw/mgar/pkg/examples/modulations/trunk/files Message-ID: Revision: 6739 http://gar.svn.sourceforge.net/gar/?rev=6739&view=rev Author: wahwah Date: 2009-10-07 10:29:20 +0000 (Wed, 07 Oct 2009) Log Message: ----------- libexample: initial commit Added Paths: ----------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/ csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am csw/mgar/pkg/examples/modulations/trunk/files/libexample/NEWS csw/mgar/pkg/examples/modulations/trunk/files/libexample/README csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/gpl.texinfo csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.1 csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.info csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.lsm.in csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.spec.in csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.texinfo csw/mgar/pkg/examples/modulations/trunk/files/libexample/system.h Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1 @@ +Maciej Blizinski Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,4 @@ +2009-10-07 Maciej Blizinski + + * libexample: initial version. + Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,18 @@ +bin_PROGRAMS=libexample +libexample_SOURCES=libexample.c libexample.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h + +# uncomment the following if libexample requires the math library +#libexample_LDADD=-lm + +EXTRA_DIST=libexample.lsm.in libexample.spec.in libexample.texinfo + +# if you write a self-test script named `chk', uncomment the +# following and add `chk' to the EXTRA_DIST list +#TESTS=chk + +# build and install the .info pages +info_TEXINFOS = libexample.texinfo +libexample_TEXINFOS = gpl.texinfo + +# install the man pages +man_MANS=libexample.1 Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/README =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/README (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/README 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,23 @@ + libexample - A shared library example project + + + + Copyright (C) 2009 Maciej Blizinski + + libexample is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Comments are welcome. + + - Maciej Blizinski Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,40 @@ +#serial 3 + +dnl From Jim Meyering + +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- +dnl usually in . +dnl Some systems have utime.h but don't declare the struct anywhere. + +AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, +[ + AC_CHECK_HEADERS(utime.h) + AC_REQUIRE([AC_HEADER_TIME]) + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, + [AC_TRY_COMPILE( + [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#ifdef HAVE_UTIME_H +# include +#endif + ], + [static struct utimbuf x; x.actime = x.modtime;], + fu_cv_sys_struct_utimbuf=yes, + fu_cv_sys_struct_utimbuf=no) + ]) + + if test $fu_cv_sys_struct_utimbuf = yes; then + AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, +[Define if struct utimbuf is declared -- usually in . + Some systems have utime.h but don't declare the struct anywhere. ]) + fi +]) Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,964 @@ +# generated automatically by aclocal 1.11 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +[m4_warning([this file was generated for autoconf 2.64. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 9 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 10 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 5 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 16 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 6 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([acinclude.m4]) Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,41 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT(libexample.c) +dnl Every other copy of the package version number gets its value from here +AM_INIT_AUTOMAKE(libexample, 0.1.0) + +dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) +AM_CONFIG_HEADER(config.h) + +AC_SUBST(VERSION) + +ISODATE=`date +%Y-%m-%d` +AC_SUBST(ISODATE) + +AC_CANONICAL_HOST + +dnl Checks for programs. +AC_PROG_INSTALL +AC_PROG_CC + +dnl Checks for libraries. + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h ) + + +jm_CHECK_TYPE_STRUCT_UTIMBUF +AC_HEADER_MAJOR +AC_FUNC_ALLOCA +AC_STRUCT_TM +AC_STRUCT_ST_BLOCKS +AC_FUNC_CLOSEDIR_VOID +AC_CHECK_FUNCS(mkfifo) +AC_CHECK_FUNC(mknod) + +dnl Checks for typedefs, structures, and compiler characteristics. + +dnl Checks for library functions. + +AC_OUTPUT(Makefile libexample.lsm libexample.spec) Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,1055 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper at gnu.org + before changing it! + + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 + Free Software Foundation, Inc. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include +# include +#endif /* GNU C library. */ + +#ifdef VMS +# include +# if HAVE_STRING_H - 0 +# include +# endif +#endif + +#ifndef _ +/* This is for other GNU distributions with internationalized messages. + When compiling libc, the _ macro is predefined. */ +# ifdef HAVE_LIBINTL_H +# include +# define _(msgid) gettext (msgid) +# else +# define _(msgid) (msgid) +# endif +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include +# define my_index strchr +#else + +# if HAVE_STRING_H +# include +# else +# include +# endif + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; + +static int original_argc; +static char *const *original_argv; + +/* Make sure the environment variable bash 2.0 puts in the environment + is valid for the getopt call we must make sure that the ARGV passed + to getopt is that one passed to the process. */ +static void +__attribute__ ((unused)) +store_args_and_env (int argc, char *const *argv) +{ + /* XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ + original_argc = argc; + original_argv = argv; +} +# ifdef text_set_element +text_set_element (__libc_subinit, store_args_and_env); +# endif /* text_set_element */ + +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +#if defined __STDC__ && __STDC__ +static void exchange (char **); +#endif + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#ifdef _LIBC + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +#if defined __STDC__ && __STDC__ +static const char *_getopt_initialize (int, char *const *, const char *); +#endif +static const char * +_getopt_initialize (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#ifdef _LIBC + if (posixly_correct == NULL + && argc == original_argc && argv == original_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + int print_errors = opterr; + if (optstring[0] == ':') + print_errors = 0; + + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#ifdef _LIBC +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + _("%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); + else + /* +option or -option */ + fprintf (stderr, + _("%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); + } + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (print_errors) + { + if (argv[optind][1] == '-') + /* --option */ + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); + else + /* +option or -option */ + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (print_errors) + { + if (posixly_correct) + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: illegal option -- %c\n"), + argv[0], c); + else + fprintf (stderr, _("%s: invalid option -- %c\n"), + argv[0], c); + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,169 @@ +/* Declarations for getopt. + Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _GETOPT_H + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +# if defined __STDC__ && __STDC__ + const char *name; +# else + char *name; +# endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#if defined __STDC__ && __STDC__ +# ifdef __GNU_LIBRARY__ +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int __argc, char *const *__argv, const char *__shortopts); +# else /* not __GNU_LIBRARY__ */ +extern int getopt (); +# endif /* __GNU_LIBRARY__ */ + +# ifndef __need_getopt +extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt_internal (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only); +# endif +#else /* not __STDC__ */ +extern int getopt (); +# ifndef __need_getopt +extern int getopt_long (); +extern int getopt_long_only (); + +extern int _getopt_internal (); +# endif +#endif /* __STDC__ */ + +#ifdef __cplusplus +} +#endif + +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt + +#endif /* getopt.h */ Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,188 @@ +/* getopt_long and getopt_long_only entry points for GNU getopt. + Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "getopt.h" + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +#ifndef const +#define const +#endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +#include +#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +#define ELIDE_CODE +#endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#endif + +#ifndef NULL +#define NULL 0 +#endif + +int +getopt_long (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 1); +} + + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +#include + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + int option_index = 0; + static struct option long_options[] = + { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; + @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 12:41:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 10:41:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6740] csw/mgar/pkg/examples/modulations/trunk/files/ libexample Message-ID: Revision: 6740 http://gar.svn.sourceforge.net/gar/?rev=6740&view=rev Author: wahwah Date: 2009-10-07 10:41:12 +0000 (Wed, 07 Oct 2009) Log Message: ----------- libexample: Added one shared library Modified Paths: -------------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in Added Paths: ----------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/ csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 Removed Paths: ------------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c Modified: csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,11 +1,17 @@ -bin_PROGRAMS=libexample -libexample_SOURCES=libexample.c libexample.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h +bin_PROGRAMS=binexample +binexample_SOURCES=binexample.c libexample.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h # uncomment the following if libexample requires the math library #libexample_LDADD=-lm EXTRA_DIST=libexample.lsm.in libexample.spec.in libexample.texinfo +# AUTOMAKE_OPTIONS = gnu + +lib_LTLIBRARIES = libexample.la +libexample_la_SOURCES = libexample.c +libexample_la_LDFLAGS = -version-info 0:0:0 + # if you write a self-test script named `chk', uncomment the # following and add `chk' to the EXTRA_DIST list #TESTS=chk Deleted: csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,40 +0,0 @@ -#serial 3 - -dnl From Jim Meyering - -dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- -dnl usually in . -dnl Some systems have utime.h but don't declare the struct anywhere. - -AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, -[ - AC_CHECK_HEADERS(utime.h) - AC_REQUIRE([AC_HEADER_TIME]) - AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, - [AC_TRY_COMPILE( - [ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif -#ifdef HAVE_UTIME_H -# include -#endif - ], - [static struct utimbuf x; x.actime = x.modtime;], - fu_cv_sys_struct_utimbuf=yes, - fu_cv_sys_struct_utimbuf=no) - ]) - - if test $fu_cv_sys_struct_utimbuf = yes; then - AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, -[Define if struct utimbuf is declared -- usually in . - Some systems have utime.h but don't declare the struct anywhere. ]) - fi -]) Deleted: csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,964 +0,0 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -[m4_warning([this file was generated for autoconf 2.64. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 10 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 16 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([acinclude.m4]) Copied: csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c (from rev 6739, csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c) =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c 2009-10-07 10:41:12 UTC (rev 6740) @@ -0,0 +1,118 @@ +/* + libexample - A shared library example project + + Copyright (C) 2009 Maciej Blizinski + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +#include +#include +#include +*/ + +#include +#include +#include +#include "system.h" + +#define EXIT_FAILURE 1 + +/* +char *xmalloc (); +char *xrealloc (); +char *xstrdup (); +*/ + + +static void usage (int status); + +/* The name the program was run with, stripped of any leading path. */ +char *program_name; + +/* getopt_long return codes */ +enum {DUMMY_CODE=129 +}; + +/* Option flags and variables */ + + +static struct option const long_options[] = +{ + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'V'}, + {NULL, 0, NULL, 0} +}; + +static int decode_switches (int argc, char **argv); + +int +main (int argc, char **argv) +{ + int i; + + program_name = argv[0]; + + i = decode_switches (argc, argv); + + /* do the work */ + + exit (0); +} + +/* Set all the option flags according to the switches specified. + Return the index of the first non-option argument. */ + +static int +decode_switches (int argc, char **argv) +{ + int c; + + + while ((c = getopt_long (argc, argv, + "h" /* help */ + "V", /* version */ + long_options, (int *) 0)) != EOF) + { + switch (c) + { + case 'V': + printf ("libexample %s\n", VERSION); + exit (0); + + case 'h': + usage (0); + + default: + usage (EXIT_FAILURE); + } + } + + return optind; +} + + +static void +usage (int status) +{ + printf (_("%s - \ +A shared library example project\n"), program_name); + printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); + printf (_("\ +Options:\n\ + -h, --help display this help and exit\n\ + -V, --version output version information and exit\n\ +")); + exit (status); +} Modified: csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in 2009-10-07 10:41:12 UTC (rev 6740) @@ -3,6 +3,8 @@ AC_INIT(libexample.c) dnl Every other copy of the package version number gets its value from here AM_INIT_AUTOMAKE(libexample, 0.1.0) +AM_PROG_LIBTOOL +AC_CONFIG_MACRO_DIR([m4]) dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) AM_CONFIG_HEADER(config.h) Deleted: csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,118 +0,0 @@ -/* - libexample - A shared library example project - - Copyright (C) 2009 Maciej Blizinski - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -#include -#include -#include -*/ - -#include -#include -#include -#include "system.h" - -#define EXIT_FAILURE 1 - -/* -char *xmalloc (); -char *xrealloc (); -char *xstrdup (); -*/ - - -static void usage (int status); - -/* The name the program was run with, stripped of any leading path. */ -char *program_name; - -/* getopt_long return codes */ -enum {DUMMY_CODE=129 -}; - -/* Option flags and variables */ - - -static struct option const long_options[] = -{ - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {NULL, 0, NULL, 0} -}; - -static int decode_switches (int argc, char **argv); - -int -main (int argc, char **argv) -{ - int i; - - program_name = argv[0]; - - i = decode_switches (argc, argv); - - /* do the work */ - - exit (0); -} - -/* Set all the option flags according to the switches specified. - Return the index of the first non-option argument. */ - -static int -decode_switches (int argc, char **argv) -{ - int c; - - - while ((c = getopt_long (argc, argv, - "h" /* help */ - "V", /* version */ - long_options, (int *) 0)) != EOF) - { - switch (c) - { - case 'V': - printf ("libexample %s\n", VERSION); - exit (0); - - case 'h': - usage (0); - - default: - usage (EXIT_FAILURE); - } - } - - return optind; -} - - -static void -usage (int status) -{ - printf (_("%s - \ -A shared library example project\n"), program_name); - printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); - printf (_("\ -Options:\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ -")); - exit (status); -} Copied: csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 (from rev 6739, csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4) =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 2009-10-07 10:41:12 UTC (rev 6740) @@ -0,0 +1,40 @@ +#serial 3 + +dnl From Jim Meyering + +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- +dnl usually in . +dnl Some systems have utime.h but don't declare the struct anywhere. + +AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, +[ + AC_CHECK_HEADERS(utime.h) + AC_REQUIRE([AC_HEADER_TIME]) + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, + [AC_TRY_COMPILE( + [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#ifdef HAVE_UTIME_H +# include +#endif + ], + [static struct utimbuf x; x.actime = x.modtime;], + fu_cv_sys_struct_utimbuf=yes, + fu_cv_sys_struct_utimbuf=no) + ]) + + if test $fu_cv_sys_struct_utimbuf = yes; then + AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, +[Define if struct utimbuf is declared -- usually in . + Some systems have utime.h but don't declare the struct anywhere. ]) + fi +]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 13:15:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 11:15:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6741] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 6741 http://gar.svn.sourceforge.net/gar/?rev=6741&view=rev Author: dmichelsen Date: 2009-10-07 11:15:16 +0000 (Wed, 07 Oct 2009) Log Message: ----------- diffstat: Update to 1.50 Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile csw/mgar/pkg/diffstat/trunk/checksums Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2009-10-07 10:41:12 UTC (rev 6740) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-10-07 11:15:16 UTC (rev 6741) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.49 +GARVERSION = 1.50 CATEGORIES = utils DESCRIPTION = A utility which provides statistics based on the output of diff Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2009-10-07 10:41:12 UTC (rev 6740) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-10-07 11:15:16 UTC (rev 6741) @@ -1 +1 @@ -63fa6d90f137f5d839e94aa93882db98 download/diffstat-1.49.tgz +ece8f6a380d30cf2355ebb27375350d7 diffstat-1.50.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 13:26:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 11:26:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6742] csw/mgar/pkg/esound/trunk/Makefile Message-ID: Revision: 6742 http://gar.svn.sourceforge.net/gar/?rev=6742&view=rev Author: dmichelsen Date: 2009-10-07 11:26:29 +0000 (Wed, 07 Oct 2009) Log Message: ----------- esound: Add todo Modified Paths: -------------- csw/mgar/pkg/esound/trunk/Makefile Modified: csw/mgar/pkg/esound/trunk/Makefile =================================================================== --- csw/mgar/pkg/esound/trunk/Makefile 2009-10-07 11:15:16 UTC (rev 6741) +++ csw/mgar/pkg/esound/trunk/Makefile 2009-10-07 11:26:29 UTC (rev 6742) @@ -18,6 +18,11 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# TODO on next release: +# - Move config file from /opt/csw/etc to /etc/opt/csw +# - Document the location in esd(1) +# - Skip 64 binaries + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 14:03:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 12:03:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6743] csw/mgar/pkg/cups/branches/cups-1.4/ Message-ID: Revision: 6743 http://gar.svn.sourceforge.net/gar/?rev=6743&view=rev Author: wahwah Date: 2009-10-07 12:03:06 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cups-1.4: Setting svn:externals to v2-pbuild Property Changed: ---------------- csw/mgar/pkg/cups/branches/cups-1.4/ Property changes on: csw/mgar/pkg/cups/branches/cups-1.4 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-pbuild This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 15:06:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 13:06:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6744] csw/mgar/pkg Message-ID: Revision: 6744 http://gar.svn.sourceforge.net/gar/?rev=6744&view=rev Author: dmichelsen Date: 2009-10-07 13:06:14 +0000 (Wed, 07 Oct 2009) Log Message: ----------- pakchois: Initial commit Added Paths: ----------- csw/mgar/pkg/pakchois/ csw/mgar/pkg/pakchois/branches/ csw/mgar/pkg/pakchois/tags/ csw/mgar/pkg/pakchois/trunk/ csw/mgar/pkg/pakchois/trunk/Makefile csw/mgar/pkg/pakchois/trunk/checksums csw/mgar/pkg/pakchois/trunk/files/ Property changes on: csw/mgar/pkg/pakchois/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pakchois/trunk/Makefile =================================================================== --- csw/mgar/pkg/pakchois/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pakchois/trunk/Makefile 2009-10-07 13:06:14 UTC (rev 6744) @@ -0,0 +1,26 @@ +GARNAME = pakchois +GARVERSION = 0.4 +CATEGORIES = lib + +DESCRIPTION = Just another PKCS #11 wrapper library +define BLURB + pakchois is just another PKCS #11 wrapper library. pakchois aims to provide + a thin wrapper over the PKCS#11 interface. +endef + +MASTER_SITES = http://www.manyfish.co.uk/pakchois/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.manyfish.co.uk/pakchois/ + +BUILD64 = 1 +NOISALIST = 1 +EXTRA_LINKER_FLAGS = -lintl +CONFIGURE_ARGS = $(DIRPATHS) + +REQUIRED_PKGS = CSWggettextrt + +include gar/category.mk Added: csw/mgar/pkg/pakchois/trunk/checksums =================================================================== --- csw/mgar/pkg/pakchois/trunk/checksums (rev 0) +++ csw/mgar/pkg/pakchois/trunk/checksums 2009-10-07 13:06:14 UTC (rev 6744) @@ -0,0 +1 @@ +218ad0256e514989299acdf4e86aaf3d download/pakchois-0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 16:04:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 14:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6745] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6745 http://gar.svn.sourceforge.net/gar/?rev=6745&view=rev Author: dmichelsen Date: 2009-10-07 14:04:36 +0000 (Wed, 07 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Add setonce-magic to some variables Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-07 13:06:14 UTC (rev 6744) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-07 14:04:36 UTC (rev 6745) @@ -33,6 +33,10 @@ MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') +# If you call this the value is only evaluated the first time +# Usage: $(call SETONCE,A,MyComplexVariableEvaluatedOnlyOnce) +SETONCE = $(eval $(1) ?= $(2)) + #meant to take a git url and return just the $proj.git part GITPROJ = $(lastword $(subst /, ,$(1))) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-07 13:06:14 UTC (rev 6744) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-07 14:04:36 UTC (rev 6745) @@ -157,7 +157,7 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db -SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES @@ -191,9 +191,9 @@ endif ifeq ($(SPKG_FULL_REVSTAMP),1) -SPKG_REVSTAMP ?= ,REV=$(shell date '+%Y.%m.%d.%H.%M') +$(call SETONCE,SPKG_REVSTAMP,REV=$(shell date '+%Y.%m.%d.%H.%M')) else -SPKG_REVSTAMP ?= ,REV=$(shell date '+%Y.%m.%d') +$(call SETONCE,SPKG_REVSTAMP,REV=$(shell date '+%Y.%m.%d')) endif # Where we find our mkpackage global templates @@ -470,7 +470,7 @@ $(_DBG)(echo "PKG=$*"; \ echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \ echo "ARCH=$(if $(or $(ARCHALL),$(ARCHALL_$*)),all,$(call pkgvar,GARCH,$*))"; \ - echo "VERSION=$(call pkgvar,SPKG_VERSION,$*)$(call pkgvar,SPKG_REVSTAMP,$*)"; \ + echo "VERSION=$(call pkgvar,SPKG_VERSION,$*),$(call pkgvar,SPKG_REVSTAMP,$*)"; \ echo "CATEGORY=$(call pkgvar,SPKG_CATEGORY,$*)"; \ echo "VENDOR=$(call pkgvar,SPKG_VENDOR,$*)"; \ echo "EMAIL=$(call pkgvar,SPKG_EMAIL,$*)"; \ @@ -681,7 +681,7 @@ submitpkg-%: @$(if $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),\ $(error You have local files not in the repository. Please commit everything before submitting a package)) - $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION)$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION)$(SPKG_REVSTAMP) + $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION),$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION),$(SPKG_REVSTAMP) # dependb - update the dependency database # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 17:28:59 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 15:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6746] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.r.cswinetd Message-ID: Revision: 6746 http://gar.svn.sourceforge.net/gar/?rev=6746&view=rev Author: bdwalton Date: 2009-10-07 15:28:59 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cswclassutils: make the inetd service removal generic (copy/paste error); backup inetd.conf before modifications Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd 2009-10-07 14:04:36 UTC (rev 6745) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd 2009-10-07 15:28:59 UTC (rev 6746) @@ -28,11 +28,12 @@ inetdsvc=`cat $dest` set -- $inetdsvc svcname=$1 - echo "Removing $svcname service from inetd.conf" - /usr/xpg4/bin/sed -e '/# CSWgitosis/{ + echo "Removing $svcname service from inetd.conf (original: $inetdconf.$PKGINST)" + cp -p $inetdconf $inetdconf.$PKGINST + /usr/xpg4/bin/sed -e "/# $PKGINST/{ $!N -/^# CSWgitosis.*\n#git.*$/d -}' $inetdconf > $inetdconf.$$ && \ +/^# $PKGINST.*\n#$svcname.*$/d +}" $inetdconf > $inetdconf.$$ && \ mv $inetdconf.$$ $inetdconf && \ chown root:sys $inetdconf && \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 18:18:42 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 16:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6747] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 6747 http://gar.svn.sourceforge.net/gar/?rev=6747&view=rev Author: bdwalton Date: 2009-10-07 16:18:42 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cswclassutils: setup GAR copyright/license stuff Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-07 15:28:59 UTC (rev 6746) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-07 16:18:42 UTC (rev 6747) @@ -8,6 +8,8 @@ ARCHALL = 1 +LICENSE = license + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -31,6 +33,6 @@ @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license + @cp $(FILEDIR)/CSW$(GARNAME).copyright $(WORKSRC)/license @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 18:46:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 16:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6748] csw/mgar/pkg/gardev/trunk/files/README.csw Message-ID: Revision: 6748 http://gar.svn.sourceforge.net/gar/?rev=6748&view=rev Author: bdwalton Date: 2009-10-07 16:46:38 +0000 (Wed, 07 Oct 2009) Log Message: ----------- gardev: update the README for gar_devel Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/files/README.csw Modified: csw/mgar/pkg/gardev/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/gardev/trunk/files/README.csw 2009-10-07 16:18:42 UTC (rev 6747) +++ csw/mgar/pkg/gardev/trunk/files/README.csw 2009-10-07 16:46:38 UTC (rev 6748) @@ -1,3 +1,15 @@ This is just a dummy package that depends on all CSW packages that are required to create packages with GAR. Feel free to remove it after you've used it to install the current requirements. + +It is useful _only_ in the situation where you'd like to checkout +package build descriptions from the gar.sourceforge.net subversion +repository on a machine and roll your own packages from it. + +Currently, this package will pull everything required by GAR except +the compilers. These, you will need to get and install yourself. If +packages you're working on need GCC, you can obtain v3 or v4 packages +from OpenCSW. Sun compilers must be obtained from sun.com. + +Please see http://sourceforge.net/apps/trac/gar/wiki/GarSetup for more +help getting a working GAR development environment on your machine. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 19:04:12 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 17:04:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6749] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6749 http://gar.svn.sourceforge.net/gar/?rev=6749&view=rev Author: bdwalton Date: 2009-10-07 17:04:12 +0000 (Wed, 07 Oct 2009) Log Message: ----------- git: fix the PKGFILES for the bash completion package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-07 16:46:38 UTC (rev 6748) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-07 17:04:12 UTC (rev 6749) @@ -99,7 +99,7 @@ PKGFILES_CSWgitcvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) PKGFILES_CSWgitemacs = .*emacs.* PKGFILES_CSWgitdoc = $(docdir)/.* -PKGFILES_CSWgitcompletion = $(bashconfdir)/bash_completion.d/.* +PKGFILES_CSWgitcompletion = .*/bash_completion.d/.* PKGFILES_CSWgitdevel = $(includedir)/.* $(libdir)/.* # We define upstream file regex so we can be notifed of new upstream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 21:04:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6750] csw/mgar/pkg/pakchois/trunk/Makefile Message-ID: Revision: 6750 http://gar.svn.sourceforge.net/gar/?rev=6750&view=rev Author: dmichelsen Date: 2009-10-07 19:04:50 +0000 (Wed, 07 Oct 2009) Log Message: ----------- pakchois: Fix description Modified Paths: -------------- csw/mgar/pkg/pakchois/trunk/Makefile Modified: csw/mgar/pkg/pakchois/trunk/Makefile =================================================================== --- csw/mgar/pkg/pakchois/trunk/Makefile 2009-10-07 17:04:12 UTC (rev 6749) +++ csw/mgar/pkg/pakchois/trunk/Makefile 2009-10-07 19:04:50 UTC (rev 6750) @@ -2,10 +2,10 @@ GARVERSION = 0.4 CATEGORIES = lib -DESCRIPTION = Just another PKCS #11 wrapper library +DESCRIPTION = Just another PKCS \#11 wrapper library define BLURB - pakchois is just another PKCS #11 wrapper library. pakchois aims to provide - a thin wrapper over the PKCS#11 interface. + pakchois is just another PKCS \#11 wrapper library. pakchois aims to provide + a thin wrapper over the PKCS \#11 interface. endef MASTER_SITES = http://www.manyfish.co.uk/pakchois/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 21:05:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6751] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6751 http://gar.svn.sourceforge.net/gar/?rev=6751&view=rev Author: bdwalton Date: 2009-10-07 19:05:34 +0000 (Wed, 07 Oct 2009) Log Message: ----------- git: bash completion package depends on CSWbashcmplt Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-07 19:04:50 UTC (rev 6750) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-07 19:05:34 UTC (rev 6751) @@ -52,7 +52,7 @@ # We include bash here even though git itself depends on it because in theory # git could use any other POSIX compliant shell and drop the dependency... -REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash +REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash CSWbashcmplt LICENSE_CSWgit = COPYING LICENSE_CSWgitk = COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 21:13:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:13:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6752] csw/mgar/pkg Message-ID: Revision: 6752 http://gar.svn.sourceforge.net/gar/?rev=6752&view=rev Author: dmichelsen Date: 2009-10-07 19:13:03 +0000 (Wed, 07 Oct 2009) Log Message: ----------- fribidi: Initial commit Added Paths: ----------- csw/mgar/pkg/fribidi/ csw/mgar/pkg/fribidi/branches/ csw/mgar/pkg/fribidi/tags/ csw/mgar/pkg/fribidi/trunk/ csw/mgar/pkg/fribidi/trunk/Makefile csw/mgar/pkg/fribidi/trunk/checksums csw/mgar/pkg/fribidi/trunk/files/ Property changes on: csw/mgar/pkg/fribidi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fribidi/trunk/Makefile =================================================================== --- csw/mgar/pkg/fribidi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fribidi/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) @@ -0,0 +1,21 @@ +GARNAME = fribidi +GARVERSION = 0.19.2 +CATEGORIES = lib + +DESCRIPTION = An implementation of the Unicode Bidirectional Algorithm (bidi) +define BLURB +endef + +MASTER_SITES = http://fribidi.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.fribidi.org/ + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/fribidi/trunk/checksums =================================================================== --- csw/mgar/pkg/fribidi/trunk/checksums (rev 0) +++ csw/mgar/pkg/fribidi/trunk/checksums 2009-10-07 19:13:03 UTC (rev 6752) @@ -0,0 +1 @@ +626db17d2d99b43615ad9d12500f568a fribidi-0.19.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 21:28:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:28:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6753] csw/mgar/pkg/x11 Message-ID: Revision: 6753 http://gar.svn.sourceforge.net/gar/?rev=6753&view=rev Author: wbonnet Date: 2009-10-07 19:28:54 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xineramaproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xineramaproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xineramaproto/ Modified: csw/mgar/pkg/x11/x11_xineramaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xineramaproto/trunk/Makefile 2009-10-07 19:28:54 UTC (rev 6753) @@ -1,6 +1,8 @@ -GARNAME = xineramaproto GARVERSION = 1.1.2 CATEGORIES = x11 +PROTONAME = xineramaproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Xinerama protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 21:36:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6754] csw/mgar/flatpkg/ Message-ID: Revision: 6754 http://gar.svn.sourceforge.net/gar/?rev=6754&view=rev Author: dmichelsen Date: 2009-10-07 19:36:21 +0000 (Wed, 07 Oct 2009) Log Message: ----------- GAR test Added Paths: ----------- csw/mgar/flatpkg/ Property changes on: csw/mgar/flatpkg ___________________________________________________________________ Added: svn:externals + asciidoc https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/asciidoc Algorithm-Annotate https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/cpan/Algorithm-Annotate This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 22:00:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6755] csw/mgar/pkg Message-ID: Revision: 6755 http://gar.svn.sourceforge.net/gar/?rev=6755&view=rev Author: dmichelsen Date: 2009-10-07 19:59:55 +0000 (Wed, 07 Oct 2009) Log Message: ----------- libmatio: Initial commit Added Paths: ----------- csw/mgar/pkg/libmatio/ csw/mgar/pkg/libmatio/branches/ csw/mgar/pkg/libmatio/tags/ csw/mgar/pkg/libmatio/trunk/ csw/mgar/pkg/libmatio/trunk/Makefile csw/mgar/pkg/libmatio/trunk/checksums csw/mgar/pkg/libmatio/trunk/files/ Property changes on: csw/mgar/pkg/libmatio/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmatio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmatio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmatio/trunk/Makefile 2009-10-07 19:59:55 UTC (rev 6755) @@ -0,0 +1,22 @@ +GARNAME = libmatio +GARVERSION = 1.3.3 +CATEGORIES = lib + +DESCRIPTION = An ISO C library for reading and writing Matlab MAT files +define BLURB +endef + +SF_PROJ = matio +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + +include gar/category.mk Added: csw/mgar/pkg/libmatio/trunk/checksums =================================================================== --- csw/mgar/pkg/libmatio/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmatio/trunk/checksums 2009-10-07 19:59:55 UTC (rev 6755) @@ -0,0 +1 @@ +5c12a98f391de000e88b5a1b20d74abf matio-1.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 22:07:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6756] csw/mgar/flatpkg/ Message-ID: Revision: 6756 http://gar.svn.sourceforge.net/gar/?rev=6756&view=rev Author: dmichelsen Date: 2009-10-07 20:07:06 +0000 (Wed, 07 Oct 2009) Log Message: ----------- GAR Test Removed Paths: ------------- csw/mgar/flatpkg/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 7 22:21:59 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6757] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 6757 http://gar.svn.sourceforge.net/gar/?rev=6757&view=rev Author: idogan23 Date: 2009-10-07 20:21:58 +0000 (Wed, 07 Oct 2009) Log Message: ----------- unbound: bump version to 1.3.4 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-10-07 20:07:06 UTC (rev 6756) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-10-07 20:21:58 UTC (rev 6757) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.3.3 +GARVERSION = 1.3.4 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2009-10-07 20:07:06 UTC (rev 6756) +++ csw/mgar/pkg/unbound/trunk/checksums 2009-10-07 20:21:58 UTC (rev 6757) @@ -1,4 +1,3 @@ -90405f880273db5036c2ebf2e881b998 download/CSWunbound.gspec 75867432e238f5afd48dfe5d138097e9 download/cswunbound 601effee1051487655f66790762b66fd download/cswusergroup -f6b2b2c375288dfd2a03c4a36676221e download/unbound-1.3.3.tar.gz +d1eb5efed0c36c10dbaf3f805ff3a4bd download/unbound-1.3.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:31:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:31:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6758] csw/mgar/pkg/x11 Message-ID: Revision: 6758 http://gar.svn.sourceforge.net/gar/?rev=6758&view=rev Author: wbonnet Date: 2009-10-07 20:31:05 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86vidmodeproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86vidmodeproto/ Modified: csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile 2009-10-07 20:31:05 UTC (rev 6758) @@ -1,6 +1,8 @@ -GARNAME = xf86vidmodeproto GARVERSION = 2.2.2 CATEGORIES = x11 +PROTONAME = xf86vidmodeproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86VidMode protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11xf86vidmdproto +CATALOGNAME_CSWx11xf86vidmdproto = $(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:35:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6759] csw/mgar/pkg/x11 Message-ID: Revision: 6759 http://gar.svn.sourceforge.net/gar/?rev=6759&view=rev Author: wbonnet Date: 2009-10-07 20:35:14 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_windowswmproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_windowswmproto/ Removed Paths: ------------- csw/mgar/pkg/x11/windowswmproto/ Modified: csw/mgar/pkg/x11/x11_windowswmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_windowswmproto/trunk/Makefile 2009-10-07 20:35:14 UTC (rev 6759) @@ -1,6 +1,8 @@ -GARNAME = windowswmproto GARVERSION = 1.0.3 CATEGORIES = x11 +PROTONAME = windowswmproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Windowswmproto headers for X.org define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:40:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:40:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6760] csw/mgar/pkg/x11 Message-ID: Revision: 6760 http://gar.svn.sourceforge.net/gar/?rev=6760&view=rev Author: wbonnet Date: 2009-10-07 20:40:06 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_videoproto/ Removed Paths: ------------- csw/mgar/pkg/x11/videoproto/ Modified: csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile 2009-10-07 20:40:06 UTC (rev 6760) @@ -1,20 +1,23 @@ -GARNAME = videoproto GARVERSION = 2.3.0 CATEGORIES = x11 +PROTONAME = videoproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Video extension headers define BLURB Video extension headers endef -PACKAGES = CSWxvideoproto +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:46:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6761] csw/mgar/pkg/x11 Message-ID: Revision: 6761 http://gar.svn.sourceforge.net/gar/?rev=6761&view=rev Author: wbonnet Date: 2009-10-07 20:46:18 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xcmiscproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xcmiscproto/ Modified: csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile 2009-10-07 20:46:18 UTC (rev 6761) @@ -1,6 +1,8 @@ -GARNAME = xcmiscproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = xcmiscproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XCMisc extension headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:53:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:53:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6762] csw/mgar/pkg/x11 Message-ID: Revision: 6762 http://gar.svn.sourceforge.net/gar/?rev=6762&view=rev Author: wbonnet Date: 2009-10-07 20:53:19 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86dgaproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86dgaproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86dgaproto/ Modified: csw/mgar/pkg/x11/x11_xf86dgaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86dgaproto/trunk/Makefile 2009-10-07 20:53:19 UTC (rev 6762) @@ -1,6 +1,8 @@ -GARNAME = xf86dgaproto GARVERSION = 2.0.3 CATEGORIES = x11 +PROTONAME = xf86dgaproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86DGA protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:02:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:02:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6763] csw/mgar/pkg/x11 Message-ID: Revision: 6763 http://gar.svn.sourceforge.net/gar/?rev=6763&view=rev Author: wbonnet Date: 2009-10-07 21:02:05 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86driproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86driproto/ Modified: csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86driproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile 2009-10-07 21:02:05 UTC (rev 6763) @@ -1,6 +1,8 @@ -GARNAME = xf86driproto GARVERSION = 2.1.0 CATEGORIES = x11 +PROTONAME = xf86driproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86DRI protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:03:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:03:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6764] csw/mgar/pkg/x11 Message-ID: Revision: 6764 http://gar.svn.sourceforge.net/gar/?rev=6764&view=rev Author: wbonnet Date: 2009-10-07 21:03:51 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86miscproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86miscproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86miscproto/ Modified: csw/mgar/pkg/x11/x11_xf86miscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86miscproto/trunk/Makefile 2009-10-07 21:03:51 UTC (rev 6764) @@ -1,6 +1,8 @@ -GARNAME = xf86miscproto GARVERSION = 0.9.2 CATEGORIES = x11 +PROTONAME = xf86miscproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86Misc protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:05:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:05:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6765] csw/mgar/pkg/x11 Message-ID: Revision: 6765 http://gar.svn.sourceforge.net/gar/?rev=6765&view=rev Author: wbonnet Date: 2009-10-07 21:05:54 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86rushproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86rushproto/ Modified: csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile 2009-10-07 21:05:54 UTC (rev 6765) @@ -1,6 +1,8 @@ -GARNAME = xf86rushproto GARVERSION = 1.1.2 CATEGORIES = x11 +PROTONAME = xf86rushproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86Rush protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:09:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:09:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6766] csw/mgar/pkg/x11 Message-ID: Revision: 6766 http://gar.svn.sourceforge.net/gar/?rev=6766&view=rev Author: wbonnet Date: 2009-10-07 21:09:42 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86bigfontproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86bigfontproto/ Modified: csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile 2009-10-07 21:09:42 UTC (rev 6766) @@ -1,6 +1,8 @@ -GARNAME = xf86bigfontproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = xf86bigfontproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86BigFont protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11xf86bigftproto +CATALOGNAME_CSWx11xf86bigftproto = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 23:16:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:16:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6767] csw/mgar/pkg Message-ID: Revision: 6767 http://gar.svn.sourceforge.net/gar/?rev=6767&view=rev Author: dmichelsen Date: 2009-10-07 21:16:26 +0000 (Wed, 07 Oct 2009) Log Message: ----------- wireshark: Initial commit, review X11 Added Paths: ----------- csw/mgar/pkg/wireshark/ csw/mgar/pkg/wireshark/branches/ csw/mgar/pkg/wireshark/tags/ csw/mgar/pkg/wireshark/trunk/ csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums csw/mgar/pkg/wireshark/trunk/files/ Property changes on: csw/mgar/pkg/wireshark/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile (rev 0) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-10-07 21:16:26 UTC (rev 6767) @@ -0,0 +1,34 @@ +GARNAME = wireshark +GARVERSION = 1.2.2 +CATEGORIES = apps + +DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.wireshark.org/ + +#SED = /opt/csw/bin/gsed +#EXTRA_COMMON_EXPORTS = SED + +EXTRA_INC = /opt/csw/include/gtk-2.0 +EXTRA_INC += /opt/csw/lib/gtk-2.0/include +EXTRA_INC += /opt/csw/include/glib-2.0 +EXTRA_INC += /opt/csw/lib/glib-2.0/include +EXTRA_INC += /opt/csw/include/cairo +EXTRA_INC += /opt/csw/include/pango-1.0 +EXTRA_INC += /opt/csw/include/atk-1.0 + +EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums (rev 0) +++ csw/mgar/pkg/wireshark/trunk/checksums 2009-10-07 21:16:26 UTC (rev 6767) @@ -0,0 +1 @@ +bb5c09b8cffd461ced4d3251fddb217b wireshark-1.2.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 23:24:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6768] csw/mgar/pkg/npadmin Message-ID: Revision: 6768 http://gar.svn.sourceforge.net/gar/?rev=6768&view=rev Author: dmichelsen Date: 2009-10-07 21:24:08 +0000 (Wed, 07 Oct 2009) Log Message: ----------- npadmin: Convert legacy build receipt Added Paths: ----------- csw/mgar/pkg/npadmin/branches/ csw/mgar/pkg/npadmin/tags/ csw/mgar/pkg/npadmin/tags/legacy/ csw/mgar/pkg/npadmin/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/npadmin/trunk/legacy/ Copied: csw/mgar/pkg/npadmin/trunk/Makefile (from rev 6625, csw/mgar/pkg/colordiff/trunk/Makefile) =================================================================== --- csw/mgar/pkg/npadmin/trunk/Makefile (rev 0) +++ csw/mgar/pkg/npadmin/trunk/Makefile 2009-10-07 21:24:08 UTC (rev 6768) @@ -0,0 +1,24 @@ +GARNAME = npadmin +GARVERSION = 0.14 +CATEGORIES = apps + +DESCRIPTION = Command line SNMP based network adminstration tool for printers +define BLURB +endef + +SF_PROJ = lpr +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://lpr.sourceforge.net/ + +ARCHALL = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + cd $(WORKSRC) && rm -f config.cache config.status This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:25:40 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6769] csw/mgar/pkg/x11 Message-ID: Revision: 6769 http://gar.svn.sourceforge.net/gar/?rev=6769&view=rev Author: wbonnet Date: 2009-10-07 21:25:40 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/x11_xextproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/x11_xextproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xextproto/ Modified: csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-07 21:25:40 UTC (rev 6769) @@ -1,5 +1,7 @@ -GARNAME = xextproto GARVERSION = 7.1.1 +PROTONAME = xextproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) CATEGORIES = x11 @@ -9,11 +11,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 Modified: csw/mgar/pkg/x11/x11_xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xextproto/trunk/checksums 2009-10-07 21:25:40 UTC (rev 6769) @@ -1 +1 @@ -fb6ccaae76db7a35e49b12aea60ca6ff download/xextproto-7.1.1.tar.bz2 +6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:29:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6770] csw/mgar/pkg/x11 Message-ID: Revision: 6770 http://gar.svn.sourceforge.net/gar/?rev=6770&view=rev Author: wbonnet Date: 2009-10-07 21:29:30 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xproto/ Modified: csw/mgar/pkg/x11/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-07 21:29:30 UTC (rev 6770) @@ -1,6 +1,8 @@ -GARNAME = xproto GARVERSION = 7.0.15 CATEGORIES = x11 +PROTONAME = xproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X protocol and ancillary headers from X.org X11 define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:41:58 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:41:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6771] csw/mgar/pkg/x11/glproto/ Message-ID: Revision: 6771 http://gar.svn.sourceforge.net/gar/?rev=6771&view=rev Author: wbonnet Date: 2009-10-07 21:41:58 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Removed Paths: ------------- csw/mgar/pkg/x11/glproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:42:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:42:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6772] csw/mgar/pkg/x11 Message-ID: Revision: 6772 http://gar.svn.sourceforge.net/gar/?rev=6772&view=rev Author: wbonnet Date: 2009-10-07 21:42:52 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/x11_glproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/x11_glproto/ Modified: csw/mgar/pkg/x11/x11_glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_glproto/trunk/Makefile 2009-10-07 21:42:52 UTC (rev 6772) @@ -1,19 +1,22 @@ -GARNAME = glproto GARVERSION = 1.4.10 CATEGORIES = x11 +PROTONAME = glproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = GL extension headers define BLURB GL extension headers endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxglproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common Modified: csw/mgar/pkg/x11/x11_glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/checksums 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_glproto/trunk/checksums 2009-10-07 21:42:52 UTC (rev 6772) @@ -1 +1 @@ -c9f8cebfba72bfab674bc0170551fb8d download/glproto-1.4.10.tar.bz2 +ac89626ed6bced045d0515217bfffd4f download/glproto-1.4.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:47:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6773] csw/mgar/pkg/x11 Message-ID: Revision: 6773 http://gar.svn.sourceforge.net/gar/?rev=6773&view=rev Author: wbonnet Date: 2009-10-07 21:47:51 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_kbproto/ Removed Paths: ------------- csw/mgar/pkg/x11/kbproto/ Modified: csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile 2009-10-07 21:47:51 UTC (rev 6773) @@ -1,5 +1,7 @@ -GARNAME = kbproto GARVERSION = 1.0.3 +PROTONAME = kbproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) CATEGORIES = x11 @@ -8,13 +10,14 @@ This provides the KB extension headers from modular X.org X11 project. endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxkbproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:55:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6774] csw/mgar/pkg/x11 Message-ID: Revision: 6774 http://gar.svn.sourceforge.net/gar/?rev=6774&view=rev Author: wbonnet Date: 2009-10-07 21:55:18 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_renderproto/ Removed Paths: ------------- csw/mgar/pkg/x11/renderproto/ Modified: csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-07 21:55:18 UTC (rev 6774) @@ -1,20 +1,22 @@ -GARNAME = renderproto GARVERSION = 0.11 - CATEGORIES = x11 +PROTONAME = renderproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Render extension headers from modular X.org define BLURB This provides the Render extension headers from modular X.org X11 project. endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxrenderproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:59:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6775] csw/mgar/pkg/x11 Message-ID: Revision: 6775 http://gar.svn.sourceforge.net/gar/?rev=6775&view=rev Author: wbonnet Date: 2009-10-07 21:59:08 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_recordproto/trunk/Makefile csw/mgar/pkg/x11/x11_recordproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/x11_recordproto/ Removed Paths: ------------- csw/mgar/pkg/x11/recordproto/ Modified: csw/mgar/pkg/x11/x11_recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_recordproto/trunk/Makefile 2009-10-07 21:59:08 UTC (rev 6775) @@ -1,19 +1,22 @@ -GARNAME = recordproto GARVERSION = 1.13.2 CATEGORIES = x11 +PROTONAME = recordproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Record extension headers define BLURB Record extension headers endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxrecordproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common Modified: csw/mgar/pkg/x11/x11_recordproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/recordproto/trunk/checksums 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_recordproto/trunk/checksums 2009-10-07 21:59:08 UTC (rev 6775) @@ -1 +1 @@ -0ed4706564a34fc2aff724aa16d3ff00 download/recordproto-1.13.2.tar.bz2 +a184f8939a7ecae064857e7932a929b2 download/recordproto-1.13.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 00:04:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 22:04:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6776] csw/mgar/pkg/x11 Message-ID: Revision: 6776 http://gar.svn.sourceforge.net/gar/?rev=6776&view=rev Author: wbonnet Date: 2009-10-07 22:04:39 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_inputproto/ Removed Paths: ------------- csw/mgar/pkg/x11/inputproto/ Modified: csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-07 22:04:39 UTC (rev 6776) @@ -1,5 +1,7 @@ -GARNAME = inputproto GARVERSION = 1.5.1 +PROTONAME = inputproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) CATEGORIES = x11 @@ -7,17 +9,20 @@ define BLURB This provides the input extension headers from modular X.org X11 project endef - + MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 00:06:28 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 22:06:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6777] csw/mgar/pkg/x11 Message-ID: Revision: 6777 http://gar.svn.sourceforge.net/gar/?rev=6777&view=rev Author: wbonnet Date: 2009-10-07 22:06:28 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_scrnsaverproto/ Removed Paths: ------------- csw/mgar/pkg/x11/scrnsaverproto/ Modified: csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile 2009-10-07 22:06:28 UTC (rev 6777) @@ -1,18 +1,23 @@ -GARNAME = scrnsaverproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = scrnsaverproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org ScrnSaver protocol headers define BLURB ScrnSaver protocol headers from modular X.org endef - + MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 11:18:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 09:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6778] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6778 http://gar.svn.sourceforge.net/gar/?rev=6778&view=rev Author: dmichelsen Date: 2009-10-08 09:18:06 +0000 (Thu, 08 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Added prototype modifiers Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-07 22:06:28 UTC (rev 6777) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-08 09:18:06 UTC (rev 6778) @@ -307,6 +307,28 @@ $(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER_$(SPEC)),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC))))) $(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER)))) +# Assemble prototype modifiers +# PROTOTYPE_MODIFIERS = mytweaks +# PROTOTYPE_FTYPE_mytweaks = e +# PROTOTYPE_CLASS_mytweaks = cswconffile +# PROTOTYPE_FILES_mytweaks = $(bindir)/.*\.conf +# PROTOTYPE_PERMS_mytweaks = 0644 +# PROTOTYPE_USER_mytweaks = somebody +# PROTOTYPE_GROUP_mytweaks = somegroup + +_PROTOTYPE_MODIFIERS = | perl -ane '\ + $(foreach M,$(PROTOTYPE_MODIFIERS),\ + $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(PROTOTYPE_FILES_$M)$$) ) {)\ + $(if $(PROTOTYPE_FTYPE_$M),$$F[0] = "$(PROTOTYPE_FTYPE_$M)";)\ + $(if $(PROTOTYPE_CLASS_$M),$$F[1] = "$(PROTOTYPE_CLASS_$M)";)\ + $(if $(PROTOTYPE_PERMS_$M),$$F[3] = "$(PROTOTYPE_PERMS_$M)";)\ + $(if $(PROTOTYPE_USER_$M),$$F[4] = "$(PROTOTYPE_USER_$M)";)\ + $(if $(PROTOTYPE_GROUP_$M),$$F[5] = "$(PROTOTYPE_GROUP_$M)";)\ + $(if $(PROTOTYPE_FILES_$M),})\ + )\ + print join(" ", at F),"\n";' + + # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype @@ -342,13 +364,13 @@ ) \ <$(PROTOTYPE); \ if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ - ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \ + ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ else \ - cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \ + cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype - $(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ + $(_DBG)cat $(WORKDIR)/$*.prototype >$@ # Dynamic depends are constructed as follows: # - Packages the currently constructed one depends on can be specified with This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 14:12:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 12:12:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6779] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6779 http://gar.svn.sourceforge.net/gar/?rev=6779&view=rev Author: dmichelsen Date: 2009-10-08 12:12:27 +0000 (Thu, 08 Oct 2009) Log Message: ----------- colordiff: Force CSW less Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 09:18:06 UTC (rev 6778) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 12:12:27 UTC (rev 6779) @@ -10,11 +10,12 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = fix-entity-nesting.patch PATCHFILES += force-csw-perl.patch +PATCHFILES += force-csw-less.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWperl +REQUIRED_PKGS = CSWperl CSWless CONFIGURE_SCRIPTS = BUILD_ARGS = doc Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch 2009-10-08 12:12:27 UTC (rev 6779) @@ -0,0 +1,9 @@ +diff -Naur colordiff-1.0.9.orig/cdiff.sh colordiff-1.0.9.patched/cdiff.sh +--- colordiff-1.0.9.orig/cdiff.sh 2009-01-26 21:17:47.000000000 +0100 ++++ colordiff-1.0.9.patched/cdiff.sh 2009-10-08 14:11:03.128576934 +0200 +@@ -56,4 +56,4 @@ + done + else + cat +-fi) | colordiff | less -R ++fi) | /opt/csw/bin/colordiff | /opt/csw/bin/less -R This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 14:13:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 12:13:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6780] csw/mgar/pkg Message-ID: Revision: 6780 http://gar.svn.sourceforge.net/gar/?rev=6780&view=rev Author: dmichelsen Date: 2009-10-08 12:13:53 +0000 (Thu, 08 Oct 2009) Log Message: ----------- libebml: Initial commit Added Paths: ----------- csw/mgar/pkg/libebml/ csw/mgar/pkg/libebml/branches/ csw/mgar/pkg/libebml/tags/ csw/mgar/pkg/libebml/trunk/ csw/mgar/pkg/libebml/trunk/Makefile csw/mgar/pkg/libebml/trunk/checksums csw/mgar/pkg/libebml/trunk/files/ csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff Property changes on: csw/mgar/pkg/libebml/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libebml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libebml/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libebml/trunk/Makefile 2009-10-08 12:13:53 UTC (rev 6780) @@ -0,0 +1,38 @@ +GARNAME = libebml +GARVERSION = 0.7.8 +CATEGORIES = lib + +DESCRIPTION = Library for Extensible Binary Meta Language +define BLURB +endef + +MASTER_SITES = http://dl.matroska.org/downloads/libebml/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = libebml-shared-library.diff + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.matroska.org/ + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_SCRIPTS = + +# Needed for shared library +EXTRA_CFLAGS = -xcode=pic32 +EXTRA_CXXFLAGS = -xcode=pic32 + +WARNINGFLAGS = +BUILD_OVERRIDE_DIRS = CC CXX LD CFLAGS WARNINGFLAGS +BUILD_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = CC CXX LD CFLAGS WARNINGFLAGS INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall +INSTALL_OVERRIDE_DIRS = prefix libdir includedir +INSTALL_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +include gar/category.mk Added: csw/mgar/pkg/libebml/trunk/checksums =================================================================== --- csw/mgar/pkg/libebml/trunk/checksums (rev 0) +++ csw/mgar/pkg/libebml/trunk/checksums 2009-10-08 12:13:53 UTC (rev 6780) @@ -0,0 +1,2 @@ +6278109f52e4f9d2c8a8dfc0d668b587 libebml-0.7.8.tar.bz2 +da5e2aaafdcba2c1bc83dba1e8ce2721 libebml-shared-library.diff Added: csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff =================================================================== --- csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff (rev 0) +++ csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff 2009-10-08 12:13:53 UTC (rev 6780) @@ -0,0 +1,12 @@ +diff -Naur libebml-0.7.8.orig/make/linux/Makefile libebml-0.7.8.patched/make/linux/Makefile +--- libebml-0.7.8.orig/make/linux/Makefile 2006-06-02 16:32:15.000000000 +0200 ++++ libebml-0.7.8.patched/make/linux/Makefile 2009-10-08 10:49:26.151491509 +0200 +@@ -94,7 +94,7 @@ + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) ++ $(CXX) -G $(LDFLAGS) -o $(LIBRARY_SO_VER) $(objects_so) + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 14:21:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 12:21:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6781] csw/mgar/pkg/colordiff/trunk/checksums Message-ID: Revision: 6781 http://gar.svn.sourceforge.net/gar/?rev=6781&view=rev Author: dmichelsen Date: 2009-10-08 12:21:08 +0000 (Thu, 08 Oct 2009) Log Message: ----------- colordiff: Updated checksum Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/checksums Modified: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 12:13:53 UTC (rev 6780) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 12:21:08 UTC (rev 6781) @@ -1,3 +1,4 @@ -31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz -d202632e9ec507e53445232a930c9c6f download/fix-entity-nesting.patch -b37c28fccba12407d69a9d856d81a396 download/force-csw-perl.patch +31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz +d202632e9ec507e53445232a930c9c6f fix-entity-nesting.patch +94bb55618657dd39b3d4d1b8b321eac3 force-csw-less.patch +b37c28fccba12407d69a9d856d81a396 force-csw-perl.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 15:25:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 13:25:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6782] csw/mgar/pkg Message-ID: Revision: 6782 http://gar.svn.sourceforge.net/gar/?rev=6782&view=rev Author: dmichelsen Date: 2009-10-08 13:25:51 +0000 (Thu, 08 Oct 2009) Log Message: ----------- libmatroska: Initial commit Added Paths: ----------- csw/mgar/pkg/libmatroska/ csw/mgar/pkg/libmatroska/branches/ csw/mgar/pkg/libmatroska/tags/ csw/mgar/pkg/libmatroska/trunk/ csw/mgar/pkg/libmatroska/trunk/Makefile csw/mgar/pkg/libmatroska/trunk/checksums csw/mgar/pkg/libmatroska/trunk/files/ csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff Property changes on: csw/mgar/pkg/libmatroska/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/libmatroska/trunk/Makefile (from rev 6780, csw/mgar/pkg/libebml/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libmatroska/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmatroska/trunk/Makefile 2009-10-08 13:25:51 UTC (rev 6782) @@ -0,0 +1,41 @@ +GARNAME = libmatroska +GARVERSION = 0.8.1 +CATEGORIES = lib + +DESCRIPTION = A C++ libary to parse Matroska files (.mkv and .mka) +define BLURB +endef + +MASTER_SITES = http://dl.matroska.org/downloads/libmatroska/libmatroska-0.8.1.tar.bz2 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = libmatroska-shared-library.diff + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.matroska.org/ + +REQUIRED_PKGS = CSWlibebml +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_SCRIPTS = + +# Needed for shared library +EXTRA_CFLAGS = -xcode=pic32 +EXTRA_CXXFLAGS = -xcode=pic32 + +WARNINGFLAGS = +BUILD_OVERRIDE_DIRS = CC CXX LD CFLAGS WARNINGFLAGS +BUILD_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = CC CXX LD CFLAGS WARNINGFLAGS INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall +INSTALL_OVERRIDE_DIRS = prefix libdir includedir +INSTALL_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +include gar/category.mk Added: csw/mgar/pkg/libmatroska/trunk/checksums =================================================================== --- csw/mgar/pkg/libmatroska/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmatroska/trunk/checksums 2009-10-08 13:25:51 UTC (rev 6782) @@ -0,0 +1,2 @@ +20cf624ace0c58a54c7752eebfbc0b19 libmatroska-0.8.1.tar.bz2 +154440024a5596dc63e4ec24ded01f24 libmatroska-shared-library.diff Copied: csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff (from rev 6780, csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff) =================================================================== --- csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff (rev 0) +++ csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff 2009-10-08 13:25:51 UTC (rev 6782) @@ -0,0 +1,12 @@ +diff -Naur libmatroska-0.8.1.orig/make/linux/Makefile libmatroska-0.8.1.patched/make/linux/Makefile +--- libmatroska-0.8.1.orig/make/linux/Makefile 2006-06-02 16:32:52.000000000 +0200 ++++ libmatroska-0.8.1.patched/make/linux/Makefile 2009-10-08 14:19:53.080322384 +0200 +@@ -102,7 +102,7 @@ + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml ++ $(CXX) -G $(LDFLAGS) -o $(LIBRARY_SO_VER) $(objects_so) -lebml + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 15:26:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 13:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6783] csw/mgar/pkg/libebml/trunk/Makefile Message-ID: Revision: 6783 http://gar.svn.sourceforge.net/gar/?rev=6783&view=rev Author: dmichelsen Date: 2009-10-08 13:26:04 +0000 (Thu, 08 Oct 2009) Log Message: ----------- libebml: Relocate includes to ebml/ Modified Paths: -------------- csw/mgar/pkg/libebml/trunk/Makefile Modified: csw/mgar/pkg/libebml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libebml/trunk/Makefile 2009-10-08 13:25:51 UTC (rev 6782) +++ csw/mgar/pkg/libebml/trunk/Makefile 2009-10-08 13:26:04 UTC (rev 6783) @@ -33,6 +33,7 @@ INSTALL_OVERRIDE_VARS = CC CXX LD CFLAGS WARNINGFLAGS INSTALL INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall INSTALL_OVERRIDE_DIRS = prefix libdir includedir +includedir = $(prefix)/include/ebml INSTALL_SCRIPTS = $(WORKSRC)/make/linux/Makefile include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 15:27:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 13:27:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6784] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6784 http://gar.svn.sourceforge.net/gar/?rev=6784&view=rev Author: dmichelsen Date: 2009-10-08 13:27:06 +0000 (Thu, 08 Oct 2009) Log Message: ----------- colordiff: Force usage of GNU diff Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 13:26:04 UTC (rev 6783) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 13:27:06 UTC (rev 6784) @@ -11,11 +11,12 @@ PATCHFILES = fix-entity-nesting.patch PATCHFILES += force-csw-perl.patch PATCHFILES += force-csw-less.patch +PATCHFILES += force-csw-gdiff.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWperl CSWless +REQUIRED_PKGS = CSWdiffutils CSWperl CSWless CONFIGURE_SCRIPTS = BUILD_ARGS = doc Modified: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 13:26:04 UTC (rev 6783) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 13:27:06 UTC (rev 6784) @@ -1,4 +1,5 @@ 31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz d202632e9ec507e53445232a930c9c6f fix-entity-nesting.patch +4e078d43dfd8032c95699190c3bf9f16 force-csw-gdiff.patch 94bb55618657dd39b3d4d1b8b321eac3 force-csw-less.patch b37c28fccba12407d69a9d856d81a396 force-csw-perl.patch Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch 2009-10-08 13:27:06 UTC (rev 6784) @@ -0,0 +1,12 @@ +diff -Naur colordiff-1.0.9.orig/colordiff.pl colordiff-1.0.9.patched/colordiff.pl +--- colordiff-1.0.9.orig/colordiff.pl 2009-01-28 21:12:10.000000000 +0100 ++++ colordiff-1.0.9.patched/colordiff.pl 2009-10-08 14:26:51.806222906 +0200 +@@ -178,7 +178,7 @@ + my $exitcode = 0; + if ((defined $ARGV[0]) || (-t STDIN)) { + # More reliable way of pulling in arguments +- my $pid = open2(\*INPUTSTREAM, undef, "diff", @ARGV); ++ my $pid = open2(\*INPUTSTREAM, undef, "/opt/csw/bin/gdiff", @ARGV); + @inputstream = ; + close INPUTSTREAM; + waitpid $pid, 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 8 16:54:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 08 Oct 2009 14:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6785] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 6785 http://gar.svn.sourceforge.net/gar/?rev=6785&view=rev Author: bonivart Date: 2009-10-08 14:54:10 +0000 (Thu, 08 Oct 2009) Log Message: ----------- perl: update to use new bdb47 package Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-10-08 13:27:06 UTC (rev 6784) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-10-08 14:54:10 UTC (rev 6785) @@ -19,8 +19,10 @@ PACKAGES = CSWperl CSWperldoc ARCHALL_CSWperldoc = 1 -REQUIRED_PKGS_CSWperl = CSWbdb CSWgdbm +REQUIRED_PKGS_CSWperl = CSWbdb47 CSWgdbm REQUIRED_PKGS_CSWperldoc = CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +SPKG_DESC_CSWperldoc = Perl documentation LICENSE = Copying @@ -56,7 +58,7 @@ DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) # Dependencies -LIBDEPS += lib/bdb47 +#LIBDEPS += bdb48/lib LIBDEPS += lib/gdbm # Custom configure @@ -106,8 +108,8 @@ CONFIGURE_ARGS += -Dlibsdirs=" /usr/lib /opt/csw/lib" CONFIGURE_ARGS += -Dsed=$(bindir)/gsed -#EXTRA_LIB += $(prefix)/bdb44/lib -#EXTRA_INC += $(prefix)/bdb44/include +EXTRA_LIB += $(prefix)/bdb47/lib +EXTRA_INC += $(prefix)/bdb47/include #EXTRA_LDFLAGS = -lperl EXTRA_LDFLAGS = -L/opt/csw/lib/libperl.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 17:22:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 15:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6786] csw/mgar/pkg/fping/trunk Message-ID: Revision: 6786 http://gar.svn.sourceforge.net/gar/?rev=6786&view=rev Author: dmichelsen Date: 2009-10-08 15:22:50 +0000 (Thu, 08 Oct 2009) Log Message: ----------- fping: Add patch Modified Paths: -------------- csw/mgar/pkg/fping/trunk/Makefile csw/mgar/pkg/fping/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch Modified: csw/mgar/pkg/fping/trunk/Makefile =================================================================== --- csw/mgar/pkg/fping/trunk/Makefile 2009-10-08 14:54:10 UTC (rev 6785) +++ csw/mgar/pkg/fping/trunk/Makefile 2009-10-08 15:22:50 UTC (rev 6786) @@ -20,7 +20,8 @@ MASTER_SITES = http://fping.sourceforge.net/download/ MASTER_SITES += http://oss.oetiker.ch/smokeping/pub/ DISTFILES = $(GARNAME).tar.gz -PATCHFILES = fping-2.4b2_to-sequence-fix.patch +#PATCHFILES = fping-2.4b2_to-sequence-fix.patch +PATCHFILES += fping-ipv6.patch # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/fping/trunk/checksums =================================================================== --- csw/mgar/pkg/fping/trunk/checksums 2009-10-08 14:54:10 UTC (rev 6785) +++ csw/mgar/pkg/fping/trunk/checksums 2009-10-08 15:22:50 UTC (rev 6786) @@ -1,2 +1,2 @@ -ee105906fc48b78f72866e121a7c179e download/fping-2.4b2_to-sequence-fix.patch +c5e9dc057bda53ed36af08ee9fb84938 download/fping-ipv6.patch d5e8be59e307cef76bc479e1684df705 download/fping.tar.gz Added: csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch =================================================================== --- csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch (rev 0) +++ csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch 2009-10-08 15:22:50 UTC (rev 6786) @@ -0,0 +1,82 @@ +Only in fping-2.4b2_to.patch: Makefile +Only in fping-2.4b2_to.patch: config.h +Only in fping-2.4b2_to.patch: config.log +Only in fping-2.4b2_to.patch: config.status +Only in fping-2.4b2_to.patch: fping +diff -u fping-2.4b2_to/fping.c fping-2.4b2_to.patch/fping.c +--- fping-2.4b2_to/fping.c 2001-07-20 19:10:26.000000000 +0200 ++++ fping-2.4b2_to.patch/fping.c 2008-08-18 22:14:38.000000000 +0200 +@@ -1440,7 +1440,7 @@ + icp->icmp_type = ICMP_ECHO; + icp->icmp_code = 0; + icp->icmp_cksum = 0; +- icp->icmp_seq = h->i; ++ icp->icmp_seq = h->i + (h->num_sent) * num_hosts; + icp->icmp_id = ident; + + pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR ); +@@ -1527,6 +1527,7 @@ + int n, avg; + HOST_ENTRY *h; + long this_reply; ++ long id; + int this_count; + struct timeval sent_time; + +@@ -1568,6 +1569,7 @@ + }/* IF */ + + icp = ( struct icmp* )( buffer + hlen ); ++ id = icp->icmp_seq % num_hosts; + if( icp->icmp_type != ICMP_ECHOREPLY ) + { + /* handle some problem */ +@@ -1583,10 +1585,10 @@ + + num_pingreceived++; + +- if( icp->icmp_seq >= ( n_short )num_hosts ) ++ if( id >= ( n_short )num_hosts ) + return( 1 ); /* packet received, don't worry about it anymore */ + +- n = icp->icmp_seq; ++ n = id; + h = table[n]; + + /* received ping is cool, so process it */ +@@ -1726,6 +1728,7 @@ + { + struct icmp *sent_icmp; + struct ip *sent_ip; ++ long id = sent_icmp->icmp_seq % num_hosts; + u_char *c; + HOST_ENTRY *h; + +@@ -1737,10 +1740,10 @@ + + if( ( sent_icmp->icmp_type == ICMP_ECHO ) && + ( sent_icmp->icmp_id == ident ) && +- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) ++ ( id < ( n_short )num_hosts ) ) + { + /* this is a response to a ping we sent */ +- h = table[sent_icmp->icmp_seq]; ++ h = table[id]; + + if( p->icmp_code > ICMP_UNREACH_MAXTYPE ) + { +@@ -1771,10 +1774,10 @@ + sent_icmp = ( struct icmp* )( c + 28 ); + if( ( sent_icmp->icmp_type = ICMP_ECHO ) && + ( sent_icmp->icmp_id = ident ) && +- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) ++ ( id < ( n_short )num_hosts ) ) + { + /* this is a response to a ping we sent */ +- h = table[sent_icmp->icmp_seq]; ++ h = table[id]; + fprintf( stderr, "%s from %s for ICMP Echo sent to %s", + icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host ); + +Only in fping-2.4b2_to.patch: fping.o +Only in fping-2.4b2_to.patch: stamp-h Added: csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch =================================================================== --- csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch (rev 0) +++ csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch 2009-10-08 15:22:50 UTC (rev 6786) @@ -0,0 +1,952 @@ +diff -Naur fping-2.4b2/ChangeLog fping-2.4b2_to-ipv6/ChangeLog +--- fping-2.4b2/ChangeLog Thu Mar 15 03:09:39 2001 ++++ fping-2.4b2_to-ipv6/ChangeLog Mon Jan 21 02:15:04 2002 +@@ -1,12 +1,23 @@ +-Tue Mar 14 18:37:50 2001 +-Jason Ewasiuk (ZeroHype Technologies Inc.) ++Wed Jan 16 2002 ++Jeroen Massar ++- Revision v2.4b2-to-IPv6 ++ - Added IPv6 support. ++ - Added -I option for selecting source IPv4/IPv6 address. ++ - Makefile.in now generates a Makefile which will build both ++ fping (IPv4) and fping6 (IPv6). Thus it makes an fping (IPv4 only) ++ and an fping6 (IPv6 only). ++ - num_unreachable was counted twice when a sendto() generated errors. ++ - See http://unfix.org/projects/ipv6/ ++ ++Tue Mar 14 2001 ++Jason Ewasiuk + - Revision v2.4b1 + - added -g option for generating IPs from a start to an end value + - two available options, generate IPs from start IP to end IP + or from a passed netmask, such as 192.168.1.0/24 + +-Thu Feb 15 14:35:00 2001 +-Jason Ewasiuk (ZeroHype Technologies Inc.) ++Thu Feb 15 2001 ++Jason Ewasiuk + - Revision v2.3b1 + - formatting changes to code layout (fping.c) + NOTE: Best viewed with a tab stop of 4 +diff -Naur fping-2.4b2/Makefile.am fping-2.4b2_to-ipv6/Makefile.am +--- fping-2.4b2/Makefile.am Thu Mar 15 03:07:52 2001 ++++ fping-2.4b2_to-ipv6/Makefile.am Wed Jan 16 01:52:18 2002 +@@ -1,5 +1,5 @@ +- + sbin_PROGRAMS = fping + fping_SOURCES = fping.c options.h linux.h + man_MANS = fping.8 + AUTOMAKE_OPTIONS=foreign ++EXTRA_DIST = $(man_MANS) +diff -Naur fping-2.4b2/README fping-2.4b2_to-ipv6/README +--- fping-2.4b2/README Wed Apr 25 20:29:10 2001 ++++ fping-2.4b2_to-ipv6/README Mon Jan 21 02:02:12 2002 +@@ -1,9 +1,9 @@ + fping README + ------------ + +-Current maintainer and cool feature adder: ++Current maintainer: + +-ZeroHype Technologies Inc. (noc at zerohype.com) http://www.zerohype.com ++David Papp - david at remote.net + + + fping website: http://www.fping.com +@@ -11,6 +11,7 @@ + + Original author: Roland Schemers (schemers at stanford.edu) + Previous maintainer: RL "Bob" Morgan (morgan at stanford.edu) ++IPv6 Support: Jeroen Massar (jeroen at unfix.org / jeroen at ipng.nl) + + + Suggestions and patches: +diff -Naur fping-2.4b2/acconfig.h fping-2.4b2_to-ipv6/acconfig.h +--- fping-2.4b2/acconfig.h Thu Mar 15 03:07:52 2001 ++++ fping-2.4b2_to-ipv6/acconfig.h Sat Nov 3 16:23:40 2001 +@@ -1,4 +1,18 @@ ++#ifndef CONFIG_H ++#define CONFIG_H ++ ++ at TOP@ + + /* VERSION (from configure.in) */ + #undef VERSION + ++ ++ at BOTTOM@ ++ ++/* some OSes do not define this ... lets take a wild guess */ ++ ++#ifndef INADDR_NONE ++# define INADDR_NONE 0xffffffffU ++#endif ++ ++#endif /* CONFIG_H */ +diff -Naur fping-2.4b2/aclocal.m4 fping-2.4b2_to-ipv6/aclocal.m4 +--- fping-2.4b2/aclocal.m4 Thu Jan 1 01:00:00 1970 ++++ fping-2.4b2_to-ipv6/aclocal.m4 Wed Jan 16 01:48:55 2002 +@@ -0,0 +1,127 @@ ++dnl aclocal.m4 generated automatically by aclocal 1.4 ++ ++dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl This program is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++dnl PARTICULAR PURPOSE. ++ ++# Do all the work for Automake. This macro actually does too much -- ++# some checks are only needed if your package does certain things. ++# But this isn't really a big deal. ++ ++# serial 1 ++ ++dnl Usage: ++dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ++ ++AC_DEFUN(AM_INIT_AUTOMAKE, ++[AC_REQUIRE([AC_PROG_INSTALL]) ++PACKAGE=[$1] ++AC_SUBST(PACKAGE) ++VERSION=[$2] ++AC_SUBST(VERSION) ++dnl test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++fi ++ifelse([$3],, ++AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) ++AC_REQUIRE([AM_SANITY_CHECK]) ++AC_REQUIRE([AC_ARG_PROGRAM]) ++dnl FIXME This is truly gross. ++missing_dir=`cd $ac_aux_dir && pwd` ++AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) ++AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) ++AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) ++AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) ++AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) ++AC_REQUIRE([AC_PROG_MAKE_SET])]) ++ ++# ++# Check to make sure that the build environment is sane. ++# ++ ++AC_DEFUN(AM_SANITY_CHECK, ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftestfile ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` ++ if test "[$]*" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftestfile` ++ fi ++ if test "[$]*" != "X $srcdir/configure conftestfile" \ ++ && test "[$]*" != "X conftestfile $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "[$]2" = conftestfile ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++rm -f conftest* ++AC_MSG_RESULT(yes)]) ++ ++dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) ++dnl The program must properly implement --version. ++AC_DEFUN(AM_MISSING_PROG, ++[AC_MSG_CHECKING(for working $2) ++# Run test in a subshell; some versions of sh will print an error if ++# an executable is not found, even if stderr is redirected. ++# Redirect stdin to placate older versions of autoconf. Sigh. ++if ($2 --version) < /dev/null > /dev/null 2>&1; then ++ $1=$2 ++ AC_MSG_RESULT(found) ++else ++ $1="$3/missing $2" ++ AC_MSG_RESULT(missing) ++fi ++AC_SUBST($1)]) ++ ++# Like AC_CONFIG_HEADER, but automatically create stamp file. ++ ++AC_DEFUN(AM_CONFIG_HEADER, ++[AC_PREREQ([2.12]) ++AC_CONFIG_HEADER([$1]) ++dnl When config.status generates a header, we must update the stamp-h file. ++dnl This file resides in the same directory as the config header ++dnl that is generated. We must strip everything past the first ":", ++dnl and everything past the last "/". ++AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl ++ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, ++<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, ++<>; do ++ case " <<$>>CONFIG_HEADERS " in ++ *" <<$>>am_file "*<<)>> ++ echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx ++ ;; ++ esac ++ am_indx=`expr "<<$>>am_indx" + 1` ++done<<>>dnl>>) ++changequote([,]))]) ++ +diff -Naur fping-2.4b2/config.h.in fping-2.4b2_to-ipv6/config.h.in +--- fping-2.4b2/config.h.in Thu Mar 15 03:07:52 2001 ++++ fping-2.4b2_to-ipv6/config.h.in Wed Jan 16 01:49:45 2002 +@@ -1,4 +1,7 @@ + /* config.h.in. Generated automatically from configure.in by autoheader. */ ++#ifndef CONFIG_H ++#define CONFIG_H ++ + + /* VERSION (from configure.in) */ + #undef VERSION +@@ -20,3 +23,18 @@ + + /* Define if you have the socket library (-lsocket). */ + #undef HAVE_LIBSOCKET ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Version number of package */ ++#undef VERSION ++ ++ ++/* some OSes do not define this ... lets take a wild guess */ ++ ++#ifndef INADDR_NONE ++# define INADDR_NONE 0xffffffffU ++#endif ++ ++#endif /* CONFIG_H */ +diff -Naur fping-2.4b2/configure.in fping-2.4b2_to-ipv6/configure.in +--- fping-2.4b2/configure.in Thu Nov 7 21:11:57 2002 ++++ fping-2.4b2_to-ipv6/configure.in Wed Jan 16 01:48:02 2002 +@@ -1,18 +1,26 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(fping.c) +-AM_INIT_AUTOMAKE(fping,fping) ++AM_INIT_AUTOMAKE(fping, 2.4b2_to_ipv6) ++ + AM_CONFIG_HEADER(config.h) ++#VERSION=2.4b2 ++#PACKAGE=fping ++AC_SUBST(PACKAGE) ++AC_SUBST(VERSION) ++AC_DEFINE_UNQUOTED(VERSION,"$VERSION") + + dnl Checks for programs. + +-AC_ARG_PROGRAM + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL + + dnl Checks for libraries. + +-AC_CHECK_FUNC(gethostbyname, [] AC_CHECK_LIB(nsl, gethostbyname)) ++AC_CHECK_FUNC(gethostbyname) ++if test $ac_cv_func_gethostbyname = no; then ++ AC_CHECK_LIB(nsl, gethostbyname) ++fi + AC_CHECK_FUNC(connect) + if test $ac_cv_func_connect = no; then + AC_CHECK_LIB(socket, connect) +@@ -21,4 +29,4 @@ + dnl Checks for header files. + AC_CHECK_HEADERS(unistd.h sys/file.h stdlib.h sys/select.h) + +-AC_OUTPUT([Makefile]) ++AC_OUTPUT(Makefile) +diff -Naur fping-2.4b2/fping.8 fping-2.4b2_to-ipv6/fping.8 +--- fping-2.4b2/fping.8 Thu Mar 15 03:10:45 2001 ++++ fping-2.4b2_to-ipv6/fping.8 Mon Jan 21 02:05:48 2002 +@@ -192,7 +192,7 @@ + .nf + Roland J. Schemers III, Stanford University, concept and versions 1.x + RL "Bob" Morgan, Stanford University, versions 2.x +-ZeroHype Technologies Inc. (http://www.zerohype.com), versions 2.3x and up, ++David Papp, versions 2.3x and up, + fping website: http://www.fping.com + .ni + .SH DIAGNOSTICS +diff -Naur fping-2.4b2/fping.c fping-2.4b2_to-ipv6/fping.c +--- fping-2.4b2/fping.c Fri Jul 20 19:10:26 2001 ++++ fping-2.4b2_to-ipv6/fping.c Mon Jan 21 02:06:30 2002 +@@ -17,12 +17,13 @@ + * + * Current maintainers of fping: + * +- * ZeroHype Technologies Inc. (http://www.zerohype.com) +- * Suggestions and patches, please email noc at zerohype.com ++ * David Papp ++ * Suggestions and patches, please email david at remote.net + * + * + * +- * Original author: Roland Schemers ++ * Original author: Roland Schemers ++ * IPv6 Support: Jeroen Massar + * + * + * +@@ -41,6 +42,7 @@ + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ ++#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */ + + #ifndef _NO_PROTO + #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \ +@@ -65,13 +67,16 @@ + + /*** autoconf includes ***/ + +-#include + + #include + #include + #include + #include + ++#include ++ ++#include "config.h" ++ + #ifdef HAVE_UNISTD_H + #include + #endif /* HAVE_UNISTD_H */ +@@ -91,8 +96,10 @@ + #include + #endif /* HAVE_SYS_FILE_H */ + ++#ifdef IPV6 ++#include ++#endif + #include +-#include + + /* Linux has bizarre ip.h and ip_icmp.h */ + #if defined( __linux__ ) +@@ -126,8 +133,8 @@ + + /*** Constants ***/ + +-#define REV_DATE "2001/01/25 11:25:04" +-#define EMAIL "noc at zerohype.com" ++#define REV_DATE "2002/01/16 00:33:42" ++#define EMAIL "david at remote.net" + + /*** Ping packet defines ***/ + +@@ -215,6 +222,13 @@ + }; + + #define ICMP_UNREACH_MAXTYPE 15 ++#ifndef IPV6 ++#define FPING_SOCKADDR struct sockaddr_in ++#define FPING_ICMPHDR struct icmp ++#else ++#define FPING_SOCKADDR struct sockaddr_in6 ++#define FPING_ICMPHDR struct icmp6_hdr ++#endif + + /* entry used to keep track of each host we are pinging */ + +@@ -225,7 +239,7 @@ + char *name; /* name as given by user */ + char *host; /* text description of host */ + char *pad; /* pad to align print names */ +- struct sockaddr_in saddr; /* internet address */ ++ FPING_SOCKADDR saddr; /* internet address */ + int timeout; /* time to wait for response */ + u_char running; /* unset when through sending */ + u_char waiting; /* waiting for response */ +@@ -335,7 +349,11 @@ + #else + + void add_name( char *name ); ++#ifndef IPV6 + void add_addr( char *name, char *host, struct in_addr ipaddr ); ++#else ++void add_addr( char *name, char *host, FPING_SOCKADDR *ipaddr ); ++#endif + char *na_cat( char *name, struct in_addr ipaddr ); + char *cpystr( char *string ); + void crash_and_burn( char *message ); +@@ -343,7 +361,7 @@ + char *get_host_by_address( struct in_addr in ); + int in_cksum( u_short *p, int n ); + void u_sleep( int u_sec ); +-int recvfrom_wto ( int s, char *buf, int len, struct sockaddr *saddr, int timo ); ++int recvfrom_wto ( int s, char *buf, int len, FPING_SOCKADDR *saddr, int timo ); + void remove_job( HOST_ENTRY *h ); + void send_ping( int s, HOST_ENTRY *h ); + long timeval_diff( struct timeval *a, struct timeval *b ); +@@ -353,7 +371,7 @@ + void print_per_system_splits( void ); + void print_global_stats( void ); + void finish(); +-int handle_random_icmp( struct icmp *p, int psize, struct sockaddr_in *addr ); ++int handle_random_icmp( FPING_ICMPHDR *p, int psize, FPING_SOCKADDR *addr ); + char *sprint_tm( int t ); + + #endif /* _NO_PROTO */ +@@ -382,12 +400,14 @@ + #endif /* _NO_PROTO */ + { + int c, i, n; ++#ifdef IPV6 ++ int opton = 1; ++#endif + u_int lt, ht; + int advance; + struct protoent *proto; + char *buf; + uid_t uid; +- + /* check if we are root */ + + if( geteuid() ) +@@ -400,15 +420,62 @@ + }/* IF */ + + /* confirm that ICMP is available on this machine */ ++#ifndef IPV6 + if( ( proto = getprotobyname( "icmp" ) ) == NULL ) ++#else ++ if( ( proto = getprotobyname( "ipv6-icmp" ) ) == NULL ) ++#endif + crash_and_burn( "icmp: unknown protocol" ); + + /* create raw socket for ICMP calls (ping) */ ++#ifndef IPV6 + s = socket( AF_INET, SOCK_RAW, proto->p_proto ); ++#else ++ s = socket( AF_INET6, SOCK_RAW, proto->p_proto ); ++#endif + + if( s < 0 ) + errno_crash_and_burn( "can't create raw socket" ); + ++#ifdef IPV6 ++ /* ++ * let the kerel pass extension headers of incoming packets, ++ * for privileged socket options ++ */ ++#ifdef IPV6_RECVHOPOPTS ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVHOPOPTS)"); ++#else /* old adv. API */ ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_HOPOPTS)"); ++#endif ++#ifdef IPV6_RECVDSTOPTS ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVDSTOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVDSTOPTS)"); ++#else /* old adv. API */ ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_DSTOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_DSTOPTS)"); ++#endif ++#ifdef IPV6_RECVRTHDRDSTOPTS ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVRTHDRDSTOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVRTHDRDSTOPTS)"); ++#endif ++#ifdef IPV6_RECVRTHDR ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVRTHDR, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVRTHDR)"); ++#else /* old adv. API */ ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RTHDR, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RTHDR)"); ++#endif ++#endif ++ + if( ( uid = getuid() ) ) + { + seteuid( getuid() ); +@@ -1425,7 +1492,7 @@ + #endif /* _NO_PROTO */ + { + char *buffer; +- struct icmp *icp; ++ FPING_ICMPHDR *icp; + PING_DATA *pdp; + int n; + +@@ -1434,9 +1501,10 @@ + crash_and_burn( "can't malloc ping packet" ); + + memset( buffer, 0, ping_pkt_size * sizeof( char ) ); +- icp = ( struct icmp* )buffer; ++ icp = ( FPING_ICMPHDR* )buffer; + + gettimeofday( &h->last_send_time, &tz ); ++#ifndef IPV6 + icp->icmp_type = ICMP_ECHO; + icp->icmp_code = 0; + icp->icmp_cksum = 0; +@@ -1448,14 +1516,25 @@ + pdp->ping_count = h->num_sent; + + icp->icmp_cksum = in_cksum( ( u_short* )icp, ping_pkt_size ); ++#else ++ icp->icmp6_type = ICMP6_ECHO_REQUEST; ++ icp->icmp6_code = 0; ++ icp->icmp6_seq = h->i; ++ icp->icmp6_id = ident; ++ ++ pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR ); ++ pdp->ping_ts = h->last_send_time; ++ pdp->ping_count = h->num_sent; + ++ icp->icmp6_cksum = 0; // The IPv6 stack calculates the checksum for us... ++#endif + #if defined(DEBUG) || defined(_DEBUG) + if( trace_flag ) + printf( "sending [%d] to %s\n", h->num_sent, h->host ); + #endif /* DEBUG || _DEBUG */ + + n = sendto( s, buffer, ping_pkt_size, 0, +- ( struct sockaddr* )&h->saddr, sizeof( struct sockaddr_in ) ); ++ ( struct sockaddr* )&h->saddr, sizeof( FPING_SOCKADDR ) ); + + if( n < 0 || n != ping_pkt_size ) + { +@@ -1520,18 +1599,17 @@ + { + int result; + static char buffer[4096]; +- struct sockaddr_in response_addr; ++ FPING_SOCKADDR response_addr; + struct ip *ip; +- int hlen; +- struct icmp *icp; ++ int hlen = 0; ++ FPING_ICMPHDR *icp; + int n, avg; + HOST_ENTRY *h; + long this_reply; + int this_count; + struct timeval sent_time; + +- result = recvfrom_wto( s, buffer, 4096, +- ( struct sockaddr* )&response_addr, select_time ); ++ result = recvfrom_wto( s, buffer, sizeof(buffer), &response_addr, select_time ); + + if( result < 0 ) + return 0; /* timeout */ +@@ -1546,7 +1624,7 @@ + #endif /* DEBUG || _DEBUG */ + + ip = ( struct ip* )buffer; +- ++#ifndef IPV6 + #if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) + /* The alpha headers are decidedly broken. + * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and +@@ -1556,37 +1634,59 @@ + #else + hlen = ip->ip_hl << 2; + #endif /* defined(__alpha__) && __STDC__ */ +- + if( result < hlen + ICMP_MINLEN ) ++#else ++ if( result < sizeof(FPING_ICMPHDR) ) ++#endif + { + if( verbose_flag ) ++ { ++#ifndef IPV6 + printf( "received packet too short for ICMP (%d bytes from %s)\n", result, + inet_ntoa( response_addr.sin_addr ) ); +- ++#else ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ printf( "received packet too short for ICMP (%d bytes from %s)\n", result, buf); ++#endif ++ } + return( 1 ); /* too short */ +- + }/* IF */ + +- icp = ( struct icmp* )( buffer + hlen ); ++ icp = ( FPING_ICMPHDR* )( buffer + hlen ); ++#ifndef IPV6 + if( icp->icmp_type != ICMP_ECHOREPLY ) ++#else ++ if( icp->icmp6_type != ICMP6_ECHO_REPLY ) ++#endif + { + /* handle some problem */ + if( handle_random_icmp( icp, result, &response_addr ) ) + num_othericmprcvd++; +- + return 1; +- + }/* IF */ + ++#ifndef IPV6 + if( icp->icmp_id != ident ) ++#else ++ if( icp->icmp6_id != ident ) ++#endif + return 1; /* packet received, but not the one we are looking for! */ + + num_pingreceived++; + ++#ifndef IPV6 + if( icp->icmp_seq >= ( n_short )num_hosts ) ++#else ++ if( icp->icmp6_seq >= ( n_short )num_hosts ) ++#endif + return( 1 ); /* packet received, don't worry about it anymore */ + ++#ifndef IPV6 + n = icp->icmp_seq; ++#else ++ n = icp->icmp6_seq; ++#endif + h = table[n]; + + /* received ping is cool, so process it */ +@@ -1595,9 +1695,14 @@ + h->timeout = timeout; + h->num_recv++; + h->num_recv_i++; +- ++ ++#ifndef IPV6 + memcpy( &sent_time, icp->icmp_data + offsetof( PING_DATA, ping_ts ), sizeof( sent_time ) ); + memcpy( &this_count, icp->icmp_data, sizeof( this_count ) ); ++#else ++ memcpy( &sent_time, ((char *)icp->icmp6_data32)+4+offsetof(PING_DATA, ping_ts), sizeof( sent_time ) ); ++ memcpy( &this_count, ((char *)icp->icmp6_data32)+4, sizeof( this_count ) ); ++#endif + + #if defined( DEBUG ) || defined( _DEBUG ) + if( trace_flag ) +@@ -1627,10 +1732,18 @@ + { + fprintf( stderr, "%s : duplicate for [%d], %d bytes, %s ms", + h->host, this_count, result, sprint_tm( this_reply ) ); +- ++#ifndef IPV6 + if( response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr ) + fprintf( stderr, " [<- %s]", inet_ntoa( response_addr.sin_addr ) ); +- ++#else ++ if(memcmp(&response_addr.sin6_addr, &h->saddr.sin6_addr, sizeof(response_addr.sin6_addr))) ++ { ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ ++ fprintf( stderr, " [<- %s]", buf); ++ } ++#endif + fprintf( stderr, "\n" ); + + }/* IF */ +@@ -1660,10 +1773,17 @@ + + if( elapsed_flag ) + printf( " (%s ms)", sprint_tm( this_reply ) ); +- ++#ifndef IPV6 + if( response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr ) + printf( " [<- %s]", inet_ntoa( response_addr.sin_addr ) ); +- ++#else ++ if(memcmp(&response_addr.sin6_addr, &h->saddr.sin6_addr, sizeof(response_addr.sin6_addr))) ++ { ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ fprintf( stderr, " [<- %s]", buf); ++ } ++#endif + printf( "\n" ); + + }/* IF */ +@@ -1688,9 +1808,17 @@ + ( h->num_recv * 100 ) / h->num_sent ); + + }/* ELSE */ +- ++#ifndef IPV6 + if( response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr ) + printf( " [<- %s]", inet_ntoa( response_addr.sin_addr ) ); ++#else ++ if(memcmp(&response_addr.sin6_addr, &h->saddr.sin6_addr, sizeof(response_addr.sin6_addr))) ++ { ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ fprintf( stderr, " [<- %s]", buf); ++ } ++#endif + + printf( "\n" ); + +@@ -1706,7 +1834,7 @@ + + ************************************************************* + +- Inputs: struct icmp *p, int psize, struct sockaddr_in *addr ++ Inputs: FPING_ICMPHDR *p, int psize, FPING_SOCKADDR *addr + + Returns: int + +@@ -1717,22 +1845,33 @@ + + #ifdef _NO_PROTO + int handle_random_icmp( p, psize, addr ) +- struct icmp *p; ++ FPING_ICMPHDR *p; + int psize; +- struct sockaddr_in *addr; ++ FPING_SOCKADDR *addr; + #else +-int handle_random_icmp( struct icmp *p, int psize, struct sockaddr_in *addr ) ++int handle_random_icmp( FPING_ICMPHDR *p, int psize, FPING_SOCKADDR *addr ) + #endif /* _NO_PROTO */ + { +- struct icmp *sent_icmp; ++ FPING_ICMPHDR *sent_icmp; + struct ip *sent_ip; + u_char *c; + HOST_ENTRY *h; ++#ifdef IPV6 ++ char addr_ascii[INET6_ADDRSTRLEN]; ++ inet_ntop(addr->sin6_family, &addr->sin6_addr, addr_ascii, INET6_ADDRSTRLEN); ++#endif + + c = ( u_char* )p; ++#ifndef IPV6 + switch( p->icmp_type ) ++#else ++ switch( p->icmp6_type ) ++#endif + { + case ICMP_UNREACH: ++ sent_icmp = ( FPING_ICMPHDR* )( c + 28 ); ++ ++#ifndef IPV6 + sent_icmp = ( struct icmp* )( c + 28 ); + + if( ( sent_icmp->icmp_type == ICMP_ECHO ) && +@@ -1747,16 +1886,37 @@ + fprintf( stderr, "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s", + inet_ntoa( addr->sin_addr ), h->host ); + ++#else ++ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) && ++ ( sent_icmp->icmp6_id == ident ) && ++ ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) ) ++ { ++ /* this is a response to a ping we sent */ ++ h = table[sent_icmp->icmp6_seq]; ++ ++ if( p->icmp6_code > ICMP_UNREACH_MAXTYPE ) ++ { ++ fprintf( stderr, "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s", ++ addr_ascii, h->host ); ++#endif + }/* IF */ + else + { + fprintf( stderr, "%s from %s for ICMP Echo sent to %s", ++#ifndef IPV6 + icmp_unreach_str[p->icmp_code], inet_ntoa( addr->sin_addr ), h->host ); ++#else ++ icmp_unreach_str[p->icmp6_code], addr_ascii, h->host ); ++#endif + + }/* ELSE */ + + if( inet_addr( h->host ) == -1 ) ++#ifndef IPV6 + fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) ); ++#else ++ fprintf( stderr, " (%s)", addr_ascii); ++#endif + + fprintf( stderr, "\n" ); + +@@ -1768,7 +1928,8 @@ + case ICMP_REDIRECT: + case ICMP_TIMXCEED: + case ICMP_PARAMPROB: +- sent_icmp = ( struct icmp* )( c + 28 ); ++ sent_icmp = ( FPING_ICMPHDR* )( c + 28 ); ++#ifndef IPV6 + if( ( sent_icmp->icmp_type = ICMP_ECHO ) && + ( sent_icmp->icmp_id = ident ) && + ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) +@@ -1780,6 +1941,19 @@ + + if( inet_addr( h->host ) == -1 ) + fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) ); ++#else ++ if( ( sent_icmp->icmp6_type = ICMP_ECHO ) && ++ ( sent_icmp->icmp6_id = ident ) && ++ ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) ) ++ { ++ /* this is a response to a ping we sent */ ++ h = table[sent_icmp->icmp6_seq]; ++ fprintf( stderr, "%s from %s for ICMP Echo sent to %s", ++ icmp_type_str[p->icmp6_type], addr_ascii, h->host ); ++ ++ if( inet_addr( h->host ) == -1 ) ++ fprintf( stderr, " (%s)", addr_ascii ); ++#endif + + fprintf( stderr, "\n" ); + +@@ -1879,6 +2053,7 @@ + void add_name( char *name ) + #endif /* _NO_PROTO */ + { ++#ifndef IPV6 + struct hostent *host_ent; + u_int ipaddress; + struct in_addr *ipa = ( struct in_addr* )&ipaddress; +@@ -1985,7 +2160,27 @@ + + }/* WHILE */ + }/* ELSE */ +- ++#else ++ FPING_SOCKADDR dst; ++ struct addrinfo *res, hints; ++ int ret_ga; ++ char *hostname; ++ ++ /* getaddrinfo */ ++ bzero(&hints, sizeof(struct addrinfo)); ++ hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = AF_INET6; ++ hints.ai_socktype = SOCK_RAW; ++ hints.ai_protocol = IPPROTO_ICMPV6; ++ ++ ret_ga = getaddrinfo(name, NULL, &hints, &res); ++ if (ret_ga) errx(1, "%s", gai_strerror(ret_ga)); ++ if (res->ai_canonname) hostname = res->ai_canonname; ++ else hostname = name; ++ if (!res->ai_addr) errx(1, "getaddrinfo failed"); ++ (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/ ++ add_addr(name, name, &dst); ++#endif + } /* add_name() */ + + +@@ -2048,9 +2243,17 @@ + void add_addr( name, host, ipaddr ) + char *name; + char *host; ++#ifndef IPV6 + struct in_addr ipaddr; + #else ++FPING_SOCKADDR *ipaddr; ++#endif ++#else ++#ifndef IPV6 + void add_addr( char *name, char *host, struct in_addr ipaddr ) ++#else ++void add_addr( char *name, char *host, FPING_SOCKADDR *ipaddr ) ++#endif + #endif /* _NO_PROTO */ + { + HOST_ENTRY *p; +@@ -2064,8 +2267,13 @@ + + p->name = name; + p->host = host; ++#ifndef IPV6 + p->saddr.sin_family = AF_INET; + p->saddr.sin_addr = ipaddr; ++#else ++ p->saddr.sin6_family = AF_INET6; ++ (void)memcpy(&p->saddr, ipaddr, sizeof(FPING_SOCKADDR)); ++#endif + p->timeout = timeout; + p->running = 1; + p->min_reply = 10000000; +@@ -2193,7 +2401,11 @@ + #endif /* _NO_PROTO */ + { + struct hostent *h; ++#ifndef IPV6 + h = gethostbyaddr( ( char* )&in, sizeof( struct in_addr ),AF_INET ); ++#else ++ h = gethostbyaddr( ( char* )&in, sizeof( FPING_SOCKADDR ),AF_INET6 ); ++#endif + + if( h == NULL || h->h_name == NULL ) + return inet_ntoa( in ); +@@ -2429,7 +2641,7 @@ + + ************************************************************* + +- Inputs: int s, char* buf, int len, struct sockaddr *saddr, int timo ++ Inputs: int s, char* buf, int len, FPING_SOCKADDR *saddr, int timo + + Returns: int + +@@ -2443,9 +2655,9 @@ + + #ifdef _NO_PROTO + int recvfrom_wto( s, buf, len, saddr, timo ) +-int s; char *buf; int len; struct sockaddr *saddr; int timo; ++int s; char *buf; int len; FPING_SOCKADDR *saddr; int timo; + #else +-int recvfrom_wto( int s, char *buf, int len, struct sockaddr *saddr, int timo ) ++int recvfrom_wto( int s, char *buf, int len, FPING_SOCKADDR *saddr, int timo ) + #endif /* _NO_PROTO */ + { + int nfound, slen, n; +@@ -2465,8 +2677,12 @@ + if( nfound == 0 ) + return -1; /* timeout */ + ++#ifndef IPV6 + slen = sizeof( struct sockaddr ); +- n = recvfrom( s, buf, len, 0, saddr, &slen ); ++#else ++ slen = sizeof( FPING_SOCKADDR ); ++#endif ++ n = recvfrom( s, buf, len, 0, (struct sockaddr *)saddr, &slen ); + if( n < 0 ) + errno_crash_and_burn( "recvfrom" ); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 8 18:05:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 08 Oct 2009 16:05:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6787] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6787 http://gar.svn.sourceforge.net/gar/?rev=6787&view=rev Author: bonivart Date: 2009-10-08 16:05:38 +0000 (Thu, 08 Oct 2009) Log Message: ----------- cswclassutils: license change Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-08 15:22:50 UTC (rev 6786) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-08 16:05:38 UTC (rev 6787) @@ -5,11 +5,10 @@ DESCRIPTION = CSW class action utilities MASTER_SITES = +DISTFILES = COPYING ARCHALL = 1 -LICENSE = license - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -33,6 +32,5 @@ @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @cp $(FILEDIR)/CSW$(GARNAME).copyright $(WORKSRC)/license @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-08 15:22:50 UTC (rev 6786) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-08 16:05:38 UTC (rev 6787) @@ -0,0 +1 @@ +48a97af56d55bc90ce90303228ed8cc3 download/COPYING Added: csw/mgar/pkg/cswclassutils/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/COPYING 2009-10-08 16:05:38 UTC (rev 6787) @@ -0,0 +1,5 @@ + +These script(s) are utility scripts used by people who package software +for opencsw.org's Solaris "Community SoftWare" (CSW) effort. The scripts +may be copied free of charge, but may be of limited use to non-opencsw folks. + Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright 2009-10-08 15:22:50 UTC (rev 6786) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright 2009-10-08 16:05:38 UTC (rev 6787) @@ -1,5 +0,0 @@ - -These script(s) are utility scripts used by people who package software -for opencsw.org's Solaris "Community SoftWare" (CSW) effort. The scripts -may be copied free of charge, but may be of limited use to non-opencsw folks. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 8 19:34:28 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Oct 2009 17:34:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6788] csw/mgar/pkg/git/trunk Message-ID: Revision: 6788 http://gar.svn.sourceforge.net/gar/?rev=6788&view=rev Author: bdwalton Date: 2009-10-08 17:34:28 +0000 (Thu, 08 Oct 2009) Log Message: ----------- git: add patch to stop segfault in ls-files Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-08 16:05:38 UTC (rev 6787) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-08 17:34:28 UTC (rev 6788) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +#TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel @@ -87,6 +87,7 @@ GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) DISTFILES = CSWgit.postinstall +PATCHFILES = 0001-ls-files-make-option-parser-keep-argv-0.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-08 16:05:38 UTC (rev 6787) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-08 17:34:28 UTC (rev 6788) @@ -1 +1,2 @@ +286ebdc4e98afca87750145775cbe918 download/0001-ls-files-make-option-parser-keep-argv-0.patch 0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall Added: csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch 2009-10-08 17:34:28 UTC (rev 6788) @@ -0,0 +1,42 @@ +From a613b30af3b8a74e8b2d8f5f9910564fb44bf59d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 7 Oct 2009 16:25:38 -0400 +Subject: [PATCH] ls-files: make option parser keep argv[0] + +The ls-files built-in was not asking the option parser to maintain +argv[0]. This led to the possibility of fprintf(stderr, "...", NULL). +On Solaris, this was causing a segfault. On glibc systems, printed +error messages didn't contain proper strings, but rather, "(null)":... + +A trigger for this bug was: `git ls-files -i` + +Signed-off-by: Ben Walton +--- + builtin-ls-files.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/builtin-ls-files.c b/builtin-ls-files.c +index f473220..9a3705a 100644 +--- a/builtin-ls-files.c ++++ b/builtin-ls-files.c +@@ -482,7 +482,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) + git_config(git_default_config, NULL); + + argc = parse_options(argc, argv, prefix, builtin_ls_files_options, +- ls_files_usage, 0); ++ ls_files_usage, PARSE_OPT_KEEP_ARGV0); + if (show_tag || show_valid_bit) { + tag_cached = "H "; + tag_unmerged = "M "; +@@ -505,7 +505,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) + if (require_work_tree && !is_inside_work_tree()) + setup_work_tree(); + +- pathspec = get_pathspec(prefix, argv); ++ pathspec = get_pathspec(prefix, argv + 1); + + /* be nice with submodule paths ending in a slash */ + read_cache(); +-- +1.6.4.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 8 19:36:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 17:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6789] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6789 http://gar.svn.sourceforge.net/gar/?rev=6789&view=rev Author: wahwah Date: 2009-10-08 17:36:43 +0000 (Thu, 08 Oct 2009) Log Message: ----------- cswutils: Support for stripping paths for comparepkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-08 17:34:28 UTC (rev 6788) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-08 17:36:43 UTC (rev 6789) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = cswutils GARVERSION = 1.14.4 CATEGORIES = utils @@ -7,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 74 +SVN_REV = 77 MASTER_SITES = DISTFILES = COPYING @@ -62,9 +64,9 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw - @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ + @ginstall -m 755 $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/compare_pkgs.py - @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ + @ginstall -m 644 $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/cswutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-10-08 17:34:28 UTC (rev 6788) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-10-08 17:36:43 UTC (rev 6789) @@ -1,10 +1,10 @@ 091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING 30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg 6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 -280eef68336d2896ecc136152014af9c download/compare_pkgs.py-r74 +a60cefbb6829c8dbbfae634a9ab01eba download/compare_pkgs.py-r77 9a637f6546cc50974159a987302d91c0 download/cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 -d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r74 +d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r77 cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:31:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:31:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6790] csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile Message-ID: Revision: 6790 http://gar.svn.sourceforge.net/gar/?rev=6790&view=rev Author: wbonnet Date: 2009-10-08 20:31:55 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-08 17:36:43 UTC (rev 6789) +++ csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-08 20:31:55 UTC (rev 6790) @@ -20,6 +20,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWinputproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:32:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6791] csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile Message-ID: Revision: 6791 http://gar.svn.sourceforge.net/gar/?rev=6791&view=rev Author: wbonnet Date: 2009-10-08 20:32:45 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile 2009-10-08 20:31:55 UTC (rev 6790) +++ csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile 2009-10-08 20:32:45 UTC (rev 6791) @@ -20,6 +20,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWkbproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:34:41 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:34:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6792] csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile Message-ID: Revision: 6792 http://gar.svn.sourceforge.net/gar/?rev=6792&view=rev Author: wbonnet Date: 2009-10-08 20:34:35 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-08 20:32:45 UTC (rev 6791) +++ csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-08 20:34:35 UTC (rev 6792) @@ -19,6 +19,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWrenderproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:35:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6793] csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile Message-ID: Revision: 6793 http://gar.svn.sourceforge.net/gar/?rev=6793&view=rev Author: wbonnet Date: 2009-10-08 20:35:47 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-08 20:34:35 UTC (rev 6792) +++ csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-08 20:35:47 UTC (rev 6793) @@ -20,6 +20,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWxextproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:36:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6794] csw/mgar/pkg/x11/x11_xproto/trunk/Makefile Message-ID: Revision: 6794 http://gar.svn.sourceforge.net/gar/?rev=6794&view=rev Author: wbonnet Date: 2009-10-08 20:36:40 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-08 20:35:47 UTC (rev 6793) +++ csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-08 20:36:40 UTC (rev 6794) @@ -19,6 +19,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWxproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 8 22:50:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6795] csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Message-ID: Revision: 6795 http://gar.svn.sourceforge.net/gar/?rev=6795&view=rev Author: wahwah Date: 2009-10-08 20:50:46 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog_ng: Formatting changes to the startup script. Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 20:36:40 UTC (rev 6794) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 20:50:46 UTC (rev 6795) @@ -1,42 +1,44 @@ #!/bin/sh +# vim:set ts=2 sw=2 sts=2 expandtab: # -# $Id: init.d.solaris,v 1.3 2003/04/11 13:37:47 bazsi Exp $ +# $Id$ # # adapted to syslog-ng by BJ, Aug, 7th 2000 # cleaned up by Bazsi, Oct, 12th 2000 # minor fix by Bojan Zdrnja, Apr, 11th 2003 # added nicer options field # changes for OpenCSW by Ihsan Dogan, 10. November 2008 +# changes for zone support by Maciej Blizinski, 2009-07-15. DAEMON=/opt/csw/sbin/syslog-ng OPTIONS="-f /etc/opt/csw/syslog-ng.conf" case "$1" in - start) - if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then - echo 'syslog-ng service starting.' - # - # Before syslog-ng starts, save any messages from previous - # crash dumps so that messages appear in chronological order. - # - /usr/bin/savecore -m - if [ -r /etc/dumpadm.conf ]; then - . /etc/dumpadm.conf - [ "x$DUMPADM_DEVICE" != xswap ] && \ - /usr/bin/savecore -m -f $DUMPADM_DEVICE - fi - $DAEMON $OPTIONS -p /var/run/syslog-ng.pid - fi - ;; + start) + if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then + echo 'syslog-ng service starting.' + # + # Before syslog-ng starts, save any messages from previous + # crash dumps so that messages appear in chronological order. + # + /usr/bin/savecore -m + if [ -r /etc/dumpadm.conf ]; then + . /etc/dumpadm.conf + [ "x$DUMPADM_DEVICE" != xswap ] && \ + /usr/bin/savecore -m -f $DUMPADM_DEVICE + fi + $DAEMON $OPTIONS -p /var/run/syslog-ng.pid + fi + ;; - stop) - if [ -f /var/run/syslog-ng.pid ]; then - syspid=`/usr/bin/cat /var/run/syslog-ng.pid` - [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid - fi - ;; - *) - echo "Usage: $0 { start | stop }" - exit 1 - ;; + stop) + if [ -f /var/run/syslog-ng.pid ]; then + syspid=`/usr/bin/cat /var/run/syslog-ng.pid` + [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid + fi + ;; + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; esac Property changes on: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 8 23:05:40 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Oct 2009 21:05:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6796] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6796 http://gar.svn.sourceforge.net/gar/?rev=6796&view=rev Author: bdwalton Date: 2009-10-08 21:05:39 +0000 (Thu, 08 Oct 2009) Log Message: ----------- git: disable tests until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-08 20:50:46 UTC (rev 6795) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-08 21:05:39 UTC (rev 6796) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -#TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 23:10:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 21:10:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6797] csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile Message-ID: Revision: 6797 http://gar.svn.sourceforge.net/gar/?rev=6797&view=rev Author: wbonnet Date: 2009-10-08 21:10:29 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Fix package file name Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile 2009-10-08 21:05:39 UTC (rev 6796) +++ csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile 2009-10-08 21:10:29 UTC (rev 6797) @@ -16,7 +16,7 @@ UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWx11xf86vidmdproto -CATALOGNAME_CSWx11xf86vidmdproto = $(PROTONAME) +CATALOGNAME_CSWx11xf86vidmdproto = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 00:16:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 22:16:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6798] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 6798 http://gar.svn.sourceforge.net/gar/?rev=6798&view=rev Author: wahwah Date: 2009-10-08 22:16:48 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: Making it use localstatedir, http://www.opencsw.org/bugtrack/view.php?id=3945 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-08 21:10:29 UTC (rev 6797) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-08 22:16:48 UTC (rev 6798) @@ -9,7 +9,7 @@ logs using TCP. endef -MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(GARVERSION)/source/ +MASTER_SITES = http://www.balabit.com/downloads/files/$(GARNAME)/open-source-edition/$(GARVERSION)/source/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += $(GARNAME).conf.CSW DISTFILES += cswsyslog_ng @@ -31,6 +31,10 @@ $$$$3 ~ /\/syslog-ng\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ { print }' +# shared /opt/csw support: +localstatedir = /var/opt/csw +sysconfdir = /etc/opt/csw + PREREQUISITE_PKGS = CSWeventlog PREREQUISITE_PKGS += CSWggettext PREREQUISITE_PKGS += CSWglib2 @@ -42,7 +46,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw REQUIRED_PKGS = CSWgcc4corert REQUIRED_PKGS += CSWeventlog @@ -64,6 +67,7 @@ ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswsyslog_ng \ $(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng - $(MAKECOOKIE) + ginstall -m 755 -d $(DESTDIR)$(localstatedir)/run + @$(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 21:10:29 UTC (rev 6797) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:16:48 UTC (rev 6798) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -fd0f7ccdc627d08a00a2e57fdbfd51d8 download/cswsyslog_ng +efa7aa43448b8a3014a10b2056382379 download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 21:10:29 UTC (rev 6797) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 22:16:48 UTC (rev 6798) @@ -10,12 +10,16 @@ # changes for OpenCSW by Ihsan Dogan, 10. November 2008 # changes for zone support by Maciej Blizinski, 2009-07-15. +localstatedir=/var/opt/csw +sysconfdir=/etc/opt/csw DAEMON=/opt/csw/sbin/syslog-ng -OPTIONS="-f /etc/opt/csw/syslog-ng.conf" +CONFIG_FILE="${sysconfdir}/syslog-ng.conf" +PID_FILE="${localstatedir}/run" +OPTIONS="-f ${CONFIG_FILE}" case "$1" in start) - if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then + if [ -f "${CONFIG_FILE}" -a -f "${DAEMON}" ]; then echo 'syslog-ng service starting.' # # Before syslog-ng starts, save any messages from previous @@ -27,14 +31,14 @@ [ "x$DUMPADM_DEVICE" != xswap ] && \ /usr/bin/savecore -m -f $DUMPADM_DEVICE fi - $DAEMON $OPTIONS -p /var/run/syslog-ng.pid + $DAEMON $OPTIONS -p ${PID_FILE} fi ;; stop) - if [ -f /var/run/syslog-ng.pid ]; then - syspid=`/usr/bin/cat /var/run/syslog-ng.pid` - [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid + if [ -f ${PID_FILE} ]; then + syspid=`/usr/bin/cat ${PID_FILE}` + [ "$syspid" -gt 0 ] && kill -15 $syspid && rm ${PID_FILE} fi ;; *) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 00:24:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 22:24:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6799] csw/mgar/pkg/syslog_ng/trunk/checksums Message-ID: Revision: 6799 http://gar.svn.sourceforge.net/gar/?rev=6799&view=rev Author: wahwah Date: 2009-10-08 22:24:48 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: updating the checksum Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:16:48 UTC (rev 6798) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:24:48 UTC (rev 6799) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -efa7aa43448b8a3014a10b2056382379 download/cswsyslog_ng +f759d093f6f73e037a48c97e2bc46c39 download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 01:14:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 23:14:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6800] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 6800 http://gar.svn.sourceforge.net/gar/?rev=6800&view=rev Author: wahwah Date: 2009-10-08 23:14:47 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: Using /var/run for the pid file. Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:24:48 UTC (rev 6799) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 23:14:47 UTC (rev 6800) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -f759d093f6f73e037a48c97e2bc46c39 download/cswsyslog_ng +4f6f1b75b8a95a7a69d93cab0eee23ef download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 22:24:48 UTC (rev 6799) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 23:14:47 UTC (rev 6800) @@ -14,7 +14,7 @@ sysconfdir=/etc/opt/csw DAEMON=/opt/csw/sbin/syslog-ng CONFIG_FILE="${sysconfdir}/syslog-ng.conf" -PID_FILE="${localstatedir}/run" +PID_FILE="/var/run/syslog-ng.pid" OPTIONS="-f ${CONFIG_FILE}" case "$1" in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 01:22:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 23:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6801] csw/mgar/pkg/syslog_ng/trunk/checksums Message-ID: Revision: 6801 http://gar.svn.sourceforge.net/gar/?rev=6801&view=rev Author: wahwah Date: 2009-10-08 23:22:09 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: updating checksums Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 23:14:47 UTC (rev 6800) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 23:22:09 UTC (rev 6801) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -4f6f1b75b8a95a7a69d93cab0eee23ef download/cswsyslog_ng +fcd5effdaa96da8abf9788bc5745bda3 download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 9 11:20:19 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 09 Oct 2009 09:20:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6802] csw/mgar/pkg Message-ID: Revision: 6802 http://gar.svn.sourceforge.net/gar/?rev=6802&view=rev Author: skayser Date: 2009-10-09 09:20:19 +0000 (Fri, 09 Oct 2009) Log Message: ----------- denyhosts: initial commit Added Paths: ----------- csw/mgar/pkg/denyhosts/ csw/mgar/pkg/denyhosts/branches/ csw/mgar/pkg/denyhosts/tags/ csw/mgar/pkg/denyhosts/trunk/ csw/mgar/pkg/denyhosts/trunk/Makefile csw/mgar/pkg/denyhosts/trunk/checksums csw/mgar/pkg/denyhosts/trunk/files/ Property changes on: csw/mgar/pkg/denyhosts/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-10-09 09:20:19 UTC (rev 6802) @@ -0,0 +1,80 @@ +# TODO +# - Integrate into SMF, do we need daemon-control-dist at all? +# - Test the package +GARNAME = denyhosts +GARVERSION = 2.6 +CATEGORIES = python + +DESCRIPTION = A tool to limit SSH brute force attacks +define BLURB + DenyHosts is a script intended to be run by system administrators + to help thwart SSH server attacks (also known as dictionary based + attacks and brute force attacks). + + If you've ever looked at your ssh log you may be alarmed to see how + many hackers attempted to gain access to your server. Hopefully, none of + them were successful (but then again, how would you know?). Wouldn't it + be better to automatically prevent that attacker from continuing to gain + entry into your system? + + DenyHosts attempts to address the above. +endef + +SPKG_SOURCEURL = http://denyhosts.sf.net/ +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = DenyHosts-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE.txt +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# No test target +TEST_SCRIPTS = +EXTRA_INSTALL_ARGS += --no-compile + +sysconfdir = /etc/opt/csw/ +localstatedir = /var/opt/csw/ +SAMPLECONF = $(sysconfdir)/denyhosts.cfg + +include gar/category.mk + +# setup.py puts everything in /usr/share by default, adjust this to $(datadir) +pre-install-modulated: + gsed -ie 's,/usr/share/denyhosts,$(datadir)/$(GARNAME),' $(WORKSRC)/setup.py + @$(MAKECOOKIE) + +post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + ginstall -d $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)$(localstatedir)/$(GARNAME) + mv $(DESTDIR)$(bindir)/denyhosts.py $(DESTDIR)$(bindir)/denyhosts + rm $(DESTDIR)$(datadir)/$(GARNAME)/README.txt + rm $(DESTDIR)$(datadir)/$(GARNAME)/LICENSE.txt + rm $(DESTDIR)$(datadir)/$(GARNAME)/setup.py + mv $(DESTDIR)$(datadir)/$(GARNAME)/CHANGELOG.txt $(DOCDEST)/changelog + mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ + $(DESTDIR)$(sysconfdir)/denyhosts.cfg + + #Adjust config to match Solaris paths + our package paths + gsed -i \ + -e 's,/var/log/secure,path to ssh log,' \ + -e 's,/usr/share/denyhosts/data,$(localstatedir)/$(GARNAME),' \ + -e 's,/var/lock/subsys/denyhosts,/var/run/denyhosts.pid,' \ + -e 's,/var/log/denyhosts,$(localestatedir)/$(GARNAME)/$(GARNAME).log,' \ + $(DESTDIR)$(sysconfdir)/denyhosts.cfg + + gsed -i \ + -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg' \ + $(DESTDIR)/opt/csw/lib/python/site-packages/DenyHosts/constants.py + + #Adjust daemon-control-dist wrapper script to match our package paths + gsed -i \ + -e 's,/usr/bin/denyhosts.py,$(bindir)/denyhosts,' \ + -e 's,/usr/share/denyhosts/denyhosts.cfg,$(sysconfdir)/denyhosts.cfg,' \ + -e 's,/usr/bin/env python,$(bindir)/python,' \ + -e 's,/var/lock/subsys/denyhosts,/var/run/denyhosts.pid,' \ + $(DESTDIR)$(datadir)/$(GARNAME)/daemon-control-dist + @$(MAKECOOKIE) Added: csw/mgar/pkg/denyhosts/trunk/checksums =================================================================== --- csw/mgar/pkg/denyhosts/trunk/checksums (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/checksums 2009-10-09 09:20:19 UTC (rev 6802) @@ -0,0 +1 @@ +fc2365305a9402886a2b0173d1beb7df download/DenyHosts-2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 11:33:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 09:33:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6803] csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Message-ID: Revision: 6803 http://gar.svn.sourceforge.net/gar/?rev=6803&view=rev Author: dmichelsen Date: 2009-10-09 09:33:58 +0000 (Fri, 09 Oct 2009) Log Message: ----------- x11/xcb-proto: Adjust to new naming and use PYCOMPILE Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-10-09 09:20:19 UTC (rev 6802) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-10-09 09:33:58 UTC (rev 6803) @@ -1,7 +1,8 @@ -GARNAME = xcb-proto GARVERSION = 1.5 - CATEGORIES = x11 +PROTONAME = xcb-proto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = XCB protocol descriptions (in XML) define BLURB @@ -25,16 +26,19 @@ endef MASTER_SITES = $(XCB_MASTER_SITES) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWxcbproto CSWpyxcbproto +PACKAGES = CSWx11xcbproto CSWpyx11xcbproto +CATALOGNAME_CSWx11xcbproto = x11_xcbproto +CATALOGNAME_CSWpyx11xcbproto = py_x11xcbproto + PREREQUISITE_PKGS = CSWpython REQUIRED_PKGS_CSWxcbproto = CSWx11common -REQUIRED_PKGS_CSWpyxcbproto = CSWxcbproto CSWpython +REQUIRED_PKGS_CSWpyxcbproto = CSWx11xcbproto CSWpython -SPKG_DESC_CSWxcbproto = XCB protocol descriptions (in XML) -SPKG_DESC_CSWpyxcbproto = XCB protocol descriptions (in XML) Python Bindings +SPKG_DESC_CSWx11xcbproto = XCB protocol descriptions (in XML) +SPKG_DESC_CSWpyx11xcbproto = XCB protocol descriptions (in XML) Python Bindings # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -48,11 +52,8 @@ EXTRA_PAX_ARGS = -s ',^.*/\(xcbgen/.*\.py\),.$(BUILD_PREFIX)/lib/python/site-packages/\1,' EXTRA_PAX_ARGS += -s ',^\.$(libdir)/python.*,,' -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils +PYCOMPILE = 1 -PKGFILES_CSWpyxcbproto = .*\.py +PKGFILES_CSWpyx11xcbproto = .*\.py include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 11:41:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 09:41:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6804] csw/mgar/pkg/x11 Message-ID: Revision: 6804 http://gar.svn.sourceforge.net/gar/?rev=6804&view=rev Author: dmichelsen Date: 2009-10-09 09:41:23 +0000 (Fri, 09 Oct 2009) Log Message: ----------- x11/x11_xcbproto: Rename directory to match new structure Added Paths: ----------- csw/mgar/pkg/x11/x11_xcbproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xcb-proto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:09:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6805] csw/mgar/pkg/bdb42/trunk/Makefile Message-ID: Revision: 6805 http://gar.svn.sourceforge.net/gar/?rev=6805&view=rev Author: dmichelsen Date: 2009-10-09 11:09:56 +0000 (Fri, 09 Oct 2009) Log Message: ----------- bdb42: Exclude db.jar on 64 bit Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/Makefile Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-09 09:41:23 UTC (rev 6804) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) @@ -69,8 +69,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb42),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar PKGFILES_CSWbdb42doc = $(PKGFILES_DOC) PKGFILES_CSWbdb42devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:21:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:21:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6806] csw/mgar/pkg Message-ID: Revision: 6806 http://gar.svn.sourceforge.net/gar/?rev=6806&view=rev Author: dmichelsen Date: 2009-10-09 11:21:54 +0000 (Fri, 09 Oct 2009) Log Message: ----------- bdb ALL: Reapply r6805 to all bdb versions Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb48/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bdb43/trunk/ csw/mgar/pkg/bdb44/trunk/ csw/mgar/pkg/bdb45/trunk/ csw/mgar/pkg/bdb46/trunk/ csw/mgar/pkg/bdb47/trunk/ csw/mgar/pkg/bdb48/trunk/ Property changes on: csw/mgar/pkg/bdb43/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -69,8 +69,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar PKGFILES_CSWbdb43doc = $(PKGFILES_DOC) PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL) Property changes on: csw/mgar/pkg/bdb44/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -69,8 +69,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb44),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar PKGFILES_CSWbdb44doc = $(PKGFILES_DOC) PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL) Property changes on: csw/mgar/pkg/bdb45/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -67,8 +67,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory Property changes on: csw/mgar/pkg/bdb46/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -67,8 +67,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory Property changes on: csw/mgar/pkg/bdb47/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -67,8 +67,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory Property changes on: csw/mgar/pkg/bdb48/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -68,8 +68,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:31:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:31:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6807] csw/mgar/gar/v2/ Message-ID: Revision: 6807 http://gar.svn.sourceforge.net/gar/?rev=6807&view=rev Author: dmichelsen Date: 2009-10-09 11:31:11 +0000 (Fri, 09 Oct 2009) Log Message: ----------- mGAR v2: Prepare for v2-pbuild update Removed Paths: ------------- csw/mgar/gar/v2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:59:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:59:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6808] csw/mgar/gar Message-ID: Revision: 6808 http://gar.svn.sourceforge.net/gar/?rev=6808&view=rev Author: dmichelsen Date: 2009-10-09 11:59:38 +0000 (Fri, 09 Oct 2009) Log Message: ----------- mGAR v2: Activate v2-pbuild Added Paths: ----------- csw/mgar/gar/v2/ Removed Paths: ------------- csw/mgar/gar/v2-pbuild/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 15:08:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 13:08:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6809] csw/mgar/pkg/libcroco Message-ID: Revision: 6809 http://gar.svn.sourceforge.net/gar/?rev=6809&view=rev Author: dmichelsen Date: 2009-10-09 13:08:05 +0000 (Fri, 09 Oct 2009) Log Message: ----------- libcroco: Update to GAR Added Paths: ----------- csw/mgar/pkg/libcroco/branches/ csw/mgar/pkg/libcroco/tags/ csw/mgar/pkg/libcroco/tags/legacy/ csw/mgar/pkg/libcroco/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libcroco/trunk/legacy/ Copied: csw/mgar/pkg/libcroco/trunk/Makefile (from rev 6625, csw/mgar/pkg/libgsf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libcroco/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcroco/trunk/Makefile 2009-10-09 13:08:05 UTC (rev 6809) @@ -0,0 +1,26 @@ +GARNAME = libcroco +GARVERSION = 0.6.2 +CATEGORIES = gnome + +DESCRIPTION = A CSS parsing and manipulation toolkit +define BLURB + The Libcroco project is an effort to build a generic Cascading Style + Sheet (CSS) parsing and manipulation toolkit that can be used by GNOME + applications in need of CSS support. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibxml2 + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 15:24:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 13:24:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6810] csw/mgar/pkg/libcroco/trunk Message-ID: Revision: 6810 http://gar.svn.sourceforge.net/gar/?rev=6810&view=rev Author: dmichelsen Date: 2009-10-09 13:24:51 +0000 (Fri, 09 Oct 2009) Log Message: ----------- libcroco: Set SVN properties Added Paths: ----------- csw/mgar/pkg/libcroco/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libcroco/trunk/ Property changes on: csw/mgar/pkg/libcroco/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libcroco/trunk/checksums =================================================================== --- csw/mgar/pkg/libcroco/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcroco/trunk/checksums 2009-10-09 13:24:51 UTC (rev 6810) @@ -0,0 +1 @@ +1429c597aa4b75fc610ab3a542c99209 libcroco-0.6.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Oct 9 21:56:00 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 09 Oct 2009 19:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6811] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 6811 http://gar.svn.sourceforge.net/gar/?rev=6811&view=rev Author: chninkel Date: 2009-10-09 19:56:00 +0000 (Fri, 09 Oct 2009) Log Message: ----------- openssh: updated to 5.3p1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-10-09 19:56:00 UTC (rev 6811) @@ -13,10 +13,10 @@ ###### Package information ####### GARNAME = openssh -GARVERSION = 5.2 +GARVERSION = 5.3 RELEASE = p1 GSSKEX_PATCH_VERSION = $(GARVERSION)$(RELEASE) -GSSKEX_PATCH_DATE = 20081003 +GSSKEX_PATCH_DATE = 20090726 CATEGORIES = server DESCRIPTION = OpenSSH Secure Shell @@ -66,7 +66,7 @@ LICENSE = LICENCE # The GSSAPI key exchange patch -PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-$(GSSKEX_PATCH_DATE).patch +PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-all-$(GSSKEX_PATCH_DATE).patch # Prevent TIOCSCTTY from being used to avoid error: # ioctl(TIOCSCTTY): Invalid argument Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-10-09 19:56:00 UTC (rev 6811) @@ -1,16 +1,16 @@ -1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall -0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall -59bf25f92d3660aa7e65fb6bdc85e72f download/CSWossh.prototype -cbe3d9921fca3130e42db09914c6ea07 download/CSWosshclient.prototype -1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWosshlpk.checkinstall -0993813fa5c752215f892cb67c86816f download/CSWosshlpk.preinstall -22ffa2a9b7bf310d58d3b299805a41b1 download/CSWosshlpk.prototype -894264acd8bfda9420b8cf10235b6a3e download/changelog.CSW -9153031524651a18e7edaed4637aa769 download/contrib-openssh-lpk-5.2p1-0.3.9.patch -a5ebb2e3fdaa06c3c9edba55aac5f83b download/cswopenssh -8e765642349b6321d01b33e95304e113 download/cswopenssh.xml -4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch -ca5403c8e1539d5ced0573f289ed7aef download/no_x_forwarding_bug.patch -bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch -ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz -db57ce80e8944213443caa4c52c884e5 download/sshd.smf_wrapper +1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall +0993813fa5c752215f892cb67c86816f CSWossh.preinstall +59bf25f92d3660aa7e65fb6bdc85e72f CSWossh.prototype +cbe3d9921fca3130e42db09914c6ea07 CSWosshclient.prototype +1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall +0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall +22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype +413f3c282c526894bbecc9dbdd6f2973 changelog.CSW +9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch +a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh +8e765642349b6321d01b33e95304e113 cswopenssh.xml +4b3e79120b60e8f25be5141eba53cac5 don_t_use_TIOCSCTTY.patch +ca5403c8e1539d5ced0573f289ed7aef no_x_forwarding_bug.patch +d8f82af1449f36ae9864bd614245fb59 openssh-5.3p1-gsskex-all-20090726.patch +13563dbf61f36ca9a1e4254260131041 openssh-5.3p1.tar.gz +db57ce80e8944213443caa4c52c884e5 sshd.smf_wrapper Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-09 19:56:00 UTC (rev 6811) @@ -1,3 +1,9 @@ +openssh (5.3,REV=2009.10.09_rev=p1) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 09 Oct 2009 21:47:46 +0200 + openssh (5.2,REV=2009.07.25_rev=p1) unstable * Fixed missing /opt/csw/etc/ssh in prototype (Closes: #3765) Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-10-09 19:56:00 UTC (rev 6811) @@ -1,2170 +0,0 @@ -diff -urN ChangeLog.gssapi ChangeLog.gssapi ---- openssh-5.2p1/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.2p1.new/ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200 -@@ -0,0 +1,75 @@ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff -urN openssh-5.2p1/Makefile.in openssh-5.2p1.new/Makefile.in ---- openssh-5.2p1/Makefile.in 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/Makefile.in 2009-03-21 15:39:14.000000000 +0100 -@@ -71,7 +71,7 @@ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ -- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o -+ entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o jpake.o schnorr.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o -@@ -84,7 +84,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o - -diff -urN openssh-5.2p1/auth-krb5.c openssh-5.2p1.new/auth-krb5.c ---- openssh-5.2p1/auth-krb5.c 2006-08-05 04:39:39.000000000 +0200 -+++ openssh-5.2p1.new/auth-krb5.c 2009-03-21 15:19:18.000000000 +0100 -@@ -166,8 +166,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -219,15 +224,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - umask(old_umask); -@@ -242,6 +254,7 @@ - return errno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -diff -urN openssh-5.2p1/auth.h openssh-5.2p1.new/auth.h ---- openssh-5.2p1/auth.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/auth.h 2009-03-21 15:19:18.000000000 +0100 -@@ -53,6 +53,7 @@ - int valid; /* user exists and is allowed to login */ - int attempt; - int failures; -+ int server_caused_failure; - int force_pwchange; - char *user; /* username sent by the client */ - char *service; -diff -urN openssh-5.2p1/auth2-gss.c openssh-5.2p1.new/auth2-gss.c ---- openssh-5.2p1/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ openssh-5.2p1.new/auth2-gss.c 2009-03-21 15:19:18.000000000 +0100 -@@ -52,6 +52,39 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -102,6 +135,7 @@ - - if (!present) { - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -109,6 +143,7 @@ - if (ctxt != NULL) - ssh_gssapi_delete_ctx(&ctxt); - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -292,6 +327,12 @@ - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, -diff -urN openssh-5.2p1/auth2.c openssh-5.2p1.new/auth2.c ---- openssh-5.2p1/auth2.c 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/auth2.c 2009-03-21 15:19:18.000000000 +0100 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - #ifdef JPAKE -@@ -79,6 +80,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - #ifdef JPAKE -@@ -274,6 +276,7 @@ - #endif - - authctxt->postponed = 0; -+ authctxt->server_caused_failure = 0; - - /* try to authenticate user */ - m = authmethod_lookup(method); -@@ -348,7 +351,9 @@ - /* Allow initial try of "none" auth without failure penalty */ - if (authctxt->attempt > 1 || strcmp(method, "none") != 0) - authctxt->failures++; -- if (authctxt->failures >= options.max_authtries) { -+ /* Dont count server configuration issues against the client */ -+ if (!authctxt->server_caused_failure && -+ authctxt->failures++ > options.max_authtries) { - #ifdef SSH_AUDIT_EVENTS - PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); - #endif -diff -urN openssh-5.2p1/configure.ac openssh-5.2p1.new/configure.ac ---- openssh-5.2p1/configure.ac 2009-02-16 05:37:03.000000000 +0100 -+++ openssh-5.2p1.new/configure.ac 2009-03-21 15:19:19.000000000 +0100 -@@ -473,6 +473,30 @@ - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE(SSH_TUN_PREPEND_AF, 1, - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow(AU_IPv) - AC_CHECK_DECL(AU_IPv4, [], - AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) -diff -urN openssh-5.2p1/gss-genr.c openssh-5.2p1.new/gss-genr.c ---- openssh-5.2p1/gss-genr.c 2007-06-12 15:44:36.000000000 +0200 -+++ openssh-5.2p1.new/gss-genr.c 2009-03-21 15:19:19.000000000 +0100 -@@ -39,12 +39,160 @@ - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ gss_indicate_mechs(&min_status, &gss_supported); -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *data) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), data)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -229,6 +377,9 @@ - OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +387,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -254,6 +418,10 @@ - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -272,7 +440,7 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); -diff -urN openssh-5.2p1/gss-serv-krb5.c openssh-5.2p1.new/gss-serv-krb5.c ---- openssh-5.2p1/gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 -+++ openssh-5.2p1.new/gss-serv-krb5.c 2009-03-21 15:19:19.000000000 +0100 -@@ -120,6 +120,7 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -diff -urN openssh-5.2p1/gss-serv.c openssh-5.2p1.new/gss-serv.c ---- openssh-5.2p1/gss-serv.c 2008-05-19 07:05:07.000000000 +0200 -+++ openssh-5.2p1.new/gss-serv.c 2009-03-21 15:19:19.000000000 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2008 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -45,8 +45,12 @@ - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -@@ -81,25 +85,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +125,28 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -352,14 +385,4 @@ - return (0); - } - --/* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) --{ -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -- -- return (ctx->major); --} -- - #endif -diff -urN openssh-5.2p1/kex.c openssh-5.2p1.new/kex.c ---- openssh-5.2p1/kex.c 2008-11-03 09:19:12.000000000 +0100 -+++ openssh-5.2p1.new/kex.c 2009-03-21 15:19:19.000000000 +0100 -@@ -49,6 +49,10 @@ - #include "dispatch.h" - #include "monitor.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #define KEX_COOKIE_LEN 16 - - #if OPENSSL_VERSION_NUMBER >= 0x00907000L -@@ -327,6 +331,20 @@ - k->kex_type = KEX_DH_GEX_SHA256; - k->evp_md = evp_ssh_sha256(); - #endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); -+#endif - } else - fatal("bad kex alg %s", k->name); - } -diff -urN openssh-5.2p1/kex.h openssh-5.2p1.new/kex.h ---- openssh-5.2p1/kex.h 2007-06-11 06:01:42.000000000 +0200 -+++ openssh-5.2p1.new/kex.h 2009-03-21 15:19:19.000000000 +0100 -@@ -64,6 +64,9 @@ - KEX_DH_GRP14_SHA1, - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -119,6 +122,11 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -141,6 +149,11 @@ - void kexgex_client(Kex *); - void kexgex_server(Kex *); - -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif -+ - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); -diff -urN openssh-5.2p1/key.c openssh-5.2p1.new/key.c ---- openssh-5.2p1/key.c 2008-11-03 09:24:17.000000000 +0100 -+++ openssh-5.2p1.new/key.c 2009-03-21 15:19:19.000000000 +0100 -@@ -764,6 +764,8 @@ - return KEY_RSA; - } else if (strcmp(name, "ssh-dss") == 0) { - return KEY_DSA; -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; - } - debug2("key_type_from_name: unknown key type '%s'", name); - return KEY_UNSPEC; -diff -urN openssh-5.2p1/key.h openssh-5.2p1.new/key.h ---- openssh-5.2p1/key.h 2008-06-12 20:40:35.000000000 +0200 -+++ openssh-5.2p1.new/key.h 2009-03-21 15:19:19.000000000 +0100 -@@ -34,6 +34,7 @@ - KEY_RSA1, - KEY_RSA, - KEY_DSA, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -diff -urN openssh-5.2p1/monitor.c openssh-5.2p1.new/monitor.c ---- openssh-5.2p1/monitor.c 2009-02-14 06:33:31.000000000 +0100 -+++ openssh-5.2p1.new/monitor.c 2009-03-21 15:38:09.000000000 +0100 -@@ -170,6 +170,7 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -239,6 +240,7 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - #ifdef JPAKE - {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, -@@ -251,6 +253,11 @@ - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -355,6 +362,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -441,6 +452,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1699,6 +1714,11 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1942,6 +1962,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1992,6 +2013,44 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ return (0); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff -urN openssh-5.2p1/monitor.h openssh-5.2p1.new/monitor.h ---- openssh-5.2p1/monitor.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/monitor.h 2009-03-21 15:19:19.000000000 +0100 -@@ -53,6 +53,7 @@ - MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, - MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, - MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC, -+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN, - MONITOR_REQ_PAM_START, - MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, - MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, -diff -urN openssh-5.2p1/monitor_wrap.c openssh-5.2p1.new/monitor_wrap.c ---- openssh-5.2p1/monitor_wrap.c 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1.new/monitor_wrap.c 2009-03-21 15:19:19.000000000 +0100 -@@ -1256,6 +1256,29 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff -urN openssh-5.2p1/monitor_wrap.h openssh-5.2p1.new/monitor_wrap.h ---- openssh-5.2p1/monitor_wrap.h 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1.new/monitor_wrap.h 2009-03-21 15:19:19.000000000 +0100 -@@ -59,6 +59,7 @@ - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); - int mm_ssh_gssapi_userok(char *user); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - #endif - - #ifdef USE_PAM -diff -urN openssh-5.2p1/readconf.c openssh-5.2p1.new/readconf.c ---- openssh-5.2p1/readconf.c 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1.new/readconf.c 2009-03-21 15:19:19.000000000 +0100 -@@ -127,6 +127,8 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssKeyEx, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, -@@ -164,10 +166,14 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -453,10 +459,18 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1008,7 +1022,9 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1099,8 +1115,12 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff -urN openssh-5.2p1/readconf.h openssh-5.2p1.new/readconf.h ---- openssh-5.2p1/readconf.h 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1.new/readconf.h 2009-03-21 15:19:19.000000000 +0100 -@@ -44,7 +44,9 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff -urN openssh-5.2p1/servconf.c openssh-5.2p1.new/servconf.c ---- openssh-5.2p1/servconf.c 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1.new/servconf.c 2009-03-21 15:19:20.000000000 +0100 -@@ -92,7 +92,9 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -210,8 +212,12 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -302,7 +308,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, -@@ -364,9 +372,13 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, -@@ -891,10 +903,18 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; -diff -urN openssh-5.2p1/servconf.h openssh-5.2p1.new/servconf.h ---- openssh-5.2p1/servconf.h 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1.new/servconf.h 2009-03-21 15:19:20.000000000 +0100 -@@ -91,7 +91,9 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -diff -urN openssh-5.2p1/ssh-gss.h openssh-5.2p1.new/ssh-gss.h ---- openssh-5.2p1/ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ openssh-5.2p1.new/ssh-gss.h 2009-03-21 15:19:20.000000000 +0100 -@@ -60,6 +60,17 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; -@@ -97,6 +108,7 @@ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -119,6 +131,11 @@ - int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *); -+char *ssh_gssapi_client_mechanisms(const char *host); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - int ssh_gssapi_userok(char *name); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -@@ -126,6 +143,8 @@ - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff -urN openssh-5.2p1/ssh_config openssh-5.2p1.new/ssh_config ---- openssh-5.2p1/ssh_config 2009-02-21 02:45:02.000000000 +0100 -+++ openssh-5.2p1.new/ssh_config 2009-03-21 15:19:20.000000000 +0100 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -diff -urN openssh-5.2p1/ssh_config.5 openssh-5.2p1.new/ssh_config.5 ---- openssh-5.2p1/ssh_config.5 2009-02-23 00:53:58.000000000 +0100 -+++ openssh-5.2p1.new/ssh_config.5 2009-03-21 15:19:20.000000000 +0100 -@@ -478,11 +478,28 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes -+to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no , -+the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff -urN openssh-5.2p1/sshconnect2.c openssh-5.2p1.new/sshconnect2.c ---- openssh-5.2p1/sshconnect2.c 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1.new/sshconnect2.c 2009-03-21 15:19:20.000000000 +0100 -@@ -104,9 +104,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -134,6 +159,16 @@ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - options.hostkeyalgorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -143,10 +178,21 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_host = gss_host; -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -235,6 +281,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -250,6 +297,10 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, -@@ -541,6 +592,12 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ char *gss_host = NULL; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = (char *)authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -553,7 +610,7 @@ - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -650,8 +707,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -761,6 +818,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -diff -urN openssh-5.2p1/sshd.c openssh-5.2p1.new/sshd.c ---- openssh-5.2p1/sshd.c 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1.new/sshd.c 2009-03-21 15:19:20.000000000 +0100 -@@ -119,6 +119,10 @@ - #include "monitor_wrap.h" - #include "version.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -1530,10 +1534,13 @@ - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); -@@ -1817,6 +1824,60 @@ - /* Log the connection. */ - verbose("Connection from %.500s port %d", remote_ip, remote_port); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2194,12 +2255,59 @@ - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -diff -urN openssh-5.2p1/sshd_config openssh-5.2p1.new/sshd_config ---- openssh-5.2p1/sshd_config 2008-07-02 14:35:43.000000000 +0200 -+++ openssh-5.2p1.new/sshd_config 2009-03-21 15:19:20.000000000 +0100 -@@ -73,6 +73,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -diff -urN openssh-5.2p1/sshd_config.5 openssh-5.2p1.new/sshd_config.5 ---- openssh-5.2p1/sshd_config.5 2009-02-23 01:00:24.000000000 +0100 -+++ openssh-5.2p1.new/sshd_config.5 2009-03-21 15:19:20.000000000 +0100 -@@ -374,12 +374,35 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed -diff -N kexgssc.c ---- openssh-5.2p1//dev/null 1 Jan 1970 00:00:00 -0000 -+++ openssh-5.2p1.new/kexgssc.c 4 Apr 2008 12:52:29 -0000 -@@ -0,0 +1,319 @@ -+/* -+ * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ -+ shared_secret = BN_new(); -+ BN_bin2bn(kbuf,kout, shared_secret); -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ serverhostkey, slen, /* server host key */ -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ serverhostkey, slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff -N kexgsss.c ---- openssh-5.2p1/kexgsss.c 1 Jan 1970 00:00:00 -0000 -+++ openssh-5.2p1.new/kexgsss.c 4 Apr 2008 12:52:29 -0000 -@@ -0,0 +1,271 @@ -+/* -+ * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ ssh_gssapi_server_mechanisms(); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ -+ shared_secret = BN_new(); -+ BN_bin2bn(kbuf, kout, shared_secret); -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+#endif /* GSSAPI */ Added: csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch 2009-10-09 19:56:00 UTC (rev 6811) @@ -0,0 +1,3060 @@ +? .kex.h.swp +? .pc +? openssh-5.0p1-gsskex-20080404.patch +? openssh-5.0p1-gssrenew-20080707.patch +? openssh-5.2p1-gsskex-20090726.patch +? openssh-5.2p1-gsskex-all-20090726.patch +? patches +Index: ChangeLog.gssapi +=================================================================== +RCS file: ChangeLog.gssapi +diff -N ChangeLog.gssapi +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ ./ChangeLog.gssapi 26 Jul 2009 12:21:52 -0000 +@@ -0,0 +1,95 @@ ++20090615 ++ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c ++ sshd.c ] ++ Fix issues identified by Greg Hudson following a code review ++ Check return value of gss_indicate_mechs ++ Protect GSSAPI calls in monitor, so they can only be used if enabled ++ Check return values of bignum functions in key exchange ++ Use BN_clear_free to clear other side's DH value ++ Make ssh_gssapi_id_kex more robust ++ Only configure kex table pointers if GSSAPI is enabled ++ Don't leak mechanism list, or gss mechanism list ++ Cast data.length before printing ++ If serverkey isn't provided, use an empty string, rather than NULL ++ ++20090201 ++ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h ++ ssh_config.5 sshconnet2.c ] ++ Add support for the GSSAPIClientIdentity option, which allows the user ++ to specify which GSSAPI identity to use to contact a given server ++ ++20080404 ++ - [ gss-serv.c ] ++ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow ++ been omitted from a previous version of this patch. Reported by Borislav ++ Stoichkov ++ ++20070317 ++ - [ gss-serv-krb5.c ] ++ Remove C99ism, where new_ccname was being declared in the middle of a ++ function ++ ++20061220 ++ - [ servconf.c ] ++ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and ++ documented, behaviour. Reported by Dan Watson. ++ ++20060910 ++ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c ++ ssh-gss.h ] ++ add support for gss-group14-sha1 key exchange mechanisms ++ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] ++ Add GSSAPIStrictAcceptorCheck option to allow the disabling of ++ acceptor principal checking on multi-homed machines. ++ ++ - [ sshd_config ssh_config ] ++ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample ++ configuration files ++ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] ++ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() ++ Limit length of error messages displayed by client ++ ++20060909 ++ - [ gss-genr.c gss-serv.c ] ++ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server ++ only, where they belong ++ ++ ++20060829 ++ - [ gss-serv-krb5.c ] ++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment ++ variable ++ ++20060828 ++ - [ gss-genr.c ] ++ Avoid Heimdal context freeing problem ++ ++ ++20060818 ++ - [ gss-genr.c ssh-gss.h sshconnect2.c ] ++ Make sure that SPENGO is disabled ++ ++ ++20060421 ++ - [ gssgenr.c, sshconnect2.c ] ++ a few type changes (signed versus unsigned, int versus size_t) to ++ fix compiler errors/warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ kexgssc.c, sshconnect2.c ] ++ fix uninitialized variable warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ gssgenr.c ] ++ pass oid to gss_display_status (helpful when using GSSAPI mechglue) ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ gss-serv-krb5.c ] ++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c ++ add client-side GssapiKeyExchange option ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ sshconnect2.c ] ++ add support for GssapiTrustDns option for gssapi-with-mic ++ (from jbasney AT ncsa.uiuc.edu) ++ +Index: Makefile.in +=================================================================== +RCS file: /cvs/openssh/Makefile.in,v +retrieving revision 1.298 +diff -u -r1.298 Makefile.in +--- ./Makefile.in 5 Nov 2008 05:20:46 -0000 1.298 ++++ ./Makefile.in 26 Jul 2009 12:21:53 -0000 +@@ -71,7 +71,8 @@ + atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ + kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ +- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o ++ entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o \ ++ kexgssc.o + + SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ + sshconnect.o sshconnect1.o sshconnect2.o mux.o +@@ -84,7 +85,7 @@ + auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ + monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ + auth-krb5.o \ +- auth2-gss.o gss-serv.o gss-serv-krb5.o \ ++ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ + audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o + +Index: auth-krb5.c +=================================================================== +RCS file: /cvs/openssh/auth-krb5.c,v +retrieving revision 1.35 +diff -u -r1.35 auth-krb5.c +--- ./auth-krb5.c 5 Aug 2006 02:39:39 -0000 1.35 ++++ ./auth-krb5.c 26 Jul 2009 12:21:53 -0000 +@@ -166,8 +166,13 @@ + + len = strlen(authctxt->krb5_ticket_file) + 6; + authctxt->krb5_ccname = xmalloc(len); ++#ifdef USE_CCAPI ++ snprintf(authctxt->krb5_ccname, len, "API:%s", ++ authctxt->krb5_ticket_file); ++#else + snprintf(authctxt->krb5_ccname, len, "FILE:%s", + authctxt->krb5_ticket_file); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -219,15 +224,22 @@ + #ifndef HEIMDAL + krb5_error_code + ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { +- int tmpfd, ret; ++ int ret; + char ccname[40]; + mode_t old_umask; ++#ifdef USE_CCAPI ++ char cctemplate[] = "API:krb5cc_%d"; ++#else ++ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; ++ int tmpfd; ++#endif + + ret = snprintf(ccname, sizeof(ccname), +- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); ++ cctemplate, geteuid()); + if (ret < 0 || (size_t)ret >= sizeof(ccname)) + return ENOMEM; + ++#ifndef USE_CCAPI + old_umask = umask(0177); + tmpfd = mkstemp(ccname + strlen("FILE:")); + umask(old_umask); +@@ -242,6 +254,7 @@ + return errno; + } + close(tmpfd); ++#endif + + return (krb5_cc_resolve(ctx, ccname, ccache)); + } +Index: auth.h +=================================================================== +RCS file: /cvs/openssh/auth.h,v +retrieving revision 1.80 +diff -u -r1.80 auth.h +--- ./auth.h 5 Nov 2008 05:20:46 -0000 1.80 ++++ ./auth.h 26 Jul 2009 12:21:53 -0000 +@@ -53,6 +53,7 @@ + int valid; /* user exists and is allowed to login */ + int attempt; + int failures; ++ int server_caused_failure; + int force_pwchange; + char *user; /* username sent by the client */ + char *service; +Index: auth2-gss.c +=================================================================== +RCS file: /cvs/openssh/auth2-gss.c,v +retrieving revision 1.19 +diff -u -r1.19 auth2-gss.c +--- ./auth2-gss.c 2 Dec 2007 11:59:45 -0000 1.19 ++++ ./auth2-gss.c 26 Jul 2009 12:21:54 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -52,6 +52,40 @@ + static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); + static void input_gssapi_errtok(int, u_int32_t, void *); + ++/* ++ * The 'gssapi_keyex' userauth mechanism. ++ */ ++static int ++userauth_gsskeyex(Authctxt *authctxt) ++{ ++ int authenticated = 0; ++ Buffer b; ++ gss_buffer_desc mic, gssbuf; ++ u_int len; ++ ++ mic.value = packet_get_string(&len); ++ mic.length = len; ++ ++ packet_check_eom(); ++ ++ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, ++ "gssapi-keyex"); ++ ++ gssbuf.value = buffer_ptr(&b); ++ gssbuf.length = buffer_len(&b); ++ ++ /* gss_kex_context is NULL with privsep, so we can't check it here */ ++ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, ++ &gssbuf, &mic)))) ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, ++ authctxt->pw)); ++ ++ buffer_free(&b); ++ xfree(mic.value); ++ ++ return (authenticated); ++} ++ + /* + * We only support those mechanisms that we know about (ie ones that we know + * how to check local user kuserok and the like) +@@ -102,6 +136,7 @@ + + if (!present) { + xfree(doid); ++ authctxt->server_caused_failure = 1; + return (0); + } + +@@ -109,6 +144,7 @@ + if (ctxt != NULL) + ssh_gssapi_delete_ctx(&ctxt); + xfree(doid); ++ authctxt->server_caused_failure = 1; + return (0); + } + +@@ -242,7 +278,8 @@ + + packet_check_eom(); + +- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, ++ authctxt->pw)); + + authctxt->postponed = 0; + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); +@@ -277,7 +314,8 @@ + gssbuf.length = buffer_len(&b); + + if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) +- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); ++ authenticated = ++ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); + else + logit("GSSAPI MIC check failed"); + +@@ -291,6 +329,12 @@ + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); + userauth_finish(authctxt, authenticated, "gssapi-with-mic"); + } ++ ++Authmethod method_gsskeyex = { ++ "gssapi-keyex", ++ userauth_gsskeyex, ++ &options.gss_authentication ++}; + + Authmethod method_gssapi = { + "gssapi-with-mic", +Index: auth2.c +=================================================================== +RCS file: /cvs/openssh/auth2.c,v +retrieving revision 1.149 +diff -u -r1.149 auth2.c +--- ./auth2.c 5 Nov 2008 05:20:46 -0000 1.149 ++++ ./auth2.c 26 Jul 2009 12:21:54 -0000 +@@ -69,6 +69,7 @@ + extern Authmethod method_kbdint; + extern Authmethod method_hostbased; + #ifdef GSSAPI ++extern Authmethod method_gsskeyex; + extern Authmethod method_gssapi; + #endif + #ifdef JPAKE +@@ -79,6 +80,7 @@ + &method_none, + &method_pubkey, + #ifdef GSSAPI ++ &method_gsskeyex, + &method_gssapi, + #endif + #ifdef JPAKE +@@ -274,6 +276,7 @@ + #endif + + authctxt->postponed = 0; ++ authctxt->server_caused_failure = 0; + + /* try to authenticate user */ + m = authmethod_lookup(method); +@@ -346,7 +349,8 @@ + } else { + + /* Allow initial try of "none" auth without failure penalty */ +- if (authctxt->attempt > 1 || strcmp(method, "none") != 0) ++ if (!authctxt->server_caused_failure && ++ (authctxt->attempt > 1 || strcmp(method, "none") != 0)) + authctxt->failures++; + if (authctxt->failures >= options.max_authtries) { + #ifdef SSH_AUDIT_EVENTS +Index: clientloop.c +=================================================================== +RCS file: /cvs/openssh/clientloop.c,v +retrieving revision 1.197 +diff -u -r1.197 clientloop.c +--- ./clientloop.c 14 Feb 2009 05:28:21 -0000 1.197 ++++ ./clientloop.c 26 Jul 2009 12:21:56 -0000 +@@ -110,6 +110,10 @@ + #include "match.h" + #include "msg.h" + ++#ifdef GSSAPI ++#include "ssh-gss.h" ++#endif ++ + /* import options */ + extern Options options; + +@@ -1429,6 +1433,13 @@ + /* Do channel operations unless rekeying in progress. */ + if (!rekeying) { + channel_after_select(readset, writeset); ++ ++ if (options.gss_renewal_rekey && ++ ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { ++ debug("credentials updated - forcing rekey"); ++ need_rekeying = 1; ++ } ++ + if (need_rekeying || packet_need_rekeying()) { + debug("need rekeying"); + xxx_kex->done = 0; +Index: configure.ac +=================================================================== +RCS file: /cvs/openssh/configure.ac,v +retrieving revision 1.415 +diff -u -r1.415 configure.ac +--- ./configure.ac 16 Feb 2009 04:37:03 -0000 1.415 ++++ ./configure.ac 26 Jul 2009 12:22:00 -0000 +@@ -473,6 +473,30 @@ + [Use tunnel device compatibility to OpenBSD]) + AC_DEFINE(SSH_TUN_PREPEND_AF, 1, + [Prepend the address family to IP tunnel traffic]) ++ AC_MSG_CHECKING(if we have the Security Authorization Session API) ++ AC_TRY_COMPILE([#include ], ++ [SessionCreate(0, 0);], ++ [ac_cv_use_security_session_api="yes" ++ AC_DEFINE(USE_SECURITY_SESSION_API, 1, ++ [platform has the Security Authorization Session API]) ++ LIBS="$LIBS -framework Security" ++ AC_MSG_RESULT(yes)], ++ [ac_cv_use_security_session_api="no" ++ AC_MSG_RESULT(no)]) ++ AC_MSG_CHECKING(if we have an in-memory credentials cache) ++ AC_TRY_COMPILE( ++ [#include ], ++ [cc_context_t c; ++ (void) cc_initialize (&c, 0, NULL, NULL);], ++ [AC_DEFINE(USE_CCAPI, 1, ++ [platform uses an in-memory credentials cache]) ++ LIBS="$LIBS -framework Security" ++ AC_MSG_RESULT(yes) ++ if test "x$ac_cv_use_security_session_api" = "xno"; then ++ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) ++ fi], ++ [AC_MSG_RESULT(no)] ++ ) + m4_pattern_allow(AU_IPv) + AC_CHECK_DECL(AU_IPv4, [], + AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) +Index: gss-genr.c +=================================================================== +RCS file: /cvs/openssh/gss-genr.c,v +retrieving revision 1.21 +diff -u -r1.21 gss-genr.c +--- ./gss-genr.c 12 Jun 2007 13:44:36 -0000 1.21 ++++ ./gss-genr.c 26 Jul 2009 12:22:01 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-genr.c,v 1.19 2007/06/12 11:56:15 dtucker Exp $ */ + + /* +- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -39,12 +39,167 @@ + #include "buffer.h" + #include "log.h" + #include "ssh2.h" ++#include "cipher.h" ++#include "key.h" ++#include "kex.h" ++#include + + #include "ssh-gss.h" + + extern u_char *session_id2; + extern u_int session_id2_len; + ++typedef struct { ++ char *encoded; ++ gss_OID oid; ++} ssh_gss_kex_mapping; ++ ++/* ++ * XXX - It would be nice to find a more elegant way of handling the ++ * XXX passing of the key exchange context to the userauth routines ++ */ ++ ++Gssctxt *gss_kex_context = NULL; ++ ++static ssh_gss_kex_mapping *gss_enc2oid = NULL; ++ ++int ++ssh_gssapi_oid_table_ok() { ++ return (gss_enc2oid != NULL); ++} ++ ++/* ++ * Return a list of the gss-group1-sha1 mechanisms supported by this program ++ * ++ * We test mechanisms to ensure that we can use them, to avoid starting ++ * a key exchange with a bad mechanism ++ */ ++ ++char * ++ssh_gssapi_client_mechanisms(const char *host, const char *client) { ++ gss_OID_set gss_supported; ++ OM_uint32 min_status; ++ ++ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) ++ return NULL; ++ ++ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, ++ host, client)); ++} ++ ++char * ++ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, ++ const char *host, const char *client) { ++ Buffer buf; ++ size_t i; ++ int oidpos, enclen; ++ char *mechs, *encoded; ++ u_char digest[EVP_MAX_MD_SIZE]; ++ char deroid[2]; ++ const EVP_MD *evp_md = EVP_md5(); ++ EVP_MD_CTX md; ++ ++ if (gss_enc2oid != NULL) { ++ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) ++ xfree(gss_enc2oid[i].encoded); ++ xfree(gss_enc2oid); ++ } ++ ++ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * ++ (gss_supported->count + 1)); ++ ++ buffer_init(&buf); ++ ++ oidpos = 0; ++ for (i = 0; i < gss_supported->count; i++) { ++ if (gss_supported->elements[i].length < 128 && ++ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { ++ ++ deroid[0] = SSH_GSS_OIDTYPE; ++ deroid[1] = gss_supported->elements[i].length; ++ ++ EVP_DigestInit(&md, evp_md); ++ EVP_DigestUpdate(&md, deroid, 2); ++ EVP_DigestUpdate(&md, ++ gss_supported->elements[i].elements, ++ gss_supported->elements[i].length); ++ EVP_DigestFinal(&md, digest, NULL); ++ ++ encoded = xmalloc(EVP_MD_size(evp_md) * 2); ++ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), ++ encoded, EVP_MD_size(evp_md) * 2); ++ ++ if (oidpos != 0) ++ buffer_put_char(&buf, ','); ++ ++ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, ++ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ buffer_put_char(&buf, ','); ++ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, ++ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ buffer_put_char(&buf, ','); ++ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, ++ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ ++ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); ++ gss_enc2oid[oidpos].encoded = encoded; ++ oidpos++; ++ } ++ } ++ gss_enc2oid[oidpos].oid = NULL; ++ gss_enc2oid[oidpos].encoded = NULL; ++ ++ buffer_put_char(&buf, '\0'); ++ ++ mechs = xmalloc(buffer_len(&buf)); ++ buffer_get(&buf, mechs, buffer_len(&buf)); ++ buffer_free(&buf); ++ ++ if (strlen(mechs) == 0) { ++ xfree(mechs); ++ mechs = NULL; ++ } ++ ++ return (mechs); ++} ++ ++gss_OID ++ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { ++ int i = 0; ++ ++ switch (kex_type) { ++ case KEX_GSS_GRP1_SHA1: ++ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) ++ return GSS_C_NO_OID; ++ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; ++ break; ++ case KEX_GSS_GRP14_SHA1: ++ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) ++ return GSS_C_NO_OID; ++ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; ++ break; ++ case KEX_GSS_GEX_SHA1: ++ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) ++ return GSS_C_NO_OID; ++ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; ++ break; ++ default: ++ return GSS_C_NO_OID; ++ } ++ ++ while (gss_enc2oid[i].encoded != NULL && ++ strcmp(name, gss_enc2oid[i].encoded) != 0) ++ i++; ++ ++ if (gss_enc2oid[i].oid != NULL && ctx != NULL) ++ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); ++ ++ return gss_enc2oid[i].oid; ++} ++ + /* Check that the OID in a data stream matches that in the context */ + int + ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) +@@ -197,7 +352,7 @@ + } + + ctx->major = gss_init_sec_context(&ctx->minor, +- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, ++ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, + GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, + 0, NULL, recv_tok, NULL, send_tok, flags, NULL); + +@@ -227,8 +382,42 @@ + } + + OM_uint32 ++ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) ++{ ++ gss_buffer_desc gssbuf; ++ gss_name_t gssname; ++ OM_uint32 status; ++ gss_OID_set oidset; ++ ++ gssbuf.value = (void *) name; ++ gssbuf.length = strlen(gssbuf.value); ++ ++ gss_create_empty_oid_set(&status, &oidset); ++ gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ ++ ctx->major = gss_import_name(&ctx->minor, &gssbuf, ++ GSS_C_NT_USER_NAME, &gssname); ++ ++ if (!ctx->major) ++ ctx->major = gss_acquire_cred(&ctx->minor, ++ gssname, 0, oidset, GSS_C_INITIATE, ++ &ctx->client_creds, NULL, NULL); ++ ++ gss_release_name(&status, &gssname); ++ gss_release_oid_set(&status, &oidset); ++ ++ if (ctx->major) ++ ssh_gssapi_error(ctx); ++ ++ return(ctx->major); ++} ++ ++OM_uint32 + ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) + { ++ if (ctx == NULL) ++ return -1; ++ + if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, + GSS_C_QOP_DEFAULT, buffer, hash))) + ssh_gssapi_error(ctx); +@@ -236,6 +425,19 @@ + return (ctx->major); + } + ++/* Priviledged when used by server */ ++OM_uint32 ++ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) ++{ ++ if (ctx == NULL) ++ return -1; ++ ++ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, ++ gssbuf, gssmic, NULL); ++ ++ return (ctx->major); ++} ++ + void + ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, + const char *context) +@@ -249,11 +451,16 @@ + } + + int +-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) ++ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, ++ const char *client) + { + gss_buffer_desc token = GSS_C_EMPTY_BUFFER; + OM_uint32 major, minor; + gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; ++ Gssctxt *intctx = NULL; ++ ++ if (ctx == NULL) ++ ctx = &intctx; + + /* RFC 4462 says we MUST NOT do SPNEGO */ + if (oid->length == spnego_oid.length && +@@ -263,6 +470,10 @@ + ssh_gssapi_build_ctx(ctx); + ssh_gssapi_set_oid(*ctx, oid); + major = ssh_gssapi_import_name(*ctx, host); ++ ++ if (!GSS_ERROR(major) && client) ++ major = ssh_gssapi_client_identity(*ctx, client); ++ + if (!GSS_ERROR(major)) { + major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, + NULL); +@@ -272,10 +483,67 @@ + GSS_C_NO_BUFFER); + } + +- if (GSS_ERROR(major)) ++ if (GSS_ERROR(major) || intctx != NULL) + ssh_gssapi_delete_ctx(ctx); + + return (!GSS_ERROR(major)); ++} ++ ++int ++ssh_gssapi_credentials_updated(Gssctxt *ctxt) { ++ static gss_name_t saved_name = GSS_C_NO_NAME; ++ static OM_uint32 saved_lifetime = 0; ++ static gss_OID saved_mech = GSS_C_NO_OID; ++ static gss_name_t name; ++ static OM_uint32 last_call = 0; ++ OM_uint32 lifetime, now, major, minor; ++ int equal; ++ gss_cred_usage_t usage = GSS_C_INITIATE; ++ ++ now = time(NULL); ++ ++ if (ctxt) { ++ debug("Rekey has happened - updating saved versions"); ++ ++ if (saved_name != GSS_C_NO_NAME) ++ gss_release_name(&minor, &saved_name); ++ ++ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, ++ &saved_name, &saved_lifetime, NULL, NULL); ++ ++ if (!GSS_ERROR(major)) { ++ saved_mech = ctxt->oid; ++ saved_lifetime+= now; ++ } else { ++ /* Handle the error */ ++ } ++ return 0; ++ } ++ ++ if (now - last_call < 10) ++ return 0; ++ ++ last_call = now; ++ ++ if (saved_mech == GSS_C_NO_OID) ++ return 0; ++ ++ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, ++ &name, &lifetime, NULL, NULL); ++ if (major == GSS_S_CREDENTIALS_EXPIRED) ++ return 0; ++ else if (GSS_ERROR(major)) ++ return 0; ++ ++ major = gss_compare_name(&minor, saved_name, name, &equal); ++ gss_release_name(&minor, &name); ++ if (GSS_ERROR(major)) ++ return 0; ++ ++ if (equal && (saved_lifetime < lifetime + now - 10)) ++ return 1; ++ ++ return 0; + } + + #endif /* GSSAPI */ +Index: gss-serv-krb5.c +=================================================================== +RCS file: /cvs/openssh/gss-serv-krb5.c,v +retrieving revision 1.17 +diff -u -r1.17 gss-serv-krb5.c +--- ./gss-serv-krb5.c 1 Sep 2006 05:38:36 -0000 1.17 ++++ ./gss-serv-krb5.c 26 Jul 2009 12:22:01 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -120,6 +120,7 @@ + krb5_principal princ; + OM_uint32 maj_status, min_status; + int len; ++ const char *new_ccname; + + if (client->creds == NULL) { + debug("No credentials stored"); +@@ -168,11 +169,16 @@ + return; + } + +- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); ++ new_ccname = krb5_cc_get_name(krb_context, ccache); ++ + client->store.envvar = "KRB5CCNAME"; +- len = strlen(client->store.filename) + 6; +- client->store.envval = xmalloc(len); +- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); ++#ifdef USE_CCAPI ++ xasprintf(&client->store.envval, "API:%s", new_ccname); ++ client->store.filename = NULL; ++#else ++ xasprintf(&client->store.envval, "FILE:%s", new_ccname); ++ client->store.filename = xstrdup(new_ccname); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -184,6 +190,71 @@ + return; + } + ++int ++ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, ++ ssh_gssapi_client *client) ++{ ++ krb5_ccache ccache = NULL; ++ krb5_principal principal = NULL; ++ char *name = NULL; ++ krb5_error_code problem; ++ OM_uint32 maj_status, min_status; ++ ++ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { ++ logit("krb5_cc_resolve(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ return 0; ++ } ++ ++ /* Find out who the principal in this cache is */ ++ if ((problem = krb5_cc_get_principal(krb_context, ccache, ++ &principal))) { ++ logit("krb5_cc_get_principal(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { ++ logit("krb5_unparse_name(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ krb5_free_principal(krb_context, principal); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ ++ if (strcmp(name,client->exportedname.value)!=0) { ++ debug("Name in local credentials cache differs. Not storing"); ++ krb5_free_principal(krb_context, principal); ++ krb5_cc_close(krb_context, ccache); ++ krb5_free_unparsed_name(krb_context, name); ++ return 0; ++ } ++ krb5_free_unparsed_name(krb_context, name); ++ ++ /* Name matches, so lets get on with it! */ ++ ++ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { ++ logit("krb5_cc_initialize(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ krb5_free_principal(krb_context, principal); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ krb5_free_principal(krb_context, principal); ++ ++ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, ++ ccache))) { ++ logit("gss_krb5_copy_ccache() failed. Sorry!"); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ return 1; ++} ++ + ssh_gssapi_mech gssapi_kerberos_mech = { + "toWM5Slw5Ew8Mqkay+al2g==", + "Kerberos", +@@ -191,7 +262,8 @@ + NULL, + &ssh_gssapi_krb5_userok, + NULL, +- &ssh_gssapi_krb5_storecreds ++ &ssh_gssapi_krb5_storecreds, ++ &ssh_gssapi_krb5_updatecreds + }; + + #endif /* KRB5 */ +Index: gss-serv.c +=================================================================== +RCS file: /cvs/openssh/gss-serv.c,v +retrieving revision 1.24 +diff -u -r1.24 gss-serv.c +--- ./gss-serv.c 19 May 2008 05:05:07 -0000 1.24 ++++ ./gss-serv.c 26 Jul 2009 12:22:01 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -45,15 +45,20 @@ + #include "channels.h" + #include "session.h" + #include "misc.h" ++#include "servconf.h" ++#include "uidswap.h" + + #include "ssh-gss.h" ++#include "monitor_wrap.h" ++ ++extern ServerOptions options; + + static ssh_gssapi_client gssapi_client = + { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, +- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; ++ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL}, 0, 0}; + + ssh_gssapi_mech gssapi_null_mech = +- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; ++ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; + + #ifdef KRB5 + extern ssh_gssapi_mech gssapi_kerberos_mech; +@@ -81,25 +86,32 @@ + char lname[MAXHOSTNAMELEN]; + gss_OID_set oidset; + +- gss_create_empty_oid_set(&status, &oidset); +- gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ if (options.gss_strict_acceptor) { ++ gss_create_empty_oid_set(&status, &oidset); ++ gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ ++ if (gethostname(lname, MAXHOSTNAMELEN)) { ++ gss_release_oid_set(&status, &oidset); ++ return (-1); ++ } + +- if (gethostname(lname, MAXHOSTNAMELEN)) { +- gss_release_oid_set(&status, &oidset); +- return (-1); +- } ++ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { ++ gss_release_oid_set(&status, &oidset); ++ return (ctx->major); ++ } ++ ++ if ((ctx->major = gss_acquire_cred(&ctx->minor, ++ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, ++ NULL, NULL))) ++ ssh_gssapi_error(ctx); + +- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { + gss_release_oid_set(&status, &oidset); + return (ctx->major); ++ } else { ++ ctx->name = GSS_C_NO_NAME; ++ ctx->creds = GSS_C_NO_CREDENTIAL; + } +- +- if ((ctx->major = gss_acquire_cred(&ctx->minor, +- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) +- ssh_gssapi_error(ctx); +- +- gss_release_oid_set(&status, &oidset); +- return (ctx->major); ++ return GSS_S_COMPLETE; + } + + /* Privileged */ +@@ -114,6 +126,29 @@ + } + + /* Unprivileged */ ++char * ++ssh_gssapi_server_mechanisms() { ++ gss_OID_set supported; ++ ++ ssh_gssapi_supported_oids(&supported); ++ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, ++ NULL, NULL)); ++} ++ ++/* Unprivileged */ ++int ++ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, ++ const char *dummy) { ++ Gssctxt *ctx = NULL; ++ int res; ++ ++ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); ++ ssh_gssapi_delete_ctx(&ctx); ++ ++ return (res); ++} ++ ++/* Unprivileged */ + void @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Oct 9 22:19:05 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 09 Oct 2009 20:19:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6812] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 6812 http://gar.svn.sourceforge.net/gar/?rev=6812&view=rev Author: chninkel Date: 2009-10-09 20:19:04 +0000 (Fri, 09 Oct 2009) Log Message: ----------- lftp: updated to 4.0.2 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-10-09 19:56:00 UTC (rev 6811) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-10-09 20:19:04 UTC (rev 6812) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 3.7.15 +GARVERSION = 4.0.2 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 19:56:00 UTC (rev 6811) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 20:19:04 UTC (rev 6812) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 download/CSWlftp.prototype -ce93239e79f5c12f5087218c9f34eb66 download/changelog.CSW -6c43ffdb59234ff0533cfdda0c3c305c download/lftp-3.7.15.tar.gz +76c476fab0a20ce50008affff55e4398 download/changelog.CSW +664fd567bb49e1e4dea1ba37430a8449 download/lftp-4.0.2.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 19:56:00 UTC (rev 6811) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 20:19:04 UTC (rev 6812) @@ -1,3 +1,9 @@ +lftp (4.0.2,REV=2009.10.09) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 09 Oct 2009 21:45:36 +0200 + lftp (3.7.15,REV=2009.07.25) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 00:21:41 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 09 Oct 2009 22:21:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6813] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 6813 http://gar.svn.sourceforge.net/gar/?rev=6813&view=rev Author: chninkel Date: 2009-10-09 22:21:41 +0000 (Fri, 09 Oct 2009) Log Message: ----------- lftp: updated changelog Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 20:19:04 UTC (rev 6812) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 22:21:41 UTC (rev 6813) @@ -1,3 +1,3 @@ -5bc881a13c106b1c97f2137ff1755817 download/CSWlftp.prototype -76c476fab0a20ce50008affff55e4398 download/changelog.CSW -664fd567bb49e1e4dea1ba37430a8449 download/lftp-4.0.2.tar.gz +5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype +7b1750a903f92e01de5978606e4c69aa changelog.CSW +664fd567bb49e1e4dea1ba37430a8449 lftp-4.0.2.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 20:19:04 UTC (rev 6812) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 22:21:41 UTC (rev 6813) @@ -1,4 +1,4 @@ -lftp (4.0.2,REV=2009.10.09) unstable +lftp (4.0.2,REV=2009.10.10) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 10 05:06:54 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Oct 2009 03:06:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6814] csw/mgar/pkg Message-ID: Revision: 6814 http://gar.svn.sourceforge.net/gar/?rev=6814&view=rev Author: bdwalton Date: 2009-10-10 03:06:54 +0000 (Sat, 10 Oct 2009) Log Message: ----------- cswpkglogger: initial commit of hooks to syslog package actions Added Paths: ----------- csw/mgar/pkg/cswpkglogger/ csw/mgar/pkg/cswpkglogger/branches/ csw/mgar/pkg/cswpkglogger/tags/ csw/mgar/pkg/cswpkglogger/trunk/ csw/mgar/pkg/cswpkglogger/trunk/Makefile csw/mgar/pkg/cswpkglogger/trunk/checksums csw/mgar/pkg/cswpkglogger/trunk/files/ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade Property changes on: csw/mgar/pkg/cswpkglogger/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-10 03:06:54 UTC (rev 6814) @@ -0,0 +1,34 @@ +GARNAME = cswpkglogger +GARVERSION = 1.0 +CATEGORIES = utils + +DESCRIPTION = Hook scripts to log package maintenance actions +define BLURB +This set of hook scripts will log package maintenance actions to syslog. +It is dependent on the use of a CSW package tool that is 'hook aware.' +endef + +MASTER_SITES = +DISTFILES = + +ARCHALL = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +HOOKDIR=$(DESTDIR)/etc/opt/csw/pkg-hooks +POSTHOOKS = postinstall postupgrade postremove +PREHOOKS = preupgrade +HOOKS = $(PREHOOKS) $(POSTHOOKS) + +install-custom: + @echo Installing CSWcswpkglogger files... + @( ginstall -m 0755 -d $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ + ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ + ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ + ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-preupgrade $(HOOKDIR)/preupgrade.d/;) Added: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-10 03:06:54 UTC (rev 6814) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/bash + +script=$0 + +set -- ${1/-/ } +PKG=$1 +VER=$2 + +function logdie() { + logger -t "CSW Package Logger" "$1" + exit 0 +} + +function success() { + case ${script} in + *install) MSG="installed ${PKG} ${VER}";; + *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; + *remove) MSG="removed ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +function failure() { + case ${script} in + *install) MSG="Failed to install ${PKG} ${VER}";; + *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; + *remove) MSG="Failed to remove ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +if [ -d /var/sadm/pkg/${PKG} ]; then + SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) + pf=/var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} + if [ -f ${pf} ]; then + PREVVER=$(cat ${pf} 2>/dev/null) + rm -f ${pf} + fi + + case ${script} in + *remove) + failure + ;; + *install|*upgrade) + case "${VER}" in + ${SYSTEMVER}) success ${PREVVER};; + *) failure ${SYSTEMVER};; + esac + ;; + esac +else + case ${script} in + *remove) + success + ;; + *install|*upgrade) + failure + ;; + esac +fi Property changes on: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-10 03:06:54 UTC (rev 6814) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -- ${1/-/ } + +PKG=$1 +VER=$2 + +SYSTEMVER=$(pkgparam ${PKG} VERSION) + +# store previous version so we can log smarter things if upgrade fails. +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} Property changes on: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 21:18:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 19:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6815] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 6815 http://gar.svn.sourceforge.net/gar/?rev=6815&view=rev Author: chninkel Date: 2009-10-10 19:18:23 +0000 (Sat, 10 Oct 2009) Log Message: ----------- openssh: now uses platforms feature Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 03:06:54 UTC (rev 6814) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 19:18:23 UTC (rev 6815) @@ -44,6 +44,7 @@ REQUIRED_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib SPKG_CLASSES_CSWosshclient = none cswpreserveconf +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris10-sparc solaris10-i386 ###### Upstream and OpenCSW files information ####### Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 03:06:54 UTC (rev 6814) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 19:18:23 UTC (rev 6815) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -413f3c282c526894bbecc9dbdd6f2973 changelog.CSW +385098d42f4454b7928e0273ee32c00c changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 03:06:54 UTC (rev 6814) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 19:18:23 UTC (rev 6815) @@ -1,8 +1,8 @@ -openssh (5.3,REV=2009.10.09_rev=p1) unstable +openssh (5.3,REV=2009.10.10_rev=p1) unstable * New upstream release. - -- Yann Rouillard Fri, 09 Oct 2009 21:47:46 +0200 + -- Yann Rouillard Fri, 10 Oct 2009 21:47:46 +0200 openssh (5.2,REV=2009.07.25_rev=p1) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 22:30:37 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 20:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6816] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 6816 http://gar.svn.sourceforge.net/gar/?rev=6816&view=rev Author: chninkel Date: 2009-10-10 20:30:37 +0000 (Sat, 10 Oct 2009) Log Message: ----------- rlwrap: updated to 0.32 and switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype Property Changed: ---------------- csw/mgar/pkg/rlwrap/trunk/ Property changes on: csw/mgar/pkg/rlwrap/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for rlwrap +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = rlwrap -GARVERSION = 0.30 +GARVERSION = 0.32 CATEGORIES = utils DESCRIPTION = A readline wrapper @@ -7,18 +21,25 @@ rlwrap is a readline wrapper, a small utility that uses the GNU readline library to allow the editing of keyboard input for any other command. It maintains a separate input history for each command, and can TAB-expand words using all previously seen words and/or a user-specified file. endef +PACKAGES = rlwrap + +REQUIRED_PKGS = CSWreadline + +###### Upstream and opencsw files information ####### + MASTER_SITES = http://utopia.knoware.nl/~hlub/uck/rlwrap/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWrlwrap,depend prototype) DISTFILES += changelog.CSW # replace setenv with putenv #PATCHFILES += putenv.patch +##### Build and installation information ##### + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk @@ -27,8 +48,9 @@ pre-configure: cd $(WORKSRC) && autoconf -post-install: - @ginstall -D $(WORKDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME)/changelog.CSW +post-merge: + @ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW @( for FILE in AUTHORS BUGS INSTALL NEWS README TODO; do \ - ginstall -D $(WORKSRC)/$$FILE $(DESTDIR)$(docdir)/$(GARNAME)/`basename $$FILE`; \ + ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(GARNAME)/`basename $$FILE`; \ done ) + Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,5 +1,5 @@ -03d8bd4996945ea32d3c7d5dc38c956e download/rlwrap-0.30.tar.gz -e699f8a2167f07465cfe891bba7a1bc7 download/CSWrlwrap.gspec -1c940e58cea90e9fd91c3286d5f2a31e download/CSWrlwrap.depend -64db02a1daa57c76f7bf1e501d5cee17 download/CSWrlwrap.prototype -dc4068d113864632f4bda60e219c0908 download/changelog.CSW +1c940e58cea90e9fd91c3286d5f2a31e CSWrlwrap.depend +e699f8a2167f07465cfe891bba7a1bc7 CSWrlwrap.gspec +64db02a1daa57c76f7bf1e501d5cee17 CSWrlwrap.prototype +913fd14e3f46b7bc09c56a3325424123 changelog.CSW +441282a9a65c1d516c1c9a6821184539 rlwrap-0.32.tar.gz Deleted: csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend 2009-10-10 20:30:37 UTC (rev 6816) @@ -1 +0,0 @@ -P CSWreadline readline - library to enable interactive line editing Deleted: csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,4 +0,0 @@ -%var bitname rlwrap -%var pkgname CSWrlwrap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,28 +0,0 @@ -f none /opt/csw/bin/rlwrap 0755 root bin -f none /opt/csw/share/doc/rlwrap/changelog.CSW 0644 root bin -f none /opt/csw/share/doc/rlwrap/AUTHORS 0644 root bin -f none /opt/csw/share/doc/rlwrap/BUGS 0644 root bin -f none /opt/csw/share/doc/rlwrap/INSTALL 0644 root bin -f none /opt/csw/share/doc/rlwrap/NEWS 0644 root bin -f none /opt/csw/share/doc/rlwrap/README 0644 root bin -f none /opt/csw/share/doc/rlwrap/TODO 0644 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/en at boldquot 0755 root bin -d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/en at quot 0755 root bin -d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/es 0755 root bin -d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/it 0755 root bin -d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/rlwrap.1 0644 root bin -d none /opt/csw/share/rlwrap 0755 root bin -f none /opt/csw/share/rlwrap/coqtop 0644 root bin -f none /opt/csw/share/rlwrap/ftp 0644 root bin -f none /opt/csw/share/rlwrap/testclient 0644 root bin -i copyright=CSWrlwrap.copyright -i depend=CSWrlwrap.depend -i pkginfo=CSWrlwrap.pkginfo Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,3 +1,9 @@ +rlwrap (0.32,REV=2009.10.09) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 09 Oct 2009 22:10:54 +0200 + rlwrap (0.30,REV=2008.01.21) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 22:41:59 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 20:41:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6817] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 6817 http://gar.svn.sourceforge.net/gar/?rev=6817&view=rev Author: chninkel Date: 2009-10-10 20:41:59 +0000 (Sat, 10 Oct 2009) Log Message: ----------- openssh: PrintMotd value is now no in the default config file Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 20:30:37 UTC (rev 6816) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 20:41:59 UTC (rev 6817) @@ -151,6 +151,7 @@ sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' \ -e 's,/usr/libexec/,/opt/csw/libexec/,g' \ -e 's,^ *# *UsePAM *.*,UsePAM yes,g' \ + -e 's,^ *# *PrintMotd *.*,PrintMotd no,g' \ -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config" > "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 20:30:37 UTC (rev 6816) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 20:41:59 UTC (rev 6817) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -385098d42f4454b7928e0273ee32c00c changelog.CSW +d9eea5c8d787a514827e94d80e4f5574 changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 20:30:37 UTC (rev 6816) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 20:41:59 UTC (rev 6817) @@ -1,6 +1,8 @@ openssh (5.3,REV=2009.10.10_rev=p1) unstable * New upstream release. + * PrintMotd is now no in the default config file to avoid a double login + banner (Closes: #3829) -- Yann Rouillard Fri, 10 Oct 2009 21:47:46 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 22:42:36 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 20:42:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6818] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 6818 http://gar.svn.sourceforge.net/gar/?rev=6818&view=rev Author: chninkel Date: 2009-10-10 20:42:36 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: updated to 1.1 Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 20:41:59 UTC (rev 6817) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 20:42:36 UTC (rev 6818) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash_completion -GARVERSION = 1.0 +GARVERSION = 1.1 CATEGORIES = xtra DESCRIPTION = Programmable completion for bash Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:41:59 UTC (rev 6817) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:42:36 UTC (rev 6818) @@ -1,8 +1,8 @@ -cd1c5648272917fbe0eef4ba30bb93f4 download/bash-completion-1.0.tar.gz -5bc234f6060561c564a20d2a9cc552c1 download/pkg-get.completion -af7a63477c6e81ed5b08f195e153091e download/pkgadd.completion -1389a7771e34fc54fe993d442cce1524 download/pkgrm.completion -f922762210a6f208695c328c040ac90d download/pkgutil.completion -52bd6948f5cc1548c3791a969da0e5e2 download/smf.completion -a413f5d9346c32ef22093b55956bd268 download/changelog.CSW -d0c0d867babf351bca9ee97e03be550d download/opencsw_paths.patch +593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz +d7870800fc6e52484cc8faf32865e2cc changelog.CSW +d0c0d867babf351bca9ee97e03be550d opencsw_paths.patch +5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion +af7a63477c6e81ed5b08f195e153091e pkgadd.completion +1389a7771e34fc54fe993d442cce1524 pkgrm.completion +f922762210a6f208695c328c040ac90d pkgutil.completion +52bd6948f5cc1548c3791a969da0e5e2 smf.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 20:41:59 UTC (rev 6817) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 20:42:36 UTC (rev 6818) @@ -1,3 +1,9 @@ +bash_completion (1.1,REV=2009.10.10) + + * New upstream version. + + -- Yann Rouillard Sat, 10 Oct 2009 22:34:13 +0200 + bash_completion (1.0,REV=2009.04.07) * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 23:34:12 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 21:34:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6819] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 6819 http://gar.svn.sourceforge.net/gar/?rev=6819&view=rev Author: chninkel Date: 2009-10-10 21:34:11 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: updated opencsw paths patch Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:42:36 UTC (rev 6818) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 21:34:11 UTC (rev 6819) @@ -1,6 +1,6 @@ 593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz d7870800fc6e52484cc8faf32865e2cc changelog.CSW -d0c0d867babf351bca9ee97e03be550d opencsw_paths.patch +4c7dc3d0486ba84c5c0bbb57ee5ac420 opencsw_paths.patch 5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion af7a63477c6e81ed5b08f195e153091e pkgadd.completion 1389a7771e34fc54fe993d442cce1524 pkgrm.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2009-10-10 20:42:36 UTC (rev 6818) +++ csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2009-10-10 21:34:11 UTC (rev 6819) @@ -1,6 +1,7 @@ ---- bash-completion-1.0/bash_completion 2009-04-02 22:01:39.000000000 +0200 -+++ bash-completion-1.0/bash_completion.new 2009-04-04 19:21:58.156466726 +0200 -@@ -42,8 +42,8 @@ +diff --speed-large-files --minimal -Nru bash-completion-1.1.orig/bash_completion bash-completion-1.1/bash_completion +--- bash-completion-1.1.orig/bash_completion 2009-10-10 23:29:39.177572555 +0200 ++++ bash-completion-1.1/bash_completion 2009-10-10 23:29:13.520556369 +0200 +@@ -40,8 +40,8 @@ # Alter the following to reflect the location of this file. # @@ -8,38 +9,26 @@ -[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d +[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/opt/csw/etc/bash_completion +[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/opt/csw/etc/bash_completion.d - readonly BASH_COMPLETION BASH_COMPLETION_DIR + [ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d + readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR - # Set a couple of useful vars -@@ -2657,6 +2657,8 @@ - [ -r "$configfile" ] && - config=( "${config[@]}" "$configfile" ) - else -+ [ -r /opt/csw/etc/ssh/ssh_config ] && -+ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" ) - [ -r /etc/ssh/ssh_config ] && - config=( "${config[@]}" "/etc/ssh/ssh_config" ) - [ -r "${HOME}/.ssh/config" ] && -@@ -2676,6 +2678,8 @@ - [ -r "$global_kh" ] && - kh=( "${kh[@]}" "$global_kh" ) - if [ -z "$configfile" ]; then -+ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] && -+ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts ) - [ -r /etc/ssh/ssh_known_hosts ] && - kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts ) - [ -r /etc/ssh/ssh_known_hosts2 ] && ---- bash-completion-1.0/bash_completion.sh 2009-04-02 22:01:42.000000000 +0200 -+++ bash-completion-1.0/bash_completion.sh.new 2009-04-04 19:22:33.430034421 +0200 -@@ -4,9 +4,9 @@ - # Check for recent enough version of bash. - bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} - if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then -- if [ -r /etc/bash_completion ]; then -+ if [ -r /opt/csw/etc/bash_completion ]; then - # Source completion code. -- . /etc/bash_completion -+ . /opt/csw/etc/bash_completion - fi - fi - unset bash bminor bmajor +@@ -1196,6 +1196,8 @@ + [ -r "$configfile" ] && + config=( "${config[@]}" "$configfile" ) + else ++ [ -r /opt/csw/etc/ssh/ssh_config ] && ++ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" ) + [ -r /etc/ssh/ssh_config ] && + config=( "${config[@]}" "/etc/ssh/ssh_config" ) + [ -r "${HOME}/.ssh/config" ] && +@@ -1223,6 +1225,10 @@ + [ -r "$global_kh" ] && + kh=( "${kh[@]}" "${global_kh[@]}" ) + if [ -z "$configfile" ]; then ++ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] && ++ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts ) ++ [ -r /opt/csw/etc/ssh/ssh_known_hosts2 ] && ++ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts2 ) + [ -r /etc/ssh/ssh_known_hosts ] && + kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts ) + [ -r /etc/ssh/ssh_known_hosts2 ] && This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 23:35:47 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 21:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6820] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 6820 http://gar.svn.sourceforge.net/gar/?rev=6820&view=rev Author: chninkel Date: 2009-10-10 21:35:47 +0000 (Sat, 10 Oct 2009) Log Message: ----------- elinks: updated changelog Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/checksums csw/mgar/pkg/elinks/trunk/files/changelog.CSW Modified: csw/mgar/pkg/elinks/trunk/checksums =================================================================== --- csw/mgar/pkg/elinks/trunk/checksums 2009-10-10 21:34:11 UTC (rev 6819) +++ csw/mgar/pkg/elinks/trunk/checksums 2009-10-10 21:35:47 UTC (rev 6820) @@ -1,4 +1,4 @@ -9998467007acbd4cb8e46db6e5a9b306 download/CSWelinks.prototype -dccc134301c3dfa95ca4748e9ca948a7 download/changelog.CSW -fcd087a6d2415cd4c6fd1db53dceb646 download/elinks-0.11.7.tar.bz2 -858331d6cc6c8459b2dba5e24f0c8cc3 download/elinks-417789.diff +9998467007acbd4cb8e46db6e5a9b306 CSWelinks.prototype +ff0d7959d92aea06116190bb6f03731b changelog.CSW +fcd087a6d2415cd4c6fd1db53dceb646 elinks-0.11.7.tar.bz2 +858331d6cc6c8459b2dba5e24f0c8cc3 elinks-417789.diff Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-10-10 21:34:11 UTC (rev 6819) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-10-10 21:35:47 UTC (rev 6820) @@ -1,8 +1,8 @@ -elinks (0.11.7,REV=2009.09.04) unstable +elinks (0.11.7,REV=2009.10.10) unstable * New upstream version. - -- Yann Rouillard Sun, 04 Sep 2009 10:38:39 +0100 + -- Yann Rouillard Sun, 10 Oct 2009 21:38:39 +0100 elinks (0.11.6,REV=2009.03.22) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 23:38:33 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 21:38:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6821] csw/mgar/pkg/bash_completion/trunk/Makefile Message-ID: Revision: 6821 http://gar.svn.sourceforge.net/gar/?rev=6821&view=rev Author: chninkel Date: 2009-10-10 21:38:33 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: removed CHANGES file Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile Modified: csw/mgar/pkg/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 21:35:47 UTC (rev 6820) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 21:38:33 UTC (rev 6821) @@ -67,7 +67,7 @@ merge-additional-docs: - @( for FILE in AUTHORS README TODO CHANGES; do \ + @( for FILE in AUTHORS README TODO; do \ ginstall -D "$(WORKSRC_FIRSTMOD)/$$FILE" "$(PKGROOT)$(docdir)/$(GARNAME)/$$FILE"; \ done ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:41:27 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:41:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6822] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 6822 http://gar.svn.sourceforge.net/gar/?rev=6822&view=rev Author: chninkel Date: 2009-10-10 22:41:27 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: updated changelog Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 21:38:33 UTC (rev 6821) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 22:41:27 UTC (rev 6822) @@ -1,5 +1,5 @@ 593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz -d7870800fc6e52484cc8faf32865e2cc changelog.CSW +075292057aa7dce8fb78dba076ee0832 changelog.CSW 4c7dc3d0486ba84c5c0bbb57ee5ac420 opencsw_paths.patch 5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion af7a63477c6e81ed5b08f195e153091e pkgadd.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 21:38:33 UTC (rev 6821) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 22:41:27 UTC (rev 6822) @@ -1,8 +1,8 @@ -bash_completion (1.1,REV=2009.10.10) +bash_completion (1.1,REV=2009.10.11) * New upstream version. - -- Yann Rouillard Sat, 10 Oct 2009 22:34:13 +0200 + -- Yann Rouillard Sat, 11 Oct 2009 00:34:13 +0200 bash_completion (1.0,REV=2009.04.07) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:41:57 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:41:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6823] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 6823 http://gar.svn.sourceforge.net/gar/?rev=6823&view=rev Author: chninkel Date: 2009-10-10 22:41:57 +0000 (Sat, 10 Oct 2009) Log Message: ----------- lftp: updated changelog Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-10-10 22:41:27 UTC (rev 6822) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-10-10 22:41:57 UTC (rev 6823) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -7b1750a903f92e01de5978606e4c69aa changelog.CSW +90cfdf4e9b3481ab053e46a4baf82845 changelog.CSW 664fd567bb49e1e4dea1ba37430a8449 lftp-4.0.2.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-10 22:41:27 UTC (rev 6822) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-10 22:41:57 UTC (rev 6823) @@ -1,8 +1,8 @@ -lftp (4.0.2,REV=2009.10.10) unstable +lftp (4.0.2,REV=2009.10.11) unstable * New upstream release. - -- Yann Rouillard Fri, 09 Oct 2009 21:45:36 +0200 + -- Yann Rouillard Fri, 11 Oct 2009 00:45:36 +0200 lftp (3.7.15,REV=2009.07.25) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:42:59 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6824] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 6824 http://gar.svn.sourceforge.net/gar/?rev=6824&view=rev Author: chninkel Date: 2009-10-10 22:42:59 +0000 (Sat, 10 Oct 2009) Log Message: ----------- vsftpd: removed no_rlimit_nproc patch Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-10-10 22:42:59 UTC (rev 6824) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.1.2 +GARVERSION = 2.2.0 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. @@ -71,9 +71,6 @@ # vsftpd makfile PATCHFILES += destdir.patch -# solaris doesn't have RLIMIT_NPROC -PATCHFILES += no_rlimit_nproc.patch - # Documentation files DOCFILES = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-10-10 22:42:59 UTC (rev 6824) @@ -1,17 +1,16 @@ -a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall -8944fcd302add66d5b2b287d390b9c91 download/CSWvsftpd.prototype -eeaf77528b2da0c7730323838f30b7ef download/README.CSW -281c51282cabd9475cceef363bbc699b download/build_options.patch -16b388b04478ebdc9ee7ebac6a03387d download/changelog.CSW -54c1c39c6bfa8747a4457f135fd5bca1 download/csw_build_system.patch -a9e994d2b57999b76a0e03503745c01a download/csw_paths.patch -98e1d831801985daf5ce2ed01fbc0efd download/cswusergroup -796d46089f9e9c25c897a34e0dcfadc8 download/cswvsftpd -93173edf9931b8eb835c6d0177a7c6bd download/cswvsftpd.xml -73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch -81d5a4a3831f318cd9e7ea3b3634f41b download/no_rlimit_nproc.patch -a9a65f55cbfd01f9d72d1de25e67148d download/set_priv_sep_user.patch -6a8c8579d50adf0d0fc07226c03bfb52 download/vsftpd-2.1.2.tar.gz -f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf -0d4a1cf36560892adb9eb9410a01c522 download/vsftpd.smf_wrapper -60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist +a2f5b70fe49839b0463c9d90af0f11dd CSWvsftpd.preinstall +8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype +eeaf77528b2da0c7730323838f30b7ef README.CSW +281c51282cabd9475cceef363bbc699b build_options.patch +1680c237d8aa01a3571b80e426dba7a3 changelog.CSW +54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch +a9e994d2b57999b76a0e03503745c01a csw_paths.patch +98e1d831801985daf5ce2ed01fbc0efd cswusergroup +796d46089f9e9c25c897a34e0dcfadc8 cswvsftpd +93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml +73e59f9ada47d3d20199f7c97849fb13 destdir.patch +a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch +e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz +f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf +0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper +60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) @@ -1,3 +1,11 @@ +vsftpd (2.2.0,REV=2009.10.10) unstable + + * New upstream version. + * Removed no_rlimit_nproc.patch as the same modification has been applied + upstream. + + -- Yann Rouillard Sat, 10 Oct 2009 23:37:15 +0200 + vsftpd (2.1.2,REV=2009.06.30) unstable * New upstream version. Deleted: csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch 2009-10-10 22:42:59 UTC (rev 6824) @@ -1,19 +0,0 @@ -diff --speed-large-files --minimal -Nru vsftpd-2.1.2.orig/sysutil.c vsftpd-2.1.2/sysutil.c ---- vsftpd-2.1.2.orig/sysutil.c 2009-05-27 08:14:59.000000000 +0200 -+++ vsftpd-2.1.2/sysutil.c 2009-06-09 22:56:52.905511283 +0200 -@@ -2779,6 +2779,7 @@ - void - vsf_sysutil_set_no_procs() - { -+#ifdef RLIMIT_NPROC - int ret; - struct rlimit rlim; - rlim.rlim_cur = 0; -@@ -2788,6 +2789,7 @@ - { - die("setrlimit NPROC"); - } -+#endif - } - - void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:49:34 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:49:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6825] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6825 http://gar.svn.sourceforge.net/gar/?rev=6825&view=rev Author: chninkel Date: 2009-10-10 22:49:33 +0000 (Sat, 10 Oct 2009) Log Message: ----------- cyrus_imapd: updated to 2.3.15 Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Property Changed: ---------------- csw/mgar/pkg/cyrus_imapd/trunk/ Property changes on: csw/mgar/pkg/cyrus_imapd/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for Cyrus Imap +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = cyrus_imapd -GARVERSION = 2.3.14 +GARVERSION = 2.3.15 CATEGORIES = server DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -15,10 +29,14 @@ multiple SASL mechanisms, and the Sieve mail filtering language. endef -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ +###### Upstream and opencsw files information ####### + +#MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.14/ + # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = cyrus-imapd-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcyrusimapd,prototype preinstall depend checkinstall) @@ -33,9 +51,6 @@ DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz - # compile_et is not provided by krb5lib_dev so we must provide our own version # taken from the krb5 source. DISTFILES += compile_et et_c.awk et_h.awk @@ -48,7 +63,7 @@ # University of Athens patchs to allow autocreation of mailboxes # and autocreation of sub-lolders for filter rules #PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff -PATCHFILES = cyrus-imapd-2.3.13-autocreate-0.10-0.diff cyrus-imapd-2.3.13-autosieve-0.6.0.diff +PATCHFILES = cyrus-imapd-2.3.14-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff # UPDATE: not necessary anymore, integrated upstream # This patch adds a new option which allows cyrus to @@ -72,6 +87,8 @@ #GNU_CC_OPT = -g #GNU_LD_OPT = -g +##### Build and installation information ##### + # files are extracted in cyrus_imapd not cyrus-imapd WORKSRC = $(WORKDIR)/$(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) @@ -124,7 +141,7 @@ find doc -type f -exec perl -pi -e 's/\/opt\/csw\/etc\/cyrus\/sasldb2/\/opt\/csw\/etc\/sasldb2/g' '{}' ';') @$(MAKECOOKIE) -pre-install: +pre-merge: # we must create the directory where perl libraries will be installed mkdir -p $(DESTDIR)/$(prefix)/lib/perl mkdir -p $(DESTDIR)/$(sbindir) @@ -132,7 +149,7 @@ mkdir -p $(DESTDIR)/$(prefix)/share/doc/cyrus_imapd @$(MAKECOOKIE) -post-install: +post-merge: # we install binary under tools as part of the package cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir) ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,35 +1,35 @@ -1030d4d9d04036b2fb9830165723908e download/cyrus-imapd-2.3.14.tar.gz +a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall +248ac6089e88b4eb3365e48c897b9734 download/CSWcyrusimapd.depend 7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec +5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype -5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall -248ac6089e88b4eb3365e48c897b9734 download/CSWcyrusimapd.depend -a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall -19204460216d299f19b6504be90b1d79 download/cyrus_imapd.changelog.CSW +4d5ad6d492ca45da347bd9bd48213ac4 download/CSWcyrusimapdutils.depend +d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec +7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype +fc64965b3c22618fb6b1dff7306a78e7 download/CSWpmcyrus.depend +fdb06983e1a6fdde58ec25834742cf5d download/CSWpmcyrus.gspec +404a6d2b6608c26aaef4e37095200105 download/CSWpmcyrus.prototype d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW -79211aee56db01e15566ced1ba4078da download/i.services -149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services -6dfee20f7c02139350caf9f75199e587 download/services -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf +9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init 628c5cf5f5b01f9e173e090ee0c969aa download/cswcyrus.xml -d41d8cd98f00b204e9800998ecf8427e download/svc-cswcyrus -908dbf764d3ccd541c4de881ac81a6ae download/imapd.conf +95d0eb720cb67d712ab799609c619929 download/cyrus-imapd-2.3.14-autocreate-0.10-0.diff +4f010ee86b24f737c9de9fffa0d194e4 download/cyrus-imapd-2.3.14-autosieve-0.6.0.diff +d89cb1b55023188938f332b7ef120fae download/cyrus-imapd-2.3.15.tar.gz +b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch +6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d download/cyrus.conf -fdb06983e1a6fdde58ec25834742cf5d download/CSWpmcyrus.gspec -404a6d2b6608c26aaef4e37095200105 download/CSWpmcyrus.prototype -fc64965b3c22618fb6b1dff7306a78e7 download/CSWpmcyrus.depend -d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec -7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype -4d5ad6d492ca45da347bd9bd48213ac4 download/CSWcyrusimapdutils.depend -43d004e8a98a9143db8073bd529b8f7a download/cyrus_imapd_utils.changelog.CSW -5f2dbde9c973e714c0a4727e25863f75 download/pm_cyrus.changelog.CSW -9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et +81f9b346bf3c1803381c94ce33f2163e download/cyrus_imapd.changelog.CSW +d722bfe708263b946d7bbc7f4d0ddf46 download/cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 download/et_c.awk d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk +9b2ae27f98333b73ff2b16ed98ee896a download/i.conf +79211aee56db01e15566ced1ba4078da download/i.services +908dbf764d3ccd541c4de881ac81a6ae download/imapd.conf 14bb6e8c6d6914351f80df293982e88a download/install-upgrade -f1957096f173dcc9ea94d0544a07e9db download/cyrus-imapd-2.3.13-autocreate-0.10-0.diff -cce2e7fbc847791182b8f431c59e473a download/cyrus-imapd-2.3.13-autosieve-0.6.0.diff -6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch -b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch +e6730668fa500fc77120ee007e535274 download/pm_cyrus.changelog.CSW +5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf +149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch +6dfee20f7c02139350caf9f75199e587 download/services +d41d8cd98f00b204e9800998ecf8427e download/svc-cswcyrus Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,3 +1,9 @@ +cyrus_imapd (2.3.15,REV=2009.10.11) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 + cyrus_imapd (2.3.14,REV=2009.03.27) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,3 +1,9 @@ +cyrus_imapd_utils (2.3.15,REV=2009.10.11) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 + cyrus_imapd_utils (2.3.14,REV=2009.03.27) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,3 +1,9 @@ +pm_cyrus (2.3.15,REV=2009.10.11) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 + pm_cyrus (2.3.14,REV=2009.03.27) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 12:59:25 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 10:59:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6826] csw/mgar/pkg/bash/trunk Message-ID: Revision: 6826 http://gar.svn.sourceforge.net/gar/?rev=6826&view=rev Author: chninkel Date: 2009-10-11 10:59:25 +0000 (Sun, 11 Oct 2009) Log Message: ----------- bash: updated to patch level 33 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-10-10 22:49:33 UTC (rev 6825) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-10-11 10:59:25 UTC (rev 6826) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.28 +GARVERSION = 4.0.33 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-10-10 22:49:33 UTC (rev 6825) +++ csw/mgar/pkg/bash/trunk/checksums 2009-10-11 10:59:25 UTC (rev 6826) @@ -1,33 +1,38 @@ -f93b41b44ce6b023df65b72f00386ac5 download/CSWbash.prototype -a90a1b5a6db4838483f05438e05e8eb9 download/bash-4.0.tar.gz -bc7f4762443939bd7dccb42370f0d932 download/bash40-001 -c2a4a4786a83ed4ec366c6a8924369a2 download/bash40-002 -22e8a824eddba21a8fce10d7984c2aba download/bash40-003 -ed7cbced8c7c964323265522369a37a2 download/bash40-004 -8ed86b7d31423d71ecf3148251d63512 download/bash40-005 -5f447338cb98ff156cabf1fd9879d5f3 download/bash40-006 -96e946cb66a4ca186cba1da44f1ee163 download/bash40-007 -d3eb7b6f00d525e032478c33f51d46a8 download/bash40-008 -340601c997ce569532417a7ae92248b8 download/bash40-009 -0bd5ab96d514ffb1afbb8c7984b15146 download/bash40-010 -32cb20f339a20e1e9fb37a5d18f18fca download/bash40-011 -33fd9e93d30a17988c19554ef26d56e0 download/bash40-012 -a266b42df5e9ed7e8818a8b00d50e00b download/bash40-013 -86cac78f191a32cd1404f11264eb9b2a download/bash40-014 -bb41963d030bc61a20e8185367b337c5 download/bash40-015 -f75455048a086528971252fd979b8755 download/bash40-016 -34b2cd57271a452f4a26b39d77ff908f download/bash40-017 -99318eed8dcc05e10a14ae27043f175d download/bash40-018 -af3b9aaeadc71a5007bec2b98c751cde download/bash40-019 -eb7c7ddeb7e8451eb59228dca3329696 download/bash40-020 -585d701b978ceb63967dc020db3a2234 download/bash40-021 -7a70f2608f90f6ac0c2051e5f1c6c414 download/bash40-022 -7a23aa41630dd4fe8d30108a200e2d96 download/bash40-023 -82ba5fc9eb780eb57d8b7628a17b7d74 download/bash40-024 -b26f9007ac4eef5c378f1abcb8959025 download/bash40-025 -83bc844c82d0a30740e8d91a8238bfa9 download/bash40-026 -a41c187f05ecab07389c18acc91214c6 download/bash40-027 -fcc367e6471267d2e397257e703b817d download/bash40-028 -871d6e5e87ea680cdf870f67210be8b3 download/changelog.CSW -60956e6be20f69dafbb06fcc83bab88e download/shells -29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch +f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype +a90a1b5a6db4838483f05438e05e8eb9 bash-4.0.tar.gz +bc7f4762443939bd7dccb42370f0d932 bash40-001 +c2a4a4786a83ed4ec366c6a8924369a2 bash40-002 +22e8a824eddba21a8fce10d7984c2aba bash40-003 +ed7cbced8c7c964323265522369a37a2 bash40-004 +8ed86b7d31423d71ecf3148251d63512 bash40-005 +5f447338cb98ff156cabf1fd9879d5f3 bash40-006 +96e946cb66a4ca186cba1da44f1ee163 bash40-007 +d3eb7b6f00d525e032478c33f51d46a8 bash40-008 +340601c997ce569532417a7ae92248b8 bash40-009 +0bd5ab96d514ffb1afbb8c7984b15146 bash40-010 +32cb20f339a20e1e9fb37a5d18f18fca bash40-011 +33fd9e93d30a17988c19554ef26d56e0 bash40-012 +a266b42df5e9ed7e8818a8b00d50e00b bash40-013 +86cac78f191a32cd1404f11264eb9b2a bash40-014 +bb41963d030bc61a20e8185367b337c5 bash40-015 +f75455048a086528971252fd979b8755 bash40-016 +34b2cd57271a452f4a26b39d77ff908f bash40-017 +99318eed8dcc05e10a14ae27043f175d bash40-018 +af3b9aaeadc71a5007bec2b98c751cde bash40-019 +eb7c7ddeb7e8451eb59228dca3329696 bash40-020 +585d701b978ceb63967dc020db3a2234 bash40-021 +7a70f2608f90f6ac0c2051e5f1c6c414 bash40-022 +7a23aa41630dd4fe8d30108a200e2d96 bash40-023 +82ba5fc9eb780eb57d8b7628a17b7d74 bash40-024 +b26f9007ac4eef5c378f1abcb8959025 bash40-025 +83bc844c82d0a30740e8d91a8238bfa9 bash40-026 +a41c187f05ecab07389c18acc91214c6 bash40-027 +fcc367e6471267d2e397257e703b817d bash40-028 +4d4da1c0be8dfee8e2a6a7703901130f bash40-029 +55cbdc8e5173d7d59bf1113c3ff590dc bash40-030 +389635281133416de9d13295251cabc7 bash40-031 +d646cb4aed8e0f0d1d47eea2ed5f3690 bash40-032 +d3e77d2a0a051478aca8c30d13ded834 bash40-033 +2e65971f182336356e87af544a24ccfe changelog.CSW +60956e6be20f69dafbb06fcc83bab88e shells +29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-10-11 10:59:25 UTC (rev 6826) @@ -1,3 +1,9 @@ +bash (4.0.33,REV=2009.10.11) unstable + + * Added bash patches bash40-029 to bash40-033. + + -- Yann Rouillard Sun, 11 Oct 2009 11:51:37 +0200 + bash (4.0.28,REV=2009.07.25) unstable * Added bash patches bash40-025 to bash40-028. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Oct 11 13:42:26 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 11 Oct 2009 11:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6827] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 6827 http://gar.svn.sourceforge.net/gar/?rev=6827&view=rev Author: idogan23 Date: 2009-10-11 11:42:25 +0000 (Sun, 11 Oct 2009) Log Message: ----------- Apache2: bump version to 2.2.14 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-10-11 10:59:25 UTC (rev 6826) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-10-11 11:42:25 UTC (rev 6827) @@ -1,5 +1,5 @@ GARNAME = httpd -GARVERSION = 2.2.13 +GARVERSION = 2.2.14 CATEGORIES = server DESCRIPTION = A high performance Unix-based HTTP server. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 11 15:31:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Oct 2009 13:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6828] csw/mgar/pkg/git/trunk Message-ID: Revision: 6828 http://gar.svn.sourceforge.net/gar/?rev=6828&view=rev Author: bdwalton Date: 2009-10-11 13:31:43 +0000 (Sun, 11 Oct 2009) Log Message: ----------- git: bump to 1.6.5 (enable tests again); remove autoconf build dep since patches were accepted; remove ls-files patch since it was accepted; make build quiet again Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-11 11:42:25 UTC (rev 6827) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-11 13:31:43 UTC (rev 6828) @@ -1,10 +1,10 @@ GARNAME = git -GARVERSION = 1.6.4.4 +GARVERSION = 1.6.5 #xPATCHLEVEL = rc3 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +# TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel @@ -30,8 +30,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs -PREREQUISITE_PKGS += CSWautoconf - + REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror REQUIRED_PKGS_CSWgit += CSWpmtermreadkey @@ -87,7 +86,7 @@ GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) DISTFILES = CSWgit.postinstall -PATCHFILES = 0001-ls-files-make-option-parser-keep-argv-0.patch +#PATCHFILES = 0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files @@ -122,7 +121,7 @@ CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ - ETC_GITCONFIG=$(sysconfdir)/gitconfig V=1 \ + ETC_GITCONFIG=$(sysconfdir)/gitconfig \ ASCIIDOC_NO_ROFF=YesPlease \ all @@ -150,7 +149,6 @@ post-build-modulated: @echo Builing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) - @( cd $(WORKSRC)/Documentation; $(MAKE) ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-11 11:42:25 UTC (rev 6827) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-11 13:31:43 UTC (rev 6828) @@ -1,2 +1,2 @@ -286ebdc4e98afca87750145775cbe918 download/0001-ls-files-make-option-parser-keep-argv-0.patch +43f73e9e39bc388253c4c48986ef7b5c download/0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch 0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 15:55:25 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 13:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6829] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6829 http://gar.svn.sourceforge.net/gar/?rev=6829&view=rev Author: chninkel Date: 2009-10-11 13:55:25 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: updated to 2.3.15 cyrus_imapd: switched to cswclassutils for SMF support and configuration file handling cyrus_imapd: removed headers and static libraries cyrus_imapd: switched to automatic gspec and depend file Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW Added Paths: ----------- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff Removed Paths: ------------- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init csw/mgar/pkg/cyrus_imapd/trunk/files/i.conf csw/mgar/pkg/cyrus_imapd/trunk/files/r.conf csw/mgar/pkg/cyrus_imapd/trunk/files/svc-cswcyrus Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 13:55:25 UTC (rev 6829) @@ -29,7 +29,24 @@ multiple SASL mechanisms, and the Sieve mail filtering language. endef +PACKAGES = CSWcyrusimapd CSWcyrusimapdutils CSWpmcyrus +SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system +CATALOGNAME_CSWcyrusimapd = cyrus_imapd +REQUIRED_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert +SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf + +SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd +CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils +REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWpcrert +SPKG_CLASSES_CSWcyrusimapd = none + +SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions +CATALOGNAME_CSWpmcyrus = pm_cyrus +REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb4 CSWosslrt CSWsasl +SPKG_CLASSES_CSWcyrusimapd = none + + ###### Upstream and opencsw files information ####### #MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ @@ -38,16 +55,17 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz -DISTFILES = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWcyrusimapd,prototype preinstall depend checkinstall) +DISTNAME = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) + +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += CSWcyrusimapd.prototype CSWcyrusimapd.preinstall CSWcyrusimapd.checkinstall DISTFILES += cyrus_imapd.changelog.CSW README.CSW DISTFILES += i.services r.services services -DISTFILES += i.conf r.conf -DISTFILES += cswcyrus.init cswcyrus.xml svc-cswcyrus +DISTFILES += cswcyrus cswcyrus.xml DISTFILES += imapd.conf cyrus.conf -DISTFILES += $(call admfiles,CSWpmcyrus,prototype depend) -DISTFILES += $(call admfiles,CSWcyrusimapdutils,prototype depend) +DISTFILES += CSWpmcyrus.prototype +DISTFILES += CSWcyrusimapdutils.prototype DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW @@ -58,18 +76,11 @@ # le fichier install-upgrade de cyrus 2.3.11 est incomplet DISTFILES += install-upgrade -SPKG_CLASSES = none services conf - # University of Athens patchs to allow autocreation of mailboxes # and autocreation of sub-lolders for filter rules #PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff -PATCHFILES = cyrus-imapd-2.3.14-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff +PATCHFILES = cyrus-imapd-2.3.15-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff -# UPDATE: not necessary anymore, integrated upstream -# This patch adds a new option which allows cyrus to -# accept mails with 8bits characters in header -# PATCHFILES += cyrus-imapd-2.2.7-munge8bit.patch - # This patch makes cyrus more tolerant with mails containing # invalid From headers # This avoids "Invalid Message header" error messages @@ -89,9 +100,6 @@ ##### Build and installation information ##### -# files are extracted in cyrus_imapd not cyrus-imapd -WORKSRC = $(WORKDIR)/$(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus @@ -120,7 +128,7 @@ pre-patch: cp $(WORKDIR)/install-upgrade $(WORKSRC)/doc/text -pre-configure: +pre-configure-modulated: # master is a too common name, so we rename it cyrus-master cp $(WORKSRC)/man/master.8 $(WORKSRC)/man/cyrus-master.8 cp $(WORKSRC)/doc/man/master.8.html $(WORKSRC)/doc/man/cyrus-master.8.html @@ -143,33 +151,48 @@ pre-merge: # we must create the directory where perl libraries will be installed - mkdir -p $(DESTDIR)/$(prefix)/lib/perl - mkdir -p $(DESTDIR)/$(sbindir) - mkdir -p $(DESTDIR)/$(sysconfdir)/cyrus - mkdir -p $(DESTDIR)/$(prefix)/share/doc/cyrus_imapd + mkdir -p $(PKGROOT)/$(prefix)/lib/perl + mkdir -p $(PKGROOT)/$(sbindir) + mkdir -p $(PKGROOT)/$(sysconfdir)/cyrus + mkdir -p $(PKGROOT)/$(prefix)/share/doc/cyrus_imapd @$(MAKECOOKIE) post-merge: + # we provide our class action scripts to modify /etc/inet/services + ginstall $(WORKDIR_FIRSTMOD)/*.services $(WORKDIR)/ + ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/inet/services + + # configuration and init file installation + ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus" + ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswcyrus.xml" + ginstall -D "$(WORKDIR_FIRSTMOD)/imapd.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/imapd.conf.CSW" + ginstall -D "$(WORKDIR_FIRSTMOD)/cyrus.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/cyrus.conf.CSW" + + # we install binary under tools as part of the package - cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir) - ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort + cp -r $(WORKSRC_FIRSTMOD)/tools/* $(PKGROOT)$(sbindir) + ginstall -D $(PKGROOT)$(sbindir)/arbitronsort.pl $(PKGROOT)$(sbindir)/arbitronsort # we want perl script to use opencsw perl - perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(DESTDIR)$(sbindir)/* $(DESTDIR)$(bindir)/* + perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(PKGROOT)$(sbindir)/* $(PKGROOT)$(bindir)/* ( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \ - perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(DESTDIR)$(sbindir)/$$FILE; \ + perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(PKGROOT)$(sbindir)/$$FILE; \ done ) # we install the documentation - cp -r $(WORKSRC)/doc/* $(DESTDIR)/$(docdir)/cyrus_imapd + cp -r $(WORKSRC_FIRSTMOD)/doc/* $(PKGROOT)/$(docdir)/cyrus_imapd ( for PKG in cyrus_imapd cyrus_imapd_utils pm_cyrus; do \ - ginstall -D $(WORKDIR)/$$PKG.changelog.CSW $(DESTDIR)/$(docdir)/$$PKG/changelog.CSW; \ + ginstall -D $(WORKDIR_FIRSTMOD)/$$PKG.changelog.CSW $(PKGROOT)/$(docdir)/$$PKG/changelog.CSW; \ + ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$PKG/README.CSW; \ done ) # we rename some tools with too generic names - ginstall -D $(DESTDIR)/$(sbindir)/mkimap $(DESTDIR)/$(sbindir)/mkdirs + ginstall -D $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs ( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \ - ginstall -D $(DESTDIR)/$(sbindir)/$$FILE $(DESTDIR)/$(sbindir)/cyrus-$$FILE; \ + ginstall -D $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \ done ) + + # we fix some permission problems + chmod -R u+w "$(PKGROOT)/" + @$(MAKECOOKIE) - Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,35 +1,26 @@ -a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall -248ac6089e88b4eb3365e48c897b9734 download/CSWcyrusimapd.depend -7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec -5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall -a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype -4d5ad6d492ca45da347bd9bd48213ac4 download/CSWcyrusimapdutils.depend -d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec -7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype -fc64965b3c22618fb6b1dff7306a78e7 download/CSWpmcyrus.depend -fdb06983e1a6fdde58ec25834742cf5d download/CSWpmcyrus.gspec -404a6d2b6608c26aaef4e37095200105 download/CSWpmcyrus.prototype -d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW -9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et -a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init -628c5cf5f5b01f9e173e090ee0c969aa download/cswcyrus.xml -95d0eb720cb67d712ab799609c619929 download/cyrus-imapd-2.3.14-autocreate-0.10-0.diff -4f010ee86b24f737c9de9fffa0d194e4 download/cyrus-imapd-2.3.14-autosieve-0.6.0.diff -d89cb1b55023188938f332b7ef120fae download/cyrus-imapd-2.3.15.tar.gz -b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch -6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch -fdb3416ec41f3a56d1594ca25a6dcd7d download/cyrus.conf -81f9b346bf3c1803381c94ce33f2163e download/cyrus_imapd.changelog.CSW -d722bfe708263b946d7bbc7f4d0ddf46 download/cyrus_imapd_utils.changelog.CSW -5375c25c8bc325a90553d0be87a64a04 download/et_c.awk -d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -79211aee56db01e15566ced1ba4078da download/i.services -908dbf764d3ccd541c4de881ac81a6ae download/imapd.conf -14bb6e8c6d6914351f80df293982e88a download/install-upgrade -e6730668fa500fc77120ee007e535274 download/pm_cyrus.changelog.CSW -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services -dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch -6dfee20f7c02139350caf9f75199e587 download/services -d41d8cd98f00b204e9800998ecf8427e download/svc-cswcyrus +a55d22e88ee57fa81da2ea75c6e0e3d8 CSWcyrusimapd.checkinstall +5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall +63f0e304d69648e4cbaf197a329f1537 CSWcyrusimapd.prototype +7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype +404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype +d0b97b33e75ac75f89ee6236a2d53f05 README.CSW +9cbebaeeafa6eb3320eafa594c253bc1 compile_et +1c2b850f7a264704eefec741a75977ab cswcyrus +628c5cf5f5b01f9e173e090ee0c969aa cswcyrus.xml +4f010ee86b24f737c9de9fffa0d194e4 cyrus-imapd-2.3.14-autosieve-0.6.0.diff +318f1d2bd48bb4a7c2db5fb9f82c9e3d cyrus-imapd-2.3.15-autocreate-0.10-0.diff +d89cb1b55023188938f332b7ef120fae cyrus-imapd-2.3.15.tar.gz +b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch +6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch +fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf +e8868f4e344649d1f2939d5d00f3f800 cyrus_imapd.changelog.CSW +d722bfe708263b946d7bbc7f4d0ddf46 cyrus_imapd_utils.changelog.CSW +5375c25c8bc325a90553d0be87a64a04 et_c.awk +d1d86e61463a1dfefccbadedb11a8604 et_h.awk +79211aee56db01e15566ced1ba4078da i.services +908dbf764d3ccd541c4de881ac81a6ae imapd.conf +14bb6e8c6d6914351f80df293982e88a install-upgrade +e6730668fa500fc77120ee007e535274 pm_cyrus.changelog.CSW +149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services +dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch +6dfee20f7c02139350caf9f75199e587 services Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,7 +0,0 @@ -P CSWosslrt - openssl - OpenSSL Secure Sockets Layer lib and utilities -P CSWsasl - sasl - Simple Authentication and Security Layer -P CSWbdb4 - berkeleydb4 - embedded database libraries and utilities -P CSWkrb5lib -P CSWtcpwrap -P CSWnetsnmp -P CSWpcrert Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,13 +0,0 @@ -%var bitname cyrus_imapd -%var pkgname CSWcyrusimapd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT -%var RC_INIT_SCRIPT cswcyrus.init -%var SMF_SCRIPT svc-cswcyrus -%var SMF_MANIFEST cswcyrus.xml -%var INIT_KILL_PRIO 99 -%var INIT_START_PRIO 10 -%var CAN_BE_AUTOENABLED yes -%var SERVICE_CONF_FILES /opt/csw/etc/cyrus/cyrus.conf -%var SERVICE_NAME cyrus_imapd -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,11 +1,11 @@ -i i.conf=i.conf -i r.conf=r.conf -i i.services=i.services -i r.services=r.services -e services /etc/inet/services=services +i i.services +i r.services +e services /etc/inet/services 0444 root sys d none /opt/csw/etc/cyrus 0755 root bin -e conf /opt/csw/etc/cyrus/imapd.conf=imapd.conf 0640 root mail -f none /opt/csw/etc/cyrus/cyrus.conf.CSW=cyrus.conf 0640 root mail +d none /opt/csw/etc/pkg/CSWcyrusimapd 0755 root bin +f cswinitsmf /etc/opt/csw/init.d/cswcyrus 0755 root bin +f preserveconf /opt/csw/etc/cyrus/imapd.conf.CSW 0640 root mail +f preserveconf /opt/csw/etc/cyrus/cyrus.conf.CSW 0640 root mail d none /opt/csw/var/cyrus 0755 cyrus mail d none /opt/csw/var/cyrus/sieve 0755 cyrus mail d none /opt/csw/var/cyrus/config 0755 cyrus mail @@ -17,45 +17,6 @@ d none /opt/csw/var/cyrus/config/ptclient 0755 cyrus mail d none /opt/csw/var/cyrus/mail 0755 cyrus mail d none /opt/csw/var/cyrus/mail/stage. 0755 cyrus mail -d none /opt/csw/include/cyrus 0755 root bin -f none /opt/csw/include/cyrus/acl.h 0644 root bin -f none /opt/csw/include/cyrus/assert.h 0644 root bin -f none /opt/csw/include/cyrus/auth.h 0644 root bin -f none /opt/csw/include/cyrus/bsearch.h 0644 root bin -f none /opt/csw/include/cyrus/byteorder64.h 0644 root bin -f none /opt/csw/include/cyrus/charset.h 0644 root bin -f none /opt/csw/include/cyrus/cyrusdb.h 0644 root bin -f none /opt/csw/include/cyrus/glob.h 0644 root bin -f none /opt/csw/include/cyrus/gmtoff.h 0644 root bin -f none /opt/csw/include/cyrus/hash.h 0644 root bin -f none /opt/csw/include/cyrus/hmac-md5.h 0644 root bin -f none /opt/csw/include/cyrus/imapopts.h 0644 root bin -f none /opt/csw/include/cyrus/imapurl.h 0644 root bin -f none /opt/csw/include/cyrus/imclient.h 0644 root bin -f none /opt/csw/include/cyrus/imparse.h 0644 root bin -f none /opt/csw/include/cyrus/iptostring.h 0644 root bin -f none /opt/csw/include/cyrus/libconfig.h 0644 root bin -f none /opt/csw/include/cyrus/libcyr_cfg.h 0644 root bin -f none /opt/csw/include/cyrus/lock.h 0644 root bin -f none /opt/csw/include/cyrus/lsort.h 0644 root bin -f none /opt/csw/include/cyrus/map.h 0644 root bin -f none /opt/csw/include/cyrus/md5.h 0644 root bin -f none /opt/csw/include/cyrus/mkgmtime.h 0644 root bin -f none /opt/csw/include/cyrus/mpool.h 0644 root bin -f none /opt/csw/include/cyrus/nonblock.h 0644 root bin -f none /opt/csw/include/cyrus/parseaddr.h 0644 root bin -f none /opt/csw/include/cyrus/prot.h 0644 root bin -f none /opt/csw/include/cyrus/retry.h 0644 root bin -f none /opt/csw/include/cyrus/rfc822date.h 0644 root bin -f none /opt/csw/include/cyrus/strhash.h 0644 root bin -f none /opt/csw/include/cyrus/stristr.h 0644 root bin -f none /opt/csw/include/cyrus/sysexits.h 0644 root bin -f none /opt/csw/include/cyrus/util.h 0644 root bin -f none /opt/csw/include/cyrus/xmalloc.h 0644 root bin -f none /opt/csw/include/cyrus/xstrlcat.h 0644 root bin -f none /opt/csw/include/cyrus/xstrlcpy.h 0644 root bin -f none /opt/csw/lib/libcyrus.a 0644 root bin -f none /opt/csw/lib/libcyrus_min.a 0644 root bin f none /opt/csw/share/man/man3/imclient.3 0644 root bin f none /opt/csw/share/man/man5/imapd.conf.5 0644 root bin f none /opt/csw/share/man/man5/krb.equiv.5 0644 root bin @@ -301,5 +262,5 @@ f none /opt/csw/share/doc/cyrus_imapd/text/sieve-protocol 0644 root bin f none /opt/csw/share/doc/cyrus_imapd/text/sieve 0644 root bin f none /opt/csw/share/doc/cyrus_imapd/text/specs 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/README.CSW=README.CSW 0644 root bin +f none /opt/csw/share/doc/cyrus_imapd/README.CSW 0644 root bin f none /opt/csw/share/doc/cyrus_imapd/changelog.CSW 0644 root bin Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,6 +0,0 @@ -P CSWpmcyrus -P CSWosslrt - openssl - OpenSSL Secure Sockets Layer lib and utilities -P CSWsasl - sasl - Simple Authentication and Security Layer -P CSWbdb4 - berkeleydb4 - embedded database libraries and utilities -P CSWkrb5lib -P CSWpcrert Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,6 +0,0 @@ -%var bitname cyrus_imapd_utils -%var pkgname CSWcyrusimapdutils -%var desc Various admin utilities for Cyrus Imapd/Popd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT - Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,4 +0,0 @@ -P CSWperl -P CSWbdb4 -P CSWosslrt -P CSWsasl Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,6 +0,0 @@ -%var bitname pm_cyrus -%var pkgname CSWpmcyrus -%var desc Perl interface to Cyrus Imap functions -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT - Copied: csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus (from rev 6825, csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init) =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus (rev 0) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus 2009-10-11 13:55:25 UTC (rev 6829) @@ -0,0 +1,78 @@ +#!/sbin/sh +# +# Cyrus startup script for opencsw +# +# Yann Rouillard + +# cswclassutils smf variable +#RC_KNUM 99 +#RC_SNUM 10 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#MANIFEST /var/opt/csw/svc/manifest/network/cswcyrus.xml + + +PID_FILE="/var/run/cyrus-master.pid" +COMMAND=/opt/csw/sbin/cyrus-master + +[ -f /opt/csw/etc/cyrus/cyrus.conf ] || exit 0 + +check_proc () +{ + if [ -f $1 ]; then + _PID=`cat $1 | head -1` + _COMMAND=`ps -p $_PID -o comm | tail -1` + [ "x$_COMMAND" = "x$2" ] + else + return 1 + fi +} + + +case "$1" in + 'start') + # Start Daemons. + if check_proc $PID_FILE $COMMAND; then + echo "Cyrus seems to be already running. If it's not the case, you might want to delete the file $PID_FILE"; + else + /usr/ucb/echo -n "Starting Cyrus..." + $COMMAND -d -p $PID_FILE + if [ "$?" -eq 0 ]; then + echo "Ok" + else + echo "Failed" + fi + fi + ;; + + 'stop') + #stop daemons. + if check_proc $PID_FILE $COMMAND; then + /usr/ucb/echo -n "Stopping Cyrus..." + kill `cat $PID_FILE` + rm $PID_FILE + echo "Ok" + else + echo "Cyrus is not running"; + fi + ;; + + 'restart') + $0 stop + $0 start + ;; + + 'status') + if [ -r $PID_FILE ];then + echo "Cyrus is running." + else + echo "Cyrus is not running"; + fi + ;; + + *) + echo "usage: cyrus {start|stop|restart|status}" + exit 1 +esac + +exit 0 Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,74 +0,0 @@ -#!/sbin/sh -# -# Cyrus startup script for blastwave -# -# Yann Rouillard - -# chkconfig stuff -# chkconfig: 3 90 10 -# description: Pop and Imap server from the Cyrus mail system - -PID_FILE="/var/run/cyrus-master.pid" -COMMAND=/opt/csw/sbin/cyrus-master - -[ -f /opt/csw/etc/cyrus/cyrus.conf ] || exit 0 - -check_proc () -{ - if [ -f $1 ]; then - _PID=`cat $1 | head -1` - _COMMAND=`ps -p $_PID -o comm | tail -1` - [ "x$_COMMAND" = "x$2" ] - else - return 1 - fi -} - - -case "$1" in - 'start') - # Start Daemons. - if check_proc $PID_FILE $COMMAND; then - echo "Cyrus seems to be already running. If it's not the case, you might want to delete the file $PID_FILE"; - else - /usr/ucb/echo -n "Starting Cyrus..." - $COMMAND -d -p $PID_FILE - if [ "$?" -eq 0 ]; then - echo "Ok" - else - echo "Failed" - fi - fi - ;; - - 'stop') - #stop daemons. - if check_proc $PID_FILE $COMMAND; then - /usr/ucb/echo -n "Stopping Cyrus..." - kill `cat $PID_FILE` - rm $PID_FILE - echo "Ok" - else - echo "Cyrus is not running"; - fi - ;; - - 'restart') - $0 stop - $0 start - ;; - - 'status') - if [ -r $PID_FILE ];then - echo "Cyrus is running." - else - echo "Cyrus is not running"; - fi - ;; - - *) - echo "usage: cyrus {start|stop|restart|status}" - exit 1 -esac - -exit 0 Added: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff (rev 0) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff 2009-10-11 13:55:25 UTC (rev 6829) @@ -0,0 +1,2399 @@ +diff -Naur cyrus-imapd-2.3.15.orig/imap/autosieve.c cyrus-imapd-2.3.15/imap/autosieve.c +--- cyrus-imapd-2.3.15.orig/imap/autosieve.c 1970-01-01 01:00:00.000000000 +0100 ++++ cyrus-imapd-2.3.15/imap/autosieve.c 2009-09-09 16:13:03.000000000 +0200 +@@ -0,0 +1,590 @@ ++#include ++#include ++#include ++ ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "global.h" ++#include "util.h" ++#include "xmalloc.h" ++#include "xstrlcpy.h" ++#include "xstrlcat.h" ++#include "mailbox.h" ++#include "imap_err.h" ++#include "sieve_interface.h" ++#include "script.h" ++ ++#define TIMSIEVE_FAIL -1 ++#define TIMSIEVE_OK 0 ++#define MAX_FILENAME 1024 ++ ++static int get_script_name(char *sievename, size_t buflen, const char *filename); ++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir); ++int autoadd_sieve(char *userid, const char *source_script); ++ ++//static void fatal(const char *s, int code); ++static void foo(void); ++static int sieve_notify(void *ac __attribute__((unused)), ++ void *interp_context __attribute__((unused)), ++ void *script_context __attribute__((unused)), ++ void *message_context __attribute__((unused)), ++ const char **errmsg __attribute__((unused))); ++static int mysieve_error(int lineno, const char *msg, ++ void *i __attribute__((unused)), void *s); ++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); ++ ++ ++sieve_vacation_t vacation2 = { ++ 0, /* min response */ ++ 0, /* max response */ ++ (sieve_callback *) &foo, /* autorespond() */ ++ (sieve_callback *) &foo /* send_response() */ ++}; ++ ++ ++/* ++ * Find the name of the sieve script ++ * given the source script and compiled script names ++ */ ++static int get_script_name(char *sievename, size_t buflen, const char *filename) ++{ ++ char *p; ++ int r; ++ ++ p = strrchr(filename, '/'); ++ if (p == NULL) ++ p = (char *) filename; ++ else ++ p++; ++ ++ r = strlcpy(sievename, p, buflen) - buflen; ++ return (r >= 0 || r == -buflen ? 1 : 0); ++} ++ ++ ++/* ++ * Find the directory where the sieve scripts of the user ++ * reside ++ */ ++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir) ++{ ++ char *user = NULL, *domain = NULL; ++ ++ /* Setup the user and the domain */ ++ if(config_virtdomains && (domain = strchr(userid, '@'))) { ++ user = (char *) xmalloc((domain - userid +1) * sizeof(char)); ++ strlcpy(user, userid, domain - userid + 1); ++ domain++; ++ } else ++ user = userid; ++ ++ /* Find the dir path where the sieve scripts of the user will reside */ ++ if (config_virtdomains && domain) { ++ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/", ++ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) { ++ free(user); ++ return 1; ++ } ++ } else { ++ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", ++ sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen) ++ return 1; ++ } ++ ++ /* Free the xmalloced user memory, reserved above */ ++ if(user != userid) ++ free(user); ++ ++ return 0; ++} ++ ++int autoadd_sieve(char *userid, const char *source_script) ++{ ++ sieve_script_t *s = NULL; ++ bytecode_info_t *bc = NULL; ++ char *err = NULL; ++ FILE *in_stream, *out_fp; ++ int out_fd, in_fd, r, k; ++ int do_compile = 0; ++ const char *sieve_dir = NULL; ++ const char *compiled_source_script = NULL; ++ char sievename[MAX_FILENAME]; ++ char sieve_script_name[MAX_FILENAME]; ++ char sieve_script_dir[MAX_FILENAME]; ++ char sieve_bcscript_name[MAX_FILENAME]; ++ char sieve_default[MAX_FILENAME]; ++ char sieve_tmpname[MAX_FILENAME]; ++ char sieve_bctmpname[MAX_FILENAME]; ++ char sieve_bclink_name[MAX_FILENAME]; ++ char buf[4096]; ++ mode_t oldmask; ++ struct stat statbuf; ++ ++ /* We don't support using the homedirectory, like timsieved */ ++ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) { ++ syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf"); ++ return 1; ++ } ++ ++ /* Check if sievedir is defined in imapd.conf */ ++ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) { ++ syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf"); ++ return 1; ++ } ++ ++ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */ ++ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { ++ syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it"); ++ do_compile = 1; ++ } ++ ++ if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory"); ++ return 1; ++ } ++ ++ if (get_script_name(sievename, sizeof(sievename), source_script)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script); ++ return 1; ++ } ++ ++ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ ++ /* Check if a default sieve filter alrady exists */ ++ if(!stat(sieve_default,&statbuf)) { ++ syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists"); ++ fclose(in_stream); ++ return 1; ++ } ++ ++ /* Open the source script. if there is a problem with that exit */ ++ in_stream = fopen(source_script, "r"); ++ if(!in_stream) { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script); ++ return 1; ++ } ++ ++ ++ /* ++ * At this point we start the modifications of the filesystem ++ */ ++ ++ /* Create the directory where the sieve scripts will reside */ ++ r = cyrus_mkdir(sieve_script_dir, 0755); ++ if(r == -1) { ++ /* If this fails we just leave */ ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name); ++ return 1; ++ } ++ ++ /* ++ * We open the file that will be used as the bc file. If this file exists, overwrite it ++ * since something bad has happened. We open the file here so that this error checking is ++ * done before we try to open the rest of the files to start copying etc. ++ */ ++ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ++ if(out_fd < 0) { ++ if(errno == EEXIST) { ++ syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname); ++ } else if (errno == EACCES) { ++ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } else { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } ++ } ++ ++ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) { ++ while((r = read(in_fd, buf, sizeof(buf))) > 0) { ++ if((k=write(out_fd, buf,r)) < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno); ++ close(out_fd); ++ close(in_fd); ++ fclose(in_stream); ++ unlink(sieve_bctmpname); ++ return 1; ++ } ++ } ++ ++ if(r == 0) { /* EOF */ ++ close(out_fd); ++ close(in_fd); ++ } else if (r < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", ++ compiled_source_script); ++ close(in_fd); ++ do_compile = 1; ++ if(lseek(out_fd, 0, SEEK_SET)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting"); ++ return 1; ++ } ++ } ++ close(in_fd); ++ } else { ++ if(compiled_source_script) ++ syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script); ++ do_compile = 1; ++ } ++ ++ ++ /* Because we failed to open a precompiled bc sieve script, we compile one */ ++ if(do_compile) { ++ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { ++ if(err && *err) { ++ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err); ++ free(err); ++ } else ++ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script"); ++ ++ unlink(sieve_bctmpname); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ /* generate the bytecode */ ++ if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) { ++ syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script"); ++ /* removing the copied script and cleaning up memory */ ++ unlink(sieve_bctmpname); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) { ++ syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script"); ++ /* removing the copied script and cleaning up memory */ ++ unlink(sieve_bctmpname); ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ /* clean up the memory */ ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ } ++ ++ close(out_fd); ++ rewind(in_stream); ++ ++ /* Copy the initial script */ ++ oldmask = umask(077); ++ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname); ++ unlink(sieve_bctmpname); ++ umask(oldmask); ++ fclose(in_stream); ++ return 1; ++ } ++ umask(oldmask); ++ ++ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) { ++ if( fwrite(buf,sizeof(char), r, out_fp) != r) { ++ syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname); ++ fclose(out_fp); ++ unlink(sieve_tmpname); ++ unlink(sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } ++ } ++ ++ if(feof(in_stream)) { ++ fclose(out_fp); ++ } else { /* ferror */ ++ fclose(out_fp); ++ unlink(sieve_tmpname); ++ unlink(sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } ++ ++ /* Renaming the necessary stuff */ ++ if(rename(sieve_tmpname, sieve_script_name)) { ++ unlink(sieve_tmpname); ++ unlink(sieve_bctmpname); ++ return 1; ++ } ++ ++ if(rename(sieve_bctmpname, sieve_bcscript_name)) { ++ unlink(sieve_bctmpname); ++ unlink(sieve_bcscript_name); ++ return 1; ++ } ++ ++ /* end now with the symlink */ ++ if(symlink(sieve_bclink_name, sieve_default)) { ++ if(errno != EEXIST) { ++ syslog(LOG_WARNING, "autocreate_sieve: problem making the default link."); ++ /* Lets delete the files */ ++ unlink(sieve_script_name); ++ unlink(sieve_bcscript_name); ++ } ++ } ++ ++ /* ++ * If everything has succeeded AND we have compiled the script AND we have requested ++ * to generate the global script so that it is not compiled each time then we create it. ++ */ ++ if(do_compile && ++ config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) { ++ ++ if(!compiled_source_script) { ++ syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf"); ++ return 0; ++ } ++ ++ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname)) ++ return 0; ++ ++ /* ++ * Copy everything from the newly created bc sieve sieve script. ++ */ ++ if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) { ++ return 0; ++ } ++ ++ if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { ++ if(errno == EEXIST) { ++ /* Someone is already doing this so just bail out. */ ++ syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname); ++ close(in_fd); ++ return 0; ++ } else if (errno == EACCES) { ++ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname); ++ close(in_fd); ++ return 0; ++ } else { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname); ++ close(in_fd); ++ return 0; ++ } ++ } ++ ++ while((r = read(in_fd, buf, sizeof(buf))) > 0) { ++ if((k = write(out_fd,buf,r)) < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); ++ close(out_fd); ++ close(in_fd); ++ unlink(sieve_tmpname); ++ return 0; ++ } ++ } ++ ++ if(r == 0 ) { /*EOF */ ++ close(out_fd); ++ close(in_fd); ++ } else if (r < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); ++ close(out_fd); ++ close(in_fd); ++ unlink(sieve_tmpname); ++ return 0; ++ } ++ ++ /* Rename the temporary created sieve script to its final name. */ ++ if(rename(sieve_tmpname, compiled_source_script)) { ++ if(errno != EEXIST) { ++ unlink(sieve_tmpname); ++ unlink(compiled_source_script); ++ } ++ return 0; ++ } ++ ++ syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script); ++ } ++ ++ return 0; ++} ++ ++/*static void fatal(const char *s, int code) ++{ ++ printf("Fatal error: %s (%d)\r\n", s, code); ++ exit(1); ++}*/ ++ ++/* to make larry's stupid functions happy :) */ ++static void foo(void) ++{ ++ fatal("stub function called", 0); ++} ++ ++static int sieve_notify(void *ac __attribute__((unused)), ++ void *interp_context __attribute__((unused)), ++ void *script_context __attribute__((unused)), ++ void *message_context __attribute__((unused)), ++ const char **errmsg __attribute__((unused))) ++{ ++ fatal("stub function called", 0); ++ return SIEVE_FAIL; ++} ++ ++static int mysieve_error(int lineno, const char *msg, ++ void *i __attribute__((unused)), void *s) ++{ ++ char buf[1024]; ++ char **errstr = (char **) s; ++ ++ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); ++ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); ++ syslog(LOG_DEBUG, "%s", buf); ++ strcat(*errstr, buf); ++ ++ return SIEVE_OK; ++} ++ ++/* end the boilerplate */ ++ ++/* returns TRUE or FALSE */ ++int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) ++{ ++ sieve_interp_t *i; ++ sieve_script_t *s; ++ int res; ++ ++ res = sieve_interp_alloc(&i, NULL); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_redirect(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_discard(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_reject(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_fileinto(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_keep(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_imapflags(i, NULL); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_size(i, (sieve_get_size *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_header(i, (sieve_get_header *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_vacation(i, &vacation2); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_notify(i, &sieve_notify); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_parse_error(i, &mysieve_error); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ rewind(stream); ++ ++ *errstr = (char *) xmalloc(20 * sizeof(char)); ++ strcpy(*errstr, "script errors:\r\n"); ++ ++ res = sieve_script_parse(i, stream, errstr, &s); ++ ++ if (res == SIEVE_OK) { ++ if(ret) { ++ *ret = s; ++ } else { ++ sieve_script_free(&s); ++ } ++ free(*errstr); ++ *errstr = NULL; ++ } ++ ++ /* free interpreter */ ++ sieve_interp_free(&i); ++ ++ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; ++} ++ ++/* ++ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of ++ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present ++ */ ++ +diff -Naur cyrus-imapd-2.3.15.orig/imap/compile_sieve.c cyrus-imapd-2.3.15/imap/compile_sieve.c +--- cyrus-imapd-2.3.15.orig/imap/compile_sieve.c 1970-01-01 01:00:00.000000000 +0100 ++++ cyrus-imapd-2.3.15/imap/compile_sieve.c 2009-09-09 16:13:03.000000000 +0200 +@@ -0,0 +1,365 @@ ++/* This tool compiles the sieve script from a command ++line so that it can be used wby the autoadd patch */ ++#include ++#include ++ ++#include ++#include ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "global.h" ++ ++#include "util.h" ++#include "xmalloc.h" ++#include "xstrlcpy.h" ++#include "xstrlcat.h" ++#include "mailbox.h" ++#include "imap_err.h" ++#include "sieve_interface.h" ++#include "script.h" ++ ++#include ++ ++#define TIMSIEVE_FAIL -1 ++#define TIMSIEVE_OK 0 ++#define MAX_FILENAME_SIZE 100 ++ ++/* Needed by libconfig */ ++const int config_need_data = 0; ++ ++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); ++ ++/*static void fatal(const char *s, int code) ++{ ++ printf("Fatal error: %s (%d)\r\n", s, code); ++ ++ exit(1); ++}*/ ++ ++void usage(void) ++{ ++ fprintf(stderr, ++ "Usage:\n\tcompile_sieve [-C ] [-i -o ]\n"); ++ exit(-1); ++} ++ ++ ++int main (int argc, char **argv) ++{ ++ ++ sieve_script_t *s = NULL; ++ bytecode_info_t *bc = NULL; ++ char *err = NULL; ++ FILE *in_stream; ++ int out_fd, opt; ++ char *source_script = NULL; ++ char *compiled_source_script = NULL; ++ char *alt_config = NULL; ++ extern char *optarg; ++ char sieve_tmpname[MAX_MAILBOX_NAME+1]; ++ ++ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); ++ ++ while((opt = getopt(argc, argv, "C:i:o:")) != EOF) { ++ switch (opt) { ++ case 'C': /* alt config file */ ++ alt_config = optarg; ++ break; ++ case 'i': /* input script file */ ++ source_script = optarg; ++ break; ++ case 'o': /* output script file */ ++ compiled_source_script = optarg; ++ break; ++ default: ++ usage(); ++ break; ++ } ++ } ++ ++ if(source_script && !compiled_source_script) { ++ fprintf(stderr, "No output file was defined\n"); ++ usage(); ++ } else if (!source_script && compiled_source_script) { ++ fprintf(stderr, "No input file was defined\n"); ++ usage(); ++ } ++ ++ /* ++ * If no has been defined, then read them from ++ * the configuration file. ++ */ ++ if (!source_script && !compiled_source_script) { ++ cyrus_init(alt_config, "compile_sieve", 0); ++ ++ /* Initially check if we want to have the sieve script created */ ++ if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) { ++ fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n"); ++ return 1; ++ } ++ ++ /* Check if we have an already compiled sieve script*/ ++ if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { ++ fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n"); ++ return 1; ++ } ++ ++ if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) { ++ /* ++ * At this point the only think that is inconsistent is the directory ++ * that was created. But if the user will have any sieve scripts then ++ * they will eventually go there, so no big deal ++ */ ++ fprintf(stderr, ++ "In imapd.conf the full path of the filenames must be defined\n"); ++ return 1; ++ } ++ } ++ ++ printf("input file : %s, output file : %s\n", source_script, compiled_source_script); ++ ++ ++ if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) { ++ fprintf(stderr, "Filename %s is too big\n", compiled_source_script); ++ return 1; ++ } ++ ++ snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script); ++ ++ in_stream = fopen(source_script,"r"); ++ ++ if(!in_stream) { ++ fprintf(stderr,"Unable to open %s source sieve script\n",source_script); ++ return 1; ++ } ++ ++ /* ++ * We open the file that will be used as the bc file. If this file exists, overwrite it ++ * since something bad has happened. We open the file here so that this error checking is ++ * done before we try to open the rest of the files to start copying etc. ++ */ ++ out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ++ if(out_fd < 0) { ++ if(errno == EEXIST) { ++ fprintf(stderr, "File %s already exists\n", sieve_tmpname); ++ } else if (errno == EACCES) { ++ fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n", ++ sieve_tmpname); ++ } else { ++ fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n", ++ sieve_tmpname); ++ } ++ ++ fclose(in_stream); ++ return 1; ++ } ++ ++ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { ++ if(err && *err) { ++ fprintf(stderr, "Error while parsing script %s\n",err); ++ free(err); ++ } ++ else ++ fprintf(stderr,"Error while parsing script\n"); ++ unlink(sieve_tmpname); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ ++ /* generate the bytecode */ ++ if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) { ++ fprintf(stderr,"Error occured while compiling sieve script\n"); ++ /* removing the copied script and cleaning up memory */ ++ unlink(sieve_tmpname); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) { ++ fprintf(stderr, "Error occured while emitting sieve script\n"); ++ unlink(sieve_tmpname); ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ /* clean up the memory */ ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ ++ close(out_fd); ++ ++ if(rename(sieve_tmpname, compiled_source_script)) { ++ if(errno != EEXIST) { ++ unlink(sieve_tmpname); ++ unlink(compiled_source_script); ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++ ++/* to make larry's stupid functions happy :) */ ++static void foo(void) ++{ ++ fatal("stub function called", 0); ++} ++ ++extern sieve_vacation_t vacation2;/* = { ++ 0, / min response / ++ 0, / max response / ++ (sieve_callback *) &foo, / autorespond() / ++ (sieve_callback *) &foo / send_response() / ++}; */ ++ ++static int sieve_notify(void *ac __attribute__((unused)), ++ void *interp_context __attribute__((unused)), ++ void *script_context __attribute__((unused)), ++ void *message_context __attribute__((unused)), ++ const char **errmsg __attribute__((unused))) ++{ ++ fatal("stub function called", 0); ++ return SIEVE_FAIL; ++} ++ ++static int mysieve_error(int lineno, const char *msg, ++ void *i __attribute__((unused)), void *s) ++{ ++ char buf[1024]; ++ char **errstr = (char **) s; ++ ++ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); ++ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); ++ fprintf(stderr, "%s\n", buf); ++ strcat(*errstr, buf); ++ ++ return SIEVE_OK; ++} ++ ++/* end the boilerplate */ ++ ++/* returns TRUE or FALSE */ ++int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) ++{ ++ sieve_interp_t *i; ++ sieve_script_t *s; ++ int res; ++ ++ res = sieve_interp_alloc(&i, NULL); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_interp_alloc() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_redirect(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_redirect() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_discard(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_discard() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_reject(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_reject() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_fileinto(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_fileinto() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_keep(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_keep() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_imapflags(i, NULL); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_imapflags() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_size(i, (sieve_get_size *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_size() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_header(i, (sieve_get_header *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_header() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_envelope() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_vacation(i, &vacation2); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_vacation() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_notify(i, &sieve_notify); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_notify() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_parse_error(i, &mysieve_error); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_parse_error() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ rewind(stream); ++ ++ *errstr = (char *) xmalloc(20 * sizeof(char)); ++ strcpy(*errstr, "script errors:\r\n"); ++ ++ res = sieve_script_parse(i, stream, errstr, &s); ++ ++ if (res == SIEVE_OK) { ++ if(ret) { ++ *ret = s; ++ } else { ++ sieve_script_free(&s); ++ } ++ free(*errstr); ++ *errstr = NULL; ++ } ++ ++ /* free interpreter */ ++ sieve_interp_free(&i); ++ ++ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; ++} ++ ++ ++ ++ ++ ++ +diff -Naur cyrus-imapd-2.3.15.orig/imap/imapd.c cyrus-imapd-2.3.15/imap/imapd.c +--- cyrus-imapd-2.3.15.orig/imap/imapd.c 2009-07-29 17:51:21.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/imapd.c 2009-09-09 16:13:03.000000000 +0200 +@@ -211,6 +211,7 @@ + void motd_file(int fd); + void shut_down(int code); + void fatal(const char *s, int code); ++void autocreate_inbox(void); + + void cmdloop(void); + void cmd_login(char *tag, char *user); +@@ -2003,6 +2004,43 @@ + } + + /* ++ * Autocreate Inbox and subfolders upon login ++ */ ++void autocreate_inbox() ++{ ++ char inboxname[MAX_MAILBOX_NAME+1]; ++ int autocreatequota; ++ int r; ++ ++ /* ++ * Exlude admin's accounts ++ */ ++ if (imapd_userisadmin || imapd_userisproxyadmin) ++ return; ++ ++ /* ++ * Exclude anonymous ++ */ ++ if (!strcmp(imapd_userid, "anonymous")) ++ return; ++ ++ if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) { ++ /* This is actyally not required ++ as long as the lenght of userid is ok */ ++ r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace, ++ "INBOX", imapd_userid, inboxname); ++ if (!r) ++ r = mboxlist_lookup(inboxname, NULL, NULL); ++ ++ if (r == IMAP_MAILBOX_NONEXISTENT) { ++ mboxlist_autocreateinbox(&imapd_namespace, imapd_userid, ++ imapd_authstate, inboxname, autocreatequota); ++ } ++ } ++} ++ ++ ++/* + * Perform a LOGIN command + */ + void cmd_login(char *tag, char *user) +@@ -2179,6 +2217,9 @@ + strcspn(imapd_userid, "@") : 0); + + freebuf(&passwdbuf); ++ ++ autocreate_inbox(); ++ + return; + } + +@@ -2336,6 +2377,8 @@ + config_virtdomains ? + strcspn(imapd_userid, "@") : 0); + ++ autocreate_inbox(); ++ + return; + } + +diff -Naur cyrus-imapd-2.3.15.orig/imap/lmtpd.c cyrus-imapd-2.3.15/imap/lmtpd.c +--- cyrus-imapd-2.3.15.orig/imap/lmtpd.c 2009-04-23 19:10:06.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/lmtpd.c 2009-09-09 16:13:03.000000000 +0200 +@@ -117,6 +117,8 @@ + static FILE *spoolfile(message_data_t *msgdata); + static void removespool(message_data_t *msgdata); + ++static int autocreate_inbox(const char *user, const char *domain); ++ + /* current namespace */ + static struct namespace lmtpd_namespace; + +@@ -977,6 +979,86 @@ + exit(code); + } + ++ ++/* ++ * Autocreate Inbox and subfolders upon login ++ */ ++int autocreate_inbox(const char *user, const char *domain) ++{ ++ struct auth_state *auth_state; ++ char inboxname[MAX_MAILBOX_NAME+1]; ++ char *rcpt_userid = NULL; ++ int autocreatequota; ++ int r = 0; ++ ++ if (user == NULL) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ if (domain != NULL) { ++ int k; ++ ++ rcpt_userid = (char *) xmalloc((strlen(user) + strlen(domain) + 2) * sizeof(char)); ++ k = strlcpy(rcpt_userid, user, strlen(user) + 1); ++ *(rcpt_userid + k) = '@'; ++ strlcpy(rcpt_userid + k + 1, domain, strlen(domain) + 1); ++ } else { ++ rcpt_userid = (char *) user; ++ } ++ ++ ++ /* ++ * Exclude anonymous ++ */ ++ if (!strcmp(rcpt_userid, "anonymous")) { ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++ /* ++ * Check for autocreatequota and createonpost ++ */ ++ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) || ++ !(config_getswitch(IMAPOPT_CREATEONPOST))) { ++ ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++ ++ /* ++ * Exclude admin's accounts ++ */ ++ auth_state = auth_newstate(rcpt_userid); ++ ++ if (global_authisa(auth_state, IMAPOPT_ADMINS)) { ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++ r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace, ++ "INBOX", rcpt_userid, inboxname); ++ ++ if (!r) ++ r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid, ++ auth_state, inboxname, autocreatequota); ++ ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return r; ++} ++ ++ + static int verify_user(const char *user, const char *domain, char *mailbox, + quota_t quotacheck, struct auth_state *authstate) + { +@@ -1020,6 +1102,15 @@ + */ + r = mlookup(namebuf, &server, &acl, NULL); + ++ /* If user mailbox does not exist, then invoke autocreate inbox function */ ++ if (r == IMAP_MAILBOX_NONEXISTENT) { ++ r = autocreate_inbox(user, domain); ++ ++ /* Try to locate the mailbox again */ ++ if (!r) ++ r = mlookup(namebuf, &server, &acl, NULL); ++ } ++ + if (r == IMAP_MAILBOX_NONEXISTENT && !user && + config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && + /* see if we have a mailbox whose name is close */ +@@ -1046,6 +1137,7 @@ + aclcheck, (quotacheck < 0) + || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? + quotacheck : 0); ++ + } + } + +diff -Naur cyrus-imapd-2.3.15.orig/imap/Makefile.in cyrus-imapd-2.3.15/imap/Makefile.in +--- cyrus-imapd-2.3.15.orig/imap/Makefile.in 2009-03-30 18:04:56.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/Makefile.in 2009-09-09 16:28:02.000000000 +0200 +@@ -101,7 +101,7 @@ + convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ + annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ + imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ +- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ ++ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ + statuscache_db.o + + IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o +@@ -118,7 +118,7 @@ + fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ + cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ + ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ +- unexpunge cyr_df @IMAP_PROGS@ ++ unexpunge cyr_df compile_sieve @IMAP_PROGS@ + + BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ + lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ +@@ -183,9 +183,9 @@ + mupdate_err.h: mupdate_err.c + + ### Services +-idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) ++idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o idled \ +- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) ++ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ + libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) +@@ -199,166 +199,170 @@ + $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ + mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o imapd \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ +- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ +- libimap.a $(DEPLIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o mupdate \ + $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ + mutex_pthread.o tls.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread + + mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ +- libimap.a $(DEPLIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ + $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ +- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread ++ mutex_pthread.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread + + pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(SERVICE) ++ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ +- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ +- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) ++ mutex_fake.o nntp_err.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ + smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ +- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) ++fud: fud.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) ++smmapd: smmapd.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + sync_server: sync_server.o sync_support.o sync_commit.o \ +- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) ++ imapparse.o tls.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o \ + sync_server sync_server.o sync_support.o sync_commit.o \ + imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + ### Command Line Utilities +-arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) ++arbitron: arbitron.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) ++cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) ++cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) ++cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) ++chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) ++deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ +- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) ++ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) ++fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) ++squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ +- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) ++mbpath: mbpath.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ +- $(DEPLIBS) $(LIBS) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ipurge: ipurge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) -lclamav ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -lclamav + +-cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ cyr_df cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) ++mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) ++reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) ++quota: quota.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) ++tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) ++unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) +- $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++make_md5: make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) ++ $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) +- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++make_sha1: make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) ++ $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + sync_client: sync_client.o sync_support.o \ +- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) ++ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ + sync_client sync_client.o sync_support.o \ +- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + sync_reset: sync_reset.o sync_support.o sync_commit.o \ +- libimap.a mutex_fake.o $(DEPLIBS) ++ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ + sync_reset sync_reset.o sync_support.o sync_commit.o \ +- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) ++ ++compile_sieve: compile_sieve.o libimap.a $(DEPLIBS) $(SIEVE_LIBS) ++ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \ ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + ### Other Misc Targets + +diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.c cyrus-imapd-2.3.15/imap/mboxlist.c +--- cyrus-imapd-2.3.15.orig/imap/mboxlist.c 2009-07-28 04:46:23.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/mboxlist.c 2009-09-09 16:13:03.000000000 +0200 +@@ -83,6 +83,12 @@ + #include "quota.h" + #include "sync_log.h" + ++#ifdef USE_SIEVE ++extern int autoadd_sieve(char *userid, ++ const char *source_script); ++#endif ++ ++ + #define DB config_mboxlist_db + #define SUBDB config_subscription_db + +@@ -100,11 +106,29 @@ + static int mboxlist_changequota(const char *name, int matchlen, int maycreate, + void *rock); + ++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, ++ void *rock); ++ ++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, ++ char *userid, char *auth_userid, ++ struct auth_state *auth_state); ++ + struct change_rock { + struct quota *quota; + struct txn **tid; + }; + ++/* ++ * Struct needed to be passed as void *rock to ++ * mboxlist_autochangesub(); ++ */ ++struct changesub_rock_st { ++ char *userid; ++ char *auth_userid; ++ struct auth_state *auth_state; ++}; ++ ++ + #define FNAME_SUBSSUFFIX ".sub" + + /* +@@ -3413,3 +3437,349 @@ + + return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED); + } ++ ++/* ++ * Automatically subscribe user to *ALL* shared folders, ++ * one has permissions to be subscribed to. ++ * INBOX subfolders are excluded. ++ */ ++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, ++ void *rock) { ++ ++ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock; ++ char *userid = changesub_rock->userid; ++ char *auth_userid = changesub_rock->auth_userid; ++ struct auth_state *auth_state = changesub_rock->auth_state; ++ int r; ++ ++ ++ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */ ++ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */ ++ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */ ++ return 0; ++ ++ ++ r = mboxlist_changesub(name, userid, auth_state, 1, 0); ++ ++ if (r) { ++ syslog(LOG_WARNING, ++ "autosubscribe: User %s to folder %s, subscription failed: %s", ++ auth_userid, name, error_message(r)); ++ } else { ++ syslog(LOG_NOTICE, ++ "autosubscribe: User %s to folder %s, subscription succeeded", ++ auth_userid, name); ++ } ++ ++ return 0; ++} ++ ++#define SEP '|' ++ ++/* ++ * Automatically subscribe user to a shared folder. ++ * Subscription is done successfully, if the shared ++ * folder exists and the user has the necessary ++ * permissions. ++ */ ++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, ++ char *userid, char *auth_userid, ++ struct auth_state *auth_state) { ++ ++ const char *sub ; ++ char *p, *q, *next_sub; ++ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1]; ++ int len; ++ int r = 0; ++ int subscribe_all_sharedfolders = 0; ++ ++ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS); ++ ++ /* ++ * If subscribeallsharedfolders is set to yes in imapd.conf, then ++ * subscribe user to every shared folder one has the apropriate ++ * permissions. ++ */ ++ if(subscribe_all_sharedfolders) { ++ char pattern[MAX_MAILBOX_PATH+1]; ++ struct changesub_rock_st changesub_rock; ++ ++ strcpy(pattern, "*"); ++ changesub_rock.userid = userid; ++ changesub_rock.auth_userid = auth_userid; ++ changesub_rock.auth_state = auth_state; ++ ++ r = mboxlist_findall(namespace, pattern, 0, userid, ++ auth_state, mboxlist_autochangesub, &changesub_rock); ++ ++ return r; ++ } ++ ++ if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL) ++ return r; ++ ++ next_sub = (char *) sub; ++ while (*next_sub) { ++ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); ++ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); ++ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); ++ if (!*p ) continue; ++ ++ len = q - p + 1; ++ /* Check for folder length */ ++ if (len > sizeof(folder)-1) ++ continue; ++ ++ if (!r) { ++ strncpy(folder, p, len); ++ folder[len] = '\0'; ++ ++ strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name)); ++ len = strlcat(name, folder, sizeof(name)); ++ ++ r = (namespace->mboxname_tointernal) (namespace, name, userid, ++ mailboxname); ++ } ++ ++ if (!r) ++ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0); ++ ++ if (!r) { ++ syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded", ++ userid, folder); ++ } else { ++ syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s", ++ userid, folder, error_message(r)); ++ r = 0; ++ } ++ } ++ ++ return r; ++} ++ ++ ++ ++int mboxlist_autocreateinbox(struct namespace *namespace, ++ char *userid, ++ struct auth_state *auth_state, ++ char *mailboxname, int autocreatequota) { ++ char name [MAX_MAILBOX_NAME+1]; ++ char folder [MAX_MAILBOX_NAME+1]; ++ char *auth_userid = NULL; ++ char *partition = NULL; ++ const char *crt; ++ const char *sub; ++ char *p, *q, *next_crt, *next_sub; ++ int len; ++ int r = 0; ++ int numcrt = 0; ++ int numsub = 0; ++#ifdef USE_SIEVE ++ const char *source_script; ++#endif ++ ++ ++ ++ auth_userid = auth_canonuser(auth_state); ++ if (auth_userid == NULL) { ++ /* ++ * Couldn't get cannon userid ++ */ ++ syslog(LOG_ERR, ++ "autocreateinbox: Could not get canonified userid for user %s", userid); ++ return IMAP_PARTITION_UNKNOWN; ++ } ++ ++ /* Added this for debug information. */ ++ syslog(LOG_DEBUG, "autocreateinbox: autocreate inbox for user %s was called", auth_userid); ++ ++ /* ++ * While this is not needed for admins ++ * and imap_admins accounts, it would be ++ * better to separate *all* admins and ++ * proxyservers from normal accounts ++ * (accounts that have mailboxes). ++ * UOA Specific note(1): Even if we do not ++ * exclude these servers-classes here, ++ * UOA specific code, will neither return ++ * role, nor create INBOX, because none of these ++ * administrative accounts belong to the ++ * mailRecipient objectclass, or have imapPartition. ++ * UOA Specific note(2): Another good reason for doing ++ * this, is to prevent the code, from getting into ++ * cyrus_ldap.c because of the continues MSA logins to LMTPd. ++ */ ++ ++ /* ++ * admins and the coresponding imap ++ * service, had already been excluded. ++ */ ++ ++ /* ++ * Do we really need group membership ++ * for admins or service_admins? ++ */ ++ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0; ++ ++ /* ++ * Do we really need group membership ++ * for proxyservers? ++ */ ++ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0; ++ ++ /* ++ * Check if user belongs to the autocreate_users group. This option ++ * controls for whom the mailbox may be automatically created. Default ++ * value for this option is 'anyone'. So, if not declared, all mailboxes ++ * will be created. ++ */ ++ if (!global_authisa(auth_state, IMAPOPT_AUTOCREATE_USERS)) { ++ syslog(LOG_DEBUG, "autocreateinbox: User %s does not belong to the autocreate_users. No mailbox is created", ++ auth_userid); ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++#if 0 ++ /* ++ * Get Partition info or return. ++ * (Here you should propably use ++ * you own "get_partition(char *userid)" ++ * function. Otherwise all new INBOXes will be ++ * created into whatever partition has been declared ++ * as default in your imapd.conf) ++ */ ++ ++ partition = get_partition(userid); ++ if (partition == NULL) { ++ /* ++ * Couldn't get partition info ++ */ ++ syslog(LOG_ERR, ++ "Could not get imapPartition info for user %s", userid); ++ return IMAP_PARTITION_UNKNOWN; ++ } ++#endif ++ ++ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, ++ 1, userid, auth_state, 0, 0, 0); ++ ++ if (!r && autocreatequota > 0) ++ r = mboxlist_setquota(mailboxname, autocreatequota, 0); ++ ++ if (!r) ++ r = mboxlist_changesub(mailboxname, userid, ++ auth_state, 1, 1); ++ ++ if (!r) { ++ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s", ++ auth_userid, partition == NULL ? "default" : partition); ++ } else { ++ syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s", ++ auth_userid, error_message(r)); ++ } ++ ++#if 0 ++ /* Allocated from get_partition, and not needed any more */ ++ free_partition(partition); ++#endif ++ ++ if (r) return r; ++ ++ /* INBOX's subfolders */ ++ if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS))) ++ sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS); ++ ++ /* Roll through crt */ ++ next_crt = (char *) crt; ++ while (next_crt!=NULL && *next_crt) { ++ for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++); ++ for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++); ++ for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--); ++ ++ if (!*p) continue; ++ ++ len = q - p + 1; ++ ++ /* First time we check for length */ ++ if (len > sizeof(folder) - 5) ++ r = IMAP_MAILBOX_BADNAME; ++ ++ if (!r) { ++ strncpy(folder, p, len); ++ folder[len] = '\0'; ++ ++ strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name)); ++ len = strlcat(name, folder, sizeof(name)); ++ } ++ ++ if (!r) ++ r = (namespace->mboxname_tointernal) (namespace, name, userid, ++ mailboxname); ++ if (!r) ++ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, ++ 1, userid, auth_state, 0, 0, 0); ++ ++ if (!r) { ++ numcrt++; ++ syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", ++ auth_userid, name); ++ } else { ++ syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", ++ auth_userid, name, error_message(r)); ++ r=0; ++ continue; ++ } ++ ++ /* Roll through sub */ ++ next_sub = (char *) sub; ++ while (next_sub!=NULL && *next_sub) { ++ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); ++ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); ++ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); ++ if (!*p ) continue; ++ ++ len = q - p + 1; ++ ++ if (len != strlen(folder) || strncmp(folder, p, len)) ++ continue; ++ ++ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1); ++ ++ if (!r) { ++ numsub++; ++ syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded", ++ auth_userid, name); ++ } else ++ syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s", ++ auth_userid, name, error_message(r)); ++ ++ break; ++ } ++ } ++ ++ if (crt!=NULL && *crt) ++ syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", ++ auth_userid, numcrt, numsub); ++ ++ /* ++ * Check if shared folders are available for subscription. ++ */ ++ mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state); ++ ++#ifdef USE_SIEVE ++ /* ++ * Here the autocreate sieve script feature is iniated from. ++ */ ++ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT); ++ ++ if (source_script) { ++ if (!autoadd_sieve(userid, source_script)) ++ syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid); ++ else ++ syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid); ++ } ++#endif ++ ++ return r; ++} ++ +diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.h cyrus-imapd-2.3.15/imap/mboxlist.h +--- cyrus-imapd-2.3.15.orig/imap/mboxlist.h 2009-05-05 03:20:03.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/mboxlist.h 2009-09-09 16:13:03.000000000 +0200 +@@ -216,4 +216,8 @@ + int mboxlist_abort(struct txn *tid); + + int mboxlist_delayed_delete_isenabled(void); ++int mboxlist_autocreateinbox(struct namespace *namespace,char *userid, ++ struct auth_state *auth_state, char *mailboxname, ++ int autocreatequota); ++ + #endif +diff -Naur cyrus-imapd-2.3.15.orig/imap/pop3d.c cyrus-imapd-2.3.15/imap/pop3d.c +--- cyrus-imapd-2.3.15.orig/imap/pop3d.c 2009-04-23 19:10:07.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/pop3d.c 2009-09-09 16:13:03.000000000 +0200 +@@ -173,6 +173,8 @@ + static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* */ + static void cmd_apop(char *response); + ++static int autocreate_inbox(char *inboxname, char *userid); ++ + static void cmd_auth(char *arg); + static void cmd_capa(void); + static void cmd_pass(char *pass); +@@ -1246,6 +1248,7 @@ + popd_userid = xstrdup(userbuf); + prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); + } ++ + } + + void cmd_pass(char *pass) +@@ -1549,6 +1552,43 @@ + } + + /* ++ * Autocreate Inbox and subfolders upon login ++ */ ++int autocreate_inbox(char *inboxname, char *auth_userid) ++{ ++ struct auth_state *auth_state; ++ int autocreatequota; ++ int r; ++ ++ if (inboxname == NULL || auth_userid == NULL) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ /* ++ * Exclude anonymous ++ */ ++ if (!strcmp(popd_userid, "anonymous")) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ /* ++ * Check for autocreatequota ++ */ ++ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ /* ++ * Exclude admin's accounts ++ */ ++ auth_state = auth_newstate(popd_userid); ++ if (global_authisa(auth_state, IMAPOPT_ADMINS)) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ r = mboxlist_autocreateinbox(&popd_namespace, auth_userid, ++ auth_state, inboxname, autocreatequota); ++ return r; ++} ++ ++ ++/* + * Complete the login process by opening and locking the user's inbox + */ + int openinbox(void) +@@ -1577,6 +1617,12 @@ + + if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL, + &server, &acl, NULL); ++ ++ /* Try once again after autocreate_inbox */ ++ if (r == IMAP_MAILBOX_NONEXISTENT && !(r = autocreate_inbox(inboxname, userid))) ++ r = mboxlist_detail(inboxname, &type, NULL, NULL, ++ &server, &acl, NULL); ++ + if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && + (!acl || + !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.c cyrus-imapd-2.3.15/lib/auth.c +--- cyrus-imapd-2.3.15.orig/lib/auth.c 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth.c 2009-09-09 16:13:03.000000000 +0200 +@@ -118,3 +118,11 @@ + + auth->freestate(auth_state); + } ++ ++char *auth_canonuser(struct auth_state *auth_state) ++{ ++ struct auth_mech *auth = auth_fromname(); ++ ++ return auth->auth_canonuser(auth_state); ++} ++ +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.h cyrus-imapd-2.3.15/lib/auth.h +--- cyrus-imapd-2.3.15.orig/lib/auth.h 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth.h 2009-09-09 16:13:03.000000000 +0200 +@@ -55,6 +55,7 @@ + const char *identifier); + struct auth_state *(*newstate)(const char *identifier); + void (*freestate)(struct auth_state *auth_state); ++ char *(*auth_canonuser)(struct auth_state *auth_state); + }; + + extern struct auth_mech *auth_mechs[]; +@@ -77,5 +78,6 @@ + const char *identifier); + struct auth_state *auth_newstate(const char *identifier); + void auth_freestate(struct auth_state *auth_state); ++char *auth_canonuser(struct auth_state *auth_state); + + #endif /* INCLUDED_AUTH_H */ +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb5.c cyrus-imapd-2.3.15/lib/auth_krb5.c +--- cyrus-imapd-2.3.15.orig/lib/auth_krb5.c 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth_krb5.c 2009-09-09 16:13:03.000000000 +0200 +@@ -199,6 +199,14 @@ + free(auth_state); + } + ++static char *mycanonuser(struct auth_state *auth_state) ++{ ++ if (auth_state) ++ return auth_state->userid; ++ ++ return NULL; ++} ++ + #else /* HAVE_GSSAPI_H */ + + static int mymemberof( +@@ -230,6 +238,13 @@ + fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); + } + ++static char *mycanonuser( ++ struct auth_state *auth_state __attribute__((unused))) ++{ ++ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); ++ return NULL; ++} ++ + #endif + + struct auth_mech auth_krb5 = +@@ -240,4 +255,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb.c cyrus-imapd-2.3.15/lib/auth_krb.c +--- cyrus-imapd-2.3.15.orig/lib/auth_krb.c 2009-03-31 06:11:21.000000000 +0200 ++++ cyrus-imapd-2.3.15/lib/auth_krb.c 2009-09-09 16:13:03.000000000 +0200 +@@ -341,6 +341,15 @@ + free((char *)auth_state); + } + ++static char *mycanonuser(struct auth_state *auth_state) ++{ ++ if (auth_state) ++ return auth_state->userid; ++ ++ return NULL; ++} ++ ++ + #else /* HAVE_KRB */ + + static int mymemberof( +@@ -372,6 +381,13 @@ + fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); + } + ++static char *mycanonuser( ++ struct auth_state *auth_state __attribute__((unused))) ++{ ++ fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); ++} ++ ++ + #endif + + struct auth_mech auth_krb = +@@ -382,4 +398,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_pts.c cyrus-imapd-2.3.15/lib/auth_pts.c +--- cyrus-imapd-2.3.15.orig/lib/auth_pts.c 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth_pts.c 2009-09-09 16:13:03.000000000 +0200 +@@ -512,6 +512,14 @@ + free(auth_state); + } + ++static char *mycanonuser(struct auth_state *auth_state) ++{ ++ if (auth_state) ++ return auth_state->userid.id; ++ ++ return NULL; ++} ++ + struct auth_mech auth_pts = + { + "pts", /* name */ +@@ -520,4 +528,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_unix.c cyrus-imapd-2.3.15/lib/auth_unix.c +--- cyrus-imapd-2.3.15.orig/lib/auth_unix.c 2009-03-31 06:11:22.000000000 +0200 ++++ cyrus-imapd-2.3.15/lib/auth_unix.c 2009-09-09 16:13:03.000000000 +0200 +@@ -315,6 +315,16 @@ + free((char *)auth_state); + } + ++static char *mycanonuser(auth_state) ++ struct auth_state *auth_state; ++{ ++ if (auth_state) ++ return auth_state->userid; ++ ++ return NULL; ++} ++ ++ + + struct auth_mech auth_unix = + { +@@ -324,4 +334,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/imapoptions cyrus-imapd-2.3.15/lib/imapoptions +--- cyrus-imapd-2.3.15.orig/lib/imapoptions 2009-06-29 19:21:06.000000000 +0200 ++++ cyrus-imapd-2.3.15/lib/imapoptions 2009-09-09 16:13:03.000000000 +0200 +@@ -198,6 +198,55 @@ + /* Number of seconds to wait before returning a timeout failure when + performing a client connection (e.g., in a murder environment) */ + ++{ "createonpost", 0, SWITCH } ++/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist, ++ then the INBOX is automatically created by lmtpd. */ ++ ++{ "autocreateinboxfolders", NULL, STRING } ++/* If a user does not have an INBOX created then the INBOX as well as some INBOX ++ subfolders are created under two conditions. ++ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value) ++ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes) ++ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that ++ are automatically created by the server under the previous two situations. */ ++ ++{ "autosubscribeinboxfolders", NULL, STRING } ++/* A list of folder names, separated by "|", that the users get automatically subscribed to, ++ when their INBOX is created. These folder names must have been included in the ++ autocreateinboxfolders option of the imapd.conf. */ ++ ++{ "autosubscribesharedfolders", NULL, STRING } ++/* A list of shared folders (bulletin boards), separated by "|", that the users get ++ automatically subscribed to, after their INBOX is created. The shared folder must ++ have been created and the user must have the required permissions to get subscribed ++ to it. Otherwise, subscribing to the shared folder fails. */ ++ ++{ "autosubscribe_all_sharedfolders", 0, SWITCH } ++/* If set to yes, the user is automatically subscribed to all shared folders, one has permission ++ to subscribe to. */ ++ ++{ "autocreate_sieve_script", NULL, STRING } ++/* The full path of a file that contains a sieve script. This script automatically becomes a ++ user's initial default sieve filter script. When this option is not defined, no default ++ sieve filter is created. The file must be readable by the cyrus daemon. */ ++ ++{ "autocreate_sieve_compiledscript", NULL, STRING } ++/* The full path of a file that contains a compiled in bytecode sieve script. This script ++ automatically becomes a user's initial default sieve filter script. If this option is ++ not specified, or the filename doesn't exist then the script defined by ++ autocreate_sieve_script is compiled on the fly and installed as the user's default ++ sieve script */ ++ ++{ "generate_compiled_sieve_script", 0, SWITCH } ++/* If set to yes and no compiled sieve script file exists, the sieve script which is ++ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript ++ option points to. In order a compiled script to be generated, autocreate_sieve_script and ++ autocreate_sieve_compiledscript must have valid values */ ++ ++{ "autocreate_users", "anyone", STRING } ++/* A space separated list of users and/or groups that are allowed their INBOX to be ++ automatically created. */ ++ + { "configdirectory", NULL, STRING } + /* The pathname of the IMAP configuration directory. This field is + required. */ +diff -Naur cyrus-imapd-2.3.15.orig/notifyd/Makefile.in cyrus-imapd-2.3.15/notifyd/Makefile.in +--- cyrus-imapd-2.3.15.orig/notifyd/Makefile.in 2008-03-24 20:59:32.000000000 +0100 ++++ cyrus-imapd-2.3.15/notifyd/Makefile.in 2009-09-09 16:13:03.000000000 +0200 +@@ -71,10 +71,11 @@ + SERVICE=../master/service.o + + IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ ++SIEVE_LIBS = @SIEVE_LIBS@ + IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ + LIB_WRAP = @LIB_WRAP@ + LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS) +-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ ++DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + + PURIFY=/usr/local/bin/purify + PUREOPT=-best-effort +diff -Naur cyrus-imapd-2.3.15.orig/notifyd/notifyd.c cyrus-imapd-2.3.15/notifyd/notifyd.c +--- cyrus-imapd-2.3.15.orig/notifyd/notifyd.c 2008-03-24 20:59:32.000000000 +0100 ++++ cyrus-imapd-2.3.15/notifyd/notifyd.c 2009-09-09 16:13:03.000000000 +0200 +@@ -96,7 +96,7 @@ + + #define NOTIFY_MAXSIZE 8192 + +-int do_notify() ++static int do_notify() + { + struct sockaddr_un sun_data; + socklen_t sunlen = sizeof(sun_data); +diff -Naur cyrus-imapd-2.3.15.orig/ptclient/Makefile.in cyrus-imapd-2.3.15/ptclient/Makefile.in +--- cyrus-imapd-2.3.15.orig/ptclient/Makefile.in 2008-03-24 19:34:22.000000000 +0100 ++++ cyrus-imapd-2.3.15/ptclient/Makefile.in 2009-09-09 16:13:03.000000000 +0200 +@@ -57,10 +57,11 @@ + AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ + AFS_LIBS = @AFS_LIBS@ + IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ ++SIEVE_LIBS = @SIEVE_LIBS@ + LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@ + LIB_SASL = @LIB_SASL@ + LIB_WRAP = @LIB_WRAP@ +-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ ++DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o + + LDAP_LIBS=@LDAP_LIBS@ +diff -Naur cyrus-imapd-2.3.15.orig/README.autocreate cyrus-imapd-2.3.15/README.autocreate +--- cyrus-imapd-2.3.15.orig/README.autocreate 1970-01-01 01:00:00.000000000 +0100 ++++ cyrus-imapd-2.3.15/README.autocreate 2009-09-09 16:13:03.000000000 +0200 +@@ -0,0 +1,211 @@ ++Cyrus IMAP autocreate Inbox patch ++---------------------------------- ++ ++NOTE : This patch has been created at the University of Athens. For more info, as well ++as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ ++ ++The design of Cyrus IMAP server does not predict the automatic creation of users' ++INBOX folders. The creation of a user's INBOX is considered to be an external task, ++that has to be completed as part of the user email account creation procedure. ++Hence, to create a new email account the site administrator has to: ++ ++ a) Include the new account in the user database for the authentication procedure ++ (e.g. sasldb, shadow, mysql, ldap). ++ b) Create the corresponding INBOX folder. ++ ++Alternatively, the user, if succesfully authenticated, may create his own INBOX folder, ++as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf). ++Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't ++lead to the automatic INBOX folder creation by Cyrus IMAP server. ++In fact, "autocreate" means that the IMAP clients are allowed to automatically create ++the user INBOX. ++ ++This patch adds the functionality of automatic creation of the users' INBOX folders into ++the Cyrus IMAP server. It is implemented as two features, namely the "create on login" ++and "create on post". ++ ++ ++ ++Create on login ++=============== ++This feauture provides automatic creation of a user's INBOX folder when all of the ++following requirements are met: ++ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 16:09:48 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 14:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6830] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6830 http://gar.svn.sourceforge.net/gar/?rev=6830&view=rev Author: chninkel Date: 2009-10-11 14:09:48 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: added cyr_df in prototype Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 13:55:25 UTC (rev 6829) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 14:09:48 UTC (rev 6830) @@ -1,6 +1,6 @@ a55d22e88ee57fa81da2ea75c6e0e3d8 CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall -63f0e304d69648e4cbaf197a329f1537 CSWcyrusimapd.prototype +219ba1dc6ec1593132019389064eeeff CSWcyrusimapd.prototype 7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype 404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype d0b97b33e75ac75f89ee6236a2d53f05 README.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 13:55:25 UTC (rev 6829) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 14:09:48 UTC (rev 6830) @@ -59,6 +59,7 @@ s none /opt/csw/sbin/sievec=../libexec/cyrus/sievec s none /opt/csw/sbin/cyrus-master=../libexec/cyrus/cyrus-master f none /opt/csw/libexec/cyrus/cyrus-master 0755 root bin +f none /opt/csw/libexec/cyrus/cyr_df 0755 root bin f none /opt/csw/libexec/cyrus/imapd 0755 root bin f none /opt/csw/libexec/cyrus/pop3d 0755 root bin f none /opt/csw/libexec/cyrus/fud 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 16:10:58 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 14:10:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6831] csw/mgar/pkg/cyrus_imapd/trunk/Makefile Message-ID: Revision: 6831 http://gar.svn.sourceforge.net/gar/?rev=6831&view=rev Author: chninkel Date: 2009-10-11 14:10:57 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: disables temporarily package check Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 14:09:48 UTC (rev 6830) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 14:10:57 UTC (rev 6831) @@ -120,6 +120,9 @@ TEST_SCRIPTS = +# Disable package check for now as pmcyrus dependancy is not recognized +ENABLE_CHECK=0 + include gar/category.mk # compile_et is missing so we want our to be used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 19:22:50 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 17:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6832] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6832 http://gar.svn.sourceforge.net/gar/?rev=6832&view=rev Author: chninkel Date: 2009-10-11 17:22:49 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: removed unuseful checkinstall code and fixed classes list Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 14:10:57 UTC (rev 6831) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 17:22:49 UTC (rev 6832) @@ -39,12 +39,12 @@ SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWpcrert -SPKG_CLASSES_CSWcyrusimapd = none +SPKG_CLASSES_CSWcyrusimapdutils = none SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions CATALOGNAME_CSWpmcyrus = pm_cyrus REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb4 CSWosslrt CSWsasl -SPKG_CLASSES_CSWcyrusimapd = none +SPKG_CLASSES_CSWpmcyrus = none ###### Upstream and opencsw files information ####### Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 14:10:57 UTC (rev 6831) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 17:22:49 UTC (rev 6832) @@ -1,4 +1,4 @@ -a55d22e88ee57fa81da2ea75c6e0e3d8 CSWcyrusimapd.checkinstall +585646739e9403c02e868900ebed892a CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall 219ba1dc6ec1593132019389064eeeff CSWcyrusimapd.prototype 7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall 2009-10-11 14:10:57 UTC (rev 6831) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall 2009-10-11 17:22:49 UTC (rev 6832) @@ -1,27 +1,5 @@ -# begin content of csw_smf_checkinstall -# (we must manually copy the content as we use -# our own checkinstall file, is there a better way ?) - trap `exit 3` 15 -# Assign Solaris release class to install release specific files -if [ -f "$BASEDIR/usr/sbin/svccfg" -a -f "$BASEDIR/usr/sbin/svcadm" ]; then - CLASSES="$CLASSES smf" - SMF="yes" -else - CLASSES="$CLASSES init" - SMF="no" -fi - -# Make env variables available to other packaging scripts -cat >$1 < Revision: 6833 http://gar.svn.sourceforge.net/gar/?rev=6833&view=rev Author: j_arndt Date: 2009-10-11 18:06:59 +0000 (Sun, 11 Oct 2009) Log Message: ----------- nrpe: use of cswusergroup, switched to dynamic dependencies, configuration file moved to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype csw/mgar/pkg/nrpe/trunk/files/cswnrpe Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 18:06:59 UTC (rev 6833) @@ -12,20 +12,30 @@ SF_PROJ = nagios MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall preremove ) -DISTFILES += cswnrpe + +# Distfiles for CSWnrpe + +DISTFILES += CSWnrpe.preinstall CSWnrpe.prototype +DISTFILES += cswnrpe cswusergroup DISTFILES += README_8k -DISTFILES += $(call admfiles,CSWnrpeplugin, prototype ) +# Distfiles for check_nrpe + +DISTFILES += CSWnrpeplugin.prototype + PATCHFILES = patch.diff configure.diff PATCHFILES_isa-sparcv8-size-8k = common.h.diff PATCHFILES_isa-i386-size-8k = common.h.diff +PACKAGES = CSWnrpe CSWnrpeplugin +CATALOGNAME_CSWmuninmaster = nrpe +CATALOGNAME_CSWmuninnode = nrpe_plugin + REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt -SPKG_CLASSES_CSWnrpe = none cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf EXTRA_MODULATORS = SIZE MODULATIONS_SIZE = 1k 8k @@ -41,12 +51,7 @@ CONFIGURE_ARGS += --prefix=/opt/csw CONFIGURE_ARGS += --exec-prefix=/opt/csw -#PATCHFILES = patch.diff # Removal of LOG_AUTHPRIV and LOG_FTP - # Solaris doesn't have these log facilities -#PATCHFILES += configure.diff -#PATCHFILES += common.h.diff # Enable packet size of 8192 bytes - -sysconfdir = $(prefix)/etc +sysconfdir = /etc/${prefix} bindir = $(prefix)/bin libexecdir = $(prefix)/libexec/nagios-plugins datadir = $(prefix)/share @@ -71,6 +76,7 @@ ginstall -m 775 -d $(DESTDIR)$(DOCDIR) ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR) ginstall -m 755 -d $(DESTDIR)$(BINDIR) + ginstall -m 755 -d $(DESTDIR)/nagios ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR) ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR) @@ -83,6 +89,8 @@ ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg.CSW ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe + @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe/cswusergroup @$(MAKECOOKIE) merge-copy-nrpe-only: Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-10-11 18:06:59 UTC (rev 6833) @@ -1,13 +1,10 @@ -bda68135e2b65da40c3d2b68a3b8dc78 download/CSWnrpe.checkinstall -1c656040abd280f9228b42df744d93eb download/CSWnrpe.gspec -53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall -393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove -ff0be2f6b8d7fa72875d570fff53c3e6 download/CSWnrpe.prototype -2b35d5e0d57bcb3aff096040e0d06b8b download/CSWnrpeplugin.gspec +afe807962bd3d189e78a92f040b10eff download/CSWnrpe.preinstall +67dc14268283a23ac8ee9ae29614b6dc download/CSWnrpe.prototype 6eafe4b86758d91ac3fc4c0e759f25a0 download/CSWnrpeplugin.prototype 3bb2fbb228a6e2d0a99d981d82610d9a download/README_8k 36b85dd37d47a3813bfef5dee5804b61 download/common.h.diff 4b51476c782d2c5764d10f8ed530ada0 download/configure.diff -0e9afe89caf7b60817165842c6e36780 download/cswnrpe +f7b166f02aa2cefb76fc235f6edd1745 download/cswnrpe +0a98ba4dd462e50f23239433117bae5e download/cswusergroup b2d75e2962f1e3151ef58794d60c9e97 download/nrpe-2.12.tar.gz 5b02d4385daaea2a8c13903539aa6189 download/patch.diff Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2009-10-11 18:06:59 UTC (rev 6833) @@ -1,23 +1,18 @@ -# This script exists to make sure the required user -# accounts nagios and groups nagios exist. -# 2006-02-27: group nagioscm is required. -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. +cat << EOF -#If installing package on a filesystem tree not running the OS; then exit. -if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi +======================================================================= -NAGIOSHOME=/opt/csw/nagios +From package revision nrpe-2.12,REV=2009.10.11 on the configuration +file for NRPE is stored in /etc/opt/csw/. -if [ "$NEEDNAGGROUP" = 1 ] ; then - echo adding nagios group - /usr/sbin/groupadd nagios -fi +No further action is needed (to have a backup is always a good idea). -if [ "$NEEDNAGUSER" = 1 ] ; then - echo adding nagios user - /usr/sbin/useradd -g nagios nagios - /usr/sbin/usermod -s /bin/false -d $NAGIOSHOME nagios -fi + Installation will proceed in 10 seconds. + Press CTRL+C if you want to stop now. +======================================================================= +EOF + +sleep 10 + exit 0 Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove 2009-10-11 18:06:59 UTC (rev 6833) @@ -1,27 +0,0 @@ -# nrpe - preremove script -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# -# Stop nagios if it is running. - -#If removing package from a filesystem tree not running the OS; then exit. -if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi - -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - - echo "## Stopping nrpe" - if [ $smf = yes ] - then - # Disable service - /usr/sbin/svcadm disable -s svc:application/cswnrpe:default >/dev/null 2>&1 - else - /etc/init.d/cswnrpe stop >/dev/null 2>&1 - fi - -if [ $smf = yes ] ; then - # Unregister with SMF - /usr/sbin/svccfg delete svc:application/cswnrpe:default >/dev/null 2>&1 -fi - -exit 0 Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-10-11 18:06:59 UTC (rev 6833) @@ -3,7 +3,7 @@ f none /opt/csw/bin/nrpe_8k 0775 root bin s none /opt/csw/bin/nrpe=/opt/csw/bin/nrpe_1k d none /opt/csw/etc 0755 root bin -f cswpreserveconf /opt/csw/etc/nrpe.cfg.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/nrpe.cfg.CSW 0644 root bin d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin @@ -11,6 +11,9 @@ f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin f none /opt/csw/share/doc/nrpe/README.SSL 0644 root bin f none /opt/csw/share/doc/nrpe/SECURITY 0644 root bin +d none /opt/csw/nagios 755 root bin f cswinitsmf /etc/opt/csw/init.d/cswnrpe 0755 root bin +d none /opt/csw/etc/pkg/CSWnrpe 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWnrpe/cswusergroup 0644 root bin i depend=CSWnrpe.depend i pkginfo=CSWnrpe.pkginfo Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-10-11 18:06:59 UTC (rev 6833) @@ -9,7 +9,12 @@ # 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. # Modified for OpenCSW by Juergen Arndt 2009-03-14 +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink #FMRI application # FMRI path for service +#AUTOENABLE yes SMF_EXIT_ERR_CONFIG=1 Added: csw/mgar/pkg/nrpe/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/cswusergroup 2009-10-11 18:06:59 UTC (rev 6833) @@ -0,0 +1 @@ +nagios:nagios:Nagios user:/opt/csw/nagios:/bin/false:m:r This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Oct 11 20:59:46 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Oct 2009 18:59:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6834] csw/mgar/pkg/nrpe/trunk/Makefile Message-ID: Revision: 6834 http://gar.svn.sourceforge.net/gar/?rev=6834&view=rev Author: j_arndt Date: 2009-10-11 18:59:46 +0000 (Sun, 11 Oct 2009) Log Message: ----------- nrpe: fixed typo Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 18:06:59 UTC (rev 6833) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 18:59:46 UTC (rev 6834) @@ -19,7 +19,7 @@ DISTFILES += cswnrpe cswusergroup DISTFILES += README_8k -# Distfiles for check_nrpe +# Distfiles for nrpe_plugin DISTFILES += CSWnrpeplugin.prototype @@ -29,8 +29,8 @@ PATCHFILES_isa-i386-size-8k = common.h.diff PACKAGES = CSWnrpe CSWnrpeplugin -CATALOGNAME_CSWmuninmaster = nrpe -CATALOGNAME_CSWmuninnode = nrpe_plugin +CATALOGNAME_CSWnrpe = nrpe +CATALOGNAME_CSWnrpeplugin = nrpe_plugin REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 01:18:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Oct 2009 23:18:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6835] csw/mgar/pkg/git/trunk Message-ID: Revision: 6835 http://gar.svn.sourceforge.net/gar/?rev=6835&view=rev Author: bdwalton Date: 2009-10-11 23:18:39 +0000 (Sun, 11 Oct 2009) Log Message: ----------- git: actually remove patch file, update checksums Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-11 18:59:46 UTC (rev 6834) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-11 23:18:39 UTC (rev 6835) @@ -1,2 +1 @@ -43f73e9e39bc388253c4c48986ef7b5c download/0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch -0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall +0f3606cd6720f525e7261cea87c11a61 CSWgit.postinstall Deleted: csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch 2009-10-11 18:59:46 UTC (rev 6834) +++ csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch 2009-10-11 23:18:39 UTC (rev 6835) @@ -1,42 +0,0 @@ -From a613b30af3b8a74e8b2d8f5f9910564fb44bf59d Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 7 Oct 2009 16:25:38 -0400 -Subject: [PATCH] ls-files: make option parser keep argv[0] - -The ls-files built-in was not asking the option parser to maintain -argv[0]. This led to the possibility of fprintf(stderr, "...", NULL). -On Solaris, this was causing a segfault. On glibc systems, printed -error messages didn't contain proper strings, but rather, "(null)":... - -A trigger for this bug was: `git ls-files -i` - -Signed-off-by: Ben Walton ---- - builtin-ls-files.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/builtin-ls-files.c b/builtin-ls-files.c -index f473220..9a3705a 100644 ---- a/builtin-ls-files.c -+++ b/builtin-ls-files.c -@@ -482,7 +482,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) - git_config(git_default_config, NULL); - - argc = parse_options(argc, argv, prefix, builtin_ls_files_options, -- ls_files_usage, 0); -+ ls_files_usage, PARSE_OPT_KEEP_ARGV0); - if (show_tag || show_valid_bit) { - tag_cached = "H "; - tag_unmerged = "M "; -@@ -505,7 +505,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) - if (require_work_tree && !is_inside_work_tree()) - setup_work_tree(); - -- pathspec = get_pathspec(prefix, argv); -+ pathspec = get_pathspec(prefix, argv + 1); - - /* be nice with submodule paths ending in a slash */ - read_cache(); --- -1.6.4.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 01:31:46 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Oct 2009 23:31:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6836] csw/mgar/pkg Message-ID: Revision: 6836 http://gar.svn.sourceforge.net/gar/?rev=6836&view=rev Author: bdwalton Date: 2009-10-11 23:31:46 +0000 (Sun, 11 Oct 2009) Log Message: ----------- tig: initial commit Added Paths: ----------- csw/mgar/pkg/tig/ csw/mgar/pkg/tig/branches/ csw/mgar/pkg/tig/tags/ csw/mgar/pkg/tig/trunk/ csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tig/trunk/checksums csw/mgar/pkg/tig/trunk/files/ Property changes on: csw/mgar/pkg/tig/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-11 23:31:46 UTC (rev 6836) @@ -0,0 +1,24 @@ +GARNAME = tig +GARVERSION = 0.14.1 +CATEGORIES = utils + +DESCRIPTION = A git repository browser +define BLURB +Tig is a git repository browser that additionally can act as a pager +for output from various git commands. + +When browsing repositories, it uses the underlying git commands to +present the user with various views, such as summarized revision log +and showing the commit with the log message, diffstat, and the diff. + +Using it as a pager, it will display input from stdin and colorize it. +endef + +PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv + +GIT_REPOS = http://jonas.nitro.dk/tig/tig.git +GIT_TREEISH_tig.git = $(GARNAME)-$(GARVERSION) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 02:28:04 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 00:28:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6837] csw/mgar/pkg/tig/trunk Message-ID: Revision: 6837 http://gar.svn.sourceforge.net/gar/?rev=6837&view=rev Author: bdwalton Date: 2009-10-12 00:28:04 +0000 (Mon, 12 Oct 2009) Log Message: ----------- tig: steps up to install-doc work Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-11 23:31:46 UTC (rev 6836) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:28:04 UTC (rev 6837) @@ -14,11 +14,29 @@ Using it as a pager, it will display input from stdin and colorize it. endef +GARCOMPILER = GNU + PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv +REQUIRED_PKGS = CSWncurses CSWiconv CSWgit + GIT_REPOS = http://jonas.nitro.dk/tig/tig.git GIT_TREEISH_tig.git = $(GARNAME)-$(GARVERSION) +PATCHFILES = 0001-add-install-detection-to-the-autoconf-setup.patch + +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libiconv=$(prefix) +TEST_SCRIPTS = + +INSTALL_ARGS = install install-doc + include gar/category.mk + +# automake isn't used, but we want install-sh. automake exits 1, so +# we run true after to keep gmake happy +pre-configure-modulated: + @(cd $(WORKSRC); autoreconf; automake --add-missing; true) \ No newline at end of file Modified: csw/mgar/pkg/tig/trunk/checksums =================================================================== --- csw/mgar/pkg/tig/trunk/checksums 2009-10-11 23:31:46 UTC (rev 6836) +++ csw/mgar/pkg/tig/trunk/checksums 2009-10-12 00:28:04 UTC (rev 6837) @@ -0,0 +1 @@ +5fe966f3db6c641cc10dbef40913dddf 0001-add-install-detection-to-the-autoconf-setup.patch Added: csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch =================================================================== --- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch (rev 0) +++ csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch 2009-10-12 00:28:04 UTC (rev 6837) @@ -0,0 +1,73 @@ +From d12d5d6f186ac25d83324c6cd87eaef87d6df6bb Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 12 Oct 2009 02:03:17 +0200 +Subject: [PATCH] add install detection to the autoconf setup + +--- + Makefile | 8 ++++---- + config.make.in | 2 ++ + configure.ac | 2 ++ + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index d764644..cf0771b 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,7 @@ doc-html: $(HTMLDOC) + install: all + mkdir -p $(DESTDIR)$(bindir) && \ + for prog in $(PROGS); do \ +- install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \ ++ $(INSTALL) -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \ + done + + install-doc-man: doc-man +@@ -77,8 +77,8 @@ install-doc-man: doc-man + for doc in $(MANDOC); do \ + sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \ + case "$$doc" in \ +- *.1) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \ +- *.5) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \ ++ *.1) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \ ++ *.5) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \ + esac; \ + $(RM) "$$doc+"; \ + done +@@ -88,7 +88,7 @@ install-doc-html: doc-html + for doc in $(HTMLDOC); do \ + sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \ + case "$$doc" in \ +- *.html) install -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \ ++ *.html) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \ + esac; \ + $(RM) "$$doc+"; \ + done +diff --git a/config.make.in b/config.make.in +index 3962050..a5621e9 100644 +--- a/config.make.in ++++ b/config.make.in +@@ -12,6 +12,8 @@ CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H + LDFLAGS = @LDFLAGS@ + LDLIBS = @LIBS@ + ++INSTALL = @INSTALL@ ++ + ASCIIDOC = @ASCIIDOC@ + XMLTO = @XMLTO@ + DOCBOOK2PDF = @DOCBOOK2PDF@ +diff --git a/configure.ac b/configure.ac +index b179389..5225c7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,8 @@ AM_ICONV + + AC_PROG_CC + ++AC_PROG_INSTALL ++ + AC_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])]) + AC_MSG_CHECKING([which config subcommand git supports]) + GIT_CONFIG="repo-config" +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 02:33:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 00:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6838] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 6838 http://gar.svn.sourceforge.net/gar/?rev=6838&view=rev Author: bdwalton Date: 2009-10-12 00:33:02 +0000 (Mon, 12 Oct 2009) Log Message: ----------- tig: use the current tip of master to get patches that allow doc building with asciidoc 8.4.5 Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:28:04 UTC (rev 6837) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:33:02 UTC (rev 6838) @@ -1,6 +1,7 @@ GARNAME = tig GARVERSION = 0.14.1 CATEGORIES = utils +PATCHLEVEL = 1e69632 DESCRIPTION = A git repository browser define BLURB @@ -21,7 +22,7 @@ REQUIRED_PKGS = CSWncurses CSWiconv CSWgit GIT_REPOS = http://jonas.nitro.dk/tig/tig.git -GIT_TREEISH_tig.git = $(GARNAME)-$(GARVERSION) +GIT_TREEISH_tig.git = $(PATCHLEVEL) PATCHFILES = 0001-add-install-detection-to-the-autoconf-setup.patch @@ -36,6 +37,10 @@ include gar/category.mk +# Set a slightly altered revstamp to indicate that we're not using a +# pressed release. +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) + # automake isn't used, but we want install-sh. automake exits 1, so # we run true after to keep gmake happy pre-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 02:34:36 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 00:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6839] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 6839 http://gar.svn.sourceforge.net/gar/?rev=6839&view=rev Author: bdwalton Date: 2009-10-12 00:34:36 +0000 (Mon, 12 Oct 2009) Log Message: ----------- tig: depends on gcc4 runtime Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:33:02 UTC (rev 6838) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:34:36 UTC (rev 6839) @@ -19,7 +19,7 @@ PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv -REQUIRED_PKGS = CSWncurses CSWiconv CSWgit +REQUIRED_PKGS = CSWncurses CSWiconv CSWgit CSWgcc4corert GIT_REPOS = http://jonas.nitro.dk/tig/tig.git GIT_TREEISH_tig.git = $(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 05:11:12 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 03:11:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6840] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6840 http://gar.svn.sourceforge.net/gar/?rev=6840&view=rev Author: bdwalton Date: 2009-10-12 03:11:12 +0000 (Mon, 12 Oct 2009) Log Message: ----------- cswclassutils: add cas for /etc/services manipulation; bump version to 1.20 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-12 00:34:36 UTC (rev 6839) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-12 03:11:12 UTC (rev 6840) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.19 +GARVERSION = 1.20 CATEGORIES = utils DESCRIPTION = CSW class action utilities Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-12 03:11:12 UTC (rev 6840) @@ -0,0 +1,39 @@ +#!/bin/sh +# +# r.cswetcservices - Class action script +# for CSW /etc/inet/services registrations +# +# Written and maintained by Ben Walton +# +# 2009-10-11 Initial release + +# set DEBUG to any value to enable trace outpu. +DEBUG= + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + svcfile=/etc/inet/services + + /usr/xpg4/bin/grep -v "^#" $dest | while read svc; do + set -- $svc + svcname=$1 + port_proto=$2 + + if [ -n "$DEBUG" ]; then + echo "svcname: $svcname; port/proto: $port_proto" + fi + + + /usr/xpg4/bin/grep -q "^$svcname[[:space:]]$port_proto" $svcfile + if [ $? -ne 0 ]; then + echo "$svcname $port_proto # $PKGINST" >> $svcfile + fi + done +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices 2009-10-12 03:11:12 UTC (rev 6840) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# r.cswetcservices - Class action script +# for CSW /etc/inet/services registrations +# +# Written and maintained by Ben Walton +# +# 2009-10-11 Initial release + +# NOTE: In the future, we could offer a variable in csw.conf +# to remove values from /etc/services too. For now, we'll +# just leave them. + +while read dest; do + echo $dest + rm -f $dest +done + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 05:43:07 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 03:43:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6841] csw/mgar/pkg/git/trunk Message-ID: Revision: 6841 http://gar.svn.sourceforge.net/gar/?rev=6841&view=rev Author: bdwalton Date: 2009-10-12 03:43:07 +0000 (Mon, 12 Oct 2009) Log Message: ----------- git: remove /etc/service manipulation from postinstall script (soon to be in cswclassutils) Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-12 03:11:12 UTC (rev 6840) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-12 03:43:07 UTC (rev 6841) @@ -1 +1 @@ -0f3606cd6720f525e7261cea87c11a61 CSWgit.postinstall +92482ca3b4e8626f428f8878bcc1477f CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-12 03:11:12 UTC (rev 6840) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-12 03:43:07 UTC (rev 6841) @@ -16,11 +16,3 @@ EOF fi - -/usr/xpg4/bin/grep -q CSWgit /etc/inet/services -if [ $? -ne 0 ]; then - cat <>/etc/inet/services -git 9418/tcp # CSWgit: git transfer service -git 9418/udp # CSWgit: git transfer service -EOF -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 12 09:47:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Oct 2009 07:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6842] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswetcservices Message-ID: Revision: 6842 http://gar.svn.sourceforge.net/gar/?rev=6842&view=rev Author: bonivart Date: 2009-10-12 07:47:40 +0000 (Mon, 12 Oct 2009) Log Message: ----------- cswclassutils: fix typo in i.cswetcservices Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-12 03:43:07 UTC (rev 6841) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-12 07:47:40 UTC (rev 6842) @@ -1,6 +1,6 @@ #!/bin/sh # -# r.cswetcservices - Class action script +# i.cswetcservices - Class action script # for CSW /etc/inet/services registrations # # Written and maintained by Ben Walton This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 12 11:12:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 12 Oct 2009 09:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6843] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 6843 http://gar.svn.sourceforge.net/gar/?rev=6843&view=rev Author: wahwah Date: 2009-10-12 09:12:22 +0000 (Mon, 12 Oct 2009) Log Message: ----------- syslog-ng: Removing old .ctl and .persist files from /opt/csw/var. Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-12 07:47:40 UTC (rev 6842) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-12 09:12:22 UTC (rev 6843) @@ -15,34 +15,17 @@ DISTFILES += cswsyslog_ng DISTFILES += CSWsyslogng.preinstall DISTFILES += CSWsyslogng.postremove - -CATALOGNAME = syslog_ng - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES = CSWsyslogng - +CATALOGNAME = syslog_ng SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ +INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng +SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW -SPKG_CLASSES = none cswcpsampleconf cswinitsmf -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswsyslog_ng$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/syslog-ng\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' - # shared /opt/csw support: localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw -PREREQUISITE_PKGS = CSWeventlog -PREREQUISITE_PKGS += CSWggettext -PREREQUISITE_PKGS += CSWglib2 -PREREQUISITE_PKGS += CSWglib2devel -PREREQUISITE_PKGS += CSWtcpwrap -PREREQUISITE_PKGS += CSWpkgconfig -PREREQUISITE_PKGS += CSWgcc4core - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no @@ -57,6 +40,12 @@ REQUIRED_PKGS += CSWtcpwrap REQUIRED_PKGS += CSWcswclassutils +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS += CSWggettext +PREREQUISITE_PKGS += CSWglib2devel +PREREQUISITE_PKGS += CSWpkgconfig +PREREQUISITE_PKGS += CSWgcc4core + GARCOMPILER = GNU TEST_SCRIPTS = Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-12 07:47:40 UTC (rev 6842) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-12 09:12:22 UTC (rev 6843) @@ -1,5 +1,5 @@ -91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove -7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -fcd5effdaa96da8abf9788bc5745bda3 download/cswsyslog_ng -69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW -86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz +91e692a52c4c9668e3bcf8b8816425c3 CSWsyslogng.postremove +c3da292b828f03158c7227f5b35feb12 CSWsyslogng.preinstall +fcd5effdaa96da8abf9788bc5745bda3 cswsyslog_ng +69bad95775b98d26e52db8a8292e2790 syslog-ng.conf.CSW +86c39779261545d2289e9c309e262b8d syslog-ng_3.0.4.tar.gz Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-10-12 07:47:40 UTC (rev 6842) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-10-12 09:12:22 UTC (rev 6843) @@ -4,3 +4,13 @@ echo "Disabling svc:/system/system-log:default" /usr/sbin/svcadm disable svc:/system/system-log:default fi + +# The assumption is that this script is going to be run from the global zone +# first. The -f option is for the rm command not to complain if it can't remove +# the file. +for f in /opt/csw/var/syslog-ng.{ctl,persist}; do + if [ -r "${f}" ]; + echo "Removing an obsolete file: '${f}'." + rm -f "${f}" + fi +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Oct 12 19:15:18 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 12 Oct 2009 17:15:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6844] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 6844 http://gar.svn.sourceforge.net/gar/?rev=6844&view=rev Author: j_arndt Date: 2009-10-12 17:15:17 +0000 (Mon, 12 Oct 2009) Log Message: ----------- nsca: switched to dynamic gspec, packages uses cswusergroup, config and var moved to /etc/opt/csw and /var/opt/csw Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/CSWnsca.preinstall csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.preinstall csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype Added Paths: ----------- csw/mgar/pkg/nsca/trunk/files/CSWnsca.cswusergroup csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.cswusergroup Removed Paths: ------------- csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-10-12 17:15:17 UTC (rev 6844) @@ -11,23 +11,38 @@ MASTER_SITES = http://mesh.dl.sourceforge.net/sourceforge/nagios/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall ) -DISTFILES += $(call admfiles,CSWsendnsca, prototype preinstall ) -DISTFILES += cswnsca +# +## Distfiles for CSWnsca +# + +DISTFILES += CSWnsca.prototype CSWnsca.preinstall +DISTFILES += cswnsca CSWnsca.cswusergroup + +# +## Distfiles for CSWsendnsca +# + +DISTFILES += CSWsendnsca.prototype CSWsendnsca.preinstall +DISTFILES += CSWsendnsca.cswusergroup + PATCHFILES += submit_check_results.diff +PACKAGES = CSWnsca CSWsendnsca +CATALOGNAME_CSWnsca = nsca +CATALOGNAME_CSWsendnsca = send_nsca + REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils -SPKG_CLASSES_CSWnsca = none cswpreserveconf cswinitsmf -SPKG_CLASSES_CSWsendnsca = none cswpreserveconf +SPKG_CLASSES_CSWnsca = none cswusergroup cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWsendnsca = none cswusergroup cswpreserveconf NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 -CONFIGURE_ARGS += --localstatedir=/opt/csw/nagios/var +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/nagios BUILD_TARGETS = nsca @@ -37,8 +52,7 @@ BINDIR=$(prefix)/bin NAGIOSBINDIR=$(prefix)/nagios/bin -CFGDIR=$(prefix)/etc -NAGIOSCFGDIR=$(prefix)/nagios/etc +NAGIOSCFGDIR=/etc$(prefix)/nagios NSCADOCDIR=$(prefix)/share/doc/nsca SENDNSCADOCDIR=$(prefix)/share/doc/send_nsca @@ -57,11 +71,15 @@ ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR) ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) - ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg.CSW + ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/send_nsca.cfg.CSW ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(SENDNSCADOCDIR) ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ ginstall -m 755 $(FILEDIR)/cswnsca $(DESTDIR)/etc/opt/csw/init.d/ + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWsendnsca + @ginstall -m 644 $(FILEDIR)/CSWsendnsca.cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWsendnsca/cswusergroup + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWnsca + @ginstall -m 644 $(FILEDIR)/CSWnsca.cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWnsca/cswusergroup @$(MAKECOOKIE) Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/checksums 2009-10-12 17:15:17 UTC (rev 6844) @@ -1,10 +1,9 @@ -33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz -82f1144c12dc6247524609dbeefc3023 download/CSWnsca.gspec -6c3e8f2bf654a03cc7e993bf26bb066d download/CSWnsca.prototype -1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall -7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall -0f458cf358b1aab192c02fd0d37b1220 download/CSWsendnsca.gspec -664e84201491b489ae20b983a150d72a download/CSWsendnsca.prototype -8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall +e9ed8b90404f0aebfc6f77355d8c9bbe download/CSWnsca.cswusergroup +ec54b953469889200d99a86669653173 download/CSWnsca.preinstall +c9578d6892ce725133fcef365adcc6fe download/CSWnsca.prototype +0a98ba4dd462e50f23239433117bae5e download/CSWsendnsca.cswusergroup +e275462ffbf488fe5f7e29dd3abab0ae download/CSWsendnsca.preinstall +d8d3eeee6cb8fbc3534734590d83a13b download/CSWsendnsca.prototype 55a1c5523b2fe1ee66b45a2807e80bd6 download/cswnsca +33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz cbb38cacd3ca318f00dfa0877b6017df download/submit_check_results.diff Deleted: csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall 2009-10-12 17:15:17 UTC (rev 6844) @@ -1,32 +0,0 @@ -# checkinstall script for nsca -# Verify that the external command group nagioscm exists -# 2007-12-02 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# -# See if group are needed -NEEDCMDGROUP=0 - -# First check target machines group file, THEN check -# NIS/NIS+/whatever - -/usr/bin/grep '^nagioscm:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent group nagioscm >/dev/null - if [ $? -ne 0 ] ; then - NEEDCMDGROUP=1 - fi -fi - -if [ "$NEEDCMDGROUP" = 1 ] ; then - echo "***" - echo "Group nagioscm must exist for this package install." - echo "nagioscm group will be added." - ADDCMDGROUP=1 -else - echo "nagioscm group detected" -fi - -cat >$1 </dev/null -if [ $? -ne 0 ] ; then - getent passwd nagios >/dev/null - if [ $? -ne 0 ] ; then - NEEDUSER=1 - fi -fi +From NSCA 2.7.2,REV=2009.10.05 on the configuration file for the +OpenCSW package is stored in /etc/opt/csw/nagios/. -grep '^nagios:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - getent group nagios >/dev/null - if [ $? -ne 0 ] ; then - NEEDGROUP=1 - fi -fi +No further action is needed (to have a backup is always a good idea). -if [ "$NEEDGROUP" = 1 ] ; then - echo adding nagios group - /usr/sbin/groupadd nagios -else - echo nagios group detected -fi + Installation will proceed in 10 seconds. + Press CTRL+C if you want to stop now. + +======================================================================= +EOF -if [ "$NEEDUSER" = 1 ] ; then - echo adding nagios user - /usr/sbin/useradd -g nagios nagios - /usr/sbin/usermod -s /bin/false -d $NAGIOSHOME nagios -else - echo nagios user detected -fi +sleep 10 + +exit 0 Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-10-12 17:15:17 UTC (rev 6844) @@ -1,12 +1,14 @@ d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/send_nsca 0755 root bin d none /opt/csw/etc 0755 root bin -f cswpreserveconf /opt/csw/etc/send_nsca.cfg.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/nagios/send_nsca.cfg.CSW 0644 root bin d none /opt/csw/share/doc/send_nsca 0755 root bin f none /opt/csw/share/doc/send_nsca/Changelog 0644 root bin f none /opt/csw/share/doc/send_nsca/LEGAL 0644 root bin f none /opt/csw/share/doc/send_nsca/README 0644 root bin f none /opt/csw/share/doc/send_nsca/SECURITY 0644 root bin f none /opt/csw/share/doc/send_nsca/submit_check_result-sample 0755 root bin +d none /opt/csw/etc/pkg/CSWsendnsca 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWsendnsca/cswusergroup 0644 root bin i pkginfo=CSWsendnsca.pkginfo i preinstall=CSWsendnsca.preinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Tue Oct 13 12:47:15 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Tue, 13 Oct 2009 10:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6845] csw/mgar/pkg/ncmpc/trunk Message-ID: Revision: 6845 http://gar.svn.sourceforge.net/gar/?rev=6845&view=rev Author: trygvis Date: 2009-10-13 10:47:14 +0000 (Tue, 13 Oct 2009) Log Message: ----------- o Upgrading to latest; 0.15. Modified Paths: -------------- csw/mgar/pkg/ncmpc/trunk/Makefile csw/mgar/pkg/ncmpc/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ncmpc/trunk/files/ Modified: csw/mgar/pkg/ncmpc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncmpc/trunk/Makefile 2009-10-12 17:15:17 UTC (rev 6844) +++ csw/mgar/pkg/ncmpc/trunk/Makefile 2009-10-13 10:47:14 UTC (rev 6845) @@ -1,9 +1,9 @@ GARNAME = ncmpc -GARVERSION = 0.11.1 +GARVERSION = 0.15 CATEGORIES = apps GARCOMPILER = GNU -OPTARCH_i386 = i686 +#OPTARCH_i386 = i686 DESCRIPTION = ncurses client for controlling Music Player Daemons (MPD) define BLURB @@ -14,9 +14,9 @@ to manage playlists and control MPD with a remote control. endef -MASTER_SITES = http://hem.bredband.net/kaw/ncmpc/files/ +SF_PROJ = musicpd +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWncmpc,prototype) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -26,4 +26,10 @@ include gar/category.mk CPPFLAGS += -I/opt/csw/include/ncurses LDFLAGS += -lsocket -lnsl -lintl -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-colors +CONFIGURE_ARGS += --enable-lyrics-screen + +REQUIRED_PKGS = CSWggettextrt +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWncurses Modified: csw/mgar/pkg/ncmpc/trunk/checksums =================================================================== --- csw/mgar/pkg/ncmpc/trunk/checksums 2009-10-12 17:15:17 UTC (rev 6844) +++ csw/mgar/pkg/ncmpc/trunk/checksums 2009-10-13 10:47:14 UTC (rev 6845) @@ -1,3 +1,3 @@ -c90668b12f3676c73913a863482ec405 download/ncmpc-0.11.1.tar.gz -539c628ad5e2574fbf13885e1ce41969 download/CSWncmpc.gspec -07ba532add82c860335cd0f35154df0b download/CSWncmpc.prototype +539c628ad5e2574fbf13885e1ce41969 CSWncmpc.gspec +07ba532add82c860335cd0f35154df0b CSWncmpc.prototype +363fde730c9b4a5cec05e00e7ae64e03 ncmpc-0.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 13:45:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 11:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6846] csw/mgar/pkg/postgresql Message-ID: Revision: 6846 http://gar.svn.sourceforge.net/gar/?rev=6846&view=rev Author: dmichelsen Date: 2009-10-13 11:45:16 +0000 (Tue, 13 Oct 2009) Log Message: ----------- postgresql: Relocate legacy to tags/ Added Paths: ----------- csw/mgar/pkg/postgresql/tags/legacy-8.3.3/ Removed Paths: ------------- csw/mgar/pkg/postgresql/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 13:48:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 11:48:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6847] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 6847 http://gar.svn.sourceforge.net/gar/?rev=6847&view=rev Author: dmichelsen Date: 2009-10-13 11:48:57 +0000 (Tue, 13 Oct 2009) Log Message: ----------- posgresql: Start converting legacy scripts to GAR Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt csw/mgar/pkg/postgresql/trunk/files/cswpostgres csw/mgar/pkg/postgresql/trunk/files/cswusergroup csw/mgar/pkg/postgresql/trunk/files/postgresql.conf Property Changed: ---------------- csw/mgar/pkg/postgresql/trunk/ Property changes on: csw/mgar/pkg/postgresql/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-10-13 11:45:16 UTC (rev 6846) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-10-13 11:48:57 UTC (rev 6847) @@ -1,16 +1,68 @@ -GARNAME = package -GARVERSION = 1.0 -CATEGORIES = category +GARNAME = postgresql +GARVERSION = 8.4.1 +CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = An advanced open source database define BLURB - Long description endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += cswpostgres +DISTFILES += cswusergroup +DISTFILES += postgresql.conf +DISTFILES += README-CSW.txt +PACKAGES = CSWpostgresql CSWpostgresqldoc CSWpostgresqldevel CSWlibpq + +CATALOGNAME_CSWpostgresql = postgresql +CATALOGNAME_CSWpostgresqldoc = postgresql_doc +CATALOGNAME_CSWpostgresqldevel = postgresql_devel +CATALOGNAME_CSWlibpq = libpq + +SPKG_DESC_CSWpostgresql = An advanced open source database +SPKG_DESC_CSWpostgresqldoc = PostgreSQL Documentation +SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files +SPKG_DESC_CSWlibpq = PostgreSQL Libraries + +SPKG_SOURCEURL = http://www.postgresql.org/ + +REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq +REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql + +LICENSE = COPYRIGHT + +prefix = $(BUILD_PREFIX)/postgresql +docdir = $(BUILD_PREFIX)/share/doc + +EXTRA_INC = $(BUILD_PREFIX)/include +EXTRA_LIB = $(BUILD_PREFIX)/lib + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + +EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" + +PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpq = $(PKGFILES_RT) + +# -> TODO: start in rc3.d S10, Stop everywhere else in K90 +INITSMF = /etc/init.d/cswpostgres + +# -> TODO: Migrate /opt/csw/var/pgdata to /var/opt/csw/postgresql/pgdata +USERGROUP = /opt/csw/etc/pkg/postgresql + +# -> TODO: Migrate /opt/csw/etc/postgresql.conf to /etc/opt/csw/postgresql.conf +PRESERVECONF = /opt/csw/etc/postgresql.conf + include gar/category.mk + +post-merge: + ginstall -d $(PKGROOT)/etc/init.d && ginstall $(WORKDIR)/cswpostgres $(PKGROOT)/etc/init.d/ + ginstall -d $(PKGROOT)/opt/csw/etc/pkg/postgresql && ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/opt/csw/etc/pkg/postgresql/ + ginstall -d $(PKGROOT)/opt/csw/etc && ginstall $(WORKDIR)/postgresql.conf $(PKGROOT)/opt/csw/etc/ + ginstall -d $(PKGROOT)$(docdir)/postgresql/ && ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/postgresql/ + @$(MAKECOOKIE) Added: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums (rev 0) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,5 @@ +45613fd5367cd230505ad68feb9ad634 README-CSW.txt +6916c5b1a6e1285c6a564abf4b659697 cswpostgres +443171cc5303a8ea0f0a13cbb5e32189 cswusergroup +f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 +121c45f17350191ca5676453c25716da postgresql.conf Copied: csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt (from rev 6825, csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,103 @@ +*** Important information - please make sure you read this ! *** + +*** Migrating from older versions *** + +If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, +your databases will NOT work on this 8.3.x version. Before upgrading, you +should dump your databases using the old utilities. You can then create a +new data directory using this 8.3.x package, and import your dumps. +See the "64-bit support" section below for pointers to documentation on t +his. + +Another point to note is that the location of the PostgreSQL install has +changed. Previous 7.3.x packages used /opt/csw as the base - this package +uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your +$PATH, and any scripts you have written using the old locations will have to +be changed. + + +*** User configuration of server options *** + +Configuration of the server start-up options is now done through a user- +configuration file, /opt/csw/etc/postgresql.conf. A sample template has been +provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change +any of the server options discussed below, make a copy of this file to +/opt/csw/etc/postgresql.conf and edit it accordingly. + +If you cannot modify this file (for instance, you are mounting /opt/csw +from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf +instead, and it will take precedence over /opt/csw/etc/postgresql.conf. + +*** Networking *** + +By default, the cswpostgres init script will start the server up listening on +localhost only. If you want to allow other hosts on your network to connect, you +will need to add "-o -i" to the value of SERVEROPTS in the user configuration +file and restart your server. The included template has the line already +entered, you just need to uncomment it (remove the leading #). + +Once this is done, PostgreSQL will now bind to all network interfaces and +listen for connections. You will still need to configure which hosts are allowed +access by modifying the pg_hba.conf file in your data directory - read the manual +for more information on this. + +*** 64-bit support *** + +The SPARC packages have been built with 64-bit support, but by default, the +32-bit version of the server will be run. If you need the 64-bit version, +edit the user configuration file and change the values of PGINIT and PGCTL +accordingly. + +It is important to note that the 64-bit server WILL NOT WORK with databases +created with the 32-bit version, and vice versa. You will get an error +message if you attempt this. + +In order to migrate your system to the 64-bit server, you will need to dump +your databases while running the 32-bit client, stop and upgrade the server, +initialise a new database directory, and import your dumps. For more information +on this procedure, see the PostgreSQL manual (included with this package), +chapter 9 - Backup and restore. This is located at : + +/opt/csw/postgresql/share/doc/html/backup.html + +All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the +'isaexec' wrapper, which will run the appropriate binary for your +architecture and/or kernel. + +*** Starting the server *** + +The PostgreSQL database runs under the user 'postgres' - this has been created +for you by the installation script. + +The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not +exist, you will need to create it yourself before the database will start. +You can change the location of the data directory by altering the user +configuration file, and modifying the value of PGDATA. + +A startup script has been provided for you that handles database initialisation, +startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You +should always use this script to start or stop the server, otherwise you may +find that you are running the wrong binaries (64-bit instead of 32-bit). + +It is set to start the database the next time the system enters runlevel 3 - +usually, this will be at the next boot. + +To create the data directory, the startup script accepts the "init" argument : + +/etc/init.d/cswpostgres init + +This will create and initialise the data directory. After this step has been +completed succesfully, the database can be started with : + +/etc/init.d/cswpostgres start + +If you get errors relating to shared memory on startup, make sure you have read +the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the +PostgreSQL HTML Administrator's Guide, located at + +/opt/csw/postgresql/share/doc/html/index.html + + +Mark Round, +mark at blastwave.org + Copied: csw/mgar/pkg/postgresql/trunk/files/cswpostgres (from rev 6825, csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,97 @@ +#!/bin/sh +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf + +# Defaults +[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata +[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + + +# The following attempts to catch any mistakes in the server +# version - it checks if the 64-bit server was last run. If so, +# it forces the 64-bit server, otherwise it won't start up! +# And vice-versa for the 32-bit server... +if [ -f $PGDATA/postmaster.opts ]; then + grep 'sparcv9' $PGDATA/postmaster.opts > /dev/null + if [ $? -eq 0 ]; then + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -eq 0 ]; then + echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," + echo " but 64-bit version was last run. Using 64-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + else + # Did not detect 64-bit server last used + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -ne 0 ]; then + echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," + echo " but 32-bit version was last run. Using 32-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + fi +fi + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to /var/tmp, as pgctl etc. need to be started from +# a directory that they can read +cd /var/tmp + +case "$1" in +start) + if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" + ;; + +status) + su postgres -c "$PGCTL -D $PGDATA status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at $PGDATA..." + # Create it, unless it's already there and empty + [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA + chown postgres $PGDATA + echo "Initialising PostgreSQL database..." + su postgres -c "$PGINIT -D $PGDATA > /dev/null" + ;; + +*) + echo "Usage: $0 (init|start|stop|restart|reload|status)" + ;; + +esac + Added: csw/mgar/pkg/postgresql/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1 @@ +postgres::CSW Postgres:/opt/csw/var/pgdata:/bin/sh:: Copied: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf (from rev 6825, csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,34 @@ +# Example PostgreSQL server configuration file. +# Provided by the Blastwave package of PostgreSQL. +# This file is read by the /etc/init.d/cswpostgres startup script, +# and can be used to override the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=/opt/csw/var/pgdata + + +# Which binaries to use, 32- or 64-bit. +# Only use the 64-bit server if you're sure you need it. +# Make sure you have read /opt/csw/postgresql/share/doc/README-CSW.txt +# before changing these, as your databases may not work without +# a 'dump and restore' cycle ! + +# 32-bit server - default, and fine for most uses +PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + +# 64-bit server - uncomment these lines only if you really need them. +#PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl +#PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + + +# Additional options to pass to postmaster. +# These options will be passed to the postmaster program. The most common use of +# these is to allow network access to PostgreSQL from other hosts over TCP/IP. +# This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. +# Note that you will still need to configure authentication in the pg_hba.conf +# in your data directory. +# SERVEROPTS="-o -i" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 15:02:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 13:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6848] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswetcservices Message-ID: Revision: 6848 http://gar.svn.sourceforge.net/gar/?rev=6848&view=rev Author: bdwalton Date: 2009-10-13 13:02:15 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: correct regex used for /etc/services registration detection Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 11:48:57 UTC (rev 6847) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:02:15 UTC (rev 6848) @@ -29,7 +29,7 @@ fi - /usr/xpg4/bin/grep -q "^$svcname[[:space:]]$port_proto" $svcfile + /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile if [ $? -ne 0 ]; then echo "$svcname $port_proto # $PKGINST" >> $svcfile fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 15:10:36 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 13:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6849] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 6849 http://gar.svn.sourceforge.net/gar/?rev=6849&view=rev Author: bdwalton Date: 2009-10-13 13:10:36 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: use /etc/{inetd.conf,services} instead of files in /etc/inet to have better effect on opensolaris Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:02:15 UTC (rev 6848) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:10:36 UTC (rev 6849) @@ -1,7 +1,7 @@ #!/bin/sh # # i.cswetcservices - Class action script -# for CSW /etc/inet/services registrations +# for CSW /etc/services registrations # # Written and maintained by Ben Walton # @@ -17,7 +17,7 @@ echo $dest /usr/bin/cp $src $dest || exit 2 - svcfile=/etc/inet/services + svcfile=/etc/services /usr/xpg4/bin/grep -v "^#" $dest | while read svc; do set -- $svc @@ -28,7 +28,6 @@ echo "svcname: $svcname; port/proto: $port_proto" fi - /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile if [ $? -ne 0 ]; then echo "$svcname $port_proto # $PKGINST" >> $svcfile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 13:02:15 UTC (rev 6848) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 13:10:36 UTC (rev 6849) @@ -58,7 +58,7 @@ # we won't register with inetd if the service name isn't registered # in the global services file. - /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/inet/services + /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/services if [ $? -eq 0 ]; then if [ -n "$DEBUG" ]; then echo "Installing inetd service:" @@ -92,7 +92,7 @@ else [ -n "$DEBUG" ] && echo "For solaris 8 or 9" - inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf + inetdconf=$PKG_INSTALL_ROOT/etc/inetd.conf echo "Installing '$svcname' into inetd.conf." echo "# $PKGINST: added by i.cswinetd" >> $inetdconf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 13 15:27:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Oct 2009 13:27:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6850] csw/mgar/pkg/examples Message-ID: Revision: 6850 http://gar.svn.sourceforge.net/gar/?rev=6850&view=rev Author: wahwah Date: 2009-10-13 13:27:05 +0000 (Tue, 13 Oct 2009) Log Message: ----------- examples/loose-files: Initial commit Modified Paths: -------------- csw/mgar/pkg/examples/loose-files/trunk/Makefile csw/mgar/pkg/examples/loose-files/trunk/checksums Added Paths: ----------- csw/mgar/pkg/examples/loose-files/ Modified: csw/mgar/pkg/examples/loose-files/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/examples/loose-files/trunk/Makefile 2009-10-13 13:27:05 UTC (rev 6850) @@ -2,181 +2,38 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg +GARNAME = loose-files GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +CATEGORIES = utils +DESCRIPTION = An example of a package created from loose files. define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +PACKAGES = CSWloosefilesexa +CATALOGNAME = loose_files_example + +# The directory where all the sources are kept. The slash at the end is +# necessary. +LOCAL_SRC = /usr/xpg4/ + +# The list of files to include, relative to LOCAL_SRC +FILES = bin/grep +FILES += include/curses.h + +MASTER_SITES = $(sort $(addprefix file://$(LOCAL_SRC),$(dir $(FILES)))) +DISTFILES = $(notdir $(FILES)) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/examples/loose-files/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/examples/loose-files/trunk/checksums 2009-10-13 13:27:05 UTC (rev 6850) @@ -0,0 +1,2 @@ +1738ceecf464e2b847c27cf9e7c410a6 curses.h +f50d8b08c2ae68dc9b090c2c39abc4f0 grep This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Oct 13 16:27:44 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 13 Oct 2009 14:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6851] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6851 http://gar.svn.sourceforge.net/gar/?rev=6851&view=rev Author: bonivart Date: 2009-10-13 14:27:44 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: new version with minor bug fixes Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-13 13:27:05 UTC (rev 6850) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-13 14:27:44 UTC (rev 6851) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.20 +GARVERSION = 1.21 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:27:05 UTC (rev 6850) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 14:27:44 UTC (rev 6851) @@ -7,7 +7,7 @@ # # 2009-10-11 Initial release -# set DEBUG to any value to enable trace outpu. +# set DEBUG to any value to enable trace output DEBUG= echo "Installing class ..." Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 13:27:05 UTC (rev 6850) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 14:27:44 UTC (rev 6851) @@ -6,7 +6,7 @@ # # 2009-10-02 Initial release -# set DEBUG to any value to enable trace outpu. +# set DEBUG to any value to enable trace output DEBUG= # Source csw.conf, if it exists This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 16:41:02 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 14:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6852] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.README.CSW Message-ID: Revision: 6852 http://gar.svn.sourceforge.net/gar/?rev=6852&view=rev Author: bdwalton Date: 2009-10-13 14:41:01 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: update README for cswinetdconf and cswetcservices Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-10-13 14:27:44 UTC (rev 6851) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-10-13 14:41:01 UTC (rev 6852) @@ -38,11 +38,21 @@ - cswpycompile This class takes care of creating/removing python's normal and optimized - bytecode files. Set all *.py files' class = pycompile to activate. - Example: - # use prototype filters to set the class - PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } { print }' + bytecode files. Set all *.py files' class = cswpycompile to activate. + In GAR, set the variable PYCOMPILE = 1 to activate. + +- cswinetdconf + + This class manipulates /etc/inetd.conf (solaris 8/9) or enables an + inetd service in smf (solaris 10+). + +- cswetcservices + + This class takes care of registering services in the global + /etc/services file. It is a one way manipulation. At package + removal, the service entries are left behind. + Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package. -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 17:08:14 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 15:08:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6853] csw/mgar/pkg/gitosis/trunk Message-ID: Revision: 6853 http://gar.svn.sourceforge.net/gar/?rev=6853&view=rev Author: bdwalton Date: 2009-10-13 15:08:14 +0000 (Tue, 13 Oct 2009) Log Message: ----------- gitosis: prepare for cswinetdconf class utils support Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gitosis/trunk/files/inetd.conf Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-13 14:41:01 UTC (rev 6852) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-13 15:08:14 UTC (rev 6853) @@ -59,9 +59,10 @@ GITOSISHOME = /var/opt/csw/gitosis CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:: -CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) +CSWPKGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup +INETDCONF = /opt/csw/etc/pkg/CSWgitosis/inetd.conf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }' @@ -78,8 +79,9 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) post-install-modulated: - @( gmkdir -p $(CSWUGD); \ - echo "$(CSWUG)" > $(CSWUGD)/cswusergroup; \ + @( gmkdir -p $(CSWPKGD); \ + echo "$(CSWUG)" > $(CSWPKGD)/cswusergroup; \ + ginstall -m 0644 $(FILEDIR)/inetd.conf $(CSWPKGD); \ gmkdir -p $(INSTALLISADIR)$(GITOSISHOME); \ echo 'PATH=/opt/csw/bin:$$PATH' > $(INSTALLISADIR)$(GITOSISHOME)/.bashrc; \ echo 'PATH=/opt/csw/bin:$$PATH' > $(INSTALLISADIR)$(GITOSISHOME)/.bash_profile; \ Added: csw/mgar/pkg/gitosis/trunk/files/inetd.conf =================================================================== --- csw/mgar/pkg/gitosis/trunk/files/inetd.conf (rev 0) +++ csw/mgar/pkg/gitosis/trunk/files/inetd.conf 2009-10-13 15:08:14 UTC (rev 6853) @@ -0,0 +1 @@ +git stream tcp nowait gitosis /opt/csw/bin/git git daemon --base-path=/var/opt/csw/gitosis/repositories --syslog --inetd --verbose \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 18:01:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 16:01:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6854] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6854 http://gar.svn.sourceforge.net/gar/?rev=6854&view=rev Author: dmichelsen Date: 2009-10-13 16:01:17 +0000 (Tue, 13 Oct 2009) Log Message: ----------- mGAR v2: Preserve perms etc. on merge-phase Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-13 15:08:14 UTC (rev 6853) +++ csw/mgar/gar/v2/gar.mk 2009-10-13 16:01:17 UTC (rev 6854) @@ -691,14 +691,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -706,7 +706,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -714,7 +714,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -722,7 +722,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 18:01:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 16:01:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6855] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 6855 http://gar.svn.sourceforge.net/gar/?rev=6855&view=rev Author: dmichelsen Date: 2009-10-13 16:01:56 +0000 (Tue, 13 Oct 2009) Log Message: ----------- mGAR v2: Allow special chars in package names Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:01:17 UTC (rev 6854) +++ csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:01:56 UTC (rev 6855) @@ -143,7 +143,7 @@ # checksums without path this is not necessary. checksum-%: $(CHECKSUM_FILE) @echo " ==> Running checksum on $*" - @if gegrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + @if ggrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ echo '(!!!) $* failed checksum test!' 1>&2; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 18:23:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 16:23:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6856] csw/mgar/gar/v2 Message-ID: Revision: 6856 http://gar.svn.sourceforge.net/gar/?rev=6856&view=rev Author: dmichelsen Date: 2009-10-13 16:23:26 +0000 (Tue, 13 Oct 2009) Log Message: ----------- mGAR v2: Copy stuff from DISTFILES to global WORKDIR without unpacking Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:01:56 UTC (rev 6855) +++ csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:23:26 UTC (rev 6856) @@ -393,6 +393,9 @@ extract-archive-%.git: git-extract-%.git @$(MAKECOOKIE) +extract-copy-%: cp-extract-% + @$(MAKECOOKIE) + # anything we don't know about, we just assume is already # uncompressed and unarchived in plain format extract-archive-%: cp-extract-% Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-13 16:01:56 UTC (rev 6855) +++ csw/mgar/gar/v2/gar.mk 2009-10-13 16:23:26 UTC (rev 6856) @@ -329,8 +329,9 @@ garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) +EXTRACT_TARGETS-global ?= $(addprefix extract-copy-,$(filter-out $(NOEXTRACT),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS-default = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS = $(or $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-default)) # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 02:19:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 00:19:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6857] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6857 http://gar.svn.sourceforge.net/gar/?rev=6857&view=rev Author: bdwalton Date: 2009-10-14 00:19:34 +0000 (Wed, 14 Oct 2009) Log Message: ----------- git: rework doc build/install; update for pending ETCSERVICES support Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-13 16:23:26 UTC (rev 6856) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-14 00:19:34 UTC (rev 6857) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -# TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel @@ -30,7 +30,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs - + REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror REQUIRED_PKGS_CSWgit += CSWpmtermreadkey @@ -123,15 +123,17 @@ BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ETC_GITCONFIG=$(sysconfdir)/gitconfig \ ASCIIDOC_NO_ROFF=YesPlease \ - all + all doc INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \ INSTALLDIRS=vendor \ - install-doc + install-man install-html # We want static libs installed for our devel package MERGE_EXCLUDE_STATICLIBS = +ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services + include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts @@ -155,6 +157,10 @@ post-install-modulated: ID=$(DESTDIR)/$(includedir)/git post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git post-install-modulated: + @echo Installing /etc/services definitions file + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWgit/; \ + echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \ + echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); ) @echo Cleaning up perl stuff @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* @rm -rf $(DESTDIR)/$(perllib)/ @@ -172,13 +178,6 @@ done; \ ginstall -c -m 0444 libgit.a $(LD)/; \ ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a ) - @echo Installing Documentation - @( cd $(WORKSRC); \ - ginstall -c -m 0755 -d $(GD); \ - cp -R Documentation/*.txt $(GD)/; \ - cp -R contrib/hooks README COPYING $(GD)/; \ - cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \ - cp -R Documentation/howto Documentation/technical $(GD)/; ) @echo Installing Bash Completion files @( cd $(WORKSRC); \ ginstall -c -m 0755 -d $(BD); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 04:37:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 02:37:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6858] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 6858 http://gar.svn.sourceforge.net/gar/?rev=6858&view=rev Author: bdwalton Date: 2009-10-14 02:37:00 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: add ability to specify that created account is NP instead of *LK* Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 00:19:34 UTC (rev 6857) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 02:37:00 UTC (rev 6858) @@ -34,6 +34,7 @@ dir=`echo $i | awk -F':' '{print $4}'` shell=`echo $i | awk -F':' '{print $5}'` create=`echo $i | awk -F':' '{print $6}'` + nopass=`echo $i | awk -F':' '{print $8}'` if [ -n "$group" ]; then /bin/getent group $group > /dev/null if [ $? -ne 0 ]; then @@ -77,6 +78,27 @@ else echo User $user already exists fi + + if [ -n "$nopass" ]; then + omask=`umask` + umask 0377 + awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST + if [ $? -eq 0 ]; then + cmp -s /etc/shadow /etc/shadow.$PKGINST + if [ $? -ne 0 ]; then + echo "Updating account '$user' to be no-login (NP)" + chgrp sys /etc/shadow.$PKGINST + cp -p /etc/shadow /etc/shadow.CSW && \ + mv /etc/shadow.$PKGINST /etc/shadow + else + rm /etc/shadow.$PKGINST + fi + else + echo "ERROR: Setting NP for '$user' failed." + rm /etc/shadow.$PKGINST + fi + umask $omask + fi else echo No user to create fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 16:04:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:04:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6859] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 6859 http://gar.svn.sourceforge.net/gar/?rev=6859&view=rev Author: bdwalton Date: 2009-10-14 14:04:00 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: cswusergroup: use passwd -N on solaris 10 or newer, only munge shadow manually on 8/9 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 02:37:00 UTC (rev 6858) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 14:04:00 UTC (rev 6859) @@ -80,24 +80,36 @@ fi if [ -n "$nopass" ]; then - omask=`umask` - umask 0377 - awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST - if [ $? -eq 0 ]; then - cmp -s /etc/shadow /etc/shadow.$PKGINST - if [ $? -ne 0 ]; then - echo "Updating account '$user' to be no-login (NP)" - chgrp sys /etc/shadow.$PKGINST - cp -p /etc/shadow /etc/shadow.CSW && \ - mv /etc/shadow.$PKGINST /etc/shadow - else - rm /etc/shadow.$PKGINST - fi - else - echo "ERROR: Setting NP for '$user' failed." - rm /etc/shadow.$PKGINST - fi - umask $omask + case "`uname -r`" in + 5.8|5.9) + # for old solaris, we munge the shadow file manually. + omask=`umask` + umask 0377 + awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST + if [ $? -eq 0 ]; then + cmp -s /etc/shadow /etc/shadow.$PKGINST + if [ $? -ne 0 ]; then + echo "Updating account '$user' to be no-login (NP)" + chgrp sys /etc/shadow.$PKGINST + cp -p /etc/shadow /etc/shadow.CSW && \ + mv /etc/shadow.$PKGINST /etc/shadow + else + rm /etc/shadow.$PKGINST + fi + else + echo "ERROR: Setting NP for '$user' failed." + rm /etc/shadow.$PKGINST + fi + umask $omask + ;; + *) + # for modern solaris, use the built-in tools + passwd -N $user + if [ $? -ne 0 ]; then + echo "ERROR: Setting NP for '$user' failed." + fi + ;; + esac fi else echo No user to create This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 16:26:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6860] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6860 http://gar.svn.sourceforge.net/gar/?rev=6860&view=rev Author: bdwalton Date: 2009-10-14 14:26:39 +0000 (Wed, 14 Oct 2009) Log Message: ----------- gar: add support for ETCSERVICES (cswetcservices) and INETDCONF (cswinetd) class action scripts; arrange ordering of SPKG_CLASSES to ensure initsmf/inetd are added last; factor the conditional adding of classes into a function Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-10-14 14:04:00 UTC (rev 6859) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-10-14 14:26:39 UTC (rev 6860) @@ -160,17 +160,30 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils -# - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) +# append $2 to SPKG_CLASSES if $1 is non-null +define _spkg_cond_add +$(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) +endef + +# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should +# always be the last two added. The reason for this is that +# you need to ensure any binaries and config files are already on disk +# and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) +SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) +SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) +SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) +SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) +SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) +SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) + # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 14 16:52:08 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6861] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 6861 http://gar.svn.sourceforge.net/gar/?rev=6861&view=rev Author: bonivart Date: 2009-10-14 14:52:07 +0000 (Wed, 14 Oct 2009) Log Message: ----------- miltergreylist: update to 4.2.3, use new gar features Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums Added Paths: ----------- csw/mgar/pkg/miltergreylist/trunk/files/COPYING csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug csw/mgar/pkg/miltergreylist/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2009-10-14 14:26:39 UTC (rev 6860) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2009-10-14 14:52:07 UTC (rev 6861) @@ -1,29 +1,32 @@ GARNAME = miltergreylist -GARVERSION = 4.2 -RELEASE = b1 -DISTVERSION = $(GARVERSION)$(RELEASE) +GARVERSION = 4.2.3 +#RELEASE = rc1 +#DISTVERSION = $(GARVERSION)$(RELEASE) +DISTVERSION = $(GARVERSION) DISTNAME = milter-greylist-$(DISTVERSION) WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net -DESCRIPTION = greylist mail filtering method +DESCRIPTION = Greylist mail filtering method define BLURB + Greylist mail filtering method endef MASTER_SITES = http://ftp.espci.fr/pub/milter-greylist/ DISTFILES = milter-greylist-$(DISTVERSION).tgz -DISTFILES += $(call admfiles,CSWmiltergreylist,) +DISTFILES += COPYING -REQUIRED_PKGS = CSWsendmail CSWcurlrt CSWgeoip CSWcswclassutils +REQUIRED_PKGS = CSWsendmail CSWcurlrt CSWgeoip # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz -#CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw -CONFIGURE_ARGS += --with-user=bonivart +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw #CONFIGURE_ARGS += --with-user=greylist -CONFIGURE_ARGS += --with-conffile=/opt/csw/etc/mail/greylist.conf +CONFIGURE_ARGS += --with-user=`/usr/xpg4/bin/id -u` +CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf CONFIGURE_ARGS += --enable-dnsrbl CONFIGURE_ARGS += --enable-stdio-hack CONFIGURE_ARGS += --localstatedir=/var/opt/csw/milter-greylist @@ -31,12 +34,40 @@ CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man +#SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf + TEST_SCRIPTS = +INSTALL_SCRIPTS = custom +USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup +SAMPLECONF = /etc/opt/csw/greylist.conf.CSW +INITSMF = /etc/opt/csw/init.d/cswmiltergreylist -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswmiltergreylist$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/greylist.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" } { print }' +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/var\/opt\/csw\/miltergreylist/ { $$$$4 = "0700" ; $$$$5 = "greylist" } \ + { print }' include gar/category.mk #WORKSRC := $(WORKDIR)/$(GARNAME)-$(GARVERSION)b1 SPKG_SOURCEURL = http://hcpnet.free.fr/milter-greylist -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) +#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + +DOCLIST = README ChangeLog greylist.conf greylist2.conf milter-greylist.m4 + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake DESTDIR=$(DESTDIR) install ) + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw + @mv $(DESTDIR)/etc/mail/greylist.conf $(DESTDIR)/etc/opt/csw/greylist.conf.CSW + @rmdir $(DESTDIR)/etc/mail + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + @ginstall -d -m 755 $(DESTDIR)/var/opt/csw/$(GARNAME) + @rmdir $(DESTDIR)/var/milter-greylist + @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) + @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)/cswusergroup + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d + @cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist + @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)$(GARNAME) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2009-10-14 14:26:39 UTC (rev 6860) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2009-10-14 14:52:07 UTC (rev 6861) @@ -1,2 +1,2 @@ -2e76e2643469ec393a15dfce9f8ff695 download/milter-greylist-4.2b1.tgz -e8f3c634293ea11273eeb1bd78d95d35 download/CSWmiltergreylist.gspec +e61edd088404cd2a0eacb03ce70e2d5f COPYING +e821a8a4527c1e313f21fe36dbde4a24 milter-greylist-4.2.3.tgz Added: csw/mgar/pkg/miltergreylist/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/COPYING 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1,149 @@ + 20 License + ========== + +This software is available under a 3 clauses BSD license: + Copyright (c) 2004-2007 Emmanuel Dreyfus + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Emmanuel Dreyfus + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + +If you run on a non-BSD system, two files with different licenses might +be required for building or installing. + +install-sh has a MIT BSD-like license: + Copyright 1991 by the Massachusetts Institute of Technology + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. M.I.T. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + + +queue.h has a 4 clause BSD license: + Copyright (c) 1991, 1993 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + +The configure script has the following license: + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + + +If you use the 32 bit ABI on Solaris and have a large traffic, you will +need the a workaround for stdio unability to use streams with associated +file dexriptor above 255. The files implementing the workaround are +fd_pool.c and fd_pool.h, and they have a 3 clause BSD license: + Copyright (c) 2007 Johann Klasek + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Johann Klasek + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + +SpamAssassin binding requires the spamd.c file, which has a 3-clauses +BSD licence: + Copyright (c) 2008 Manuel Badzong, Emmanuel Dreyfus + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Manuel Badzong + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec 2009-10-14 14:26:39 UTC (rev 6860) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec 2009-10-14 14:52:07 UTC (rev 6861) @@ -1,7 +0,0 @@ -%var bitname miltergreylist -%var pkgname CSWmiltergreylist -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/miltergreylist/README for license information - Added: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1,47 @@ +#!/sbin/sh + +# 2009-10-13 Peter Bonivart + +if [ -f /lib/svc/share/smf_include.sh ]; then + . /lib/svc/share/smf_include.sh +fi + +MILDIR=/var/opt/csw/miltergreylist +BINDIR=/opt/csw/bin +USER=greylist + +#OPTIONS="-v -w 14m" +OPTIONS="-u $USER -f /etc/opt/csw/greylist.conf" + +case "$1" in + start) + # Start daemon + echo "Starting milter-greylist ..." + chown $USER $MILDIR + ulimit -n 1024 + $BINDIR/milter-greylist $OPTIONS + ;; + stop) + # Stop daemon + echo "Shutting down milter-greylist ..." + /usr/bin/kill `cat $MILDIR/milter-greylist.pid` > /dev/null 2>&1 + ;; + restart) + echo "Restarting milter-greylist ... " + $0 stop + echo "Waiting for milter-greylist to stop: \c" + while ( pgrep milter-greylist > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; + *) + echo "Usage: `basename $0` { start | stop | restart}" + exit 1 +esac + +exit 0 Added: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1 @@ +greylist:greylist:CSW Milter-Greylist:/bin/false:/false::NP Added: csw/mgar/pkg/miltergreylist/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/README.CSW 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1,26 @@ +README.CSW +========== + +Installation +------------ + +1. If you're adding directly to your mc-file you should use this instead of + what's in the official README since the location of the socket isn't correct. + +INPUT_MAIL_FILTER(`greylist', `S=local:/var/opt/csw/milter-greylist/milter-greyl +ist.sock') +define(`confMILTER_MACROS_CONNECT', `j, {if_addr}') +define(`confMILTER_MACROS_HELO', `{verify}, {cert_subject}') +define(`confMILTER_MACROS_ENVFROM', `i, {auth_authen}') +define(`confMILTER_MACROS_ENVRCPT', `{greylist}') + + The included m4-file is fixed. + +2. Build a new cf-file. +3. Modify /etc/opt/csw/greylist.conf as needed. +4. Start milter-greylist with "/etc/init.d/cswmiltergreylist start" or + "svcadm enable cswmiltergreylist". + +More info: http://milter-greylist.wikidot.com. + +bonivart/091013 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 14 16:57:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:57:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6862] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 6862 http://gar.svn.sourceforge.net/gar/?rev=6862&view=rev Author: wahwah Date: 2009-10-14 14:57:08 +0000 (Wed, 14 Oct 2009) Log Message: ----------- wxwidgets: Modulation over version, building 2.8.5 and 2.8.10 (0.2.0 and 0.6.0) shared objects. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch csw/mgar/pkg/wxwidgets/trunk/files/0501-a-possible-fix-to-wxchar.h.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 14:52:07 UTC (rev 6861) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 14:57:08 UTC (rev 6862) @@ -12,14 +12,33 @@ wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them. endef +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 2.8.5 2.8.10 +MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only +MERGE_DIRS_isa-i386-garversion-2.8.5 = $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.5 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-2.8.5 = $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-2.8.10 = copy-all +MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.10 = copy-all + +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows -PATCHFILES = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES += 0002-Fixing-retarded-checks-for-libGL.patch -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +DISTFILES = $(SOURCEFILES) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = wxwidgets PACKAGES = CSWwxwidgetscommon PACKAGES += CSWwxwidgetsdevel PACKAGES += CSWwxwidgetsgtk2 @@ -27,6 +46,7 @@ SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support + REQUIRED_PKGS = CSWexpat REQUIRED_PKGS += CSWfconfig REQUIRED_PKGS += CSWftype2 @@ -42,6 +62,9 @@ REQUIRED_PKGS += CSWtiff REQUIRED_PKGS += CSWzlib +REQUIRED_PKGS_CSWwxwidgetsgtk2 = CSWwxwidgetscommon +REQUIRED_PKGS_CSWwxwidgetsdevel = CSWwxwidgetscommon + PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWgtk2devel PREREQUISITE_PKGS += CSWlibpthreadstubs @@ -56,13 +79,11 @@ PREREQUISITE_PKGS += SUNWxwinc PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) -REQUIRED_PKGS_CSWwxwidgetsgtk2 = CSWwxwidgetscommon -REQUIRED_PKGS_CSWwxwidgetsdevel = CSWwxwidgetscommon - CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 @@ -81,9 +102,10 @@ CONFIGURE_ARGS_5.10 = --enable-unicode CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt +EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include EXTRA_LIB = /opt/csw/X11/lib -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig INSTALL_SCRIPTS = wxwidgets Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-10-14 14:52:07 UTC (rev 6861) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-10-14 14:57:08 UTC (rev 6862) @@ -1,3 +1,6 @@ 7830ab8006ade9b14567341b5481eadd download/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 download/0002-Fixing-retarded-checks-for-libGL.patch +75ecdc04af4392f918ff6856a3ba6605 download/0500-wxT-macro-first-iteration.patch +17d8d019fd2e4137b4cd44816b14e282 download/0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf download/wxWidgets-2.8.10.tar.gz +43274231ee50eb1f35e04e693ebab902 download/wxWidgets-2.8.5.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch 2009-10-14 14:57:08 UTC (rev 6862) @@ -0,0 +1,3382 @@ +From e2e9f4c5e270479d0c8e19e4763c314f5525b3c9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 14 Oct 2009 11:57:39 +0200 +Subject: [PATCH 500/501] wxT macro first iteration + +--- + Makefile.in | 78 ++++---- + build/bakefiles/common.bkl | 2 + + include/wx/afterstd.h | 11 + + include/wx/arrstr.h | 4 +- + include/wx/artprov.h | 6 +- + include/wx/beforestd.h | 10 + + include/wx/buffer.h | 2 +- + include/wx/cocoa/dirdlg.h | 2 +- + include/wx/confbase.h | 4 +- + include/wx/cppunit.h | 2 +- + include/wx/cshelp.h | 2 +- + include/wx/datectrl.h | 2 +- + include/wx/datetime.h | 42 ++-- + include/wx/dbgrid.h | 6 +- + include/wx/dbtable.h | 2 +- + include/wx/dcbuffer.h | 6 +- + include/wx/dcmirror.h | 6 +- + include/wx/debug.h | 6 +- + include/wx/debugrpt.h | 2 +- + include/wx/defs.h | 18 +- + include/wx/dynlib.h | 2 +- + include/wx/dynload.h | 2 +- + include/wx/event.h | 4 +- + include/wx/ffile.h | 4 +- + include/wx/filefn.h | 2 +- + include/wx/filename.h | 4 +- + include/wx/generic/calctrl.h | 6 +- + include/wx/generic/combo.h | 4 +- + include/wx/generic/grid.h | 14 +- + include/wx/generic/gridctrl.h | 4 +- + include/wx/generic/spinctlg.h | 8 +- + include/wx/generic/splitter.h | 2 +- + include/wx/glcanvas.h | 2 +- + include/wx/gtk/checklst.h | 6 +- + include/wx/gtk/spinctrl.h | 4 +- + include/wx/gtk1/checklst.h | 6 +- + include/wx/gtk1/spinctrl.h | 4 +- + include/wx/imagbmp.h | 26 ++-- + include/wx/image.h | 12 +- + include/wx/imagtiff.h | 8 +- + include/wx/intl.h | 16 +- + include/wx/list.h | 2 +- + include/wx/longlong.h | 8 +- + include/wx/mimetype.h | 6 +- + include/wx/module.h | 2 +- + include/wx/msgdlg.h | 4 +- + include/wx/object.h | 2 +- + include/wx/palette.h | 2 +- + include/wx/private/fileback.h | 2 +- + include/wx/protocol/ftp.h | 2 +- + include/wx/recguard.h | 2 +- + include/wx/selstore.h | 2 +- + include/wx/sound.h | 2 +- + include/wx/spinbutt.h | 2 +- + include/wx/stopwatch.h | 2 +- + include/wx/string.h | 30 ++-- + include/wx/tbarbase.h | 4 +- + include/wx/thrimpl.cpp | 22 +- + include/wx/tokenzr.h | 2 +- + include/wx/univ/button.h | 8 +- + include/wx/univ/checkbox.h | 6 +- + include/wx/univ/checklst.h | 2 +- + include/wx/univ/combobox.h | 6 +- + include/wx/univ/control.h | 4 +- + include/wx/univ/inpcons.h | 2 +- + include/wx/univ/inphand.h | 30 ++-- + include/wx/univ/listbox.h | 36 ++-- + include/wx/univ/menuitem.h | 4 +- + include/wx/univ/notebook.h | 6 +- + include/wx/univ/scrolbar.h | 18 +- + include/wx/univ/slider.h | 20 +- + include/wx/univ/spinbutt.h | 4 +- + include/wx/univ/textctrl.h | 52 +++--- + include/wx/univ/toolbar.h | 4 +- + include/wx/univ/toplevel.h | 12 +- + include/wx/valtext.h | 4 +- + include/wx/vector.h | 2 +- + include/wx/version.h | 4 +- + include/wx/vlbox.h | 4 +- + include/wx/wfstream.h | 4 +- + include/wx/wxchar.h | 27 ++-- + include/wx/x11/textctrl.h | 50 +++--- + include/wx/xrc/xmlres.h | 2 +- + utils/wxrc/wxrc.cpp | 406 ++++++++++++++++++++-------------------- + 84 files changed, 597 insertions(+), 571 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 92b60e1..ef0c052 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -72,7 +72,7 @@ WX_RELEASE = 2.8 + WX_RELEASE_NODOT = 28 + WX_VERSION = $(WX_RELEASE).5 + LIBDIRNAME = $(wx_top_builddir)/lib +-WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ ++WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ -DWXBUILDING $(__WXUNIV_DEFINE_p) $(____SHARED) \ + $(CPPFLAGS) $(CFLAGS) + WXREGEX_OBJECTS = \ + wxregex_regcomp.o \ +@@ -674,11 +674,13 @@ MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \ ++ -DWXBUILDING \ + -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) + MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ ++ -DWXBUILDING \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + MONODLL_OBJECTS = \ + $(__monodll___win32rc) \ +@@ -871,12 +873,12 @@ MONOLIB_OBJECTS = \ + MONOLIB_ODEP = $(___pch_wxprec_monolib_wx_wxprec_h_gch___depname) + BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \ + -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) + BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) +@@ -957,12 +959,12 @@ BASEDLL_OBJECTS = \ + BASEDLL_ODEP = $(___pch_wxprec_basedll_wx_wxprec_h_gch___depname) + BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) + BASELIB_OBJECTS = \ +@@ -1041,7 +1043,7 @@ BASELIB_OBJECTS = \ + BASELIB_ODEP = $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname) + NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + NETDLL_OBJECTS = \ +@@ -1060,7 +1062,7 @@ NETDLL_OBJECTS = \ + NETDLL_ODEP = $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname) + NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ + $(CXXFLAGS) + NETLIB_OBJECTS = \ +@@ -1164,7 +1166,7 @@ MEDIALIB_OBJECTS = \ + MEDIALIB_ODEP = $(___pch_wxprec_medialib_wx_wxprec_h_gch___depname) + ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) +@@ -1175,7 +1177,7 @@ ODBCDLL_OBJECTS = \ + ODBCDLL_ODEP = $(___pch_wxprec_odbcdll_wx_wxprec_h_gch___depname) + ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) + ODBCLIB_OBJECTS = \ +@@ -1184,7 +1186,7 @@ ODBCLIB_OBJECTS = \ + ODBCLIB_ODEP = $(___pch_wxprec_odbclib_wx_wxprec_h_gch___depname) + DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + DBGRIDDLL_OBJECTS = \ +@@ -1193,7 +1195,7 @@ DBGRIDDLL_OBJECTS = \ + DBGRIDDLL_ODEP = $(___pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname) + DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) + DBGRIDLIB_OBJECTS = \ +@@ -1201,7 +1203,7 @@ DBGRIDLIB_OBJECTS = \ + DBGRIDLIB_ODEP = $(___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname) + HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_HTML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + HTMLDLL_OBJECTS = \ +@@ -1233,7 +1235,7 @@ HTMLDLL_OBJECTS = \ + HTMLDLL_ODEP = $(___pch_wxprec_htmldll_wx_wxprec_h_gch___depname) + HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) + HTMLLIB_OBJECTS = \ +@@ -1264,7 +1266,7 @@ HTMLLIB_OBJECTS = \ + HTMLLIB_ODEP = $(___pch_wxprec_htmllib_wx_wxprec_h_gch___depname) + QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ + -DWXMAKINGDLL_QA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + QADLL_OBJECTS = \ +@@ -1274,7 +1276,7 @@ QADLL_OBJECTS = \ + QADLL_ODEP = $(___pch_wxprec_qadll_wx_wxprec_h_gch___depname) + QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) + QALIB_OBJECTS = \ + qalib_debugrpt.o \ +@@ -1282,7 +1284,7 @@ QALIB_OBJECTS = \ + QALIB_ODEP = $(___pch_wxprec_qalib_wx_wxprec_h_gch___depname) + XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + XMLDLL_OBJECTS = \ +@@ -1292,7 +1294,7 @@ XMLDLL_OBJECTS = \ + XMLDLL_ODEP = $(___pch_wxprec_xmldll_wx_wxprec_h_gch___depname) + XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ + $(CXXFLAGS) + XMLLIB_OBJECTS = \ +@@ -1301,7 +1303,7 @@ XMLLIB_OBJECTS = \ + XMLLIB_ODEP = $(___pch_wxprec_xmllib_wx_wxprec_h_gch___depname) + XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ + -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + XRCDLL_OBJECTS = \ +@@ -1365,7 +1367,7 @@ XRCDLL_OBJECTS = \ + XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname) + XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) + XRCLIB_OBJECTS = \ + xrclib_xh_animatctrl.o \ +@@ -1427,7 +1429,7 @@ XRCLIB_OBJECTS = \ + XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname) + AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ + -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + AUIDLL_OBJECTS = \ +@@ -1440,7 +1442,7 @@ AUIDLL_OBJECTS = \ + AUIDLL_ODEP = $(___pch_wxprec_auidll_wx_wxprec_h_gch___depname) + AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) + AUILIB_OBJECTS = \ + auilib_framemanager.o \ +@@ -1451,7 +1453,7 @@ AUILIB_OBJECTS = \ + AUILIB_ODEP = $(___pch_wxprec_auilib_wx_wxprec_h_gch___depname) + RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + RICHTEXTDLL_OBJECTS = \ +@@ -1468,7 +1470,7 @@ RICHTEXTDLL_OBJECTS = \ + RICHTEXTDLL_ODEP = $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname) + RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) + RICHTEXTLIB_OBJECTS = \ +@@ -12550,7 +12552,7 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c + $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c + + monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL + + monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +@@ -20809,7 +20811,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) + @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp + + basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + + basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +@@ -21988,7 +21990,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP) + @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp + + netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + + netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp +@@ -22093,7 +22095,7 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP) + @COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gsocket.cpp + + coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + + coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp +@@ -28018,7 +28020,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp + + advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV + + advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp +@@ -28441,7 +28443,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) + @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp + + mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + + mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) + $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp +@@ -28528,7 +28530,7 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP) + @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp + + odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC + + odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP) + $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp +@@ -28543,7 +28545,7 @@ odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP) + $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp + + dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID + + dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP) + $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp +@@ -28552,7 +28554,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP) + $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp + + htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML + + htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) + $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp +@@ -28711,7 +28713,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) + @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp + + qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA + + qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) + $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp +@@ -28726,7 +28728,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) + $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp + + xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + + xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) + $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp +@@ -28741,7 +28743,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) + $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp + + xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC + + xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp +@@ -29080,7 +29082,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp + + auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI + + auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) + $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp +@@ -29113,7 +29115,7 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) + $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp + + richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + + richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp +@@ -29170,7 +29172,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp + + gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL + + @COND_TOOLKIT_MAC at gldll_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP) + @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp +diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl +index 15ac39b..5a31808 100644 +--- a/build/bakefiles/common.bkl ++++ b/build/bakefiles/common.bkl +@@ -592,6 +592,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r + $(wxwin.mkLibName(wxid)) + $(WXLIBNAME) + ++ WXBUILDING ++ + + + $(WXTOPDIR)src/common/dummy.cpp +diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h +index 4c1d4a5..a1ad8d1 100644 +--- a/include/wx/afterstd.h ++++ b/include/wx/afterstd.h +@@ -46,3 +46,14 @@ + #endif + #endif + ++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) ++#ifndef _T ++#if !wxUSE_UNICODE ++#define _T(x) x ++#else /* Unicode */ ++/* use wxCONCAT_HELPER so that x could be expanded if it's a macro */ ++#define _T(x) wxCONCAT_HELPER(L, x) ++#endif /* ASCII/Unicode */ ++#endif /* !defined(_T) */ ++ ++#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */ +diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h +index 0229f18..fbf04cb 100644 +--- a/include/wx/arrstr.h ++++ b/include/wx/arrstr.h +@@ -152,7 +152,7 @@ public: + wxString& Item(size_t nIndex) const + { + wxASSERT_MSG( nIndex < m_nCount, +- _T("wxArrayString: index out of bounds") ); ++ wxT("wxArrayString: index out of bounds") ); + + return *(wxString *)&(m_pItems[nIndex]); + } +@@ -163,7 +163,7 @@ public: + wxString& Last() const + { + wxASSERT_MSG( !IsEmpty(), +- _T("wxArrayString: index out of bounds") ); ++ wxT("wxArrayString: index out of bounds") ); + return Item(Count() - 1); + } + +diff --git a/include/wx/artprov.h b/include/wx/artprov.h +index 03df39e..2e83493 100644 +--- a/include/wx/artprov.h ++++ b/include/wx/artprov.h +@@ -27,10 +27,10 @@ class wxArtProviderModule; + typedef wxString wxArtClient; + typedef wxString wxArtID; + +-#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + _T("_C")) +-#define wxART_MAKE_CLIENT_ID(id) _T(#id) _T("_C") ++#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + wxT("_C")) ++#define wxART_MAKE_CLIENT_ID(id) wxT(#id) wxT("_C") + #define wxART_MAKE_ART_ID_FROM_STR(id) (id) +-#define wxART_MAKE_ART_ID(id) _T(#id) ++#define wxART_MAKE_ART_ID(id) wxT(#id) + + // ---------------------------------------------------------------------------- + // Art clients +diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h +index aacfc7c..609073c 100644 +--- a/include/wx/beforestd.h ++++ b/include/wx/beforestd.h +@@ -63,3 +63,13 @@ + #pragma warning(disable:4786) + #endif // VC++ < 7 + ++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) ++#undef _T ++#endif // SUNCC ++ ++#if defined (WXBUILDING) ++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) ++#undef _T ++#endif /* SUNCC */ ++#endif /* WXBUILDING */ ++ +diff --git a/include/wx/buffer.h b/include/wx/buffer.h +index 605f4f1..f169f22 100644 +--- a/include/wx/buffer.h ++++ b/include/wx/buffer.h +@@ -286,7 +286,7 @@ public: + // Other ways to append to the buffer + void AppendByte(char data) + { +- wxCHECK_RET( m_bufdata->m_data, _T("invalid wxMemoryBuffer") ); ++ wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") ); + + m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1); + *(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data; +diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h +index 3c5b8dc..084d561 100644 +--- a/include/wx/cocoa/dirdlg.h ++++ b/include/wx/cocoa/dirdlg.h +@@ -26,7 +26,7 @@ class WXDLLEXPORT wxDirDialog: public wxDirDialogBase + public: + wxDirDialog(wxWindow *parent, + const wxString& message = wxDirSelectorPromptStr, +- const wxString& defaultPath = _T(""), ++ const wxString& defaultPath = wxT(""), + long style = wxDD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, +diff --git a/include/wx/confbase.h b/include/wx/confbase.h +index 62b9507..852f7d6 100644 +--- a/include/wx/confbase.h ++++ b/include/wx/confbase.h +@@ -30,13 +30,13 @@ class WXDLLIMPEXP_BASE wxArrayString; + + /// separates group and entry names (probably shouldn't be changed) + #ifndef wxCONFIG_PATH_SEPARATOR +- #define wxCONFIG_PATH_SEPARATOR _T('/') ++ #define wxCONFIG_PATH_SEPARATOR wxT('/') + #endif + + /// introduces immutable entries + // (i.e. the ones which can't be changed from the local config file) + #ifndef wxCONFIG_IMMUTABLE_PREFIX +- #define wxCONFIG_IMMUTABLE_PREFIX _T('!') ++ #define wxCONFIG_IMMUTABLE_PREFIX wxT('!') + #endif + + #if wxUSE_CONFIG +diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h +index 707ac72..ad20cc4 100644 +--- a/include/wx/cppunit.h ++++ b/include/wx/cppunit.h +@@ -65,7 +65,7 @@ + if (Condition) \ + { anyTest; } \ + else \ +- wxLogInfo(wxString::Format(_T("skipping: %s.%s\n reason: %s equals false\n"), \ ++ wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n reason: %s equals false\n"), \ + wxString(suiteName, wxConvUTF8).c_str(), \ + wxString(#testMethod, wxConvUTF8).c_str(), \ + wxString(#Condition, wxConvUTF8).c_str())) +diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h +index f77ac4f..4cee508 100644 +--- a/include/wx/cshelp.h ++++ b/include/wx/cshelp.h +@@ -134,7 +134,7 @@ public: + const wxPoint& pt, + wxHelpEvent::Origin origin) + { +- wxCHECK_MSG( window, false, _T("window must not be NULL") ); ++ wxCHECK_MSG( window, false, wxT("window must not be NULL") ); + + m_helptextAtPoint = pt; + m_helptextOrigin = origin; +diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h +index 0da1277..085a8d1 100644 +--- a/include/wx/datectrl.h ++++ b/include/wx/datectrl.h +@@ -19,7 +19,7 @@ + #include "wx/control.h" // the base class + #include "wx/datetime.h" + +-#define wxDatePickerCtrlNameStr _T("datectrl") ++#define wxDatePickerCtrlNameStr wxT("datectrl") + + // wxDatePickerCtrl styles + enum +diff --git a/include/wx/datetime.h b/include/wx/datetime.h +index 772f656..1b16520 100644 +--- a/include/wx/datetime.h ++++ b/include/wx/datetime.h +@@ -938,37 +938,37 @@ public: + + inline bool operator<(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() < dt.GetValue(); + } + + inline bool operator<=(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() <= dt.GetValue(); + } + + inline bool operator>(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() > dt.GetValue(); + } + + inline bool operator>=(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() >= dt.GetValue(); + } + + inline bool operator==(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() == dt.GetValue(); + } + + inline bool operator!=(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() != dt.GetValue(); + } + +@@ -1062,15 +1062,15 @@ public: + wxString Format(const wxChar *format = wxDefaultDateTimeFormat, + const TimeZone& tz = Local) const; + // preferred date representation for the current locale +- wxString FormatDate() const { return Format(_T("%x")); } ++ wxString FormatDate() const { return Format(wxT("%x")); } + // preferred time representation for the current locale +- wxString FormatTime() const { return Format(_T("%X")); } ++ wxString FormatTime() const { return Format(wxT("%X")); } + // returns the string representing the date in ISO 8601 format + // (YYYY-MM-DD) +- wxString FormatISODate() const { return Format(_T("%Y-%m-%d")); } ++ wxString FormatISODate() const { return Format(wxT("%Y-%m-%d")); } + // returns the string representing the time in ISO 8601 format + // (HH:MM:SS) +- wxString FormatISOTime() const { return Format(_T("%H:%M:%S")); } ++ wxString FormatISOTime() const { return Format(wxT("%H:%M:%S")); } + + // implementation + // ------------------------------------------------------------------------ +@@ -1639,7 +1639,7 @@ inline wxDateTime::wxDateTime(double jdn) + + inline wxDateTime& wxDateTime::Set(const Tm& tm) + { +- wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") ); ++ wxASSERT_MSG( tm.IsValid(), wxT("invalid broken down date/time") ); + + return Set(tm.mday, (Month)tm.mon, tm.year, + tm.hour, tm.min, tm.sec, tm.msec); +@@ -1670,14 +1670,14 @@ inline wxDateTime::wxDateTime(wxDateTime_t day, + + inline wxLongLong wxDateTime::GetValue() const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + return m_time; + } + + inline time_t wxDateTime::GetTicks() const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + if ( !IsInStdRange() ) + { + return (time_t)-1; +@@ -1745,21 +1745,21 @@ inline wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const + + inline bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return m_time == datetime.m_time; + } + + inline bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return m_time < datetime.m_time; + } + + inline bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return m_time > datetime.m_time; + } +@@ -1816,14 +1816,14 @@ inline bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, + + inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + return wxDateTime(m_time + diff.GetValue()); + } + + inline wxDateTime& wxDateTime::Add(const wxTimeSpan& diff) + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + m_time += diff.GetValue(); + +@@ -1837,14 +1837,14 @@ inline wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff) + + inline wxDateTime wxDateTime::Subtract(const wxTimeSpan& diff) const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + return wxDateTime(m_time - diff.GetValue()); + } + + inline wxDateTime& wxDateTime::Subtract(const wxTimeSpan& diff) + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + m_time -= diff.GetValue(); + +@@ -1858,7 +1858,7 @@ inline wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff) + + inline wxTimeSpan wxDateTime::Subtract(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return wxTimeSpan(GetValue() - datetime.GetValue()); + } +diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h +index 4e8655c..7e3b513 100644 +--- a/include/wx/dbgrid.h ++++ b/include/wx/dbgrid.h +@@ -23,7 +23,7 @@ + #include "wx/grid.h" + #include "wx/dbkeyg.h" + +-#define wxGRID_VALUE_DBAUTO _T("dbauto") ++#define wxGRID_VALUE_DBAUTO wxT("dbauto") + + WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID); + +@@ -119,12 +119,12 @@ public: + + virtual int GetNumberRows() + { +- wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal); ++ wxLogDebug(wxT(" GetNumberRows() = %i"),m_rowtotal); + return m_rowtotal; + } + virtual int GetNumberCols() + { +- wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols); ++ wxLogDebug(wxT(" GetNumberCols() = %i"),m_nocols); + return m_nocols; + } + virtual bool IsEmptyCell(int row, int col) ; +diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h +index 1bbef54..9fb6260 100644 +--- a/include/wx/dbtable.h ++++ b/include/wx/dbtable.h +@@ -305,7 +305,7 @@ public: + HSTMT *NewCursor(bool setCursor = false, bool bindColumns = true) { return GetNewCursor(setCursor,bindColumns); } + #endif + +- ULONG Count(const wxString &args=_T("*")); ++ ULONG Count(const wxString &args=wxT("*")); + int DB_STATUS(void) { return(pDb->DB_STATUS); } + + bool IsColNull(UWORD colNumber) const; +diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h +index 46c28ba..7249235 100644 +--- a/include/wx/dcbuffer.h ++++ b/include/wx/dcbuffer.h +@@ -100,8 +100,8 @@ public: + // blitting to) is destroyed. + void UnMask() + { +- wxCHECK_RET( m_dc, _T("no underlying wxDC?") ); +- wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") ); ++ wxCHECK_RET( m_dc, wxT("no underlying wxDC?") ); ++ wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") ); + + wxCoord x = 0, + y = 0; +@@ -122,7 +122,7 @@ private: + // common part of Init()s + void InitCommon(wxDC *dc, int style) + { +- wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") ); ++ wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") ); + + m_dc = dc; + m_style = style; +diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h +index bc15a39..3b9dcb9 100644 +--- a/include/wx/dcmirror.h ++++ b/include/wx/dcmirror.h +@@ -135,7 +135,7 @@ protected: + wxCoord x2, wxCoord y2, + wxCoord xc, wxCoord yc) + { +- wxFAIL_MSG( _T("this is probably wrong") ); ++ wxFAIL_MSG( wxT("this is probably wrong") ); + + m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1), + GetX(x2, y2), GetY(x2, y2), +@@ -152,7 +152,7 @@ protected: + virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, + double sa, double ea) + { +- wxFAIL_MSG( _T("this is probably wrong") ); ++ wxFAIL_MSG( wxT("this is probably wrong") ); + + m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y), + GetX(w, h), GetY(w, h), +@@ -256,7 +256,7 @@ protected: + + virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region)) + { +- wxFAIL_MSG( _T("not implemented") ); ++ wxFAIL_MSG( wxT("not implemented") ); + } + + virtual void DoSetClippingRegion(wxCoord x, wxCoord y, +diff --git a/include/wx/debug.h b/include/wx/debug.h +index b08a71e..3cdd990 100644 +--- a/include/wx/debug.h ++++ b/include/wx/debug.h +@@ -123,13 +123,13 @@ + if ( cond ) \ + {} \ + else \ +- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg) ++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg) + #else + #define wxASSERT_MSG(cond, msg) \ + if ( cond ) \ + ; \ + else \ +- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg) ++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg) + #endif + + /* special form of assert: always triggers it (in debug mode) */ +@@ -140,7 +140,7 @@ + + /* FAIL with some message and a condition */ + #define wxFAIL_COND_MSG(cond, msg) \ +- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(cond), msg) ++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(cond), msg) + + /* An assert helper used to avoid warning when testing constant expressions, */ + /* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */ +diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h +index d1778f1..f05036b 100644 +--- a/include/wx/debugrpt.h ++++ b/include/wx/debugrpt.h +@@ -161,7 +161,7 @@ public: + wxDebugReportUpload(const wxString& url, + const wxString& input, + const wxString& action, +- const wxString& curl = _T("curl")); ++ const wxString& curl = wxT("curl")); + + protected: + virtual bool DoProcess(); +diff --git a/include/wx/defs.h b/include/wx/defs.h +index f533aa7..b3ab0e2 100644 +--- a/include/wx/defs.h ++++ b/include/wx/defs.h +@@ -915,28 +915,28 @@ inline void *wxUIntToPtr(wxUIntPtr p) + #if (defined(__VISUALC__) && defined(__WIN32__)) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 +- #define wxLongLongFmtSpec _T("I64") ++ #define wxLongLongFmtSpec wxT("I64") + #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 +- #define wxLongLongFmtSpec _T("L") ++ #define wxLongLongFmtSpec wxT("L") + #elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__))) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 +- #define wxLongLongFmtSpec _T("L") ++ #define wxLongLongFmtSpec wxT("L") + #elif defined(__DIGITALMARS__) + #define wxLongLong_t __int64 + #define wxLongLongSuffix LL +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #elif defined(__MINGW32__) + #define wxLongLong_t long long + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("I64") ++ #define wxLongLongFmtSpec wxT("I64") + #elif defined(__MWERKS__) + #if __option(longlong) + #define wxLongLong_t long long + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #else + #error "The 64 bit integer support in CodeWarrior has been disabled." + #error "See the documentation on the 'longlong' pragma." +@@ -944,7 +944,7 @@ inline void *wxUIntToPtr(wxUIntPtr p) + #elif defined(__WXPALMOS__) + #define wxLongLong_t int64_t + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 + #define wxLongLong_t long long + #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ +@@ -954,11 +954,11 @@ inline void *wxUIntToPtr(wxUIntPtr p) + (defined(__DJGPP__) && __DJGPP__ >= 2) + #define wxLongLong_t long long + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) + #define wxLongLong_t long + #define wxLongLongSuffix l +- #define wxLongLongFmtSpec _T("l") ++ #define wxLongLongFmtSpec wxT("l") + #define wxLongLongIsLong + #endif + +diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h +index fd4fe60..27eac06 100644 +--- a/include/wx/dynlib.h ++++ b/include/wx/dynlib.h +@@ -103,7 +103,7 @@ enum wxPluginCategory + // type only once, as the first parameter, and creating a variable of this type + // called "pfn" initialized with the "name" from the "dynlib" + #define wxDYNLIB_FUNCTION(type, name, dynlib) \ +- type pfn ## name = (type)(dynlib).GetSymbol(_T(#name)) ++ type pfn ## name = (type)(dynlib).GetSymbol(wxT(#name)) + + // ---------------------------------------------------------------------------- + // wxDynamicLibraryDetails: contains details about a loaded wxDynamicLibrary +diff --git a/include/wx/dynload.h b/include/wx/dynload.h +index b90a645..b53662d 100644 +--- a/include/wx/dynload.h ++++ b/include/wx/dynload.h +@@ -71,7 +71,7 @@ public: + void RefObj() { ++m_objcount; } + void UnrefObj() + { +- wxASSERT_MSG( m_objcount > 0, _T("Too many objects deleted??") ); ++ wxASSERT_MSG( m_objcount > 0, wxT("Too many objects deleted??") ); + --m_objcount; + } + +diff --git a/include/wx/event.h b/include/wx/event.h +index 9022c0b..22aa281 100644 +--- a/include/wx/event.h ++++ b/include/wx/event.h +@@ -451,7 +451,7 @@ public: + wxPropagateOnce(wxEvent& event) : m_event(event) + { + wxASSERT_MSG( m_event.m_propagationLevel > 0, +- _T("shouldn't be used unless ShouldPropagate()!") ); ++ wxT("shouldn't be used unless ShouldPropagate()!") ); + + m_event.m_propagationLevel--; + } +@@ -1398,7 +1398,7 @@ public: + // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it + // doesn't make sense for wxEVT_CLOSE_WINDOW + wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW, +- _T("this flag is for end session events only") ); ++ wxT("this flag is for end session events only") ); + + return m_loggingOff; + } +diff --git a/include/wx/ffile.h b/include/wx/ffile.h +index c3dda75..5577484 100644 +--- a/include/wx/ffile.h ++++ b/include/wx/ffile.h +@@ -37,13 +37,13 @@ public: + // def ctor + wxFFile() { m_fp = NULL; } + // open specified file (may fail, use IsOpened()) +- wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); ++ wxFFile(const wxChar *filename, const wxChar *mode = wxT("r")); + // attach to (already opened) file + wxFFile(FILE *lfp) { m_fp = lfp; } + + // open/close + // open a file (existing or not - the mode controls what happens) +- bool Open(const wxChar *filename, const wxChar *mode = _T("r")); ++ bool Open(const wxChar *filename, const wxChar *mode = wxT("r")); + // closes the opened file (this is a NOP if not opened) + bool Close(); + +diff --git a/include/wx/filefn.h b/include/wx/filefn.h +index 7e3af21..c424649 100644 +--- a/include/wx/filefn.h ++++ b/include/wx/filefn.h +@@ -387,7 +387,7 @@ enum wxFileKind + #define wxHAS_LARGE_FFILES + #endif + #else +- #define wxFileOffsetFmtSpec _T("") ++ #define wxFileOffsetFmtSpec wxT("") + #endif + // functions + #define wxClose close +diff --git a/include/wx/filename.h b/include/wx/filename.h +index 314819b..c7bec56 100644 +--- a/include/wx/filename.h ++++ b/include/wx/filename.h +@@ -488,10 +488,10 @@ public: + static wxULongLong GetSize(const wxString &file); + + // returns the size in a human readable form +- wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(_T("Not available")), ++ wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(wxT("Not available")), + int precision = 1) const; + static wxString GetHumanReadableSize(const wxULongLong &sz, +- const wxString &nullsize = wxGetTranslation(_T("Not available")), ++ const wxString &nullsize = wxGetTranslation(wxT("Not available")), + int precision = 1); + + +diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h +index c135bef..bbcfc13 100644 +--- a/include/wx/generic/calctrl.h ++++ b/include/wx/generic/calctrl.h +@@ -19,7 +19,7 @@ class WXDLLEXPORT wxComboBox; + class WXDLLEXPORT wxStaticText; + class WXDLLEXPORT wxSpinCtrl; + +-#define wxCalendarNameStr _T("CalendarCtrl") ++#define wxCalendarNameStr wxT("CalendarCtrl") + + // ---------------------------------------------------------------------------- + // wxCalendarCtrl: a control allowing the user to pick a date interactively +@@ -124,14 +124,14 @@ public: + + wxCalendarDateAttr *GetAttr(size_t day) const + { +- wxCHECK_MSG( day > 0 && day < 32, NULL, _T("invalid day") ); ++ wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") ); + + return m_attrs[day - 1]; + } + + void SetAttr(size_t day, wxCalendarDateAttr *attr) + { +- wxCHECK_RET( day > 0 && day < 32, _T("invalid day") ); ++ wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") ); + + delete m_attrs[day - 1]; + m_attrs[day - 1] = attr; +diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h +index 1b25185..06814aa 100644 +--- a/include/wx/generic/combo.h ++++ b/include/wx/generic/combo.h +@@ -26,8 +26,8 @@ + // all actions of single line text controls are supported + + // popup/dismiss the choice window +-#define wxACTION_COMBOBOX_POPUP _T("popup") +-#define wxACTION_COMBOBOX_DISMISS _T("dismiss") ++#define wxACTION_COMBOBOX_POPUP wxT("popup") ++#define wxACTION_COMBOBOX_DISMISS wxT("dismiss") + + #endif + +diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h +index c768756..ddc18d1 100644 +--- a/include/wx/generic/grid.h ++++ b/include/wx/generic/grid.h +@@ -42,11 +42,11 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[]; + #define WXGRID_DEFAULT_SCROLLBAR_WIDTH 16 + + // type names for grid table values +-#define wxGRID_VALUE_STRING _T("string") +-#define wxGRID_VALUE_BOOL _T("bool") +-#define wxGRID_VALUE_NUMBER _T("long") +-#define wxGRID_VALUE_FLOAT _T("double") +-#define wxGRID_VALUE_CHOICE _T("choice") ++#define wxGRID_VALUE_STRING wxT("string") ++#define wxGRID_VALUE_BOOL wxT("bool") ++#define wxGRID_VALUE_NUMBER wxT("long") ++#define wxGRID_VALUE_FLOAT wxT("double") ++#define wxGRID_VALUE_CHOICE wxT("choice") + + #define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING + #define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER +@@ -466,7 +466,7 @@ protected: + + // string representation of m_valueOld + wxString GetString() const +- { return wxString::Format(_T("%ld"), m_valueOld); } ++ { return wxString::Format(wxT("%ld"), m_valueOld); } + + private: + int m_min, +@@ -546,7 +546,7 @@ public: + + // set the string values returned by GetValue() for the true and false + // states, respectively +- static void UseStringValues(const wxString& valueTrue = _T("1"), ++ static void UseStringValues(const wxString& valueTrue = wxT("1"), + const wxString& valueFalse = wxEmptyString); + + // return true if the given string is equal to the string representation of +diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h +index 2581fd2..477e0f1 100644 +--- a/include/wx/generic/gridctrl.h ++++ b/include/wx/generic/gridctrl.h +@@ -16,8 +16,8 @@ + + #if wxUSE_GRID + +-#define wxGRID_VALUE_CHOICEINT _T("choiceint") +-#define wxGRID_VALUE_DATETIME _T("datetime") ++#define wxGRID_VALUE_CHOICEINT wxT("choiceint") ++#define wxGRID_VALUE_DATETIME wxT("datetime") + + #if wxUSE_DATETIME + +diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h +index 940d214..b47a7a8 100644 +--- a/include/wx/generic/spinctlg.h ++++ b/include/wx/generic/spinctlg.h +@@ -41,7 +41,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Init(); + Create(parent, id, value, pos, size, style, min, max, initial, name); +@@ -54,7 +54,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")); ++ const wxString& name = wxT("wxSpinCtrl")); + + virtual ~wxSpinCtrl(); + +@@ -124,7 +124,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Create(parent, id, value, pos, size, style, min, max, initial, name); + } +@@ -136,7 +136,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + SetRange(min, max); + +diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h +index 8601083..d2014d5 100644 +--- a/include/wx/generic/splitter.h ++++ b/include/wx/generic/splitter.h +@@ -91,7 +91,7 @@ public: + void SetSplitMode(int mode) + { + wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL, +- _T("invalid split mode") ); ++ wxT("invalid split mode") ); + + m_splitMode = (wxSplitMode)mode; + } +diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h +index 25e2eac..c6ed1c8 100644 +--- a/include/wx/glcanvas.h ++++ b/include/wx/glcanvas.h +@@ -44,7 +44,7 @@ enum + WX_GL_MIN_ACCUM_ALPHA /* use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) */ + }; + +-#define wxGLCanvasName _T("GLCanvas") ++#define wxGLCanvasName wxT("GLCanvas") + + #if defined(__WXMSW__) + #include "wx/msw/glcanvas.h" +diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h +index fa89477..2c1ff65 100644 +--- a/include/wx/gtk/checklst.h ++++ b/include/wx/gtk/checklst.h +@@ -18,10 +18,10 @@ + // there is no "right" choice of the checkbox indicators, so allow the user to + // define them himself if he wants + #ifndef wxCHECKLBOX_CHECKED +- #define wxCHECKLBOX_CHECKED _T('x') +- #define wxCHECKLBOX_UNCHECKED _T(' ') ++ #define wxCHECKLBOX_CHECKED wxT('x') ++ #define wxCHECKLBOX_UNCHECKED wxT(' ') + +- #define wxCHECKLBOX_STRING _T("[ ] ") ++ #define wxCHECKLBOX_STRING wxT("[ ] ") + #endif + + //----------------------------------------------------------------------------- +diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h +index 2929f7f..8fc1dc9 100644 +--- a/include/wx/gtk/spinctrl.h ++++ b/include/wx/gtk/spinctrl.h +@@ -26,7 +26,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Create(parent, id, value, pos, size, style, min, max, initial, name); + } +@@ -38,7 +38,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")); ++ const wxString& name = wxT("wxSpinCtrl")); + + void SetValue(const wxString& text); + void SetSelection(long from, long to); +diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h +index 5a9b8cb..de75b1f 100644 +--- a/include/wx/gtk1/checklst.h ++++ b/include/wx/gtk1/checklst.h +@@ -18,10 +18,10 @@ + // there is no "right" choice of the checkbox indicators, so allow the user to + // define them himself if he wants + #ifndef wxCHECKLBOX_CHECKED +- #define wxCHECKLBOX_CHECKED _T('x') +- #define wxCHECKLBOX_UNCHECKED _T(' ') ++ #define wxCHECKLBOX_CHECKED wxT('x') ++ #define wxCHECKLBOX_UNCHECKED wxT(' ') + +- #define wxCHECKLBOX_STRING _T("[ ] ") ++ #define wxCHECKLBOX_STRING wxT("[ ] ") + #endif + + //----------------------------------------------------------------------------- +diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h +index 7c94538..2c60b77 100644 +--- a/include/wx/gtk1/spinctrl.h ++++ b/include/wx/gtk1/spinctrl.h +@@ -32,7 +32,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Create(parent, id, value, pos, size, style, min, max, initial, name); + } +@@ -44,7 +44,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")); ++ const wxString& name = wxT("wxSpinCtrl")); + + void SetValue(const wxString& text); + void SetSelection(long from, long to); +diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h +index b7a5222..780736b 100644 +--- a/include/wx/imagbmp.h ++++ b/include/wx/imagbmp.h +@@ -14,7 +14,7 @@ + + // defines for saving the BMP file in different formats, Bits Per Pixel + // USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP ); +-#define wxIMAGE_OPTION_BMP_FORMAT wxString(_T("wxBMP_FORMAT")) ++#define wxIMAGE_OPTION_BMP_FORMAT wxString(wxT("wxBMP_FORMAT")) + + // These two options are filled in upon reading CUR file and can (should) be + // specified when saving a CUR file - they define the hotspot of the cursor: +@@ -52,10 +52,10 @@ class WXDLLEXPORT wxBMPHandler : public wxImageHandler + public: + wxBMPHandler() + { +- m_name = _T("Windows bitmap file"); +- m_extension = _T("bmp"); ++ m_name = wxT("Windows bitmap file"); ++ m_extension = wxT("bmp"); + m_type = wxBITMAP_TYPE_BMP; +- m_mime = _T("image/x-bmp"); ++ m_mime = wxT("image/x-bmp"); + } + + #if wxUSE_STREAMS +@@ -86,10 +86,10 @@ class WXDLLEXPORT wxICOHandler : public wxBMPHandler + public: + wxICOHandler() + { +- m_name = _T("Windows icon file"); +- m_extension = _T("ico"); ++ m_name = wxT("Windows icon file"); ++ m_extension = wxT("ico"); + m_type = wxBITMAP_TYPE_ICO; +- m_mime = _T("image/x-ico"); ++ m_mime = wxT("image/x-ico"); + } + + #if wxUSE_STREAMS +@@ -115,10 +115,10 @@ class WXDLLEXPORT wxCURHandler : public wxICOHandler + public: + wxCURHandler() + { +- m_name = _T("Windows cursor file"); +- m_extension = _T("cur"); ++ m_name = wxT("Windows cursor file"); ++ m_extension = wxT("cur"); + m_type = wxBITMAP_TYPE_CUR; +- m_mime = _T("image/x-cur"); ++ m_mime = wxT("image/x-cur"); + } + + // VS: This handler's meat is implemented inside wxICOHandler (the two +@@ -142,10 +142,10 @@ class WXDLLEXPORT wxANIHandler : public wxCURHandler + public: + wxANIHandler() + { +- m_name = _T("Windows animated cursor file"); +- m_extension = _T("ani"); ++ m_name = wxT("Windows animated cursor file"); ++ m_extension = wxT("ani"); + m_type = wxBITMAP_TYPE_ANI; +- m_mime = _T("image/x-ani"); ++ m_mime = wxT("image/x-ani"); + } + + +diff --git a/include/wx/image.h b/include/wx/image.h +index 18d89c6..c9dfe1a 100644 +--- a/include/wx/image.h ++++ b/include/wx/image.h +@@ -27,14 +27,14 @@ + // which breaks the compilation below + #undef index + +-#define wxIMAGE_OPTION_QUALITY wxString(_T("quality")) +-#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName")) ++#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality")) ++#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName")) + +-#define wxIMAGE_OPTION_RESOLUTION wxString(_T("Resolution")) +-#define wxIMAGE_OPTION_RESOLUTIONX wxString(_T("ResolutionX")) +-#define wxIMAGE_OPTION_RESOLUTIONY wxString(_T("ResolutionY")) ++#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution")) ++#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX")) ++#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY")) + +-#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit")) ++#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit")) + + // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT + enum +diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h +index d236b75..d807ae7 100644 +--- a/include/wx/imagtiff.h ++++ b/include/wx/imagtiff.h +@@ -21,10 +21,10 @@ + #include "wx/image.h" + + // defines for wxImage::SetOption +-#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(_T("BitsPerSample")) +-#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(_T("SamplesPerPixel")) +-#define wxIMAGE_OPTION_COMPRESSION wxString(_T("Compression")) +-#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(_T("ImageDescriptor")) ++#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample")) ++#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) ++#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression")) ++#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) + + class WXDLLEXPORT wxTIFFHandler: public wxImageHandler + { +diff --git a/include/wx/intl.h b/include/wx/intl.h +index 0322f41..b3c934e 100644 +--- a/include/wx/intl.h ++++ b/include/wx/intl.h +@@ -42,13 +42,13 @@ enum wxLayoutDirection + // --keyword="_" --keyword="wxPLURAL:1,2" options + // to extract the strings from the sources) + #ifndef WXINTL_NO_GETTEXT_MACRO +- #define _(s) wxGetTranslation(_T(s)) +- #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n) ++ #define _(s) wxGetTranslation(wxT(s)) ++ #define wxPLURAL(sing, plur, n) wxGetTranslation(wxT(sing), wxT(plur), n) + #endif + + // another one which just marks the strings for extraction, but doesn't + // perform the translation (use -kwxTRANSLATE with xgettext!) +-#define wxTRANSLATE(str) _T(str) ++#define wxTRANSLATE(str) wxT(str) + + // ---------------------------------------------------------------------------- + // forward decls +@@ -590,12 +590,12 @@ wxGetTranslation(const wxChar *sz1, const wxChar *sz2, + + #if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(_) +- #define _(s) (_T(s)) ++ #define _(s) (wxT(s)) + #endif +- #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur)) ++ #define wxPLURAL(sing, plur, n) ((n) == 1 ? wxT(sing) : wxT(plur)) + #endif + +-#define wxTRANSLATE(str) _T(str) ++#define wxTRANSLATE(str) wxT(str) + + inline const wxChar * + wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL) +@@ -609,10 +609,10 @@ wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL) + // wxTRANSLATE) too + #if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(gettext_noop) +- #define gettext_noop(str) _T(str) ++ #define gettext_noop(str) wxT(str) + #endif + #if !defined(N_) +- #define N_(s) _T(s) ++ #define N_(s) wxT(s) + #endif + #endif + +diff --git a/include/wx/list.h b/include/wx/list.h +index 821a0f1..f6d94d2 100644 +--- a/include/wx/list.h ++++ b/include/wx/list.h +@@ -207,7 +207,7 @@ private: + bool operator==(const compatibility_iterator& i) const \ + { \ + wxASSERT_MSG( m_list && i.m_list, \ +- _T("comparing invalid iterators is illegal") ); \ ++ wxT("comparing invalid iterators is illegal") ); \ + return (m_list == i.m_list) && (m_iter == i.m_iter); \ + } \ + bool operator!=(const compatibility_iterator& i) const \ +diff --git a/include/wx/longlong.h b/include/wx/longlong.h +index 628efaa..50be474 100644 +--- a/include/wx/longlong.h ++++ b/include/wx/longlong.h +@@ -177,7 +177,7 @@ public: + long ToLong() const + { + wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX), +- _T("wxLongLong to long conversion loss of precision") ); ++ wxT("wxLongLong to long conversion loss of precision") ); + + return wx_truncate_cast(long, m_ll); + } +@@ -405,7 +405,7 @@ public: + unsigned long ToULong() const + { + wxASSERT_MSG( m_ll <= LONG_MAX, +- _T("wxULongLong to long conversion loss of precision") ); ++ wxT("wxULongLong to long conversion loss of precision") ); + + return wx_truncate_cast(unsigned long, m_ll); + } +@@ -683,7 +683,7 @@ public: + long ToLong() const + { + wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l), +- _T("wxLongLong to long conversion loss of precision") ); ++ wxT("wxLongLong to long conversion loss of precision") ); + + return (long)m_lo; + } +@@ -908,7 +908,7 @@ public: + unsigned long ToULong() const + { + wxASSERT_MSG( m_hi == 0ul, +- _T("wxULongLong to long conversion loss of precision") ); ++ wxT("wxULongLong to long conversion loss of precision") ); + + return (unsigned long)m_lo; + } +diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h +index 9717235..8602050 100644 +--- a/include/wx/mimetype.h ++++ b/include/wx/mimetype.h +@@ -51,12 +51,12 @@ class WXDLLIMPEXP_BASE wxMimeType : public wxString + public: + // all string ctors here + +- wxString GetType() const { return BeforeFirst(_T('/')); } +- wxString GetSubType() const { return AfterFirst(_T('/')); } ++ wxString GetType() const { return BeforeFirst(wxT('/')); } ++ wxString GetSubType() const { return AfterFirst(wxT('/')); } + + void SetSubType(const wxString& subtype) + { +- *this = GetType() + _T('/') + subtype; ++ *this = GetType() + wxT('/') + subtype; + } + + bool Matches(const wxMimeType& wildcard) +diff --git a/include/wx/module.h b/include/wx/module.h +index 18b235b..ffeff9f 100644 +--- a/include/wx/module.h ++++ b/include/wx/module.h +@@ -68,7 +68,7 @@ protected: + // after that + void AddDependency(wxClassInfo *dep) + { +- wxCHECK_RET( dep, _T("NULL module dependency") ); ++ wxCHECK_RET( dep, wxT("NULL module dependency") ); + + m_dependencies.Add(dep); + } +diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h +index d1e212a..f67a38f 100644 +--- a/include/wx/msgdlg.h ++++ b/include/wx/msgdlg.h +@@ -23,10 +23,10 @@ protected: + void SetMessageDialogStyle(long style) + { + wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || ((style & wxYES_NO) == 0), +- _T("wxYES and wxNO may only be used together in wxMessageDialog") ); ++ wxT("wxYES and wxNO may only be used together in wxMessageDialog") ); + + wxASSERT_MSG( (style & wxID_OK) != wxID_OK, +- _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); ++ wxT("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); + + m_dialogStyle = style; + } +diff --git a/include/wx/object.h b/include/wx/object.h +index 2ff6a51..e2b60e3 100644 +--- a/include/wx/object.h ++++ b/include/wx/object.h +@@ -311,7 +311,7 @@ name##PluginSentinel m_pluginsentinel; + #ifdef __WXDEBUG__ + inline void* wxCheckCast(void *ptr) + { +- wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") ); ++ wxASSERT_MSG( ptr, wxT("wxStaticCast() used incorrectly") ); + return ptr; + } + #define wxStaticCast(obj, className) \ +diff --git a/include/wx/palette.h b/include/wx/palette.h +index 9a09456..43757ab 100644 +--- a/include/wx/palette.h ++++ b/include/wx/palette.h +@@ -27,7 +27,7 @@ public: + + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const = 0; +- virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; } ++ virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } + }; + + #if defined(__WXPALMOS__) +diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h +index 534a0f3..7f5e722 100644 +--- a/include/wx/private/fileback.h ++++ b/include/wx/private/fileback.h +@@ -33,7 +33,7 @@ public: + // backing file is never created and the backing is done with memory. + wxBackingFile(wxInputStream *stream, + size_t bufsize = DefaultBufSize, +- const wxString& prefix = _T("wxbf")); ++ const wxString& prefix = wxT("wxbf")); + + wxBackingFile() : m_impl(NULL) { } + ~wxBackingFile(); +diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h +index b074e15..0c5cfbc 100644 +--- a/include/wx/protocol/ftp.h ++++ b/include/wx/protocol/ftp.h +@@ -175,7 +175,7 @@ protected: + + // the trace mask used by assorted wxLogTrace() in ftp code, do + // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output +-#define FTP_TRACE_MASK _T("ftp") ++#define FTP_TRACE_MASK wxT("ftp") + + #endif // wxUSE_PROTOCOL_FTP + +diff --git a/include/wx/recguard.h b/include/wx/recguard.h +index f2c6ffe..8133a12 100644 +--- a/include/wx/recguard.h ++++ b/include/wx/recguard.h +@@ -35,7 +35,7 @@ public: + + ~wxRecursionGuard() + { +- wxASSERT_MSG( m_flag > 0, _T("unbalanced wxRecursionGuards!?") ); ++ wxASSERT_MSG( m_flag > 0, wxT("unbalanced wxRecursionGuards!?") ); + + m_flag--; + } +diff --git a/include/wx/selstore.h b/include/wx/selstore.h +index 7df7e79..fca6043 100644 +--- a/include/wx/selstore.h ++++ b/include/wx/selstore.h +@@ -51,7 +51,7 @@ public: + void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = false; } + + // must be called when a new item is inserted/added +- void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( _T("TODO") ); } ++ void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( wxT("TODO") ); } + + // must be called when an item is deleted + void OnItemDelete(size_t item); +diff --git a/include/wx/sound.h b/include/wx/sound.h +index 765f818..4596cd4 100644 +--- a/include/wx/sound.h ++++ b/include/wx/sound.h +@@ -43,7 +43,7 @@ public: + { + wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || + (flags & wxSOUND_ASYNC) != 0, +- _T("sound can only be looped asynchronously") ); ++ wxT("sound can only be looped asynchronously") ); + return DoPlay(flags); + } + #if WXWIN_COMPATIBILITY_2_4 +diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h +index 72e250b..52677a6 100644 +--- a/include/wx/spinbutt.h ++++ b/include/wx/spinbutt.h +@@ -23,7 +23,7 @@ + #include "wx/control.h" + #include "wx/event.h" + +-#define wxSPIN_BUTTON_NAME _T("wxSpinButton") ++#define wxSPIN_BUTTON_NAME wxT("wxSpinButton") + + // ---------------------------------------------------------------------------- + // The wxSpinButton is like a small scrollbar than is often placed next +diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h +index 9f1d188..29a9307 100644 +--- a/include/wx/stopwatch.h ++++ b/include/wx/stopwatch.h +@@ -40,7 +40,7 @@ public: + void Resume() + { + wxASSERT_MSG( m_pauseCount > 0, +- _T("Resuming stop watch which is not paused") ); ++ wxT("Resuming stop watch which is not paused") ); + + if ( --m_pauseCount == 0 ) + Start(m_pause); +diff --git a/include/wx/string.h b/include/wx/string.h +index e133bc6..aa062e8 100644 +--- a/include/wx/string.h ++++ b/include/wx/string.h +@@ -70,7 +70,7 @@ class WXDLLIMPEXP_BASE wxString; + + // implementation only + #define wxASSERT_VALID_INDEX(i) \ +- wxASSERT_MSG( (size_t)(i) <= length(), _T("invalid index in wxString") ) ++ wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") ) + + // ---------------------------------------------------------------------------- + // constants +@@ -349,7 +349,7 @@ public: + wxStringBase(const wxStringBase& stringSrc) + { + wxASSERT_MSG( stringSrc.GetStringData()->IsValid(), +- _T("did you forget to call UngetWriteBuf()?") ); ++ wxT("did you forget to call UngetWriteBuf()?") ); + + if ( stringSrc.empty() ) { + // nothing to do for an empty string +@@ -376,7 +376,7 @@ public: + wxStringBase(const wxStringBase& str, size_t nPos, size_t nLen) + { + wxASSERT_MSG( str.GetStringData()->IsValid(), +- _T("did you forget to call UngetWriteBuf()?") ); ++ wxT("did you forget to call UngetWriteBuf()?") ); + Init(); + size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen; + InitWith(str.c_str(), nPos, nLen); +@@ -754,7 +754,7 @@ public: + { + Truncate(0); + +- wxASSERT_MSG( empty(), _T("string not empty after call to Empty()?") ); ++ wxASSERT_MSG( empty(), wxT("string not empty after call to Empty()?") ); + } + // empty the string and free memory + void Clear() +@@ -785,7 +785,7 @@ public: + // get last character + wxChar Last() const + { +- wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") ); ++ wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); + + return at(length() - 1); + } +@@ -793,7 +793,7 @@ public: + // get writable last character + wxChar& Last() + { +- wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") ); ++ wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); + return at(length() - 1); + } + +@@ -993,7 +993,7 @@ public: + { + #if !wxUSE_STL + wxASSERT_MSG( s.GetStringData()->IsValid(), +- _T("did you forget to call UngetWriteBuf()?") ); ++ wxT("did you forget to call UngetWriteBuf()?") ); + #endif + + append(s); +@@ -1058,36 +1058,36 @@ public: + // stream-like functions + // insert an int into string + wxString& operator<<(int i) +- { return (*this) << Format(_T("%d"), i); } ++ { return (*this) << Format(wxT("%d"), i); } + // insert an unsigned int into string + wxString& operator<<(unsigned int ui) +- { return (*this) << Format(_T("%u"), ui); } ++ { return (*this) << Format(wxT("%u"), ui); } + // insert a long into string + wxString& operator<<(long l) +- { return (*this) << Format(_T("%ld"), l); } ++ { return (*this) << Format(wxT("%ld"), l); } + // insert an unsigned long into string + wxString& operator<<(unsigned long ul) +- { return (*this) << Format(_T("%lu"), ul); } ++ { return (*this) << Format(wxT("%lu"), ul); } + #if defined wxLongLong_t && !defined wxLongLongIsLong + // insert a long long if they exist and aren't longs + wxString& operator<<(wxLongLong_t ll) + { +- const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("d"); ++ const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("d"); + return (*this) << Format(fmt, ll); + } + // insert an unsigned long long + wxString& operator<<(wxULongLong_t ull) + { +- const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("u"); ++ const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("u"); + return (*this) << Format(fmt , ull); + } + #endif + // insert a float into string + wxString& operator<<(float f) +- { return (*this) << Format(_T("%f"), f); } ++ { return (*this) << Format(wxT("%f"), f); } + // insert a double into string + wxString& operator<<(double d) +- { return (*this) << Format(_T("%g"), d); } ++ { return (*this) << Format(wxT("%g"), d); } + + // string comparison + // case-sensitive comparison (returns a value < 0, = 0 or > 0) +diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h +index 8dae3d1..ca34ba7 100644 +--- a/include/wx/tbarbase.h ++++ b/include/wx/tbarbase.h +@@ -115,7 +115,7 @@ public: + + wxControl *GetControl() const + { +- wxASSERT_MSG( IsControl(), _T("this toolbar tool is not a control") ); ++ wxASSERT_MSG( IsControl(), wxT("this toolbar tool is not a control") ); + + return m_control; + } +@@ -129,7 +129,7 @@ public: + int GetStyle() const { return m_toolStyle; } + wxItemKind GetKind() const + { +- wxASSERT_MSG( IsButton(), _T("only makes sense for buttons") ); ++ wxASSERT_MSG( IsButton(), wxT("only makes sense for buttons") ); + + return m_kind; + } +diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp +index d8226ec..e0fb247 100644 +--- a/include/wx/thrimpl.cpp ++++ b/include/wx/thrimpl.cpp +@@ -39,7 +39,7 @@ bool wxMutex::IsOk() const + wxMutexError wxMutex::Lock() + { + wxCHECK_MSG( m_internal, wxMUTEX_INVALID, +- _T("wxMutex::Lock(): not initialized") ); ++ wxT("wxMutex::Lock(): not initialized") ); + + return m_internal->Lock(); + } +@@ -47,7 +47,7 @@ wxMutexError wxMutex::Lock() + wxMutexError wxMutex::TryLock() + { + wxCHECK_MSG( m_internal, wxMUTEX_INVALID, +- _T("wxMutex::TryLock(): not initialized") ); ++ wxT("wxMutex::TryLock(): not initialized") ); + + return m_internal->TryLock(); + } +@@ -55,7 +55,7 @@ wxMutexError wxMutex::TryLock() + wxMutexError wxMutex::Unlock() + { + wxCHECK_MSG( m_internal, wxMUTEX_INVALID, +- _T("wxMutex::Unlock(): not initialized") ); ++ wxT("wxMutex::Unlock(): not initialized") ); + + return m_internal->Unlock(); + } +@@ -243,7 +243,7 @@ bool wxCondition::IsOk() const + wxCondError wxCondition::Wait() + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Wait(): not initialized") ); ++ wxT("wxCondition::Wait(): not initialized") ); + + return m_internal->Wait(); + } +@@ -251,7 +251,7 @@ wxCondError wxCondition::Wait() + wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Wait(): not initialized") ); ++ wxT("wxCondition::Wait(): not initialized") ); + + return m_internal->WaitTimeout(milliseconds); + } +@@ -259,7 +259,7 @@ wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) + wxCondError wxCondition::Signal() + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Signal(): not initialized") ); ++ wxT("wxCondition::Signal(): not initialized") ); + + return m_internal->Signal(); + } +@@ -267,7 +267,7 @@ wxCondError wxCondition::Signal() + wxCondError wxCondition::Broadcast() + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Broadcast(): not initialized") ); ++ wxT("wxCondition::Broadcast(): not initialized") ); + + return m_internal->Broadcast(); + } +@@ -299,7 +299,7 @@ bool wxSemaphore::IsOk() const + wxSemaError wxSemaphore::Wait() + { + wxCHECK_MSG( m_internal, wxSEMA_INVALID, +- _T("wxSemaphore::Wait(): not initialized") ); ++ wxT("wxSemaphore::Wait(): not initialized") ); + + return m_internal->Wait(); + } +@@ -307,7 +307,7 @@ wxSemaError wxSemaphore::Wait() + wxSemaError wxSemaphore::TryWait() + { @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 14 17:07:00 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 14 Oct 2009 15:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6863] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 6863 http://gar.svn.sourceforge.net/gar/?rev=6863&view=rev Author: bonivart Date: 2009-10-14 15:07:00 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: update to 1.22 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 14:57:08 UTC (rev 6862) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 15:07:00 UTC (rev 6863) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.21 +GARVERSION = 1.22 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 14 17:08:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Oct 2009 15:08:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6864] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6864 http://gar.svn.sourceforge.net/gar/?rev=6864&view=rev Author: wahwah Date: 2009-10-14 15:08:49 +0000 (Wed, 14 Oct 2009) Log Message: ----------- wxwidgets: Setting PKG_CONFIG_PATH the correct way. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 15:07:00 UTC (rev 6863) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 15:08:49 UTC (rev 6864) @@ -105,7 +105,7 @@ EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib INSTALL_SCRIPTS = wxwidgets This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 20:11:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 18:11:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6865] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6865 http://gar.svn.sourceforge.net/gar/?rev=6865&view=rev Author: bdwalton Date: 2009-10-14 18:11:34 +0000 (Wed, 14 Oct 2009) Log Message: ----------- gitosis: leverage new NP setting in cswclassutils Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-14 15:08:49 UTC (rev 6864) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-14 18:11:34 UTC (rev 6865) @@ -15,8 +15,6 @@ define CSWgitosis_postinstall #!/bin/sh -/usr/bin/passwd -N gitosis - # in case the gitosis package was still using /bin/bash. /usr/bin/getent passwd gitosis | /usr/xpg4/bin/grep -q ':/bin/bash' if [ $$? -eq 0 ]; then @@ -58,7 +56,7 @@ INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed GITOSISHOME = /var/opt/csw/gitosis -CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:: +CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:::NP CSWPKGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Oct 14 20:43:50 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 14 Oct 2009 18:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6866] csw/mgar/pkg/nagios_plugins/trunk Message-ID: Revision: 6866 http://gar.svn.sourceforge.net/gar/?rev=6866&view=rev Author: j_arndt Date: 2009-10-14 18:43:50 +0000 (Wed, 14 Oct 2009) Log Message: ----------- nagios_plugins: update to 1.4.14, switched to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile csw/mgar/pkg/nagios_plugins/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff Removed Paths: ------------- csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,5 +1,5 @@ GARNAME = nagios-plugins -GARVERSION = 1.4.13 +GARVERSION = 1.4.14 CATEGORIES = apps DESCRIPTION = plugins for nagios @@ -9,11 +9,16 @@ MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagiosplug/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnagiosp,prototype ) +DISTFILES += CSWnagiosp.prototype + PATCHFILES += check_procs.c.diff PATCHFILES += subst.in.diff +PATCHFILES += pst3.c.diff +PACKAGES = CSWnagiosp +CATALOGNAME_CSWnagiosp = nagios_plugins + REQUIRED_PKGS_CSWnagiosp = CSWggettextrt CSWiconv CSWlibnet CSWlibpq REQUIRED_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl REQUIRED_PKGS_CSWnagiosp += CSWzlib CSWperl Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,5 +1,5 @@ -61f490e92b603ac8628fb0c6cebb39ce download/CSWnagiosp.gspec 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff -be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz +a1835a48a777863ed2583de3c82446a9 download/nagios-plugins-1.4.14.tar.gz +03263abe39cb30741932b878323127e1 download/pst3.c.diff 54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,3 +0,0 @@ -%var bitname nagios_plugins -%var pkgname CSWnagiosp -%include url file://%{PKGLIB}/csw_dyndepend.gspec Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,22 +0,0 @@ -diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/Makefile.in nagios-plugins-1.4.13/Makefile.in ---- nagios-plugins-1.4.13.orig/Makefile.in 2008-09-25 10:33:22.000000000 +0200 -+++ nagios-plugins-1.4.13/Makefile.in 2009-02-03 21:53:58.207039758 +0100 -@@ -1037,6 +1037,12 @@ - install-root: - cd plugins-root && $(MAKE) $@ - -+install-contrib: -+ tar cf contrib.tar contrib/ -+ $(INSTALL) -d $(DESTDIR)$(docdir) -+ $(INSTALL) -m 644 contrib.tar $(DESTDIR)$(docdir) -+ -+ - tap: - cd @TAP_DIR@ && $(MAKE) - -@@ -1073,3 +1079,5 @@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -+ -+none: Added: csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff (rev 0) +++ csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2009-10-14 18:43:50 UTC (rev 6866) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru nagios-plugins-1.4.14.orig/plugins-root/pst3.c nagios-plugins-1.4.14/plugins-root/pst3.c +--- nagios-plugins-1.4.14.orig/plugins-root/pst3.c 2009-09-14 12:21:24.000000000 +0200 ++++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 19:50:47.193501484 +0200 +@@ -43,8 +43,6 @@ + + #include + #include +-#include +-#include + #include + #include + #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Oct 14 22:29:09 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 14 Oct 2009 20:29:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6867] csw/mgar/pkg/nagios_plugins/trunk Message-ID: Revision: 6867 http://gar.svn.sourceforge.net/gar/?rev=6867&view=rev Author: j_arndt Date: 2009-10-14 20:29:08 +0000 (Wed, 14 Oct 2009) Log Message: ----------- nagios_plugins: patch for pst3 tool for compiling on sparc _and_ i386 Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/checksums csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 18:43:50 UTC (rev 6866) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 20:29:08 UTC (rev 6867) @@ -1,5 +1,5 @@ 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff a1835a48a777863ed2583de3c82446a9 download/nagios-plugins-1.4.14.tar.gz -03263abe39cb30741932b878323127e1 download/pst3.c.diff +91aaa11cae02b6855a2fdb055c27f767 download/pst3.c.diff 54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2009-10-14 18:43:50 UTC (rev 6866) +++ csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2009-10-14 20:29:08 UTC (rev 6867) @@ -1,12 +1,18 @@ diff --speed-large-files --minimal -Nru nagios-plugins-1.4.14.orig/plugins-root/pst3.c nagios-plugins-1.4.14/plugins-root/pst3.c --- nagios-plugins-1.4.14.orig/plugins-root/pst3.c 2009-09-14 12:21:24.000000000 +0200 -+++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 19:50:47.193501484 +0200 -@@ -43,8 +43,6 @@ ++++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 22:02:53.643787730 +0200 +@@ -43,11 +43,11 @@ #include #include -#include -#include ++#include "/usr/include/string.h" ++#include "/usr/include/unistd.h" #include #include - #include +-#include ++#include "/usr/include/fcntl.h" + #include + #include + #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 15 00:42:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 22:42:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6868] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6868 http://gar.svn.sourceforge.net/gar/?rev=6868&view=rev Author: bdwalton Date: 2009-10-14 22:42:38 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: rework python compilation so only package specific files are compiled Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 20:29:08 UTC (rev 6867) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.22 +GARVERSION = 1.23 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-14 20:29:08 UTC (rev 6867) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-14 22:42:38 UTC (rev 6868) @@ -7,6 +7,7 @@ # Written by Mike Watters # # 2009-05-25 First Release +# 2009-10-14 Update to only compile package specific files (Ben Walton) # # Force Path for the script to use @@ -20,34 +21,51 @@ if [ "${DEBUG}" ]; then echo PACKAGE: $PKGINST fi + +TMPPY=/tmp/pycomp.$$.`date +%Y%m%d%H%M%S`.py + +cat < $TMPPY +import py_compile + +pyfiles = [ +EOF + +echo "Installing class ..." + while read src dest; do if [ "$DEBUG" ]; then echo SRC: $src DEST: $dest fi /usr/bin/cp -p $src $dest || exit 2 + echo $dest + + echo " \"$dest\"," >> $TMPPY done +cat <> $TMPPY + ] + +for f in pyfiles: + try: + py_compile.compile(f, doraise=True) + except PyCompileError: + print "Error compiling: %s" % f + +EOF + if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then echo "Could not find or execute ${PY_BINDIR}/python" echo "Check your Python installation." exit 2 fi -if [ ! -f ${PY_LIBDIR}/compileall.py ]; then - echo "Could not find ${PY_LIBDIR}/compileall.py" - echo "Check your Python installation." - exit 2 -fi - echo "Compiling py files to normal bytecode ..." -# Compile .py libraries to .pyc files -${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \ - -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR} +${PY_BINDIR}/python -Wi -tt $TMPPY echo "Compiling py files to optimized bytecode ..." -# Compile .py libraries to .pyo files -${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \ - -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR} - +${PY_BINDIR}/python -Wi -tt -O $TMPPY + +rm $TMPPY + exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 11:21:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 09:21:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6869] csw/mgar/pkg Message-ID: Revision: 6869 http://gar.svn.sourceforge.net/gar/?rev=6869&view=rev Author: wahwah Date: 2009-10-15 09:21:43 +0000 (Thu, 15 Oct 2009) Log Message: ----------- gdata-python-client: Initial commit Modified Paths: -------------- csw/mgar/pkg/gdata-python-client/trunk/Makefile csw/mgar/pkg/gdata-python-client/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gdata-python-client/ Modified: csw/mgar/pkg/gdata-python-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/gdata-python-client/trunk/Makefile 2009-10-15 09:21:43 UTC (rev 6869) @@ -2,181 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = gdata-python-client +GARVERSION = 2.0.3 +CATEGORIES = python +DESCRIPTION = Google Data Protocol, a REST-inspired technology define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://code.google.com/apis/gdata/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = gdata-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/gdata-$(GARVERSION) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +CATALOGNAME = py_gdata +PACKAGES = CSWpygdata +REQUIRED_PKGS = +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpysetuptools +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/gdata-python-client/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/gdata-python-client/trunk/checksums 2009-10-15 09:21:43 UTC (rev 6869) @@ -0,0 +1 @@ +43d4975caeebbe8d64e101638be966cd gdata-2.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 11:31:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 09:31:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6870] csw/mgar/pkg/gdata-python-client/trunk/Makefile Message-ID: Revision: 6870 http://gar.svn.sourceforge.net/gar/?rev=6870&view=rev Author: wahwah Date: 2009-10-15 09:31:45 +0000 (Thu, 15 Oct 2009) Log Message: ----------- gdata-python-client: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/gdata-python-client/trunk/Makefile Modified: csw/mgar/pkg/gdata-python-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdata-python-client/trunk/Makefile 2009-10-15 09:21:43 UTC (rev 6869) +++ csw/mgar/pkg/gdata-python-client/trunk/Makefile 2009-10-15 09:31:45 UTC (rev 6870) @@ -15,6 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_gdata PACKAGES = CSWpygdata +ARCHALL_CSWpygdata = 1 REQUIRED_PKGS = PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpysetuptools TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 15 14:04:19 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 15 Oct 2009 12:04:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6871] csw/mgar/pkg/cpan/libwww-perl/trunk Message-ID: Revision: 6871 http://gar.svn.sourceforge.net/gar/?rev=6871&view=rev Author: bonivart Date: 2009-10-15 12:04:19 +0000 (Thu, 15 Oct 2009) Log Message: ----------- libwww: update to 5.833 Modified Paths: -------------- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/checksums Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2009-10-15 09:31:45 UTC (rev 6870) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2009-10-15 12:04:19 UTC (rev 6871) @@ -1,5 +1,5 @@ GARNAME = libwww-perl -GARVERSION = 5.830 +GARVERSION = 5.833 CATEGORIES = cpan AUTHOR = GAAS Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2009-10-15 09:31:45 UTC (rev 6870) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2009-10-15 12:04:19 UTC (rev 6871) @@ -1,2 +1,2 @@ -d6d74a59bf794b8ffc8da8bbf1e4e15a download/COPYING -55049cd17e73c94bee3aee4b65b465c5 download/libwww-perl-5.830.tar.gz +d6d74a59bf794b8ffc8da8bbf1e4e15a COPYING +8fd7d7e793355c4e6e6806c70f6d2917 libwww-perl-5.833.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 15:00:19 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 13:00:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6872] csw/mgar/pkg Message-ID: Revision: 6872 http://gar.svn.sourceforge.net/gar/?rev=6872&view=rev Author: wahwah Date: 2009-10-15 13:00:19 +0000 (Thu, 15 Oct 2009) Log Message: ----------- googletest: Initial commit Modified Paths: -------------- csw/mgar/pkg/googletest/trunk/Makefile csw/mgar/pkg/googletest/trunk/checksums Added Paths: ----------- csw/mgar/pkg/googletest/ Modified: csw/mgar/pkg/googletest/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/googletest/trunk/Makefile 2009-10-15 13:00:19 UTC (rev 6872) @@ -2,181 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = googletest +GARVERSION = 1.4.0 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = a framework for writing C++ tests on a variety of platforms define BLURB - + Google's framework for writing C++ tests on a variety of platforms (Linux, + Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit + architecture. Supports automatic test discovery, a rich set of assertions, + user-defined assertions, death tests, fatal and non-fatal failures, value- + and type-parameterized tests, various options for running the tests, and XML + test report generation. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://code.google.com/p/googletest/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = gtest-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) +UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/googletest/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/googletest/trunk/checksums 2009-10-15 13:00:19 UTC (rev 6872) @@ -0,0 +1 @@ +ec1dd5ab07cde5da033b1d631e621167 gtest-1.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 15:18:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 13:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6873] csw/mgar/pkg Message-ID: Revision: 6873 http://gar.svn.sourceforge.net/gar/?rev=6873&view=rev Author: wahwah Date: 2009-10-15 13:18:19 +0000 (Thu, 15 Oct 2009) Log Message: ----------- googlemock: Initial commit (doesn't compile at the moment) Modified Paths: -------------- csw/mgar/pkg/googlemock/trunk/Makefile csw/mgar/pkg/googlemock/trunk/checksums Added Paths: ----------- csw/mgar/pkg/googlemock/ Modified: csw/mgar/pkg/googlemock/trunk/Makefile =================================================================== --- csw/mgar/pkg/googletest/trunk/Makefile 2009-10-15 13:00:19 UTC (rev 6872) +++ csw/mgar/pkg/googlemock/trunk/Makefile 2009-10-15 13:18:19 UTC (rev 6873) @@ -2,22 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = googletest +GARNAME = googlemock GARVERSION = 1.4.0 CATEGORIES = lib -DESCRIPTION = a framework for writing C++ tests on a variety of platforms +DESCRIPTION = a library for writing and using C++ mock classes define BLURB - Google's framework for writing C++ tests on a variety of platforms (Linux, - Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit - architecture. Supports automatic test discovery, a rich set of assertions, - user-defined assertions, death tests, fatal and non-fatal failures, value- - and type-parameterized tests, various options for running the tests, and XML - test report generation. + Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s specifics + in mind, Google C++ Mocking Framework (or Google Mock for short) is a library + for writing and using C++ mock classes. endef -SPKG_SOURCEURL = http://code.google.com/p/googletest/ +SPKG_SOURCEURL = http://code.google.com/p/googlemock/ MASTER_SITES = $(GOOGLE_MIRROR) -DISTFILES = gtest-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) -UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz +DISTFILES = gmock-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/gmock-$(GARVERSION) +UFILES_REGEX = gmock-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -include gar/category.mk + +# Compilation unfortunately fails: +# +# "./include/gmock/gmock-printers.h", line 480: Error: static +# testing::internal::TuplePrefixPrinter<1>::PrintPrefixTo::Tuple>(const +# testing::internal::TuplePrefixPrinter<1>::Tuple&, std::ostream *) already had +# a body defined. +# +# include gar/category.mk Modified: csw/mgar/pkg/googlemock/trunk/checksums =================================================================== --- csw/mgar/pkg/googletest/trunk/checksums 2009-10-15 13:00:19 UTC (rev 6872) +++ csw/mgar/pkg/googlemock/trunk/checksums 2009-10-15 13:18:19 UTC (rev 6873) @@ -1 +1 @@ -ec1dd5ab07cde5da033b1d631e621167 gtest-1.4.0.tar.gz +f2ac810a5e601792f4a99f296ccb1269 gmock-1.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 17:35:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 15:35:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6874] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6874 http://gar.svn.sourceforge.net/gar/?rev=6874&view=rev Author: wahwah Date: 2009-10-15 15:35:18 +0000 (Thu, 15 Oct 2009) Log Message: ----------- cups-1.4: Cosmetic changes to the Makefile. It turns out that 1.3.11 and 1.4.0 use the same major library numbers, there's no need to include libs from 1.3.11 in 1.4.0. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-15 13:18:19 UTC (rev 6873) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-15 15:35:18 UTC (rev 6874) @@ -31,25 +31,27 @@ GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. -CUPS_MIRRORS = http://ftp.easysw.com/pub +CUPS_MIRRORS = http://ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp2.easysw.com/pub CUPS_MIRRORS += ftp://ftp3.easysw.com/pub CUPS_MIRRORS += http://www.nu6.org/_/mirror/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub + # Complete the mirror paths by adding /cups/x.y.z/ at the end. -FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) +FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -PATCHFILES = 0001-cswcups-for-service-name.patch -PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch -PATCHFILES += 0003-Reference-counting-for-printers-only.patch -DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 DISTFILES += CSWcupsclient.preinstall DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove +PATCHFILES = 0001-cswcups-for-service-name.patch +PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch +PATCHFILES += 0003-Reference-counting-for-printers-only.patch + PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg PREREQUISITE_PKGS += CSWkrb5libdev @@ -183,6 +185,8 @@ OPTIM = $(OPTIM_$(GARFLAVOR)) export OPTIM +include gar/category.mk + post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ @@ -194,5 +198,3 @@ fi \ done) @$(MAKECOOKIE) - -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 16 19:22:09 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 16 Oct 2009 17:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6875] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 6875 http://gar.svn.sourceforge.net/gar/?rev=6875&view=rev Author: bdwalton Date: 2009-10-16 17:22:09 +0000 (Fri, 16 Oct 2009) Log Message: ----------- tig: remove CSWgcc4corert dep Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-15 15:35:18 UTC (rev 6874) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-16 17:22:09 UTC (rev 6875) @@ -19,7 +19,7 @@ PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv -REQUIRED_PKGS = CSWncurses CSWiconv CSWgit CSWgcc4corert +REQUIRED_PKGS = CSWncurses CSWiconv CSWgit GIT_REPOS = http://jonas.nitro.dk/tig/tig.git GIT_TREEISH_tig.git = $(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Fri Oct 16 20:33:30 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Fri, 16 Oct 2009 18:33:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6876] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 6876 http://gar.svn.sourceforge.net/gar/?rev=6876&view=rev Author: harpchad Date: 2009-10-16 18:33:27 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Bump version to 2.6.3 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-10-16 17:22:09 UTC (rev 6875) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-10-16 18:33:27 UTC (rev 6876) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.2 +GARVERSION = 2.6.3 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-10-16 17:22:09 UTC (rev 6875) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-10-16 18:33:27 UTC (rev 6876) @@ -1 +1 @@ -2db20c9c44e9a84ae4a9290f9e47ae83 download/pidgin-2.6.2.tar.gz +d0b030f0f746251b48fc78f59fe71861 download/pidgin-2.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 17 16:35:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Oct 2009 14:35:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6877] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6877 http://gar.svn.sourceforge.net/gar/?rev=6877&view=rev Author: wahwah Date: 2009-10-17 14:35:43 +0000 (Sat, 17 Oct 2009) Log Message: ----------- cswutils: added submitpkg -- a script to submit a package to the release manager Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-16 18:33:27 UTC (rev 6876) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-17 14:35:43 UTC (rev 6877) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswutils -GARVERSION = 1.14.4 +GARVERSION = 1.14.5 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 77 +SVN_REV = 90 MASTER_SITES = DISTFILES = COPYING @@ -20,6 +20,7 @@ DISTFILES += stagepkg stagepkg.8 DISTFILES += compare_pkgs.py-r$(SVN_REV) DISTFILES += opencsw_lib.py-r$(SVN_REV) +DISTFILES += submit_to_newpkgs.py-r$(SVN_REV) REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree @@ -42,14 +43,11 @@ include gar/category.mk -download/compare_pkgs.py-r$(SVN_REV): - svn export -r $(SVN_REV) $(SVNROOT)compare_pkgs.py - mv compare_pkgs.py download/compare_pkgs.py-r$(SVN_REV) - @$(MAKECOOKIE) +SVN_FILES = submit_to_newpkgs compare_pkgs opencsw_lib -download/opencsw_lib.py-r$(SVN_REV): - svn export -r $(SVN_REV) $(SVNROOT)opencsw_lib.py - mv opencsw_lib.py download/opencsw_lib.py-r$(SVN_REV) +$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F).py-r$(SVN_REV)): + svn export -r $(SVN_REV) $(SVNROOT)$(subst -r$(SVN_REV),,$(notdir $@)) + mv $(subst -r$(SVN_REV),,$(notdir $@)) $@ @$(MAKECOOKIE) install-custom: @@ -64,9 +62,12 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw - @ginstall -m 755 $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/csw/compare_pkgs.py @ginstall -m 644 $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py + @for f in compare_pkgs.py submit_to_newpkgs.py; do \ + ginstall -m 755 $(WORKSRC)/$${f}-r$(SVN_REV) \ + $(DESTDIR)$(libdir)/python/csw/$${f}; \ + done @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg + @ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-10-16 18:33:27 UTC (rev 6876) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-10-17 14:35:43 UTC (rev 6877) @@ -1,10 +1,11 @@ -091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING -30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg -6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 -a60cefbb6829c8dbbfae634a9ab01eba download/compare_pkgs.py-r77 -9a637f6546cc50974159a987302d91c0 download/cpan2pkg -93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg -a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 -d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r77 -cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg -8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 +091b12575ebc0e45cf8c3d8b43d8b638 COPYING +30b6598a4453e3ce0c1fabeede5eb5f8 checkpkg +6ec3b6597e04714430987ccc199db3c4 checkpkg.8 +24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r90 +9a637f6546cc50974159a987302d91c0 cpan2pkg +93b6a811d303ce3be0050c5a7b3c8e69 createpkg +a605598f30195f9ab1b29fc3944d3b31 createpkg.8 +a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r90 +cd4496ee27bf86d5c8bc656c9c5974be stagepkg +8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 +989839890af2cbdc13e6bb37f3b95ba6 submit_to_newpkgs.py-r90 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 17 16:43:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Oct 2009 14:43:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6878] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6878 http://gar.svn.sourceforge.net/gar/?rev=6878&view=rev Author: wahwah Date: 2009-10-17 14:43:44 +0000 (Sat, 17 Oct 2009) Log Message: ----------- cswutils: Added dependency on CSWpython, DISTFILES are now created based on SVN_FILES Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-17 14:35:43 UTC (rev 6877) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-17 14:43:44 UTC (rev 6878) @@ -12,18 +12,18 @@ SVN_REV = 90 MASTER_SITES = +SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 DISTFILES += cpan2pkg DISTFILES += createpkg createpkg.8 DISTFILES += stagepkg stagepkg.8 DISTFILES += stagepkg stagepkg.8 -DISTFILES += compare_pkgs.py-r$(SVN_REV) -DISTFILES += opencsw_lib.py-r$(SVN_REV) -DISTFILES += submit_to_newpkgs.py-r$(SVN_REV) +DISTFILES += $(foreach F,$(SVN_FILES),$(F)-r$(SVN_REV)) REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree +REQUIRED_PKGS += CSWpython WORKSRC = $(WORKDIR) @@ -43,9 +43,8 @@ include gar/category.mk -SVN_FILES = submit_to_newpkgs compare_pkgs opencsw_lib - -$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F).py-r$(SVN_REV)): +# This target doesn't work when defined as $(DOWNLOADDIR)/%-r$(SVN_REV) +$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F)-r$(SVN_REV)): svn export -r $(SVN_REV) $(SVNROOT)$(subst -r$(SVN_REV),,$(notdir $@)) mv $(subst -r$(SVN_REV),,$(notdir $@)) $@ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 17 17:19:22 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 17 Oct 2009 15:19:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6879] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 6879 http://gar.svn.sourceforge.net/gar/?rev=6879&view=rev Author: chninkel Date: 2009-10-17 15:19:22 +0000 (Sat, 17 Oct 2009) Log Message: ----------- ca_certificates: postinstall should not fail if /opt/csw is shared by nfs or among solaris zones Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2009-10-17 14:43:44 UTC (rev 6878) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2009-10-17 15:19:22 UTC (rev 6879) @@ -40,6 +40,7 @@ cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" install-custom: install-certificates $(WORKDIR)/hash.db $(WORKDIR)/LICENSE + ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl" ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs" ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates" ginstall -D "$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates" Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 14:43:44 UTC (rev 6878) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 15:19:22 UTC (rev 6879) @@ -5,5 +5,5 @@ c7fd74bceddf27039a26a5f1dfede163 download/README.CSW 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend -32e6ea27867c760d2279330fd4c480d3 download/CSWcacertificates.postinstall +3f166eabf87f3f97ce51351eb070724d download/CSWcacertificates.postinstall 0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 14:43:44 UTC (rev 6878) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 15:19:22 UTC (rev 6879) @@ -1,3 +1,15 @@ +# workaround to not fail if /opt/csw is read-only +# in the nfs-shared or sparse zone case +# this is temporary until configuration is moved in /etc/opt/csw +if touch /opt/csw/.ca_certificate.test 2>/dev/null; then + rm -f /opt/csw/.ca_certificate.test +else + echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated" + echo " if /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have + echo " to worry about it, the certification authorities list present on the nfs server or in + echo " the global zone will be used." + exit 0 +fi # Update ca lists if [ -n "${BASEDIR}" ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 17 17:20:45 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 17 Oct 2009 15:20:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6880] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 6880 http://gar.svn.sourceforge.net/gar/?rev=6880&view=rev Author: chninkel Date: 2009-10-17 15:20:45 +0000 (Sat, 17 Oct 2009) Log Message: ----------- ca_certificates: fixed missing double quotes Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 15:19:22 UTC (rev 6879) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 15:20:45 UTC (rev 6880) @@ -5,5 +5,5 @@ c7fd74bceddf27039a26a5f1dfede163 download/README.CSW 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend -3f166eabf87f3f97ce51351eb070724d download/CSWcacertificates.postinstall +1fb44412e1ee60dd4f7bd9bd66d4af34 download/CSWcacertificates.postinstall 0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 15:19:22 UTC (rev 6879) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 15:20:45 UTC (rev 6880) @@ -4,9 +4,9 @@ if touch /opt/csw/.ca_certificate.test 2>/dev/null; then rm -f /opt/csw/.ca_certificate.test else - echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated" - echo " if /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have - echo " to worry about it, the certification authorities list present on the nfs server or in + echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated." + echo " If /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have" + echo " to worry about it, the certification authorities list present on the nfs server or in" echo " the global zone will be used." exit 0 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:28:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:28:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6881] csw/mgar/pkg/bdb3 Message-ID: Revision: 6881 http://gar.svn.sourceforge.net/gar/?rev=6881&view=rev Author: dmichelsen Date: 2009-10-18 09:28:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3,bdb33: Prepare for rechange CSWbdb33 to CSWbdb3 Added Paths: ----------- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/checksums Removed Paths: ------------- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/checksums csw/mgar/pkg/bdb3/trunk/ csw/mgar/pkg/bdb33/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ Deleted: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-08 23:22:09 UTC (rev 6801) +++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2009-10-18 09:28:04 UTC (rev 6881) @@ -1,33 +0,0 @@ -GARNAME = db -GARVERSION = 3.3.11 -CATEGORIES = lib - -DESCRIPTION = Stub package as contents moved to CSWbdb33 -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -PACKAGES = CSWbdb3 -CATALOGNAME = berkeleydb3 - -ARCHALL = 1 -REQUIRED_PKGS = CSWbdb33 - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom - -TEST_SCRIPTS = - -include gar/category.mk - -install-custom: - ginstall -d $(DESTDIR)$(libdir) - ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile (from rev 6657, csw/mgar/pkg/bdb3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile (rev 0) +++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2009-10-18 09:28:04 UTC (rev 6881) @@ -0,0 +1,33 @@ +GARNAME = db +GARVERSION = 3.3.11 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb33 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb3 +CATALOGNAME = berkeleydb3 + +ARCHALL = 1 +REQUIRED_PKGS = CSWbdb33 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 18 11:31:23 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:31:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6882] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6882 http://gar.svn.sourceforge.net/gar/?rev=6882&view=rev Author: trygvis Date: 2009-10-18 09:31:17 +0000 (Sun, 18 Oct 2009) Log Message: ----------- o Adding a patch to the latest wip branch. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-18 09:28:04 UTC (rev 6881) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-18 09:31:17 UTC (rev 6882) @@ -1,5 +1,5 @@ GARNAME = cgit -GARVERSION = 0.8.3-opencsw-1 +GARVERSION = 0.8.3_opencsw_1 CATEGORIES = devel DESCRIPTION = Web front-end for Git @@ -38,7 +38,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PATCHFILES = 0001-cgit.conf +PATCHFILES = 0001-cgit.conf +PATCHFILES += 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-18 09:28:04 UTC (rev 6881) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-18 09:31:17 UTC (rev 6882) @@ -1,3 +1,4 @@ -b013ec63820f1841df1cddaa35d66ed3 download/0001-cgit.conf -27ef98eeb9066a301e60def5b6895a2c download/apache.conf.CSW -03d013bbfdad0143ddcb4c29acf1b637 download/cgitrc.CSW +b013ec63820f1841df1cddaa35d66ed3 0001-cgit.conf +ab2c07418eec63118a2da512a99d7e34 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff +27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW +03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW Added: csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff =================================================================== --- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff 2009-10-18 09:31:17 UTC (rev 6882) @@ -0,0 +1,887 @@ +diff --git a/Makefile b/Makefile +index 60d8c58..cb7875e 100644 +--- a/Makefile ++++ b/Makefile +@@ -90,6 +90,7 @@ OBJECTS += ui-refs.o + OBJECTS += ui-repolist.o + OBJECTS += ui-shared.o + OBJECTS += ui-snapshot.o ++OBJECTS += ui-ssdiff.o + OBJECTS += ui-stats.o + OBJECTS += ui-summary.o + OBJECTS += ui-tag.o +diff --git a/cgit.c b/cgit.c +index bd37788..84f44ba 100644 +--- a/cgit.c ++++ b/cgit.c +@@ -182,6 +182,8 @@ void config_cb(const char *name, const char *value) + ctx.cfg.summary_branches = atoi(value); + else if (!strcmp(name, "summary-tags")) + ctx.cfg.summary_tags = atoi(value); ++ else if (!strcmp(name, "side-by-side-diffs")) ++ ctx.cfg.ssdiff = atoi(value); + else if (!strcmp(name, "agefile")) + ctx.cfg.agefile = xstrdup(value); + else if (!strcmp(name, "renamelimit")) +@@ -209,6 +211,8 @@ static void querystring_cb(const char *name, const char *value) + } else if (!strcmp(name, "p")) { + ctx.qry.page = xstrdup(value); + } else if (!strcmp(name, "url")) { ++ if (*value == '/') ++ value++; + ctx.qry.url = xstrdup(value); + cgit_parse_url(value); + } else if (!strcmp(name, "qt")) { +@@ -238,6 +242,8 @@ static void querystring_cb(const char *name, const char *value) + ctx.qry.showmsg = atoi(value); + } else if (!strcmp(name, "period")) { + ctx.qry.period = xstrdup(value); ++ } else if (!strcmp(name, "ss")) { ++ ctx.qry.ssdiff = atoi(value); + } + } + +@@ -279,6 +285,7 @@ static void prepare_context(struct cgit_context *ctx) + ctx->cfg.summary_branches = 10; + ctx->cfg.summary_log = 10; + ctx->cfg.summary_tags = 10; ++ ctx->cfg.ssdiff = 0; + ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); + ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); + ctx->env.https = xstrdupn(getenv("HTTPS")); +diff --git a/cgit.css b/cgit.css +index c47ebc9..3f37165 100644 +--- a/cgit.css ++++ b/cgit.css +@@ -601,3 +601,92 @@ table.hgraph div.bar { + background-color: #eee; + height: 1em; + } ++ ++table.ssdiff { ++ width: 100%; ++} ++ ++table.ssdiff td { ++ font-size: 75%; ++ font-family: monospace; ++ white-space: pre; ++ padding: 1px 4px 1px 4px; ++ border-left: solid 1px #aaa; ++ border-right: solid 1px #aaa; ++} ++ ++table.ssdiff td.add { ++ color: black; ++ background: #cfc; ++ min-width: 50%; ++} ++ ++table.ssdiff td.add_dark { ++ color: black; ++ background: #aca; ++ min-width: 50%; ++} ++ ++table.ssdiff td.del { ++ color: black; ++ background: #fcc; ++ min-width: 50%; ++} ++ ++table.ssdiff td.del_dark { ++ color: black; ++ background: #caa; ++ min-width: 50%; ++} ++ ++table.ssdiff td.changed { ++ color: black; ++ background: #ffc; ++ min-width: 50%; ++} ++ ++table.ssdiff td.changed_dark { ++ color: black; ++ background: #cca; ++ min-width: 50%; ++} ++ ++table.ssdiff td.lineno { ++ color: black; ++ background: #eee; ++ text-align: right; ++ width: 3em; ++ min-width: 3em; ++} ++ ++table.ssdiff td.hunk { ++ color: #black; ++ background: #ccf; ++ border-top: solid 1px #aaa; ++ border-bottom: solid 1px #aaa; ++} ++ ++table.ssdiff td.head { ++ border-top: solid 1px #aaa; ++ border-bottom: solid 1px #aaa; ++} ++ ++table.ssdiff td.head div.head { ++ font-weight: bold; ++ color: black; ++} ++ ++table.ssdiff td.foot { ++ border-top: solid 1px #aaa; ++ border-left: none; ++ border-right: none; ++ border-bottom: none; ++} ++ ++table.ssdiff td.space { ++ border: none; ++} ++ ++table.ssdiff td.space div { ++ min-height: 3em; ++} +\ No newline at end of file +diff --git a/cgit.h b/cgit.h +index 6c6c460..b7b0adb 100644 +--- a/cgit.h ++++ b/cgit.h +@@ -143,6 +143,7 @@ struct cgit_query { + int nohead; + char *sort; + int showmsg; ++ int ssdiff; + }; + + struct cgit_config { +@@ -194,6 +195,7 @@ struct cgit_config { + int summary_branches; + int summary_log; + int summary_tags; ++ int ssdiff; + struct string_list mimetypes; + struct cgit_filter *about_filter; + struct cgit_filter *commit_filter; +diff --git a/cgitrc.5.txt b/cgitrc.5.txt +index 0c13485..d0fd9a1 100644 +--- a/cgitrc.5.txt ++++ b/cgitrc.5.txt +@@ -241,6 +241,10 @@ section:: + after this option will inherit the current section name. Default value: + none. + ++side-by-side-diffs:: ++ If set to "1" shows side-by-side diffs instead of unidiffs per ++ default. Default value: "0". ++ + snapshots:: + Text which specifies the default set of snapshot formats generated by + cgit. The value is a space-separated list of zero or more of the +diff --git a/ui-commit.c b/ui-commit.c +index f5b0ae5..b5e3c01 100644 +--- a/ui-commit.c ++++ b/ui-commit.c +@@ -58,9 +58,14 @@ void cgit_print_commit(char *hex) + html("\n"); + html("commit"); + tmp = sha1_to_hex(commit->object.sha1); +- cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); ++ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); + html(" ("); + cgit_patch_link("patch", NULL, NULL, NULL, tmp); ++ html(") ("); ++ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) ++ cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); ++ else ++ cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); + html(")\n"); + html("tree"); + tmp = xstrdup(hex); +@@ -78,10 +83,10 @@ void cgit_print_commit(char *hex) + html("parent" + ""); + cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, +- ctx.qry.head, sha1_to_hex(p->item->object.sha1)); ++ ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); + html(" ("); + cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, +- sha1_to_hex(p->item->object.sha1), NULL); ++ sha1_to_hex(p->item->object.sha1), NULL, 0); + html(")"); + parents++; + } +diff --git a/ui-diff.c b/ui-diff.c +index 2196745..a92a768 100644 +--- a/ui-diff.c ++++ b/ui-diff.c +@@ -9,6 +9,7 @@ + #include "cgit.h" + #include "html.h" + #include "ui-shared.h" ++#include "ui-ssdiff.h" + + unsigned char old_rev_sha1[20]; + unsigned char new_rev_sha1[20]; +@@ -32,6 +33,7 @@ static struct fileinfo { + int binary:1; + } *items; + ++static int use_ssdiff = 0; + + static void print_fileinfo(struct fileinfo *info) + { +@@ -83,7 +85,7 @@ static void print_fileinfo(struct fileinfo *info) + } + htmlf("", class); + cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, +- ctx.qry.sha2, info->new_path); ++ ctx.qry.sha2, info->new_path, 0); + if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) + htmlf(" (%s from %s)", + info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", +@@ -158,7 +160,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1, + + html("
"); + cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, +- ctx.qry.sha2, NULL); ++ ctx.qry.sha2, NULL, 0); + html("
"); + html(""); + max_changes = 0; +@@ -246,26 +248,54 @@ static void header(unsigned char *sha1, char *path1, int mode1, + html(""); + } + ++static void print_ssdiff_link() ++{ ++ if (!strcmp(ctx.qry.page, "diff")) { ++ if (use_ssdiff) ++ cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, ++ ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); ++ else ++ cgit_diff_link("Side-by-side diff", NULL, NULL, ++ ctx.qry.head, ctx.qry.sha1, ++ ctx.qry.sha2, ctx.qry.path, 1); ++ } ++} ++ + static void filepair_cb(struct diff_filepair *pair) + { + unsigned long old_size = 0; + unsigned long new_size = 0; + int binary = 0; ++ linediff_fn print_line_fn = print_line; + ++ if (use_ssdiff) { ++ cgit_ssdiff_header_begin(); ++ print_line_fn = cgit_ssdiff_line_cb; ++ } + header(pair->one->sha1, pair->one->path, pair->one->mode, + pair->two->sha1, pair->two->path, pair->two->mode); ++ if (use_ssdiff) ++ cgit_ssdiff_header_end(); + if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { + if (S_ISGITLINK(pair->one->mode)) +- print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); ++ print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); + if (S_ISGITLINK(pair->two->mode)) +- print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); ++ print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); ++ if (use_ssdiff) ++ cgit_ssdiff_footer(); + return; + } +- if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, +- &new_size, &binary, print_line)) ++ if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, ++ &new_size, &binary, print_line_fn)) + cgit_print_error("Error running diff"); +- if (binary) +- html("Binary files differ"); ++ if (binary) { ++ if (use_ssdiff) ++ html(""); ++ else ++ html("Binary files differ"); ++ } ++ if (use_ssdiff) ++ cgit_ssdiff_footer(); + } + + void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) +@@ -303,11 +333,21 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi + if (!commit2 || parse_commit(commit2)) + cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); + } ++ ++ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) ++ use_ssdiff = 1; ++ ++ print_ssdiff_link(); + cgit_print_diffstat(old_rev_sha1, new_rev_sha1); + +- html("
Binary files differ
"); +- html("", + ctx.qry.showmsg ? " class='logsubject'" : ""); + cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, +- sha1_to_hex(commit->object.sha1)); ++ sha1_to_hex(commit->object.sha1), 0); + show_commit_decorations(commit); + html(""); ++ if (old_line_no > 0) ++ htmlf(""); ++ ++ if (new_line_no > 0) ++ htmlf(""); ++} ++ ++static void print_deferred_old_lines() ++{ ++ struct deferred_lines *iter_old, *tmp; ++ ++ iter_old = deferred_old; ++ while (iter_old) { ++ print_ssdiff_line("del", iter_old->line_no, ++ iter_old->line, -1, NULL); ++ tmp = iter_old->next; ++ free(iter_old); ++ iter_old = tmp; ++ } ++} ++ ++static void print_deferred_new_lines() ++{ ++ struct deferred_lines *iter_new, *tmp; ++ ++ iter_new = deferred_new; ++ while (iter_new) { ++ print_ssdiff_line("add", -1, NULL, iter_new->line_no, ++ iter_new->line); ++ tmp = iter_new->next; ++ free(iter_new); ++ iter_new = tmp; ++ } ++} ++ ++static void print_deferred_changed_lines() ++{ ++ struct deferred_lines *iter_old, *iter_new, *tmp; ++ ++ iter_old = deferred_old; ++ iter_new = deferred_new; ++ while (iter_old || iter_new) { ++ if (iter_old && iter_new) ++ print_ssdiff_line("changed", iter_old->line_no, ++ iter_old->line, ++ iter_new->line_no, iter_new->line); ++ else if (iter_old) ++ print_ssdiff_line("changed", iter_old->line_no, ++ iter_old->line, -1, NULL); ++ else if (iter_new) ++ print_ssdiff_line("changed", -1, NULL, ++ iter_new->line_no, iter_new->line); ++ ++ if (iter_old) { ++ tmp = iter_old->next; ++ free(iter_old); ++ iter_old = tmp; ++ } ++ ++ if (iter_new) { ++ tmp = iter_new->next; ++ free(iter_new); ++ iter_new = tmp; ++ } ++ } ++} ++ ++void cgit_ssdiff_print_deferred_lines() ++{ ++ if (!deferred_old && !deferred_new) ++ return; ++ ++ if (deferred_old && !deferred_new) ++ print_deferred_old_lines(); ++ else if (!deferred_old && deferred_new) ++ print_deferred_new_lines(); ++ else ++ print_deferred_changed_lines(); ++ ++ deferred_old = deferred_old_last = NULL; ++ deferred_new = deferred_new_last = NULL; ++} ++ ++/* ++ * print a single line returned from xdiff ++ */ ++void cgit_ssdiff_line_cb(char *line, int len) ++{ ++ char c = line[len - 1]; ++ ++ line[len - 1] = '\0'; ++ ++ if (line[0] == '@') { ++ current_old_line = line_from_hunk(line, '-'); ++ current_new_line = line_from_hunk(line, '+'); ++ } ++ ++ if (line[0] == ' ') { ++ if (deferred_old || deferred_new) ++ cgit_ssdiff_print_deferred_lines(); ++ print_ssdiff_line("ctx", current_old_line, line, ++ current_new_line, line); ++ current_old_line += 1; ++ current_new_line += 1; ++ } else if (line[0] == '+') { ++ deferred_new_add(line, current_new_line); ++ current_new_line += 1; ++ } else if (line[0] == '-') { ++ deferred_old_add(line, current_old_line); ++ current_old_line += 1; ++ } else if (line[0] == '@') { ++ html(""); ++ } else { ++ html(""); ++ } ++ line[len - 1] = c; ++} ++ ++void cgit_ssdiff_header_begin() ++{ ++ current_old_line = -1; ++ current_new_line = -1; ++ html(""); ++ html(""); ++} ++ ++void cgit_ssdiff_footer() ++{ ++ if (deferred_old || deferred_new) ++ cgit_ssdiff_print_deferred_lines(); ++ html(""); ++} +diff --git a/ui-ssdiff.h b/ui-ssdiff.h +new file mode 100644 +index 0000000..64b4b12 +--- /dev/null ++++ b/ui-ssdiff.h +@@ -0,0 +1,13 @@ ++#ifndef UI_SSDIFF_H ++#define UI_SSDIFF_H ++ ++extern void cgit_ssdiff_print_deferred_lines(); ++ ++extern void cgit_ssdiff_line_cb(char *line, int len); ++ ++extern void cgit_ssdiff_header_begin(); ++extern void cgit_ssdiff_header_end(); ++ ++extern void cgit_ssdiff_footer(); ++ ++#endif /* UI_SSDIFF_H */ +diff --git a/ui-tag.c b/ui-tag.c +index c2d72af..39e4cb8 100644 +--- a/ui-tag.c ++++ b/ui-tag.c +@@ -30,6 +30,14 @@ static void print_tag_content(char *buf) + } + } + ++void print_download_links(char *revname) ++{ ++ html(""); ++} ++ + void cgit_print_tag(char *revname) + { + unsigned char sha1[20]; +@@ -56,16 +64,16 @@ void cgit_print_tag(char *revname) + return; + } + html("
"); ++ if (use_ssdiff) { ++ html(""); ++ } else { ++ html("
"); ++ html(""); ++ if (!use_ssdiff) ++ html(""); + html("
"); ++ } + cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); +- html("
"); + } +diff --git a/ui-log.c b/ui-log.c +index f3132c9..0947604 100644 +--- a/ui-log.c ++++ b/ui-log.c +@@ -66,7 +66,7 @@ void show_commit_decorations(struct commit *commit) + else { + strncpy(buf, deco->name, sizeof(buf) - 1); + cgit_commit_link(buf, NULL, "deco", ctx.qry.head, +- sha1_to_hex(commit->object.sha1)); ++ sha1_to_hex(commit->object.sha1), 0); + } + deco = deco->next; + } +@@ -89,7 +89,7 @@ void print_commit(struct commit *commit) + htmlf("		"); + html_txt(info->author); +diff --git a/ui-refs.c b/ui-refs.c +index d3b4f6e..33d9bec 100644 +--- a/ui-refs.c ++++ b/ui-refs.c +@@ -74,7 +74,7 @@ static int print_branch(struct refinfo *ref) + html(""); + + if (ref->object->type == OBJ_COMMIT) { +- cgit_commit_link(info->subject, NULL, NULL, name, NULL); ++ cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0); + html(""); + html_txt(info->author); + html(""); +diff --git a/ui-repolist.c b/ui-repolist.c +index 3ef2e99..0a0b6ca 100644 +--- a/ui-repolist.c ++++ b/ui-repolist.c +@@ -94,7 +94,7 @@ int is_in_url(struct cgit_repo *repo) + + void print_sort_header(const char *title, const char *sort) + { +- htmlf(""); ++ html_txt(name); ++ html(""); + } + + void cgit_refs_link(char *name, char *title, char *class, char *head, +@@ -341,7 +357,8 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head, + } + + void cgit_diff_link(char *name, char *title, char *class, char *head, +- char *new_rev, char *old_rev, char *path) ++ char *new_rev, char *old_rev, char *path, ++ int toggle_ssdiff) + { + char *delim; + +@@ -356,6 +373,11 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, + html(delim); + html("id2="); + html_url_arg(old_rev); ++ delim = "&"; ++ } ++ if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { ++ html(delim); ++ html("ss=1"); + } + html("'>"); + html_txt(name); +@@ -383,7 +405,7 @@ void cgit_object_link(struct object *obj) + shortrev[10] = '\0'; + if (obj->type == OBJ_COMMIT) { + cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, +- ctx.qry.head, fullrev); ++ ctx.qry.head, fullrev, 0); + return; + } else if (obj->type == OBJ_TREE) + page = "tree"; +@@ -695,9 +717,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) + cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, + ctx->qry.sha1, NULL); + cgit_commit_link("commit", NULL, hc(cmd, "commit"), +- ctx->qry.head, ctx->qry.sha1); ++ ctx->qry.head, ctx->qry.sha1, 0); + cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, +- ctx->qry.sha1, ctx->qry.sha2, NULL); ++ ctx->qry.sha1, ctx->qry.sha2, NULL, 0); + if (ctx->repo->max_stats) + cgit_stats_link("stats", NULL, hc(cmd, "stats"), + ctx->qry.head, NULL); +@@ -760,13 +782,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head, + const char *hex, int snapshots) + { + const struct cgit_snapshot_format* f; ++ char *prefix; + char *filename; ++ unsigned char sha1[20]; + ++ if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && ++ (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) ++ hex++; ++ prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); + for (f = cgit_snapshot_formats; f->suffix; f++) { + if (!(snapshots & f->bit)) + continue; +- filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, +- f->suffix); ++ filename = fmt("%s%s", prefix, f->suffix); + cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); + html("
"); + } +diff --git a/ui-shared.h b/ui-shared.h +index bff4826..9ebc1f9 100644 +--- a/ui-shared.h ++++ b/ui-shared.h +@@ -3,6 +3,7 @@ + + extern char *cgit_httpscheme(); + extern char *cgit_hosturl(); ++extern char *cgit_rooturl(); + extern char *cgit_repourl(const char *reponame); + extern char *cgit_fileurl(const char *reponame, const char *pagename, + const char *filename, const char *query); +@@ -22,7 +23,7 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, + char *rev, char *path, int ofs, char *grep, + char *pattern, int showmsg); + extern void cgit_commit_link(char *name, char *title, char *class, char *head, +- char *rev); ++ char *rev, int toggle_ssdiff); + extern void cgit_patch_link(char *name, char *title, char *class, char *head, + char *rev); + extern void cgit_refs_link(char *name, char *title, char *class, char *head, +@@ -30,7 +31,8 @@ extern void cgit_refs_link(char *name, char *title, char *class, char *head, + extern void cgit_snapshot_link(char *name, char *title, char *class, + char *head, char *rev, char *archivename); + extern void cgit_diff_link(char *name, char *title, char *class, char *head, +- char *new_rev, char *old_rev, char *path); ++ char *new_rev, char *old_rev, char *path, ++ int toggle_ssdiff); + extern void cgit_stats_link(char *name, char *title, char *class, char *head, + char *path); + extern void cgit_object_link(struct object *obj); +diff --git a/ui-ssdiff.c b/ui-ssdiff.c +new file mode 100644 +index 0000000..5673642 +--- /dev/null ++++ b/ui-ssdiff.c +@@ -0,0 +1,274 @@ ++#include "cgit.h" ++#include "html.h" ++#include "ui-shared.h" ++ ++extern int use_ssdiff; ++ ++static int current_old_line, current_new_line; ++ ++struct deferred_lines { ++ int line_no; ++ char *line; ++ struct deferred_lines *next; ++}; ++ ++static struct deferred_lines *deferred_old, *deferred_old_last; ++static struct deferred_lines *deferred_new, *deferred_new_last; ++ ++static int line_from_hunk(char *line, char type) ++{ ++ char *buf1, *buf2; ++ int len; ++ ++ buf1 = strchr(line, type); ++ if (buf1 == NULL) ++ return 0; ++ buf1 += 1; ++ buf2 = strchr(buf1, ','); ++ if (buf2 == NULL) ++ return 0; ++ len = buf2 - buf1; ++ buf2 = xmalloc(len + 1); ++ strncpy(buf2, buf1, len); ++ buf2[len] = '\0'; ++ int res = atoi(buf2); ++ free(buf2); ++ return res; ++} ++ ++static char *replace_tabs(char *line) ++{ ++ char *prev_buf = line; ++ char *cur_buf; ++ int linelen = strlen(line); ++ int n_tabs = 0; ++ int i; ++ char *result; ++ char *spaces = " "; ++ ++ if (linelen == 0) { ++ result = xmalloc(1); ++ result[0] = '\0'; ++ return result; ++ } ++ ++ for (i = 0; i < linelen; i++) ++ if (line[i] == '\t') ++ n_tabs += 1; ++ result = xmalloc(linelen + n_tabs * 8 + 1); ++ result[0] = '\0'; ++ ++ while (1) { ++ cur_buf = strchr(prev_buf, '\t'); ++ if (!cur_buf) { ++ strcat(result, prev_buf); ++ break; ++ } else { ++ strcat(result, " "); ++ strncat(result, spaces, 8 - (strlen(result) % 8)); ++ strncat(result, prev_buf, cur_buf - prev_buf); ++ } ++ prev_buf = cur_buf + 1; ++ } ++ return result; ++} ++ ++static void deferred_old_add(char *line, int line_no) ++{ ++ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); ++ item->line = xstrdup(line); ++ item->line_no = line_no; ++ item->next = NULL; ++ if (deferred_old) { ++ deferred_old_last->next = item; ++ deferred_old_last = item; ++ } else { ++ deferred_old = deferred_old_last = item; ++ } ++} ++ ++static void deferred_new_add(char *line, int line_no) ++{ ++ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); ++ item->line = xstrdup(line); ++ item->line_no = line_no; ++ item->next = NULL; ++ if (deferred_new) { ++ deferred_new_last->next = item; ++ deferred_new_last = item; ++ } else { ++ deferred_new = deferred_new_last = item; ++ } ++} ++ ++static void print_ssdiff_line(char *class, int old_line_no, char *old_line, ++ int new_line_no, char *new_line) ++{ ++ html("
%d", ++ old_line_no, class); ++ else if (old_line) ++ htmlf("", class); ++ else ++ htmlf("", class); ++ ++ if (old_line) { ++ old_line = replace_tabs(old_line + 1); ++ html_txt(old_line); ++ free(old_line); ++ } ++ ++ html("%d", ++ new_line_no, class); ++ else if (new_line) ++ htmlf("", class); ++ else ++ htmlf("", class); ++ ++ if (new_line) { ++ new_line = replace_tabs(new_line + 1); ++ html_txt(new_line); ++ free(new_line); ++ } ++ ++ html("
"); ++ html_txt(line); ++ html("
"); ++ html_txt(line); ++ html("
"); ++} ++ ++void cgit_ssdiff_header_end() ++{ ++ html("
download"); ++ cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, ++ revname, ctx.repo->snapshots); ++ html("
\n"); +- htmlf("\n", sha1_to_hex(sha1)); + if (info->tagger_date > 0) { +- html("\n"); + } + if (info->tagger) { +- html("\n"); + } +- html("\n"); ++ if (ctx.repo->snapshots) ++ print_download_links(revname); + html("
Tag name"); ++ htmlf("
tag name"); + html_txt(revname); + htmlf(" (%s)
Tag date"); ++ html("
tag date"); + cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); + html("
Tagged by"); ++ html("
tagged by"); + html_txt(info->tagger); + if (info->tagger_email && !ctx.cfg.noplainemail) { + html(" "); +@@ -73,19 +81,23 @@ void cgit_print_tag(char *revname) + } + html("
Tagged object"); ++ html("
tagged object"); + cgit_object_link(tag->tagged); + html("
\n"); + print_tag_content(info->msg); + } else { + html("\n"); +- htmlf("\n"); +- html("\n"); ++ if (ctx.repo->snapshots) ++ print_download_links(revname); + html("
Tag name"); ++ htmlf("
tag name"); + html_txt(revname); + html("
Tagged object"); ++ html("
Tagged object"); + cgit_object_link(obj); + html("
\n"); + } + return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:37:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6883] csw/mgar/pkg/bdb3 Message-ID: Revision: 6883 http://gar.svn.sourceforge.net/gar/?rev=6883&view=rev Author: dmichelsen Date: 2009-10-18 09:37:23 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3,bdb33: Move content from CSWbdb33 to CSWbdb3 verbatim Added Paths: ----------- csw/mgar/pkg/bdb3/trunk/ Removed Paths: ------------- csw/mgar/pkg/bdb33/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:40:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6884] csw/mgar/pkg/bdb33/ Message-ID: Revision: 6884 http://gar.svn.sourceforge.net/gar/?rev=6884&view=rev Author: dmichelsen Date: 2009-10-18 09:40:10 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb33: Remove now empty hull, contents now in bdb3 Removed Paths: ------------- csw/mgar/pkg/bdb33/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:43:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:43:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6885] csw/mgar/pkg/bdb3/trunk Message-ID: Revision: 6885 http://gar.svn.sourceforge.net/gar/?rev=6885&view=rev Author: dmichelsen Date: 2009-10-18 09:43:39 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3: Change package names from CSWbdb33 to CSWbdb3 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bdb3/trunk/ Property changes on: csw/mgar/pkg/bdb3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 09:40:10 UTC (rev 6884) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 09:43:39 UTC (rev 6885) @@ -50,32 +50,32 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb33 CSWbdb33devel CSWbdb33doc +PACKAGES = CSWbdb3 CSWbdb3devel CSWbdb3doc -CATALOGNAME_CSWbdb33 = berkeleydb33 -CATALOGNAME_CSWbdb33devel = berkeleydb33_devel -CATALOGNAME_CSWbdb33doc = berkeleydb33_doc +CATALOGNAME_CSWbdb3 = berkeleydb3 +CATALOGNAME_CSWbdb3devel = berkeleydb3_devel +CATALOGNAME_CSWbdb3doc = berkeleydb3_doc -ARCHALL_CSWbdb33doc = 1 +ARCHALL_CSWbdb3doc = 1 -SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities -SPKG_DESC_CSWbdb33devel = BerkeleyDB 3.3 development support -SPKG_DESC_CSWbdb33doc = BerkeleyDB 3.3 documentation +SPKG_DESC_CSWbdb3 = BerkeleyDB 3.3 embedded database libraries and utilities +SPKG_DESC_CSWbdb3devel = BerkeleyDB 3.3 development support +SPKG_DESC_CSWbdb3doc = BerkeleyDB 3.3 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb33devel = CSWbdb33 +REQUIRED_PKGS_CSWbdb3devel = CSWbdb3 LICENSE = LICENSE INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb33),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb3),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb33doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb33devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb3doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb3devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:50:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:50:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6886] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6886 http://gar.svn.sourceforge.net/gar/?rev=6886&view=rev Author: dmichelsen Date: 2009-10-18 09:50:19 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb43: Change package names from CSWbdb43devel to CSWbdb43-devel to match existing package, pending later fixing. Same for CSWbdb43doc Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-18 09:43:39 UTC (rev 6885) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-18 09:50:19 UTC (rev 6886) @@ -50,21 +50,21 @@ # bdb tests are time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb43 CSWbdb43devel CSWbdb43doc +PACKAGES = CSWbdb43 CSWbdb43-devel CSWbdb43-doc -CATALOGNAME_CSWbdb43 = berkeleydb43 -CATALOGNAME_CSWbdb43devel = berkeleydb43_devel -CATALOGNAME_CSWbdb43doc = berkeleydb43_doc +CATALOGNAME_CSWbdb43 = berkeleydb43 +CATALOGNAME_CSWbdb43-devel = berkeleydb43_devel +CATALOGNAME_CSWbdb43-doc = berkeleydb43_doc -ARCHALL_CSWbdb43doc = 1 +ARCHALL_CSWbdb43-doc = 1 -SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 -SPKG_DESC_CSWbdb43devel = BerkeleyDB 4.3 development support -SPKG_DESC_CSWbdb43doc = BerkeleyDB 4.3 documentation +SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 +SPKG_DESC_CSWbdb43-devel = BerkeleyDB 4.3 development support +SPKG_DESC_CSWbdb43-doc = BerkeleyDB 4.3 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html -REQUIRED_PKGS_CSWbdb43devel = CSWbdb43 +REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 LICENSE = LICENSE @@ -72,8 +72,8 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar -PKGFILES_CSWbdb43doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb43-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:56:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:56:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6887] csw/mgar/pkg/bdb44/trunk Message-ID: Revision: 6887 http://gar.svn.sourceforge.net/gar/?rev=6887&view=rev Author: dmichelsen Date: 2009-10-18 09:56:41 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb44: Change package names from CSWbdb44devel to CSWbdb44-devel to match existing package, pending later fixing. Same for CSWbdb44doc Modified Paths: -------------- csw/mgar/pkg/bdb44/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bdb44/trunk/ Property changes on: csw/mgar/pkg/bdb44/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-18 09:50:19 UTC (rev 6886) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-18 09:56:41 UTC (rev 6887) @@ -50,21 +50,21 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb44 CSWbdb44devel CSWbdb44doc +PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc -CATALOGNAME_CSWbdb44 = berkeleydb44 -CATALOGNAME_CSWbdb44devel = berkeleydb44_devel -CATALOGNAME_CSWbdb44doc = berkeleydb44_doc +CATALOGNAME_CSWbdb44 = berkeleydb44 +CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel +CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc -ARCHALL_CSWbdb44doc = 1 +ARCHALL_CSWbdb44-doc = 1 -SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities -SPKG_DESC_CSWbdb44devel = BerkeleyDB 4.4 development support -SPKG_DESC_CSWbdb44doc = BerkeleyDB 4.4 documentation +SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities +SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support +SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb44devel = CSWbdb44 +REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 LICENSE = LICENSE @@ -72,8 +72,8 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar -PKGFILES_CSWbdb44doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 12:30:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:30:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6888] csw/mgar/pkg Message-ID: Revision: 6888 http://gar.svn.sourceforge.net/gar/?rev=6888&view=rev Author: wahwah Date: 2009-10-18 10:30:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- pysvn: Initial commit Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile csw/mgar/pkg/pysvn/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pysvn/ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:30:04 UTC (rev 6888) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = pysvn +GARVERSION = 1.7.1 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,7 +25,7 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = python ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. @@ -35,11 +35,11 @@ ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://pysvn.tigris.org/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://pysvn.barrys-emacs.org/source_kits/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,7 +49,12 @@ ## A list of space separated patch filenames from files/ that are to be applied ## to the extracted software before the ./configure stage. Patches need to be ## included in the DISTFILES variable as well. -## PATCHFILES = +PATCHFILES = 0002-pysvn.hpp-string-includes-first.patch +PATCHFILES += 0005-Use-dash-capital-R-for-runtime-path.patch +PATCHFILES += 0006-Use-opt-csw-lib.patch +PATCHFILES += 0003-bin-bash-instead-of-bin-sh.patch +PATCHFILES += 0001-fixes-for-tests.patch +PATCHFILES += 0008-gid-in-two-more-places.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the @@ -120,10 +125,20 @@ ## INITSMF = ## USERGROUP = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = CSWexpat +REQUIRED_PKGS += CSWgcc3core +REQUIRED_PKGS += CSWgcc3corert +REQUIRED_PKGS += CSWgcc3g++ +REQUIRED_PKGS += CSWgcc3g++rt +REQUIRED_PKGS += CSWgcc4corert +REQUIRED_PKGS += CSWgcc4g++rt +REQUIRED_PKGS += CSWneon +REQUIRED_PKGS += CSWsvn + ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel +INCOMPATIBELE_PKGS = CSWpyxml ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -142,10 +157,10 @@ ## completely (for example when your software doesn't need to be compiled) assign ## this variable an empty value. The procedure works for configure, build, ## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +CONFIGURE_SCRIPTS = pysvn +BUILD_SCRIPTS = pysvn +INSTALL_SCRIPTS = pysvn +TEST_SCRIPTS = pysvn ## ## Compilation settings ## @@ -172,11 +187,34 @@ ## ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 +GARCOMPILER = GNU ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +include gar/category.mk + +configure-pysvn: + (cd $(WORKSRC)/Source \ + && $(CONFIGURE_ENV) python setup.py configure \ + --apr-inc-dir=/opt/csw/apache2/include \ + --apr-lib-dir=/opt/csw/apache2/lib \ + --svn-bin-dir=/opt/csw/bin \ + --svn-inc-dir=/opt/csw/include/subversion-1 \ + --svn-lib-dir=/opt/csw/lib/svn \ + ) + @$(MAKECOOKIE) + +build-pysvn: + (cd $(WORKSRC)/Source \ + && $(BUILD_ENV) gmake \ + ) + @$(MAKECOOKIE) + +test-pysvn: + (cd $(WORKSRC)/Tests && gmake) + @$(MAKECOOKIE) + +install-pysvn: + ginstall -m 755 -d $(DESTDIR)$(libdir)/python/site-packages/pysvn + ginstall -m 644 $(WORKSRC)/Source/pysvn/__init__.py $(DESTDIR)$(libdir)/python/site-packages/pysvn + $(foreach F,$(wildcard $(WORKSRC)/Source/pysvn/_pysvn*.so),ginstall -m 755 $(F) $(DESTDIR)$(libdir)/python/site-packages/pysvn) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/pysvn/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,7 @@ +b698502c7a43d9623189924f08904c3a 0001-fixes-for-tests.patch +20381f5964a9fc08b04eb6fc69a47d04 0002-pysvn.hpp-string-includes-first.patch +64c9418717dee60ed1a613cc7d85c682 0003-bin-bash-instead-of-bin-sh.patch +a69e791dd03491aca2cfeba83528389a 0005-Use-dash-capital-R-for-runtime-path.patch +be7690f1395b76f984bf12de84418b68 0006-Use-opt-csw-lib.patch +ac24c9b4348fd857353d1444c8448d8d 0008-gid-in-two-more-places.patch +55688ec2083dcada32aa0a4128f6c309 pysvn-1.7.1.tar.gz Added: csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,53 @@ +From ec286163180177e43b95e5fce366b19cc7750f27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 11:04:23 +0100 +Subject: [PATCH] fixes for tests + +--- + Tests/test-04.sh | 2 +- + Tests/test-05.sh | 2 +- + Tests/test-07.sh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Tests/test-04.sh b/Tests/test-04.sh +index a8e2faa..c360615 100755 +--- a/Tests/test-04.sh ++++ b/Tests/test-04.sh +@@ -30,7 +30,7 @@ cmd ${PYSVN} mkdir file://${TESTROOT}/repos/trunk -m "test-04 add trunk" + cmd ${PYSVN} mkdir file://${TESTROOT}/repos/trunk/test -m "test-04 add test" + + echo Info: Install hooks +-echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit ++echo '#!/bin/bash' >${TESTROOT}/repos/hooks/pre-commit + echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit + echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit + echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit +diff --git a/Tests/test-05.sh b/Tests/test-05.sh +index 32976c0..81f2754 100755 +--- a/Tests/test-05.sh ++++ b/Tests/test-05.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +diff --git a/Tests/test-07.sh b/Tests/test-07.sh +index 903d321..d7c48a4 100755 +--- a/Tests/test-07.sh ++++ b/Tests/test-07.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,38 @@ +From 16c4295ff5290649ea7952624c5201992434b4bf Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 09:27:32 +0100 +Subject: [PATCH 2/2] pysvn.hpp: includes first + +--- + Source/pysvn.hpp | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Source/pysvn.hpp b/Source/pysvn.hpp +index 4a1d65c..ab60f82 100644 +--- a/Source/pysvn.hpp ++++ b/Source/pysvn.hpp +@@ -7,6 +7,10 @@ + // + // ==================================================================== + // ++#include ++#include ++#include ++ + #include "Python.h" + #include "CXX/Objects.hxx" + #include "CXX/Extensions.hxx" +@@ -14,10 +18,6 @@ + + #include "pysvn_svnenv.hpp" + +-#include +-#include +-#include +- + //-------------------------------------------------------------------------------- + class pysvn_module : public Py::ExtensionModule + { +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,85 @@ +From 848b922929a73b8c9587aec91876da7e544d376d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 10:38:05 +0100 +Subject: [PATCH 3/3] /bin/bash instead of /bin/sh + +--- + Tests/test-01.sh | 2 +- + Tests/test-03.sh | 2 +- + Tests/test-04.sh | 4 ++-- + Tests/test-05.sh | 2 +- + Tests/test-06.sh | 2 +- + Tests/test-07.sh | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Tests/test-01.sh b/Tests/test-01.sh +index 22ef9d0..ed79049 100755 +--- a/Tests/test-01.sh ++++ b/Tests/test-01.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-03.sh b/Tests/test-03.sh +index bd36b00..7f63e5c 100755 +--- a/Tests/test-03.sh ++++ b/Tests/test-03.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-04.sh b/Tests/test-04.sh +index 1c61fdc..a8e2faa 100755 +--- a/Tests/test-04.sh ++++ b/Tests/test-04.sh +@@ -1,11 +1,11 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: Command: $* +diff --git a/Tests/test-05.sh b/Tests/test-05.sh +index 8e892b9..32976c0 100755 +--- a/Tests/test-05.sh ++++ b/Tests/test-05.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-06.sh b/Tests/test-06.sh +index 9b8cc6b..b6e2fb4 100755 +--- a/Tests/test-06.sh ++++ b/Tests/test-06.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-07.sh b/Tests/test-07.sh +index 5847027..903d321 100755 +--- a/Tests/test-07.sh ++++ b/Tests/test-07.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,25 @@ +From e1c99ab2895e81b627aeed5be5e71cb0655cc0b6 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 09:36:12 +0100 +Subject: [PATCH 5/6] Use dash-capital-R for runtime path + +--- + Source/setup_configure.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Source/setup_configure.py b/Source/setup_configure.py +index 39c5019..8e4ccac 100644 +--- a/Source/setup_configure.py ++++ b/Source/setup_configure.py +@@ -381,7 +381,7 @@ CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s + PYCXX=%(pycxx_dir)s + PYCXXSRC=%(pycxx_src_dir)s + LDSHARED=g++ -shared %(debug_cflags)s +-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \ ++LDLIBS=-L%(svn_lib_dir)s -R%(svn_lib_dir)s \ + -lsvn_client-1 \ + -lsvn_diff-1 \ + -lsvn_repos-1 \ +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,25 @@ +From a110241e323d4029c2ebc82ee57b1af41adb47c1 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 09:39:07 +0100 +Subject: [PATCH 6/6] Use /opt/csw/lib + +--- + Source/setup_configure.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Source/setup_configure.py b/Source/setup_configure.py +index 8e4ccac..36cda90 100644 +--- a/Source/setup_configure.py ++++ b/Source/setup_configure.py +@@ -381,7 +381,7 @@ CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s + PYCXX=%(pycxx_dir)s + PYCXXSRC=%(pycxx_src_dir)s + LDSHARED=g++ -shared %(debug_cflags)s +-LDLIBS=-L%(svn_lib_dir)s -R%(svn_lib_dir)s \ ++LDLIBS=-L%(svn_lib_dir)s -L/opt/csw/lib -R/opt/csw/lib -R%(svn_lib_dir)s \ + -lsvn_client-1 \ + -lsvn_diff-1 \ + -lsvn_repos-1 \ +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,39 @@ +From 89ec666ff204e5d45f0d051ff5a2ed9e7236f7ef Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 11:12:30 +0100 +Subject: [PATCH] gid in two more places + +--- + Tests/test-01.sh | 2 +- + Tests/test-06.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Tests/test-01.sh b/Tests/test-01.sh +index ed79049..bc11292 100755 +--- a/Tests/test-01.sh ++++ b/Tests/test-01.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +diff --git a/Tests/test-06.sh b/Tests/test-06.sh +index b6e2fb4..07a8597 100755 +--- a/Tests/test-06.sh ++++ b/Tests/test-06.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 12:34:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6889] csw/mgar/pkg/pysvn/trunk/Makefile Message-ID: Revision: 6889 http://gar.svn.sourceforge.net/gar/?rev=6889&view=rev Author: wahwah Date: 2009-10-18 10:34:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- pysvn: Removed template comments from the Makefile, added blurb Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:30:04 UTC (rev 6888) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:34:04 UTC (rev 6889) @@ -2,129 +2,37 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = pysvn GARVERSION = 1.7.1 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = python -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB - + + The pysvn project's goal is to enable Tools to be written in Python that use + Subversion. + + Windows, Mac OS X, Linux and other unix platforms are supported. + + pysvn Extension Features + + * Supports all svn client features + * Supports svn transaction features required to write svn pre-commit hooks + * Easy to learn and use + * Python like interface + * Good Documentation and examples + * No need to understand the Subversion C API + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://pysvn.tigris.org/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = http://pysvn.barrys-emacs.org/source_kits/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. PATCHFILES = 0002-pysvn.hpp-string-includes-first.patch PATCHFILES += 0005-Use-dash-capital-R-for-runtime-path.patch PATCHFILES += 0006-Use-opt-csw-lib.patch PATCHFILES += 0003-bin-bash-instead-of-bin-sh.patch PATCHFILES += 0001-fixes-for-tests.patch PATCHFILES += 0008-gid-in-two-more-places.patch -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. REQUIRED_PKGS = CSWexpat REQUIRED_PKGS += CSWgcc3core REQUIRED_PKGS += CSWgcc3corert @@ -135,60 +43,14 @@ REQUIRED_PKGS += CSWneon REQUIRED_PKGS += CSWsvn -## -## A list of packages necessary to build this package PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel INCOMPATIBELE_PKGS = CSWpyxml -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. CONFIGURE_SCRIPTS = pysvn BUILD_SCRIPTS = pysvn INSTALL_SCRIPTS = pysvn TEST_SCRIPTS = pysvn -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 GARCOMPILER = GNU -## include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 12:54:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6890] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 6890 http://gar.svn.sourceforge.net/gar/?rev=6890&view=rev Author: dmichelsen Date: 2009-10-18 10:54:38 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3: Add link to /opt/csw/lib Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:34:04 UTC (rev 6889) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:54:38 UTC (rev 6890) @@ -92,6 +92,7 @@ post-merge: gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s ../bdb33/lib/libdb-3.3.so $(PKGROOT)$(libpath) @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 12:56:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:56:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6891] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 6891 http://gar.svn.sourceforge.net/gar/?rev=6891&view=rev Author: dmichelsen Date: 2009-10-18 10:56:28 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3: Add link to /opt/csw/lib Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:54:38 UTC (rev 6890) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:56:28 UTC (rev 6891) @@ -92,6 +92,7 @@ post-merge: gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + ginstall -d $(PKGROOT)$(libpath) gln -s ../bdb33/lib/libdb-3.3.so $(PKGROOT)$(libpath) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 16:15:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 14:15:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6892] csw/mgar/pkg/pysvn/trunk Message-ID: Revision: 6892 http://gar.svn.sourceforge.net/gar/?rev=6892&view=rev Author: wahwah Date: 2009-10-18 14:15:28 +0000 (Sun, 18 Oct 2009) Log Message: ----------- pysvn: using CSWbash, disabling tests on Solaris 8 due to lack of UTF-8 locale support Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile csw/mgar/pkg/pysvn/trunk/checksums csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 14:15:28 UTC (rev 6892) @@ -43,12 +43,15 @@ REQUIRED_PKGS += CSWneon REQUIRED_PKGS += CSWsvn -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash INCOMPATIBELE_PKGS = CSWpyxml CONFIGURE_SCRIPTS = pysvn BUILD_SCRIPTS = pysvn INSTALL_SCRIPTS = pysvn -TEST_SCRIPTS = pysvn +TEST_SCRIPTS_5.8 = +TEST_SCRIPTS_5.9 = pysvn +TEST_SCRIPTS_5.10 = pysvn +TEST_SCRIPTS = $(TEST_SCRIPTS_$(GAROSREL)) CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU Modified: csw/mgar/pkg/pysvn/trunk/checksums =================================================================== --- csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 14:15:28 UTC (rev 6892) @@ -1,6 +1,6 @@ -b698502c7a43d9623189924f08904c3a 0001-fixes-for-tests.patch +e6168840de7c75fcecffc6fc7e1831ba 0001-fixes-for-tests.patch 20381f5964a9fc08b04eb6fc69a47d04 0002-pysvn.hpp-string-includes-first.patch -64c9418717dee60ed1a613cc7d85c682 0003-bin-bash-instead-of-bin-sh.patch +2f3e1b6c0ffed9baecdb1e0719748813 0003-bin-bash-instead-of-bin-sh.patch a69e791dd03491aca2cfeba83528389a 0005-Use-dash-capital-R-for-runtime-path.patch be7690f1395b76f984bf12de84418b68 0006-Use-opt-csw-lib.patch ac24c9b4348fd857353d1444c8448d8d 0008-gid-in-two-more-places.patch Modified: csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 14:15:28 UTC (rev 6892) @@ -18,7 +18,7 @@ echo Info: Install hooks -echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit -+echo '#!/bin/bash' >${TESTROOT}/repos/hooks/pre-commit ++echo '#!/opt/csw/bin/bash' >${TESTROOT}/repos/hooks/pre-commit echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit Modified: csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 14:15:28 UTC (rev 6892) @@ -1,7 +1,7 @@ From 848b922929a73b8c9587aec91876da7e544d376d Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= Date: Sun, 18 Oct 2009 10:38:05 +0100 -Subject: [PATCH 3/3] /bin/bash instead of /bin/sh +Subject: [PATCH 3/3] /opt/csw/bin/bash instead of /bin/sh --- Tests/test-01.sh | 2 +- @@ -18,7 +18,7 @@ +++ b/Tests/test-01.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -28,7 +28,7 @@ +++ b/Tests/test-03.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -38,7 +38,7 @@ +++ b/Tests/test-04.sh @@ -1,11 +1,11 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -56,7 +56,7 @@ +++ b/Tests/test-05.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -66,7 +66,7 @@ +++ b/Tests/test-06.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -76,7 +76,7 @@ +++ b/Tests/test-07.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 19:00:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 17:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6893] csw/mgar/pkg Message-ID: Revision: 6893 http://gar.svn.sourceforge.net/gar/?rev=6893&view=rev Author: wahwah Date: 2009-10-18 17:00:20 +0000 (Sun, 18 Oct 2009) Log Message: ----------- log4sh: Initial commit Modified Paths: -------------- csw/mgar/pkg/log4sh/trunk/Makefile csw/mgar/pkg/log4sh/trunk/checksums Added Paths: ----------- csw/mgar/pkg/log4sh/ Modified: csw/mgar/pkg/log4sh/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/log4sh/trunk/Makefile 2009-10-18 17:00:20 UTC (rev 6893) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = log4sh +GARVERSION = 1.4.2 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,26 +25,30 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = A logging framework for shell scripts ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + http://log4sh.sourceforge.net/ + + log4sh is an advanced logging framework for shell scripts (eg. sh, bash) that + works similar to the logging products available from the Apache Software + Foundataion (eg. log4j, log4perl). endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://sites.google.com/a/forestent.com/projects/log4sh ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge ## project name of the software you wish to download. -## SF_PROJ = +SF_PROJ = log4sh ## ## A list of space separated patch filenames from files/ that are to be applied ## to the extracted software before the ./configure stage. Patches need to be @@ -54,10 +58,9 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz ## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz ## ## Catalog name is the name to be used with pkg{-get,util} -i . ## It is different from the system package name, which by convention is CSWpkgname. @@ -173,10 +176,21 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +ARCHALL = 1 +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +install-custom: + ginstall -d $(DESTDIR)$(libdir)/log4sh + ginstall $(WORKSRC)/src/shell/log4sh $(DESTDIR)$(libdir)/log4sh/log4sh + ginstall -d $(DESTDIR)$(datadir)/doc + ginstall -d $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/FAQ.txt $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/log4sh.html $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/README.txt $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/contributors.txt $(DESTDIR)$(datadir)/doc/log4sh + +include gar/category.mk Modified: csw/mgar/pkg/log4sh/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/log4sh/trunk/checksums 2009-10-18 17:00:20 UTC (rev 6893) @@ -0,0 +1 @@ +b2177ab1f84a6cd91faf123bce74c899 download/log4sh-1.4.2.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 19:29:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 17:29:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6894] csw/mgar/gar Message-ID: Revision: 6894 http://gar.svn.sourceforge.net/gar/?rev=6894&view=rev Author: dmichelsen Date: 2009-10-18 17:29:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- mGAR v2: Fork collapsed modulations Added Paths: ----------- csw/mgar/gar/v2-collapsed-modulations/ csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk csw/mgar/gar/v2-collapsed-modulations/gar.mk Removed Paths: ------------- csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk csw/mgar/gar/v2-collapsed-modulations/gar.mk Deleted: csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-09 11:59:38 UTC (rev 6808) +++ csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -1,753 +0,0 @@ -# vim: ft=make ts=4 sw=4 noet -# -# $Id$ -# -# Copyright (C) 2001 Nick Moffitt -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# - -# cookies go here, so we have to be able to find them for -# dependency checking. -VPATH += $(COOKIEDIR) - -# convenience variable to make the cookie. -MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ - -URLSTRIP = $(subst ://,//,$(1)) - -# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a -# default proxy script that works with the (squid?) proxy at the BO buildfarm. -# override GIT_PROXY_SCRIPT to something else if you need to. -GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) -GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) - -#################### FETCH RULES #################### - -URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M))))) - -# if the caller has defined _postinstall, etc targets for a package, add -# these 'dynamic script' targets to our fetch list -URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr//$(DYN)) - -ifdef GIT_REPOS -URLS += $(foreach R,$(GIT_REPOS),gitrepo//$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) -endif - -# Download the file if and only if it doesn't have a preexisting -# checksum file. Loop through available URLs and stop when you -# get one that doesn't return an error code. -$(DOWNLOADDIR)/%: - @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ - echo " ==> Grabbing $@"; \ - for i in $(filter %/$*,$(URLS)); do \ - echo " ==> Trying $$i"; \ - $(MAKE) -s $$i || continue; \ - mv $(PARTIALDIR)/$* $@; \ - break; \ - done; \ - if test -r $@ ; then : ; else \ - echo '(!!!) Failed to download $@!' 1>&2; \ - false; \ - fi; \ - fi - -gitrepo//%: - @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ - ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ - $(GIT_MAYBEPROXY) git --bare fetch ) && \ - gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ - else \ - false; \ - fi ) - -# the git remote add commands are so that we can later do a fetch -# to update the code. -# we possibly proxy the git:// references depending on GIT_USE_PROXY -git-http//%: - @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin http://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -git//%: - @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin git://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -# create ADMSCRIPTS 'on the fly' from variables defined by the caller -# This version is private and should only be called from the non-private -# version directly below -_dynscr//%: - $($(subst .,_,$*)) - -dynscr//%: - $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* - -# download an http URL (colons omitted) -http//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* - -https//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* - -# download an ftp URL (colons omitted) -#ftp//%: -# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* -ftp//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* - -# link to a local copy of the file -# (absolute path) -file///%: - @if test -f /$*; then \ - gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# link to a local copy of the file -# (relative path) -file//%: - @if test -f $*; then \ - gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# Using Jeff Waugh's rsync rule. -# DOES NOT PRESERVE SYMLINKS! -rsync//%: - @rsync -azvLP rsync://$* $(PARTIALDIR)/ - -# Using Jeff Waugh's scp rule -scp//%: - @scp -C $* $(PARTIALDIR)/ - -# Fetch a SVN repo via http -svn-http//%: - @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) - -svn-https//%: - @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) - -#################### CHECKSUM RULES #################### - -# check a given file's checksum against $(CHECKSUM_FILE) and -# error out if it mentions the file without an "OK". -# The removal of the download prefix is for legacy checksums. For newstyle -# checksums without path this is not necessary. -checksum-%: $(CHECKSUM_FILE) - @echo " ==> Running checksum on $*" - @if gegrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ - if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ - ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ - echo '(!!!) $* failed checksum test!' 1>&2; \ - false; \ - else \ - echo 'file $* passes checksum test!'; \ - $(MAKECOOKIE); \ - fi \ - else \ - echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ - false; \ - fi - -#################### CHECKNEW RULES #################### - -UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) -UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) -SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) - -define files2check -$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) -endef - -check-upstream-and-mail: FILES2CHECK = $(call files2check) -check-upstream-and-mail: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "--"; \ -# echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ - fi - -check-upstream: FILES2CHECK = $(call files2check) -check-upstream: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ - fi - -checknew-%: - @$(MAKECOOKIE) - - -#################### GARCHIVE RULES #################### - -# while we're here, let's just handle how to back up our -# checksummed files - -$(GARCHIVEDIR)/%: $(GARCHIVEDIR) - @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ - gcp -Lr $(DOWNLOADDIR)/$* $@; \ - fi - - -#################### EXTRACT RULES #################### - -TAR_ARGS = --no-same-owner - -# rule to extract uncompressed tarballs -tar-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @gtar $(TAR_ARGS) -xf $(DOWNLOADDIR)/$* -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar xzf -tar-gz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar and bzip -tar-bz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# extract compressed single files -bz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @bzip2 -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -gz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @gzip -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -# extra dependency rule for git repos, that will allow the user -# to supply an alternate target at their discretion -git-extract-%: - @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" - git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with unzip -zip-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) - @$(MAKECOOKIE) - -# this is a null extract rule for files which are constant and -# unchanged (not archives) -cp-extract-%: - @echo " ==> Copying $(DOWNLOADDIR)/$*" - @cp -rp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @$(MAKECOOKIE) - -#gets the meat of a .deb into $(WORKSRC) -deb-bin-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @ar x $(DOWNLOADDIR)/$* - @rm debian-binary && \ - mv *.tar.gz $(DOWNLOADDIR) && \ - mkdir $(WORKSRC) && \ - gtar $(TAR_ARGS) -xvz -C $(WORKSRC) \ - -f $(DOWNLOADDIR)/data.tar.gz - @$(MAKECOOKIE) - -### EXTRACT FILE TYPE MAPPINGS ### -# These rules specify which of the above extract action rules to use for a -# given file extension. Often support for a given extract type can be handled -# by simply adding a rule here. - -extract-archive-%.tar: tar-extract-%.tar - @$(MAKECOOKIE) - -extract-archive-%.tar.gz: tar-gz-extract-%.tar.gz - @$(MAKECOOKIE) - -extract-archive-%.tar.Z: tar-gz-extract-%.tar.Z - @$(MAKECOOKIE) - -extract-archive-%.tgz: tar-gz-extract-%.tgz - @$(MAKECOOKIE) - -extract-archive-%.taz: tar-gz-extract-%.taz - @$(MAKECOOKIE) - -extract-archive-%.tar.bz: tar-bz-extract-%.tar.bz - @$(MAKECOOKIE) - -extract-archive-%.tar.bz2: tar-bz-extract-%.tar.bz2 - @$(MAKECOOKIE) - -extract-archive-%.tbz: tar-bz-extract-%.tbz - @$(MAKECOOKIE) - -extract-archive-%.zip: zip-extract-%.zip - @$(MAKECOOKIE) - -extract-archive-%.ZIP: zip-extract-%.ZIP - @$(MAKECOOKIE) - -extract-archive-%.deb: deb-bin-extract-%.deb - @$(MAKECOOKIE) - -extract-archive-%.bz2: bz-extract-%.bz2 - @$(MAKECOOKIE) - -extract-archive-%.gz: gz-extract-%.gz - @$(MAKECOOKIE) - -extract-archive-%.git: git-extract-%.git - @$(MAKECOOKIE) - -# anything we don't know about, we just assume is already -# uncompressed and unarchived in plain format -extract-archive-%: cp-extract-% - @$(MAKECOOKIE) - -#################### PATCH RULES #################### - -PATCHDIR ?= $(WORKSRC) -PATCHDIRLEVEL ?= 1 -PATCHDIRFUZZ ?= 2 -GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) -BASEWORKSRC = $(shell basename $(WORKSRC)) - -# apply bzipped patches -bz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @$(MAKECOOKIE) - -# apply gzipped patches -gz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @$(MAKECOOKIE) - -# apply normal patches -normal-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - $(GARPATCH) < $(DOWNLOADDIR)/$* - @$(MAKECOOKIE) - -# This is used by makepatch -%/gar-base.diff: - @echo " ==> Creating patch $@" - @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract - @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch - @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig - @( cd $(WORKDIR_FIRSTMOD); \ - if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ - cd $(CURDIR); \ - mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ - fi ) - -### PATCH FILE TYPE MAPPINGS ### -# These rules specify which of the above patch action rules to use for a given -# file extension. Often support for a given patch format can be handled by -# simply adding a rule here. - -patch-extract-%.bz: bz-patch-%.bz - @$(MAKECOOKIE) - -patch-extract-%.bz2: bz-patch-%.bz2 - @$(MAKECOOKIE) - -patch-extract-%.gz: gz-patch-%.gz - @$(MAKECOOKIE) - -patch-extract-%.Z: gz-patch-%.Z - @$(MAKECOOKIE) - -patch-extract-%.diff: normal-patch-%.diff - @$(MAKECOOKIE) - -patch-extract-%.patch: normal-patch-%.patch - @$(MAKECOOKIE) - -patch-extract-%: normal-patch-% - @$(MAKECOOKIE) - -#################### CONFIGURE RULES #################### - -TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) - -NODIRPATHS += --lispdir - -DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) - -# configure a package that has an autoconf-style configure -# script. -configure-%/configure: - @echo " ==> Running configure in $*" - cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -configure-%/autogen.sh: - @echo " ==> Running autogen.sh in $*" - @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -# configure a package that uses imake -# FIXME: untested and likely not the right way to handle the -# arguments -configure-%/Imakefile: - @echo " ==> Running xmkmf in $*" - @cd $* && $(CONFIGURE_ENV) xmkmf $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -configure-%/setup.rb: - @echo " ==> Running setup.rb config in $*" - @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) - @$(MAKECOOKIE) - -#################### BUILD RULES #################### - -# build from a standard gnu-style makefile's default rule. -build-%/Makefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/makefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/GNUmakefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/Jamfile: - @echo " ==> Running bjam in $*" - @( cd $* ; $(BUILD_ENV) bjam $(JAMFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# Ruby makefiles -build-%/Rakefile: - @echo " ==> Running rake in $*" - @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -build-%/rakefile: - @echo " ==> Running rake in $*" - @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -build-%/setup.rb: - @echo " ==> Running setup.rb setup in $*" - @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# This can be: build, build_py, build_ext, build_clib, build_scripts -# See setup.py --help-commands for details -PYBUILD_CMD ?= build -build-%/setup.py: - @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" - @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -#################### TEST RULES #################### - -TEST_TARGET ?= test - -# Run tests on pre-built sources -test-%/Makefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -test-%/makefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -test-%/GNUmakefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -# Ruby makefiles -test-%/Rakefile: - @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) - @$(MAKECOOKIE) - -test-%/rakefile: - @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) - @$(MAKECOOKIE) - -test-%/setup.py: - @echo " ==> Running setup.py test in $*" - @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) - @$(MAKECOOKIE) - -################# INSTALL RULES #################### - -# just run make install and hope for the best. -install-%/Makefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -install-%/makefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -install-%/GNUmakefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -# Ruby makefiles -install-%/Rakefile: - @echo " ==> Running rake install in $*" - @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -install-%/rakefile: - @echo " ==> Running rake install in $*" - @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -install-%/setup.rb: - @echo " ==> Running setup.rb install in $*" - @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) - @$(MAKECOOKIE) - -# This can be: install, install_lib, install_headers, install_scripts, -# or install_data. See setup.py --help-commands for details. -PYINSTALL_CMD ?= install -install-%/setup.py: - @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" - @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -# pkg-config scripts -install-%-config: - mkdir -p $(STAGINGDIR)/$(GARNAME) - cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ - $(MAKECOOKIE) - -###################################### -# Use a manifest file of the format: -# src:dest[:mode[:owner[:group]]] -# as in... -# ${WORKSRC}/nwall:${bindir}/nwall:2755:root:tty -# ${WORKSRC}/src/foo:${sharedstatedir}/foo -# ${WORKSRC}/yoink:${sysconfdir}/yoink:0600 - -# Okay, so for the benefit of future generations, this is how it -# works: -# -# First of all, we have this file with colon-separated lines. -# The $(shell cat foo) routine turns it into a space-separated -# list of words. The foreach iterates over this list, putting a -# colon-separated record in $(ZORCH) on each pass through. -# -# Next, we have the macro $(MANIFEST_LINE), which splits a record -# into a space-separated list, and $(MANIFEST_SIZE), which -# determines how many elements are in such a list. These are -# purely for convenience, and could be inserted inline if need -# be. -MANIFEST_LINE = $(subst :, ,$(ZORCH)) -MANIFEST_SIZE = $(words $(MANIFEST_LINE)) - -# So the install command takes a variable number of parameters, -# and our records have from two to five elements. Gmake can't do -# any sort of arithmetic, so we can't do any really intelligent -# indexing into the list of parameters. -# -# Since the last three elements of the $(MANIFEST_LINE) are what -# we're interested in, we make a parallel list with the parameter -# switch text (note the dummy elements at the beginning): -MANIFEST_FLAGS = notused notused --mode= --owner= --group= - -# The following environment variables are set before the -# installation boogaloo begins. This ensures that WORKSRC is -# available to the manifest and that all of the location -# variables are suitable for *installation* (that is, using -# DESTDIR) - -MANIFEST_ENV += WORKSRC=$(WORKSRC) -# This was part of the "implicit DESTDIR" regime. However: -# http://gar.lnx-bbc.org/wiki/ImplicitDestdirConsideredHarmful -#MANIFEST_ENV += $(foreach TTT,prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir lispdir includedir mandir,$(TTT)=$(DESTDIR)$($(TTT))) - -# ...and then we join a slice of it with the corresponding slice -# of the $(MANIFEST_LINE), starting at 3 and going to -# $(MANIFEST_SIZE). That's where all the real magic happens, -# right there! -# -# following that, we just splat elements one and two of -# $(MANIFEST_LINE) on the end, since they're the ones that are -# always there. Slap a semicolon on the end, and you've got a -# completed iteration through the foreach! Beaujolais! - -# FIXME: using -D may not be the right thing to do! -install-$(MANIFEST_FILE): - @echo " ==> Installing from $(MANIFEST_FILE)" - $(MANIFEST_ENV) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)), ginstall -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE)) $(word 2,$(MANIFEST_LINE)) ;) - @$(MAKECOOKIE) - -#################### DEPENDENCY RULES #################### - -# These two lines are here to grandfather in all the packages that use -# BUILDDEPS -IMGDEPS += build -build_DEPENDS = $(BUILDDEPS) - -# Standard deps install into the standard install dir. For the -# BBC, we set the includedir to the build tree and the libdir to -# the install tree. Most dependencies work this way. - -$(GARDIR)/%/$(COOKIEDIR)/install: - @echo ' ==> Building $* as a dependency' - @$(MAKE) -C $(GARDIR)/$* install DESTIMG=$(DESTIMG) - -# builddeps need to have everything put in the build DESTIMG -#$(GARDIR)/%/$(COOKIEROOTDIR)/build.d/install: -# @echo ' ==> Building $* as a build dependency' -# @$(MAKE) -C $(GARDIR)/$* install DESTIMG=build - -# Source Deps grab the source code for another package -# XXX: nobody uses this, but it should really be more like -# $(GARDIR)/%/cookies/patch: -srcdep-$(GARDIR)/%: - @echo ' ==> Grabbing source for $* as a dependency' - @$(MAKE) -C $(GARDIR)/$* patch-p extract-p > /dev/null 2>&1 || \ - $(MAKE) -C $(GARDIR)/$* patch - -# Image deps create dependencies on package installations in -# images other than the current package's DESTIMG. -IMGDEP_TARGETS = $(foreach TTT,$($*_DEPENDS),$(subst xyzzy,$(TTT),$(GARDIR)/xyzzy/$(COOKIEROOTDIR)/$*.d/install)) -imgdep-%: - @test -z "$(strip $(IMGDEP_TARGETS))" || $(MAKE) DESTIMG="$*" $(IMGDEP_TARGETS) - -# Igor's info and man gzipper rule -gzip-info-man: gzip-info gzip-man - -gzip-info: - gfind $(DESTDIR) -type f -iname *.info* -not -iname *.gz | \ - gxargs -r gzip --force - -gzip-man: - gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ - gxargs -r gzip --force - -compile-elisp: - @(for d in $(ELISP_DIRS); do \ - echo " ===> Compiling .el files in $$d"; \ - cd $(PKGROOT)/$$d; \ - for f in `find . -name "*el"`; do \ - bf=`basename $$f`; \ - bd=`dirname $$f`; \ - cd $$bd; \ - emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ - cd $(PKGROOT)/$$d; \ - done; \ - done) - -include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) - -# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it -# is! We mustn't have nasty little gmakeses deleting our -# precious cookieses now must we? -.PRECIOUS: $(DOWNLOADDIR)/% $(COOKIEDIR)/% $(FILEDIR)/% Copied: csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk (from rev 6855, csw/mgar/gar/v2/gar.lib.mk) =================================================================== --- csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk (rev 0) +++ csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -0,0 +1,753 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright (C) 2001 Nick Moffitt +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# + +# cookies go here, so we have to be able to find them for +# dependency checking. +VPATH += $(COOKIEDIR) + +# convenience variable to make the cookie. +MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ + +URLSTRIP = $(subst ://,//,$(1)) + +# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a +# default proxy script that works with the (squid?) proxy at the BO buildfarm. +# override GIT_PROXY_SCRIPT to something else if you need to. +GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) +GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) + +#################### FETCH RULES #################### + +URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M))))) + +# if the caller has defined _postinstall, etc targets for a package, add +# these 'dynamic script' targets to our fetch list +URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr//$(DYN)) + +ifdef GIT_REPOS +URLS += $(foreach R,$(GIT_REPOS),gitrepo//$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) +endif + +# Download the file if and only if it doesn't have a preexisting +# checksum file. Loop through available URLs and stop when you +# get one that doesn't return an error code. +$(DOWNLOADDIR)/%: + @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ + echo " ==> Grabbing $@"; \ + for i in $(filter %/$*,$(URLS)); do \ + echo " ==> Trying $$i"; \ + $(MAKE) -s $$i || continue; \ + mv $(PARTIALDIR)/$* $@; \ + break; \ + done; \ + if test -r $@ ; then : ; else \ + echo '(!!!) Failed to download $@!' 1>&2; \ + false; \ + fi; \ + fi + +gitrepo//%: + @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ + ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ + $(GIT_MAYBEPROXY) git --bare fetch ) && \ + gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ + else \ + false; \ + fi ) + +# the git remote add commands are so that we can later do a fetch +# to update the code. +# we possibly proxy the git:// references depending on GIT_USE_PROXY +git-http//%: + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin http://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +git//%: + @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin git://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +# create ADMSCRIPTS 'on the fly' from variables defined by the caller +# This version is private and should only be called from the non-private +# version directly below +_dynscr//%: + $($(subst .,_,$*)) + +dynscr//%: + $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* + +# download an http URL (colons omitted) +http//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* + +https//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* + +# download an ftp URL (colons omitted) +#ftp//%: +# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* +ftp//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* + +# link to a local copy of the file +# (absolute path) +file///%: + @if test -f /$*; then \ + gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ + else \ + false; \ + fi + +# link to a local copy of the file +# (relative path) +file//%: + @if test -f $*; then \ + gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ + else \ + false; \ + fi + +# Using Jeff Waugh's rsync rule. +# DOES NOT PRESERVE SYMLINKS! +rsync//%: + @rsync -azvLP rsync://$* $(PARTIALDIR)/ + +# Using Jeff Waugh's scp rule +scp//%: + @scp -C $* $(PARTIALDIR)/ + +# Fetch a SVN repo via http +svn-http//%: + @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) + +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + +#################### CHECKSUM RULES #################### + +# check a given file's checksum against $(CHECKSUM_FILE) and +# error out if it mentions the file without an "OK". +# The removal of the download prefix is for legacy checksums. For newstyle +# checksums without path this is not necessary. +checksum-%: $(CHECKSUM_FILE) + @echo " ==> Running checksum on $*" + @if ggrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ + ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ + echo '(!!!) $* failed checksum test!' 1>&2; \ + false; \ + else \ + echo 'file $* passes checksum test!'; \ + $(MAKECOOKIE); \ + fi \ + else \ + echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ + false; \ + fi + +#################### CHECKNEW RULES #################### + +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) + +define files2check +$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) +endef + +check-upstream-and-mail: FILES2CHECK = $(call files2check) +check-upstream-and-mail: + @if [ -n '$(FILES2CHECK)' ]; then \ + NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ + for FILE in $(FILES2CHECK) ""; do \ + [ -n "$$FILE" ] || continue; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ + else \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ + fi; \ + $(MAKE) checknew-$$FILE >/dev/null; \ + done; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "--"; \ +# echo "Kindest regards"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ + fi + +check-upstream: FILES2CHECK = $(call files2check) +check-upstream: + @if [ -n '$(FILES2CHECK)' ]; then \ + NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ + for FILE in $(FILES2CHECK) ""; do \ + [ -n "$$FILE" ] || continue; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ + else \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ + fi; \ + $(MAKE) checknew-$$FILE >/dev/null; \ + done; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + fi; \ + fi + +checknew-%: + @$(MAKECOOKIE) + + +#################### GARCHIVE RULES #################### + +# while we're here, let's just handle how to back up our +# checksummed files + +$(GARCHIVEDIR)/%: $(GARCHIVEDIR) + @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ + gcp -Lr $(DOWNLOADDIR)/$* $@; \ + fi + + +#################### EXTRACT RULES #################### + +TAR_ARGS = --no-same-owner + +# rule to extract uncompressed tarballs +tar-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @gtar $(TAR_ARGS) -xf $(DOWNLOADDIR)/$* -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar xzf +tar-gz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @gzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar and bzip +tar-bz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# extract compressed single files +bz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @bzip2 -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +gz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @gzip -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +# extra dependency rule for git repos, that will allow the user +# to supply an alternate target at their discretion +git-extract-%: + @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" + git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with unzip +zip-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) + @$(MAKECOOKIE) + +# this is a null extract rule for files which are constant and +# unchanged (not archives) +cp-extract-%: + @echo " ==> Copying $(DOWNLOADDIR)/$*" + @cp -rp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @$(MAKECOOKIE) + +#gets the meat of a .deb into $(WORKSRC) +deb-bin-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @ar x $(DOWNLOADDIR)/$* + @rm debian-binary && \ + mv *.tar.gz $(DOWNLOADDIR) && \ + mkdir $(WORKSRC) && \ + gtar $(TAR_ARGS) -xvz -C $(WORKSRC) \ + -f $(DOWNLOADDIR)/data.tar.gz + @$(MAKECOOKIE) + +### EXTRACT FILE TYPE MAPPINGS ### +# These rules specify which of the above extract action rules to use for a +# given file extension. Often support for a given extract type can be handled +# by simply adding a rule here. + +extract-archive-%.tar: tar-extract-%.tar + @$(MAKECOOKIE) + +extract-archive-%.tar.gz: tar-gz-extract-%.tar.gz + @$(MAKECOOKIE) + +extract-archive-%.tar.Z: tar-gz-extract-%.tar.Z + @$(MAKECOOKIE) + +extract-archive-%.tgz: tar-gz-extract-%.tgz + @$(MAKECOOKIE) + +extract-archive-%.taz: tar-gz-extract-%.taz + @$(MAKECOOKIE) + +extract-archive-%.tar.bz: tar-bz-extract-%.tar.bz + @$(MAKECOOKIE) + +extract-archive-%.tar.bz2: tar-bz-extract-%.tar.bz2 + @$(MAKECOOKIE) + +extract-archive-%.tbz: tar-bz-extract-%.tbz + @$(MAKECOOKIE) + +extract-archive-%.zip: zip-extract-%.zip + @$(MAKECOOKIE) + +extract-archive-%.ZIP: zip-extract-%.ZIP + @$(MAKECOOKIE) + +extract-archive-%.deb: deb-bin-extract-%.deb + @$(MAKECOOKIE) + +extract-archive-%.bz2: bz-extract-%.bz2 + @$(MAKECOOKIE) + +extract-archive-%.gz: gz-extract-%.gz + @$(MAKECOOKIE) + +extract-archive-%.git: git-extract-%.git + @$(MAKECOOKIE) + +# anything we don't know about, we just assume is already +# uncompressed and unarchived in plain format +extract-archive-%: cp-extract-% + @$(MAKECOOKIE) + +#################### PATCH RULES #################### + +PATCHDIR ?= $(WORKSRC) +PATCHDIRLEVEL ?= 1 +PATCHDIRFUZZ ?= 2 +GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) +BASEWORKSRC = $(shell basename $(WORKSRC)) + +# apply bzipped patches +bz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @$(MAKECOOKIE) + +# apply gzipped patches +gz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @$(MAKECOOKIE) + +# apply normal patches +normal-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + $(GARPATCH) < $(DOWNLOADDIR)/$* + @$(MAKECOOKIE) + +# This is used by makepatch +%/gar-base.diff: + @echo " ==> Creating patch $@" + @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract + @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch + @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig + @( cd $(WORKDIR_FIRSTMOD); \ + if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ + cd $(CURDIR); \ + mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ + fi ) + +### PATCH FILE TYPE MAPPINGS ### +# These rules specify which of the above patch action rules to use for a given +# file extension. Often support for a given patch format can be handled by +# simply adding a rule here. + +patch-extract-%.bz: bz-patch-%.bz + @$(MAKECOOKIE) + +patch-extract-%.bz2: bz-patch-%.bz2 + @$(MAKECOOKIE) + +patch-extract-%.gz: gz-patch-%.gz + @$(MAKECOOKIE) + +patch-extract-%.Z: gz-patch-%.Z + @$(MAKECOOKIE) + +patch-extract-%.diff: normal-patch-%.diff + @$(MAKECOOKIE) + +patch-extract-%.patch: normal-patch-%.patch + @$(MAKECOOKIE) + +patch-extract-%: normal-patch-% + @$(MAKECOOKIE) + +#################### CONFIGURE RULES #################### + +TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) + +NODIRPATHS += --lispdir + +DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) + +# configure a package that has an autoconf-style configure +# script. +configure-%/configure: + @echo " ==> Running configure in $*" + cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +configure-%/autogen.sh: + @echo " ==> Running autogen.sh in $*" + @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +# configure a package that uses imake +# FIXME: untested and likely not the right way to handle the +# arguments +configure-%/Imakefile: + @echo " ==> Running xmkmf in $*" + @cd $* && $(CONFIGURE_ENV) xmkmf $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +configure-%/setup.rb: + @echo " ==> Running setup.rb config in $*" + @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +#################### BUILD RULES #################### + +# build from a standard gnu-style makefile's default rule. +build-%/Makefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/makefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/GNUmakefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/Jamfile: + @echo " ==> Running bjam in $*" + @( cd $* ; $(BUILD_ENV) bjam $(JAMFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# Ruby makefiles +build-%/Rakefile: + @echo " ==> Running rake in $*" + @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +build-%/rakefile: + @echo " ==> Running rake in $*" + @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +build-%/setup.rb: + @echo " ==> Running setup.rb setup in $*" + @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# This can be: build, build_py, build_ext, build_clib, build_scripts +# See setup.py --help-commands for details +PYBUILD_CMD ?= build +build-%/setup.py: + @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" + @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +#################### TEST RULES #################### + +TEST_TARGET ?= test + +# Run tests on pre-built sources +test-%/Makefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +test-%/makefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +test-%/GNUmakefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +# Ruby makefiles +test-%/Rakefile: + @echo " ==> Running rake $(TEST_TARGET) in $*" + @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @$(MAKECOOKIE) + +test-%/rakefile: + @echo " ==> Running rake $(TEST_TARGET) in $*" + @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @$(MAKECOOKIE) + +test-%/setup.py: + @echo " ==> Running setup.py test in $*" + @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) + @$(MAKECOOKIE) + +################# INSTALL RULES #################### + +# just run make install and hope for the best. +install-%/Makefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +install-%/makefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +install-%/GNUmakefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +# Ruby makefiles +install-%/Rakefile: + @echo " ==> Running rake install in $*" + @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +install-%/rakefile: + @echo " ==> Running rake install in $*" + @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +install-%/setup.rb: + @echo " ==> Running setup.rb install in $*" + @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) + @$(MAKECOOKIE) + +# This can be: install, install_lib, install_headers, install_scripts, +# or install_data. See setup.py --help-commands for details. +PYINSTALL_CMD ?= install +install-%/setup.py: + @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" + @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +# pkg-config scripts +install-%-config: + mkdir -p $(STAGINGDIR)/$(GARNAME) + cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ + $(MAKECOOKIE) + +###################################### +# Use a manifest file of the format: +# src:dest[:mode[:owner[:group]]] +# as in... +# ${WORKSRC}/nwall:${bindir}/nwall:2755:root:tty +# ${WORKSRC}/src/foo:${sharedstatedir}/foo +# ${WORKSRC}/yoink:${sysconfdir}/yoink:0600 + +# Okay, so for the benefit of future generations, this is how it +# works: +# +# First of all, we have this file with colon-separated lines. +# The $(shell cat foo) routine turns it into a space-separated +# list of words. The foreach iterates over this list, putting a +# colon-separated record in $(ZORCH) on each pass through. +# +# Next, we have the macro $(MANIFEST_LINE), which splits a record +# into a space-separated list, and $(MANIFEST_SIZE), which +# determines how many elements are in such a list. These are +# purely for convenience, and could be inserted inline if need +# be. +MANIFEST_LINE = $(subst :, ,$(ZORCH)) +MANIFEST_SIZE = $(words $(MANIFEST_LINE)) + +# So the install command takes a variable number of parameters, +# and our records have from two to five elements. Gmake can't do +# any sort of arithmetic, so we can't do any really intelligent +# indexing into the list of parameters. +# +# Since the last three elements of the $(MANIFEST_LINE) are what +# we're interested in, we make a parallel list with the parameter +# switch text (note the dummy elements at the beginning): +MANIFEST_FLAGS = notused notused --mode= --owner= --group= + +# The following environment variables are set before the +# installation boogaloo begins. This ensures that WORKSRC is +# available to the manifest and that all of the location +# variables are suitable for *installation* (that is, using +# DESTDIR) + +MANIFEST_ENV += WORKSRC=$(WORKSRC) +# This was part of the "implicit DESTDIR" regime. However: +# http://gar.lnx-bbc.org/wiki/ImplicitDestdirConsideredHarmful +#MANIFEST_ENV += $(foreach TTT,prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir lispdir includedir mandir,$(TTT)=$(DESTDIR)$($(TTT))) + +# ...and then we join a slice of it with the corresponding slice +# of the $(MANIFEST_LINE), starting at 3 and going to +# $(MANIFEST_SIZE). That's where all the real magic happens, +# right there! +# +# following that, we just splat elements one and two of +# $(MANIFEST_LINE) on the end, since they're the ones that are +# always there. Slap a semicolon on the end, and you've got a +# completed iteration through the foreach! Beaujolais! + +# FIXME: using -D may not be the right thing to do! +install-$(MANIFEST_FILE): + @echo " ==> Installing from $(MANIFEST_FILE)" + $(MANIFEST_ENV) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)), ginstall -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE)) $(word 2,$(MANIFEST_LINE)) ;) + @$(MAKECOOKIE) + +#################### DEPENDENCY RULES #################### + +# These two lines are here to grandfather in all the packages that use +# BUILDDEPS +IMGDEPS += build +build_DEPENDS = $(BUILDDEPS) + +# Standard deps install into the standard install dir. For the +# BBC, we set the includedir to the build tree and the libdir to +# the install tree. Most dependencies work this way. + +$(GARDIR)/%/$(COOKIEDIR)/install: + @echo ' ==> Building $* as a dependency' + @$(MAKE) -C $(GARDIR)/$* install DESTIMG=$(DESTIMG) + +# builddeps need to have everything put in the build DESTIMG +#$(GARDIR)/%/$(COOKIEROOTDIR)/build.d/install: +# @echo ' ==> Building $* as a build dependency' +# @$(MAKE) -C $(GARDIR)/$* install DESTIMG=build + +# Source Deps grab the source code for another package +# XXX: nobody uses this, but it should really be more like +# $(GARDIR)/%/cookies/patch: +srcdep-$(GARDIR)/%: + @echo ' ==> Grabbing source for $* as a dependency' + @$(MAKE) -C $(GARDIR)/$* patch-p extract-p > /dev/null 2>&1 || \ + $(MAKE) -C $(GARDIR)/$* patch + +# Image deps create dependencies on package installations in +# images other than the current package's DESTIMG. +IMGDEP_TARGETS = $(foreach TTT,$($*_DEPENDS),$(subst xyzzy,$(TTT),$(GARDIR)/xyzzy/$(COOKIEROOTDIR)/$*.d/install)) +imgdep-%: + @test -z "$(strip $(IMGDEP_TARGETS))" || $(MAKE) DESTIMG="$*" $(IMGDEP_TARGETS) + +# Igor's info and man gzipper rule +gzip-info-man: gzip-info gzip-man + +gzip-info: + gfind $(DESTDIR) -type f -iname *.info* -not -iname *.gz | \ + gxargs -r gzip --force + +gzip-man: + gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ + gxargs -r gzip --force + +compile-elisp: + @(for d in $(ELISP_DIRS); do \ + echo " ===> Compiling .el files in $$d"; \ + cd $(PKGROOT)/$$d; \ + for f in `find . -name "*el"`; do \ + bf=`basename $$f`; \ + bd=`dirname $$f`; \ + cd $$bd; \ + emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ + cd $(PKGROOT)/$$d; \ + done; \ + done) + +include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) + +# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it +# is! We mustn't have nasty little gmakeses deleting our +# precious cookieses now must we? +.PRECIOUS: $(DOWNLOADDIR)/% $(COOKIEDIR)/% $(FILEDIR)/% Deleted: csw/mgar/gar/v2-collapsed-modulations/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-09 11:59:38 UTC (rev 6808) +++ csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -1,828 +0,0 @@ - -# -# $Id$ -# -# Copyright (C) 2001 Nick Moffitt -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. - -# Comment this out to make much verbosity -#.SILENT: - -#ifeq ($(origin GARDIR), undefined) -#GARDIR := $(CURDIR)/../.. -#endif - -#GARDIR ?= ../.. -#ifeq ($(origin GARDIR), undefined) -#GARDIR := $(CURDIR)/../.. -#endif - -ifneq ($(abspath /),/) -$(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) -endif - -GARDIR ?= gar -GARBIN = $(GARDIR)/bin - -DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1)))) -ROOTFROMDEST = $(call DIRSTODOTS,$(DESTDIR)) -MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') -TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') - -# If you call this the value is only evaluated the first time -# Usage: $(call SETONCE,A,MyComplexVariableEvaluatedOnlyOnce) -SETONCE = $(eval $(1) ?= $(2)) - -#meant to take a git url and return just the $proj.git part -GITPROJ = $(lastword $(subst /, ,$(1))) - -PARALLELMFLAGS ?= $(MFLAGS) -export PARALLELMFLAGS - -DISTNAME ?= $(GARNAME)-$(GARVERSION) - -DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) - -# Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' -ALLFILES_DISTFILES ?= $(DISTFILES) -ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) -ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) -ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) - -ifeq ($(MAKE_INSTALL_DIRS),1) -INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) -else -INSTALL_DIRS = -endif - -# For rules that do nothing, display what dependencies they -# successfully completed -#DONADA = @echo " [$@] complete. Finished rules: $+" -#DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." -COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) -DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." - - -# TODO: write a stub rule to print out the name of a rule when it -# *does* do something, and handle indentation intelligently. - -# Default sequence for "all" is: fetch checksum extract patch configure build -all: build - -# include the configuration file to override any of these variables -include $(GARDIR)/gar.conf.mk -include $(GARDIR)/gar.lib.mk - -# ========================= MODULATIONS ======================== - -# The default is to modulate over ISAs -MODULATORS ?= ISA $(EXTRA_MODULATORS) $(EXTRA_MODULATORS_$(GARCH)) -MODULATIONS_ISA = $(NEEDED_ISAS) - -tolower = $(shell echo $(1) | tr '[A-Z]' '[a-z]') -expand_modulator_1 = $(addprefix $(call tolower,$(1))-,$(MODULATIONS_$(1))) -# This expands to the list of all modulators with their respective modulations -modulations = $(if $(word 2,$(1)),\ - $(foreach P,$(call expand_modulator_1,$(firstword $(1))),\ - $(addprefix $(P)-,$(call modulations,$(wordlist 2,$(words $(1)),$(1))))\ - ),\ - $(call expand_modulator_1,$(1))) - -MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) - -# _modulate(ISA STATIC,,,) -# -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) -# -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes) -# -> xxx-isa-i386-static-yes: @gmake xxx ISA=i386 STATIC=yes -# -> _modulate2(,,isa-i386-static-no,ISA STATIC,ISA=i386 STATIC=no) -# -> xxx-isa-i386-static-no: @gmake xxx ISA=i386 STATIC=no -# -> _modulate2(STATIC,isa-amd64,ISA,ISA=amd64) -# -> _modulate2(,,isa-amd64-static-yes,ISA STATIC,ISA=amd64 STATIC=yes) -# -> xxx-isa-amd64-static-yes: @gmake xxx ISA=amd64 STATIC=yes -# -> _modulate2(,,isa-amd64-static-no,ISA STATIC,ISA=amd64 STATIC=no) -# -> xxx-isa-amd64-static-no: @gmake xxx ISA=amd64 STATIC=no - -define _modulate_target -$(1)-$(2): - @$(MAKE) MODULATION=$(2) $(3) $(1)-modulated - @# This is MAKECOOKIE expanded to use the name of the rule explicily as the rule has - @# not been evaluated yet. XXX: Use function _MAKECOOKIE for both - @mkdir -p $(COOKIEDIR)/$(dir $(1)-$(2)) && date >> $(COOKIEDIR)/$(1)-$(2) - @# The next line has intentionally been left blank to explicitly terminate this make rule - -endef - -define _modulate_target_nocookie -$(1)-$(2): - @$(MAKE) -s MODULATION=$(2) $(3) $(1)-modulated - @# The next line has intentionally been left blank to explicitly terminate this make rule - -endef - -define _modulate_merge -$(foreach ASSIGNMENT,$(3), -merge-$(2): $(ASSIGNMENT) -) -merge-$(2): BUILDHOST=$$(call modulation2host) -merge-$(2): - @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" - $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ - $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ - ) - @# The next line has intentionally been left blank to explicitly terminate this make rule - -endef - -define _modulate_do -$(call _modulate_target,extract,$(2),$(4)) -$(call _modulate_target,patch,$(2),$(4)) -$(call _modulate_target,configure,$(2),$(4)) -$(call _modulate_target_nocookie,reset-configure,$(2),$(4)) -$(call _modulate_target,build,$(2),$(4)) -$(call _modulate_target_nocookie,reset-build,$(2),$(4)) -$(call _modulate_target,test,$(2),$(4)) -$(call _modulate_target,install,$(2),$(4)) -$(call _modulate_target_nocookie,reset-install,$(2),$(4)) -#$(call _modulate_target,merge,$(2),$(4)) -$(call _modulate_merge,,$(2),$(4)) -$(call _modulate_target_nocookie,reset-merge,$(2),$(4)) -$(call _modulate_target_nocookie,clean,$(2),$(4)) -$(call _modulate_target_nocookie,_modenv,$(2),$(4)) -endef - -# This evaluates to the make rules for all modulations passed as first argument -# Usage: _modulate( ) -define _modulate -$(foreach M,$(MODULATIONS_$(firstword $(1))),\ - $(call _modulate2,\ - $(wordlist 2,$(words $(1)),$(1)),\ - $(call tolower,$(firstword $(1)))-$(M),\ - $(firstword $(1)),\ - $(firstword $(1))=$(M)\ - )\ -) -endef - -# This is a helper for the recursive _modulate -define _modulate2 -$(if $(strip $(1)),\ - $(foreach M,$(MODULATIONS_$(firstword $(1))),\ - $(call _modulate2,\ - $(wordlist 2,$(words $(1)),$(1)),\ - $(addprefix $(2)-,$(call tolower,$(firstword $(1)))-$(M)),\ - $(3) $(firstword $(1)),\ - $(4) $(firstword $(1))=$(M)\ - )\ - ),\ - $(call _modulate_do,,$(strip $(2)),$(3),$(4))\ -) -endef - -define _pmod - @echo "[ $1 for modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) ]" -endef - -$(eval $(call _modulate,$(MODULATORS))) - -#################### DIRECTORY MAKERS #################### - -# This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: - @if test -d $@; then : ; else \ - ginstall -d $@; \ - echo "ginstall -d $@"; \ - fi - -# These stubs are wildcarded, so that the port maintainer can -# define something like "pre-configure" and it won't conflict, -# while the configure target can call "pre-configure" safely even -# if the port maintainer hasn't defined it. -# -# in addition to the pre- rules, the maintainer may wish -# to set a "pre-everything" rule, which runs before the first -# actual target. -pre-%: - @true - -post-%: - @true - -# Call any arbitrary rule recursively for all dependencies -deep-%: % - @for target in "" $(DEPEND_LIST) ; do \ - test -z "$$target" && continue ; \ - $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ - done - @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) - - -# ========================= MAIN RULES ========================= -# The main rules are the ones that the user can specify as a -# target on the "make" command-line. Currently, they are: -# prereq fetch-list fetch checksum makesum extract checkpatch patch -# build install reinstall uninstall package -# (some may not be complete yet). -# -# Each of these rules has dependencies that run in the following -# order: -# - run the previous main rule in the chain (e.g., install -# depends on build) -# - run the pre- rule for the target (e.g., configure would -# then run pre-configure) -# - generate a set of files to depend on. These are typically -# cookie files in $(COOKIEDIR), but in the case of fetch are -# actual downloaded files in $(DOWNLOADDIR) -# - run the post- rule for the target -# -# The main rules also run the $(DONADA) code, which prints out -# what just happened when all the dependencies are finished. - -announce: - @echo "[===== NOW BUILDING: $(DISTNAME) =====]" - -announce-modulation: - @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" - -# prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) - -# Force to be called in global modulation -prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) - $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite) - $(DONADA) - -prerequisitepkg-%: - @echo " ==> Verifying for installed package $*: \c" - @(pkginfo -q $*; if [ $$? -eq 0 ]; then echo "installed"; else echo "MISSING"; exit 1; fi) - @$(MAKECOOKIE) - -# fetch-list - Show list of files that would be retrieved by fetch. -# NOTE: DOES NOT RUN pre-everything! -fetch-list: - @echo "Distribution files: " - @$(foreach F,$(DISTFILES),echo " $F";) - @echo "Patch files: " - @$(foreach P,$(PATCHFILES),echo " $P";) - @$(foreach M,$(MODULATIONS),$(if $(PATCHFILES_$M),echo " Modulation $M only: $(PATCHFILES_$M)";)) - @echo "Dynamically generated scripts: " - @$(foreach D,$(DYNSCRIPTS),echo " $D";) - @echo "Git Repos tracked: " - @$(foreach R,$(GIT_REPOS),echo " $R";) - -# fetch - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined) -# into $(DOWNLOADDIR) as necessary. -FETCH_TARGETS = $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) - -fetch: prerequisite pre-fetch $(FETCH_TARGETS) post-fetch - @$(DONADA) - -# returns true if fetch has completed successfully, false -# otherwise -fetch-p: - @$(foreach COOKIEFILE,$(FETCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# checksum - Use $(CHECKSUMFILE) to ensure that your -# distfiles are valid. -CHECKSUM_TARGETS = $(addprefix checksum-,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) - -checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum - @$(DONADA) - -checksum-global: $(if $(filter global,$(MODULATION)),checksum) - $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global checksum) - @$(DONADA) - -# The next rule handles the dependency from the modulated context to -# the contextless checksumming. The rule is called when the cookie -# to the global checksum is requested. If the global checksum has not run, -# then run it. Otherwise it is silently accepted. -checksum-modulated: checksum-global - @$(DONADA) - -# returns true if checksum has completed successfully, false -# otherwise -checksum-p: - @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# makesum - Generate distinfo (only do this for your own ports!). -MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) - -makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) - @if test "x$(MAKESUM_TARGETS)" != "x "; then \ - (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ - echo "Checksums made for $(MAKESUM_TARGETS)" ; \ - cat $(CHECKSUM_FILE) ; \ - fi - -# I am always typing this by mistake -makesums: makesum - -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) - -garchive: checksum $(GARCHIVE_TARGETS) ; - -# extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) - -# We call an additional extract-modulated without resetting any variables so -# a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract - @$(DONADA) - -extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) - $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global extract) - @$(MAKECOOKIE) - -extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ - $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ - announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated - @$(DONADA) - -# returns true if extract has completed successfully, false -# otherwise -extract-p: - @$(foreach COOKIEFILE,$(EXTRACT_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# checkpatch - Do a "patch -C" instead of a "patch". Note -# that it may give incorrect results if multiple -# patches deal with the same file. -# TODO: actually write it! -checkpatch: extract - @echo "$@ NOT IMPLEMENTED YET" - -# patch - Apply any provided patches to the source. -PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) - -patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch - @$(DONADA) - -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated - @$(DONADA) - -# returns true if patch has completed successfully, false -# otherwise -patch-p: - @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# makepatch - Grab the upstream source and diff against $(WORKSRC). Since -# diff returns 1 if there are differences, we remove the patch -# file on "success". Goofy diff. -makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff - $(DONADA) - -# XXX: Allow patching of pristine sources separate from ISA directories -# XXX: Use makepatch on global/ - -# this takes the changes you've made to a working directory, -# distills them to a patch, updates the checksum file, and tries -# out the build (assuming you've listed the gar-base.diff in your -# PATCHFILES). This is way undocumented. -NickM -beaujolais: makepatch makesum clean build - $(DONADA) - -update: makesum garchive clean - -# configure - Runs either GNU configure, one or more local -# configure scripts or nothing, depending on -# what's available. -CONFIGURE_TARGETS = $(addprefix configure-,$(CONFIGURE_SCRIPTS)) - -# Limit dependencies to all but one category or to exclude one category -ALL_CATEGORIES = apps cpan devel gnome lang lib net server utils extra -ifneq ($(BUILD_CATEGORY),) -NOBUILD_CATEGORY = $(filter-out $(BUILD_CATEGORY),$(ALL_CATEGORIES)) -endif - -DEPEND_LIST = $(filter-out $(addsuffix /%,$(NOBUILD_CATEGORY)),$(DEPENDS) $(LIBDEPS) $(BUILDDEPS)) - -ifneq ($(SKIPDEPEND),1) -CONFIGURE_DEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEDIR)/install,$(DEPEND_LIST))) -CONFIGURE_IMGDEPS = $(addprefix imgdep-,$(filter-out $(DESTIMG),$(IMGDEPS))) -#CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) -endif - -configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure - @$(DONADA) - -configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ - $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if $(STRIP_LIBTOOL),strip-libtool) - @$(DONADA) - -strip-libtool: - @echo '[===== Stripping Libtool =====]' - fixlibtool $(WORKSRC) - @$(MAKECOOKIE) - -.PHONY: reset-configure reset-configure-modulated -reconfigure: reset-configure configure - -reset-configure: $(addprefix reset-configure-,$(MODULATIONS)) - rm -f $(COOKIEDIR)/configure - -reset-configure-modulated: - rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) - -# returns true if configure has completed successfully, false -# otherwise -configure-p: - @$(foreach COOKIEFILE,$(CONFIGURE_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# build - Actually compile the sources. -BUILD_TARGETS = $(addprefix build-,$(BUILD_CHECK_SCRIPTS)) $(addprefix build-,$(BUILD_SCRIPTS)) - -build: pre-build $(addprefix build-,$(MODULATIONS)) post-build - $(DONADA) - -# Build for a specific architecture -build-modulated-check: - $(if $(filter ERROR,$(ARCHFLAGS_$(GARCOMPILER)_$*)), \ - $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ - ) - -build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated - @$(MAKECOOKIE) - -# returns true if build has completed successfully, false -# otherwise -build-p: - @$(foreach COOKIEFILE,$(BUILD_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -TEST_TARGETS = $(addprefix test-,$(TEST_SCRIPTS)) - -test: pre-test $(addprefix test-,$(MODULATIONS)) post-test - $(DONADA) - -test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated - $(DONADA) - -# strip - Strip executables -ifneq ($(GARFLAVOR),DBG) -POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) -endif - -strip: - @for target in $(STRIP_DIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) ; \ - do \ - stripbin $$target ; \ - done - $(DONADA) - -# fixconfig - Remove build-time paths config files -POST_INSTALL_TARGETS := fixconfig $(POST_INSTALL_TARGETS) -FIXCONFIG_DIRS ?= $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) -FIXCONFIG_RMPATHS ?= $(DESTDIR) $(CURDIR)/$(WORKSRC) -fixconfig: - @if test "x$(FIXCONFIG_DIRS)" != "x" ; then \ - for path in $(FIXCONFIG_DIRS) ; do \ - if test -d $$path ; then \ - echo " ==> fixconfig: $$path" ; \ - replacer $$path $(FIXCONFIG_RMPATHS) ; \ - fi ; \ - done ; \ - fi - -# install - Test and install the results of a build. -INSTALL_TARGETS = $(addprefix install-,$(INSTALL_SCRIPTS)) - -install: pre-install $(addprefix install-,$(MODULATIONS)) post-install - $(DONADA) - -install-modulated: build-modulated $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test-modulated $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) pre-install-modulated pre-install-$(MODULATION) $(INSTALL_TARGETS) post-install-$(MODULATION) post-install-modulated $(POST_INSTALL_TARGETS) - @$(MAKECOOKIE) - -# returns true if install has completed successfully, false -# otherwise -install-p: - @$(foreach COOKIEFILE,$(INSTALL_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - - - -# reinstall - Install the results of a build, ignoring -# "already installed" flag. -.PHONY: reinstall reset-install reset-install-modulated -reinstall: reset-install install - -reset-install: reset-merge $(addprefix reset-install-,$(MODULATIONS)) - @rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/install-$M) $(COOKIEDIR)/install $(COOKIEDIR)/post-install - @rm -f $(COOKIEDIR)/strip - -reset-install-modulated: - @$(call _pmod,Reset install state) - @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work - @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) - @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) - @rm -f $(COOKIEDIR)/strip - @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) - @rm -f $(COOKIEROOTDIR)/global/install-$(MODULATION) - -# merge in all isas to the package directory after installation - -# Merging in general allows the selection of parts from different ISA builds into the package -# Per default merging is done differently depending on -# (a) if the sources are build for more than one ISA -# (b) if the executables should be replaced by isaexec or not -# -# - If there is only one ISA to build for everything is copied verbatim to PKGROOT. -# - If there are builds for more than one ISA the destination differs depending on if -# the binaries should be executed by isaexec. This is usually bin, sbin and libexec. -# -# default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ -# -# Automatic merging is only possible if you have the default modulation "ISA" -# Otherwise you *must* specify merge scripts for all modulations. - -ifeq ($(DEBUG_MERGING),) -_DBG_MERGE=@ -else -_DBG_MERGE= -endif - -ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -else -ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) -endif - -# These directories get relocated into their ISA subdirectories -MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION)) - -# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper -_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config -_ISAEXEC_FILES = $(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ - $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ - ) -ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ - $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ - done)),) - -ifneq ($(ISAEXEC_FILES),) -_EXTRA_GAR_PKGS += CSWisaexec -endif - -# These merge-rules are actually processed for the current modulation -MERGE_TARGETS ?= $(addprefix merge-,$(MERGE_SCRIPTS_$(MODULATION))) $(EXTRA_MERGE_TARGETS) - -# Include only these files -ifeq ($(origin MERGE_INCLUDE_FILES_$(MODULATION)), undefined) -_MERGE_INCLUDE_FILES = $(MERGE_INCLUDE_FILES) -else -_MERGE_INCLUDE_FILES = $(MERGE_INCLUDE_FILES_$(MODULATION)) -endif -_MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) - -# This can be defined in category.mk -MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY) - -# Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) -# during the merge phase. -_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py -MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) - -MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la -MERGE_EXCLUDE_BACKUPFILES ?= .*\~ -MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a -# Exclude all other .pc-files apart from the default 32- and 64 bit versions -MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc) -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE) - -# Exclude these files -ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) -_MERGE_EXCLUDE_FILES = $(MERGE_EXCLUDE_FILES) -else -_MERGE_EXCLUDE_FILES = $(MERGE_EXCLUDE_FILES_$(MODULATION)) -endif -_MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES) $(EXTRA_MERGE_EXCLUDE_FILES_$(MODULATION)) $(MERGE_EXCLUDE_DEFAULT) - -# This variable contains parameter for pax to honor global file inclusion/exclusion -# Exclude by replacing files with the empty string -_INC_EXT_RULE = $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') -# Replace files by itself terminating on first match -_INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)$$,\1,") - -# These are used during merge phase to determine the base installation directory -MERGEBASE_$(bindir) ?= $(bindir_install) -MERGEBASE_$(sbindir) ?= $(sbindir_install) -MERGEBASE_$(libexecdir) ?= $(libexecdir_install) -MERGEBASE_$(libdir) ?= $(libdir_install) - -define mergebase -$(if $(MERGEBASE_$(1)),$(MERGEBASE_$(1)),$(1)) -endef - -# A package is compiled for the pathes defined in $(bindir), $(libdir), etc. -# These may not be the standard pathes, because specific ISA compilation -# could have appended e. g. /64 for .pc-pathes to be correct. Anyway these -# pathes may need to be rewritten e. g. from lib/64 to lib/amd64. Here, -# $(libdir) has the memorymodel-directory appended, whereas $(libdir_install) -# has not, so we use this one for appending. - - -_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS) - -define killprocandparent -cpids() { \ - P=$1 \ - PPIDS=$P \ - PP=`ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $P { print \\$1 }\"` \ - while [ -n "$PP" ]; do \ - PQ=$PP \ - PP= \ - for q in $PQ; do \ - PPIDS="$PPIDS $q" \ - PP=$PP\ `ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $q { print \\$1 }\"` \ - done \ - done \ - \ - echo $PPIDS \ -} -endef - - -# The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge - @$(DONADA) - -merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) - -merge-sequential: $(addprefix merge-,$(MODULATIONS)) - -merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid -merge-parallel: merge-watch - $(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\ - $(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait - $(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)`; stty sane; fi - $(_DBG_MERGE)$(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \ - echo "Build error in modulation $M. Please see"; \ - echo " $(WORKROOTDIR)/build-$M/build.log"; \ - echo "for details:"; \ - echo; \ - tail -100 $(WORKROOTDIR)/build-$M/build.log; \ - exit "Return code: `cat $(WORKROOTDIR)/build-$M/build.ret`"; \ - fi;) - -merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) -merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) - $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ - echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ - ) - - -# This merges the -merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated - @$(MAKECOOKIE) - -# Copy the whole tree verbatim -merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ - . $(PKGROOT)) - @$(MAKECOOKIE) - -# Copy only the merge directories -merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -# Copy the whole tree and relocate the directories in $(MERGE_DIRS) -merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -# Copy only the relocated directories -merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -# Copy -merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ - -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -.PHONY: remerge reset-merge reset-merge-modulated -remerge: reset-merge merge - -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src - @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge - @rm -rf $(PKGROOT) - @$(DONADA) - -reset-merge-modulated: - @$(call _pmod,Reset merge state) - @rm -f $(COOKIEDIR)/merge-* - -# The clean rule. It must be run if you want to re-download a -# file after a successful checksum (or just remove the checksum -# cookie, but that would be lame and unportable). - -clean: $(addprefix clean-,$(MODULATIONS)) - @rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) - -clean-modulated: - $(call _pmod,Cleaning ) - @rm -rf $(WORKSRC) $(EXTRACTDIR) \ - $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) \ - $(SCRATCHDIR)-build $(SCRATCHDIR)-$(COOKIEROOTDIR) \ - $(LOGDIR) *~ - @rm -rf $(COOKIEDIR) - - -SRC_CLEAN_TARGET ?= clean -clean-source: - @if test -d $(WORKSRC) ; then \ - ( $(MAKE) -C $(WORKSRC) $(SRC_CLEAN_TARGET) || true ) ; \ - fi - -# Remove specified files/directories -clean-dirs: - @for target in "" $(REMOVE_DIRS) ; do \ - test -z "$$target" && continue ; \ - rm -rf $$target ; \ - done ; \ - -# Clean an image -imageclean: - @echo " ==> Removing $(COOKIEDIR)" - @-rm -rf $(COOKIEDIR) - @echo " ==> Removing $(WORKDIR)" - @-rm -rf $(WORKDIR) - -spotless: imageclean - @echo " ==> Removing $(DESTDIR)" - @-rm -rf work - -# Print package dependencies -PKGDEP_LIST = $(filter-out $(BUILDDEPS),$(DEPEND_LIST)) -printdepends: - @for depend in "" $(PKGDEP_LIST) ; do \ - test -z "$$depend" && continue ; \ - echo " $$depend" ; \ - if test -n "$(DEPFILE)" ; then \ - check_pkgdb -o $(DEPFILE) $$depend ; \ - else \ - check_pkgdb $$depend ; \ - fi ; \ - done - -# Update inter-package depends -makedepend: - @for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ - pkgname=`basename $$gspec .gspec` ; \ - pkgfiles=`dirname $$gspec` ; \ - pkgdir=`dirname $$pkgfiles` ; \ - pkgbuild=`basename $$pkgdir` ; \ - pkgdep="$$pkgname.depend" ; \ - echo " ==> $$pkgbuild ($$pkgname)" ; \ - ( cd $$pkgdir ; \ - rm -f /tmp/$$pkgdep ; \ - if test -f $$pkgfiles/$$pkgdep ; then \ - cat $$pkgfiles/$$pkgdep > /tmp/$$pkgdep ; \ - fi ; \ - DEPFILE=/tmp/$$pkgdep $(MAKE) printdepends ; \ - if test -f /tmp/$$pkgdep ; then \ - sort /tmp/$$pkgdep | uniq > $$pkgfiles/$$pkgname.depend ; \ - fi ) ; \ - done - -buildstatus: - -love: - @echo "not war!" - -# these targets do not have actual corresponding files -.PHONY: all fetch-list beaujolais fetch-p checksum-p extract-p patch-p configure-p build-p install-p package-p love - -# apparently this makes all previous rules non-parallelizable, -# but the actual builds of the packages will be, according to -# jdub. -.NOTPARALLEL: Copied: csw/mgar/gar/v2-collapsed-modulations/gar.mk (from rev 6854, csw/mgar/gar/v2/gar.mk) =================================================================== --- csw/mgar/gar/v2-collapsed-modulations/gar.mk (rev 0) +++ csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -0,0 +1,828 @@ + +# +# $Id$ +# +# Copyright (C) 2001 Nick Moffitt +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. + +# Comment this out to make much verbosity +#.SILENT: + +#ifeq ($(origin GARDIR), undefined) +#GARDIR := $(CURDIR)/../.. +#endif + +#GARDIR ?= ../.. +#ifeq ($(origin GARDIR), undefined) +#GARDIR := $(CURDIR)/../.. +#endif + +ifneq ($(abspath /),/) +$(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) +endif + +GARDIR ?= gar +GARBIN = $(GARDIR)/bin + +DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1)))) +ROOTFROMDEST = $(call DIRSTODOTS,$(DESTDIR)) +MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') +TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') + +# If you call this the value is only evaluated the first time +# Usage: $(call SETONCE,A,MyComplexVariableEvaluatedOnlyOnce) +SETONCE = $(eval $(1) ?= $(2)) + +#meant to take a git url and return just the $proj.git part +GITPROJ = $(lastword $(subst /, ,$(1))) + +PARALLELMFLAGS ?= $(MFLAGS) +export PARALLELMFLAGS + +DISTNAME ?= $(GARNAME)-$(GARVERSION) + +DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) + +# Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' +ALLFILES_DISTFILES ?= $(DISTFILES) +ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) +ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) +ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) + +ifeq ($(MAKE_INSTALL_DIRS),1) +INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) +else +INSTALL_DIRS = +endif + +# For rules that do nothing, display what dependencies they +# successfully completed +#DONADA = @echo " [$@] complete. Finished rules: $+" +#DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." +COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) +DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." + + +# TODO: write a stub rule to print out the name of a rule when it +# *does* do something, and handle indentation intelligently. + +# Default sequence for "all" is: fetch checksum extract patch configure build +all: build + +# include the configuration file to override any of these variables +include $(GARDIR)/gar.conf.mk +include $(GARDIR)/gar.lib.mk + +# ========================= MODULATIONS ======================== + +# The default is to modulate over ISAs +MODULATORS ?= ISA $(EXTRA_MODULATORS) $(EXTRA_MODULATORS_$(GARCH)) +MODULATIONS_ISA = $(NEEDED_ISAS) + +tolower = $(shell echo $(1) | tr '[A-Z]' '[a-z]') +expand_modulator_1 = $(addprefix $(call tolower,$(1))-,$(MODULATIONS_$(1))) +# This expands to the list of all modulators with their respective modulations +modulations = $(if $(word 2,$(1)),\ + $(foreach P,$(call expand_modulator_1,$(firstword $(1))),\ + $(addprefix $(P)-,$(call modulations,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call expand_modulator_1,$(1))) + +MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) + +# _modulate(ISA STATIC,,,) +# -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) +# -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes) +# -> xxx-isa-i386-static-yes: @gmake xxx ISA=i386 STATIC=yes +# -> _modulate2(,,isa-i386-static-no,ISA STATIC,ISA=i386 STATIC=no) +# -> xxx-isa-i386-static-no: @gmake xxx ISA=i386 STATIC=no +# -> _modulate2(STATIC,isa-amd64,ISA,ISA=amd64) +# -> _modulate2(,,isa-amd64-static-yes,ISA STATIC,ISA=amd64 STATIC=yes) +# -> xxx-isa-amd64-static-yes: @gmake xxx ISA=amd64 STATIC=yes +# -> _modulate2(,,isa-amd64-static-no,ISA STATIC,ISA=amd64 STATIC=no) +# -> xxx-isa-amd64-static-no: @gmake xxx ISA=amd64 STATIC=no + +define _modulate_target +$(1)-$(2): + @$(MAKE) MODULATION=$(2) $(3) $(1)-modulated + @# This is MAKECOOKIE expanded to use the name of the rule explicily as the rule has + @# not been evaluated yet. XXX: Use function _MAKECOOKIE for both + @mkdir -p $(COOKIEDIR)/$(dir $(1)-$(2)) && date >> $(COOKIEDIR)/$(1)-$(2) + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + +define _modulate_target_nocookie +$(1)-$(2): + @$(MAKE) -s MODULATION=$(2) $(3) $(1)-modulated + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + +define _modulate_merge +$(foreach ASSIGNMENT,$(3), +merge-$(2): $(ASSIGNMENT) +) +merge-$(2): BUILDHOST=$$(call modulation2host) +merge-$(2): + @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" + $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ + ) + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + +define _modulate_do +$(call _modulate_target,extract,$(2),$(4)) +$(call _modulate_target,patch,$(2),$(4)) +$(call _modulate_target,configure,$(2),$(4)) +$(call _modulate_target_nocookie,reset-configure,$(2),$(4)) +$(call _modulate_target,build,$(2),$(4)) +$(call _modulate_target_nocookie,reset-build,$(2),$(4)) +$(call _modulate_target,test,$(2),$(4)) +$(call _modulate_target,install,$(2),$(4)) +$(call _modulate_target_nocookie,reset-install,$(2),$(4)) +#$(call _modulate_target,merge,$(2),$(4)) +$(call _modulate_merge,,$(2),$(4)) +$(call _modulate_target_nocookie,reset-merge,$(2),$(4)) +$(call _modulate_target_nocookie,clean,$(2),$(4)) +$(call _modulate_target_nocookie,_modenv,$(2),$(4)) +endef + +# This evaluates to the make rules for all modulations passed as first argument +# Usage: _modulate( ) +define _modulate +$(foreach M,$(MODULATIONS_$(firstword $(1))),\ + $(call _modulate2,\ + $(wordlist 2,$(words $(1)),$(1)),\ + $(call tolower,$(firstword $(1)))-$(M),\ + $(firstword $(1)),\ + $(firstword $(1))=$(M)\ + )\ +) +endef + +# This is a helper for the recursive _modulate +define _modulate2 +$(if $(strip $(1)),\ + $(foreach M,$(MODULATIONS_$(firstword $(1))),\ + $(call _modulate2,\ + $(wordlist 2,$(words $(1)),$(1)),\ + $(addprefix $(2)-,$(call tolower,$(firstword $(1)))-$(M)),\ + $(3) $(firstword $(1)),\ + $(4) $(firstword $(1))=$(M)\ + )\ + ),\ + $(call _modulate_do,,$(strip $(2)),$(3),$(4))\ +) +endef + +define _pmod + @echo "[ $1 for modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) ]" +endef + +$(eval $(call _modulate,$(MODULATORS))) + +#################### DIRECTORY MAKERS #################### + +# This is to make dirs as needed by the base rules +$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + ginstall -d $@; \ + echo "ginstall -d $@"; \ + fi + +# These stubs are wildcarded, so that the port maintainer can +# define something like "pre-configure" and it won't conflict, +# while the configure target can call "pre-configure" safely even +# if the port maintainer hasn't defined it. +# +# in addition to the pre- rules, the maintainer may wish +# to set a "pre-everything" rule, which runs before the first +# actual target. +pre-%: + @true + +post-%: + @true + +# Call any arbitrary rule recursively for all dependencies +deep-%: % + @for target in "" $(DEPEND_LIST) ; do \ + test -z "$$target" && continue ; \ + $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ + done + @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) + + +# ========================= MAIN RULES ========================= +# The main rules are the ones that the user can specify as a +# target on the "make" command-line. Currently, they are: +# prereq fetch-list fetch checksum makesum extract checkpatch patch +# build install reinstall uninstall package +# (some may not be complete yet). +# +# Each of these rules has dependencies that run in the following +# order: +# - run the previous main rule in the chain (e.g., install +# depends on build) +# - run the pre- rule for the target (e.g., configure would +# then run pre-configure) +# - generate a set of files to depend on. These are typically +# cookie files in $(COOKIEDIR), but in the case of fetch are +# actual downloaded files in $(DOWNLOADDIR) +# - run the post- rule for the target +# +# The main rules also run the $(DONADA) code, which prints out +# what just happened when all the dependencies are finished. + +announce: + @echo "[===== NOW BUILDING: $(DISTNAME) =====]" + +announce-modulation: + @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" + +# prerequisite - Make sure that the system is in a sane state for building the package +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) + +# Force to be called in global modulation +prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite) + $(DONADA) + +prerequisitepkg-%: + @echo " ==> Verifying for installed package $*: \c" + @(pkginfo -q $*; if [ $$? -eq 0 ]; then echo "installed"; else echo "MISSING"; exit 1; fi) + @$(MAKECOOKIE) + +# fetch-list - Show list of files that would be retrieved by fetch. +# NOTE: DOES NOT RUN pre-everything! +fetch-list: + @echo "Distribution files: " + @$(foreach F,$(DISTFILES),echo " $F";) + @echo "Patch files: " + @$(foreach P,$(PATCHFILES),echo " $P";) + @$(foreach M,$(MODULATIONS),$(if $(PATCHFILES_$M),echo " Modulation $M only: $(PATCHFILES_$M)";)) + @echo "Dynamically generated scripts: " + @$(foreach D,$(DYNSCRIPTS),echo " $D";) + @echo "Git Repos tracked: " + @$(foreach R,$(GIT_REPOS),echo " $R";) + +# fetch - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined) +# into $(DOWNLOADDIR) as necessary. +FETCH_TARGETS = $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) + +fetch: prerequisite pre-fetch $(FETCH_TARGETS) post-fetch + @$(DONADA) + +# returns true if fetch has completed successfully, false +# otherwise +fetch-p: + @$(foreach COOKIEFILE,$(FETCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# checksum - Use $(CHECKSUMFILE) to ensure that your +# distfiles are valid. +CHECKSUM_TARGETS = $(addprefix checksum-,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) + +checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum + @$(DONADA) + +checksum-global: $(if $(filter global,$(MODULATION)),checksum) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global checksum) + @$(DONADA) + +# The next rule handles the dependency from the modulated context to +# the contextless checksumming. The rule is called when the cookie +# to the global checksum is requested. If the global checksum has not run, +# then run it. Otherwise it is silently accepted. +checksum-modulated: checksum-global + @$(DONADA) + +# returns true if checksum has completed successfully, false +# otherwise +checksum-p: + @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# makesum - Generate distinfo (only do this for your own ports!). +MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) + +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) + @if test "x$(MAKESUM_TARGETS)" != "x "; then \ + (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ + echo "Checksums made for $(MAKESUM_TARGETS)" ; \ + cat $(CHECKSUM_FILE) ; \ + fi + +# I am always typing this by mistake +makesums: makesum + +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) + +garchive: checksum $(GARCHIVE_TARGETS) ; + +# extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) +EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) + +# We call an additional extract-modulated without resetting any variables so +# a complete unpacked set goes to the global dir for packaging (like gspec) +extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract + @$(DONADA) + +extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global extract) + @$(MAKECOOKIE) + +extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ + $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ + announce-modulation \ + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated + @$(DONADA) + +# returns true if extract has completed successfully, false +# otherwise +extract-p: + @$(foreach COOKIEFILE,$(EXTRACT_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# checkpatch - Do a "patch -C" instead of a "patch". Note +# that it may give incorrect results if multiple +# patches deal with the same file. +# TODO: actually write it! +checkpatch: extract + @echo "$@ NOT IMPLEMENTED YET" + +# patch - Apply any provided patches to the source. +PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) + +patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch + @$(DONADA) + +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated + @$(DONADA) + +# returns true if patch has completed successfully, false +# otherwise +patch-p: + @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# makepatch - Grab the upstream source and diff against $(WORKSRC). Since +# diff returns 1 if there are differences, we remove the patch +# file on "success". Goofy diff. +makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff + $(DONADA) + +# XXX: Allow patching of pristine sources separate from ISA directories +# XXX: Use makepatch on global/ + +# this takes the changes you've made to a working directory, +# distills them to a patch, updates the checksum file, and tries +# out the build (assuming you've listed the gar-base.diff in your +# PATCHFILES). This is way undocumented. -NickM +beaujolais: makepatch makesum clean build + $(DONADA) + +update: makesum garchive clean + +# configure - Runs either GNU configure, one or more local +# configure scripts or nothing, depending on +# what's available. @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 19:35:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 17:35:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6895] csw/mgar/gar/v2-collapsed-modulations/gar.mk Message-ID: Revision: 6895 http://gar.svn.sourceforge.net/gar/?rev=6895&view=rev Author: dmichelsen Date: 2009-10-18 17:35:15 +0000 (Sun, 18 Oct 2009) Log Message: ----------- mGAR v2-collapsed-modulations: ISA collapsing Modified Paths: -------------- csw/mgar/gar/v2-collapsed-modulations/gar.mk Modified: csw/mgar/gar/v2-collapsed-modulations/gar.mk =================================================================== --- csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:29:04 UTC (rev 6894) +++ csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:35:15 UTC (rev 6895) @@ -191,6 +191,48 @@ $(eval $(call _modulate,$(MODULATORS))) +# --- This next block allows you to use collapsed ISAs in modulations +# isa-default-... instead of isa-sparcv8-... and isa-i386-... +# isa-default64-... instead of isa-sparcv9-... and isa-amd64-... +# isa-extra-... instead of any other ISA (if default64 is undefined it falls back to 'extra') + +__collapsedisa = $(strip $(or $(and $(filter $(ISA_DEFAULT_sparc) $(ISA_DEFAULT_i386),$(1)),default),\ + $(and $(filter $(ISA_DEFAULT64_sparc) $(ISA_DEFAULT64_i386),$(1)),default64),\ + extra)) + +__collapsedisa64 = default64 +__collapsedisaextra = extra + +__isacollapsedmodulation_1 = $(call tolower,$(1))-$(if $(filter ISA,$(1)),$(call $(2),$(ISA)),$($(1))) +__isacollapsedmodulation = $(if $(word 2,$(1)),\ + $(foreach P,$(call __isacollapsedmodulation_1,$(firstword $(1)),$(2)),\ + $(addprefix $(P)-,$(call __isacollapsedmodulation,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call __isacollapsedmodulation_1,$(1),$(2))) + +# This is the name of the current modulation but with the ISA i386, sparcv8 and amd64, sparcv9 replaced +# with the collapsed name 'default', 'default64' and everything else as 'extra'. +MODULATION_ISACOLLAPSED = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)) + +# This is the name of the current modulation but with the ISA replaced with 'default64' +MODULATION_ISACOLLAPSED64 = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa64)) + +# This is the name of the current modulation but with the ISA replaced with 'extra' +MODULATION_ISACOLLAPSEDEXTRA = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra)) + +# $(warning Mod: $(MODULATION) ISA: $(ISA) coll: $(MODULATION_ISACOLLAPSED) 64: $(MODULATION_ISACOLLAPSED64) extra: $(MODULATION_ISACOLLAPSEDEXTRA)) + +# Call this function to get either the modulation-specific value or the default. +# Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) +define modulationvalue +$(strip $(or $($(1)_$(MODULATION)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ +)) +endef + +# --- end of collapsed ISA modulations + #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules @@ -552,10 +594,15 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) +MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) +MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) + +MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-extra ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif # These directories get relocated into their ISA subdirectories This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 20:00:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 18:00:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6896] csw/mgar/pkg Message-ID: Revision: 6896 http://gar.svn.sourceforge.net/gar/?rev=6896&view=rev Author: wahwah Date: 2009-10-18 18:00:53 +0000 (Sun, 18 Oct 2009) Log Message: ----------- shunit2: Initial commit Modified Paths: -------------- csw/mgar/pkg/shunit2/trunk/Makefile csw/mgar/pkg/shunit2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/shunit2/ csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch Modified: csw/mgar/pkg/shunit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/shunit2/trunk/Makefile 2009-10-18 18:00:53 UTC (rev 6896) @@ -2,181 +2,38 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = shunit2 +GARVERSION = 2.1.5 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = a xUnit unit test framework for Bourne based shell scripts define BLURB - + + shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and it + is designed to work in a similar manner to JUnit, PyUnit, etc. If you have + ever had the desire to write a unit test for a shell script, shUnit2 can do + the job. + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://code.google.com/p/shunit2/ +MASTER_SITES = $(GOOGLE_MIRROR) +PATCHFILES = 0001-fix-shlib-path-in-docbookPrep.sh.patch +PATCHFILES += 0002-abspath-instead-of-PWD.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = shunit2 +INSTALL_SCRIPTS = shunit2 +TEST_SCRIPTS = +include gar/category.mk -#include gar/category.mk +build-shunit2: + (cd $(WORKSRC) && $(BUILD_ENV) gmake) + @$(MAKECOOKIE) + +install-shunit2: + ginstall -m 755 -d $(DESTDIR)$(libdir)/shunit2 + ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/shunit2 + ginstall -m 644 $(WORKSRC)/build/shunit2 $(DESTDIR)$(libdir)/shunit2 + ginstall -m 644 $(WORKSRC)/build/shunit2.html $(DESTDIR)$(datadir)/doc/shunit2 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/shunit2/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/shunit2/trunk/checksums 2009-10-18 18:00:53 UTC (rev 6896) @@ -0,0 +1,3 @@ +b35832f18a1557c0f5d4b58dcc2c32d3 download/0001-fix-shlib-path-in-docbookPrep.sh.patch +3d422c3b03478a37280e08d98a7c14aa download/0002-abspath-instead-of-PWD.patch +f434f0095f7ca9a698ade330feae356a download/shunit2-2.1.5.tgz Added: csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch =================================================================== --- csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch (rev 0) +++ csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch 2009-10-18 18:00:53 UTC (rev 6896) @@ -0,0 +1,25 @@ +From ed54daa547e0bc6c3b69bd45c565b58142ccd49e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 18 Oct 2009 19:10:42 +0200 +Subject: [PATCH] fix shlib path in docbookPrep.sh + +--- + bin/docbookPrep.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bin/docbookPrep.sh b/bin/docbookPrep.sh +index ab3172a..0d46ba9 100755 +--- a/bin/docbookPrep.sh ++++ b/bin/docbookPrep.sh +@@ -21,7 +21,7 @@ MY_BASE=`basename "$0"` + MY_DIR=`dirname "$0"` + + # load shlib +-. "${MY_DIR}/../lib/sh/shlib" ++. "${MY_DIR}/../lib/shlib" + + BASE_DIR=`shlib_relToAbsPath "${MY_DIR}/.."` + DL_DIR="${BASE_DIR}/tmp" +-- +1.6.3.2 + Added: csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch =================================================================== --- csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch (rev 0) +++ csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch 2009-10-18 18:00:53 UTC (rev 6896) @@ -0,0 +1,37 @@ +From 5a5f760453cec85e4f3f1c6d19448c4e16020fdd Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 18 Oct 2009 19:56:54 +0200 +Subject: [PATCH] abspath instead of PWD + +--- + Makefile | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 080ba0c..0b88336 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,13 +9,13 @@ + + PROG=shunit2 + +-BIN_DIR=$(PWD)/bin +-BUILD_DIR=$(PWD)/build +-DIST_DIR=$(PWD)/dist +-LIB_DIR=$(PWD)/lib +-SHARE_DIR=$(PWD)/share +-SRC_DIR=$(PWD)/src +-TMP_DIR=$(PWD)/tmp ++BIN_DIR=$(abspath bin) ++BUILD_DIR=$(abspath build) ++DIST_DIR=$(abspath dist) ++LIB_DIR=$(abspath lib) ++SHARE_DIR=$(abspath share) ++SRC_DIR=$(abspath src) ++TMP_DIR=$(abspath tmp) + + DOCBOOK_BUILD_DIR=$(BUILD_DIR)/docbook + DOCBOOK_SHARE_DIR=$(SHARE_DIR)/docbook +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 18 21:53:50 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Oct 2009 19:53:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6897] csw/mgar/pkg/snort/trunk Message-ID: Revision: 6897 http://gar.svn.sourceforge.net/gar/?rev=6897&view=rev Author: bonivart Date: 2009-10-18 19:53:49 +0000 (Sun, 18 Oct 2009) Log Message: ----------- snort: update to 2.8.5, initial commit Modified Paths: -------------- csw/mgar/pkg/snort/trunk/Makefile csw/mgar/pkg/snort/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/snort/trunk/files/CSWsnort.depend csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec Property Changed: ---------------- csw/mgar/pkg/snort/trunk/ Property changes on: csw/mgar/pkg/snort/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,36 +1,53 @@ GARNAME = snort -GARVERSION = 2.6.0.2 +GARVERSION = 2.8.5 CATEGORIES = net DESCRIPTION = The open source Network Intrusion Detection System define BLURB -Snort\xAE is an open source network intrusion prevention and detection system utilizing a rule-driven language, which combines the benefits of signature, protocol and anomaly based inspection methods. With millions of downloads to date, Snort is the most widely deployed intrusion detection and prevention technology worldwide and has become the de facto standard for the industry. + Snort is an open source network intrusion prevention and detection + system utilizing a rule-driven language, which combines the benefits + of signature, protocol and anomaly based inspection methods. With + millions of downloads to date, Snort is the most widely deployed + intrusion detection and prevention technology worldwide and has + become the de facto standard for the industry. endef -MASTER_SITES = http://www.snort.org/dl/current/ +MASTER_SITES = http://dl.snort.org/snort-current/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsnort, depend ) +#DISTFILES += $(call admfiles,CSWsnort, depend ) +#LICENSE = COPYRIGHT + +#PACKAGES = +#CATALOGNAME_CSWx = + +#ARCHALL_CSWx = 1 + +#SPKG_DESC_CSWx = + +REQUIRED_PKGS = CSWpcre CSWlibpcap +#REQUIRED_PKGS += CSWcswclassutils CSWosslrt CSWmysql4rt CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin -TEST_SCRIPTS = +#TEST_SCRIPTS = include gar/category.mk -pre-install: - ( mkdir -p $(DESTDIR)/opt/csw/etc ) - ( cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW ) - ( cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map ) - ( cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map ) - ( cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map ) - ( cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config ) - ( cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config ) - ( cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators ) - @$(MAKECOOKIE) +#pre-install: +# ( mkdir -p $(DESTDIR)/opt/csw/etc ) +# ( cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW ) +# ( cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map ) +# ( cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map ) +# ( cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map ) +# ( cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config ) +# ( cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config ) +# ( cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators ) +# @$(MAKECOOKIE) -post-install: - ( rm -rf $(DESTDIR)/opt/csw/src ) +#post-install: +# ( rm -rf $(DESTDIR)/opt/csw/src ) Modified: csw/mgar/pkg/snort/trunk/checksums =================================================================== --- csw/mgar/pkg/snort/trunk/checksums 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/checksums 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,3 +1 @@ -5c094ff6d82db845a5f023e4a492103e download/snort-2.6.0.2.tar.gz -63d72583684146784d0aea8cb95c5686 download/CSWsnort.gspec -32c1aa45549083163a276d8cd37abcad download/CSWsnort.depend +165c38eaf7eaf95423e44e14a0738810 snort-2.8.5.tar.gz Deleted: csw/mgar/pkg/snort/trunk/files/CSWsnort.depend =================================================================== --- csw/mgar/pkg/snort/trunk/files/CSWsnort.depend 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/files/CSWsnort.depend 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,2 +0,0 @@ -P CSWlibpcap -P CSWpcre Deleted: csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec =================================================================== --- csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,4 +0,0 @@ -%var bitname snort -%var pkgname CSWsnort -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 00:20:06 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Oct 2009 22:20:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6898] csw/mgar/pkg/snort/trunk/Makefile Message-ID: Revision: 6898 http://gar.svn.sourceforge.net/gar/?rev=6898&view=rev Author: bonivart Date: 2009-10-18 22:20:05 +0000 (Sun, 18 Oct 2009) Log Message: ----------- snort: now it builds with gcc4 Modified Paths: -------------- csw/mgar/pkg/snort/trunk/Makefile Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 19:53:49 UTC (rev 6897) +++ csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 22:20:05 UTC (rev 6898) @@ -14,40 +14,37 @@ MASTER_SITES = http://dl.snort.org/snort-current/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWsnort, depend ) -#LICENSE = COPYRIGHT - #PACKAGES = #CATALOGNAME_CSWx = - +#SPKG_DESC_CSWx = #ARCHALL_CSWx = 1 -#SPKG_DESC_CSWx = - -REQUIRED_PKGS = CSWpcre CSWlibpcap +REQUIRED_PKGS = CSWpcrert CSWlibpcap CSWgcc4corert #REQUIRED_PKGS += CSWcswclassutils CSWosslrt CSWmysql4rt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin -#TEST_SCRIPTS = +TEST_TARGET = check include gar/category.mk -#pre-install: -# ( mkdir -p $(DESTDIR)/opt/csw/etc ) -# ( cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW ) -# ( cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map ) -# ( cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map ) -# ( cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map ) -# ( cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config ) -# ( cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config ) -# ( cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators ) -# @$(MAKECOOKIE) +post-install-modulated: + @mkdir -p $(DESTDIR)/opt/csw/etc + @cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW + @cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map + @cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map + @cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map + @cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config + @cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config +# @cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators + @$(MAKECOOKIE) #post-install: # ( rm -rf $(DESTDIR)/opt/csw/src ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 00:56:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 22:56:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6899] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6899 http://gar.svn.sourceforge.net/gar/?rev=6899&view=rev Author: wahwah Date: 2009-10-18 22:56:27 +0000 (Sun, 18 Oct 2009) Log Message: ----------- cswclassutils: adding cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-18 22:20:05 UTC (rev 6898) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-18 22:56:27 UTC (rev 6899) @@ -1,10 +1,12 @@ +# $Id$ + GARNAME = cswclassutils -GARVERSION = 1.23 +GARVERSION = 1.24 CATEGORIES = utils DESCRIPTION = CSW class action utilities -MASTER_SITES = +MASTER_SITES = DISTFILES = COPYING ARCHALL = 1 @@ -16,7 +18,9 @@ SPKG_SOURCEURL = http://www.opencsw.org -CASLIST = $(foreach F,$(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +CASFILES = $(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*) +CASLIST = $(foreach F,$(CASFILES), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +DISTFILES += $(subst $(FILEDIR)/,,$(CASFILES)) PROTOTYPE_FILTER = sed -e '/^d.*\/usr/d; /scripts/{ s/bin/sys/; }' Property changes on: csw/mgar/pkg/cswclassutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 22:20:05 UTC (rev 6898) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 22:56:27 UTC (rev 6899) @@ -1 +1,17 @@ -48a97af56d55bc90ce90303228ed8cc3 download/COPYING +48a97af56d55bc90ce90303228ed8cc3 COPYING +9f7a2603bf91ea53e70f2fe5c4a56726 CSWcswclassutils.i.cswcpsampleconf +56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices +a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd +fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf +e9c9cafdd37be6f96797740711aee85c CSWcswclassutils.i.cswmigrateconf +9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf +4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile +7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup +4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf +d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices +9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd +791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf +add04169c99570731d8766ac5c38b771 CSWcswclassutils.r.cswmigrateconf +a473d9cf739a6a33ac3a7306eb4a522c CSWcswclassutils.r.cswpreserveconf +02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile +752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup Copied: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf (from rev 5733, csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf) =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-18 22:56:27 UTC (rev 6899) @@ -0,0 +1,250 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# (c) 2009 Maciej Blizinski +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# +# http://wiki.opencsw.org/configuration-directory-migration + +# To prevent issues with a-z in regular expressions +unset LC_ALL +LANG=C + +# Print errors when trying to read from an unset variable. +set -u + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +return_code=0 + +migration_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. + +For more information, please see +http://wiki.opencsw.org/configuration-directory-migration +" +readonly migration_info +deprecated_file_ext="README.migration" +readonly deprecated_file_ext + +# Create /etc/opt/csw/cswclassutils.DEBUG to enable debugging of this script +if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then + DEBUG=1 +else + DEBUG= +fi + +give_a_chance_to_stop() { + echo + echo "*******************************************************************" + echo "* Configuration files are going to be migrated from the deprecated " + echo "* location (/opt/csw/etc) to the new location (/etc/opt/csw). " + echo "* " + echo "* Migration will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + for i in 10 9 8 7 6 5 4 3 2 1; do + printf "$i " + sleep 1 + done + echo "0." +} + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${migration_info}" > "$1.${deprecated_file_ext}" +} + +sanitize() { + echo "$1" | sed -e 's/[^a-zA-Z0-9]/_/g' +} + +expand_modifiers() { + # Emulating local variables + __per_file_variable="$1" + __per_file_modifier_value="$2" + eval echo `echo \\${${__per_file_variable}_${__per_file_modifier_value}:-}` +} + +place_signpost_for() { + __file_name="$1" + echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" +} + +debug() { + [ "${DEBUG}" ] & echo "$@" +} + +should_copy_archived_file() { + __archived_file_name="$1" + __dest_file_name="$2" + __do_copy=0 + __do_not_copy=1 + debug "should_copy_archived_file(${__archived_file_name}, ${__dest_file_name})" + if [ ! -r "${__archived_file_name}" ]; then + debug "No archived file or directory at ${__archived_file_name}" + return "${__do_not_copy}" + else + debug "Archived version found in ${__archived_file_name}" + fi + + if [ ! -r "${__dest_file_name}" -a ! -h "${__dest_file_name}" ]; then + debug "Destination file ${__dest_file_name} not readable and not a symlink." + return "${__do_copy}" + else + debug "Destination file ${__dest_file_name} is readable or a symlink." + fi + + if [ -h "${__dest_file_name}" ]; then # symlink + debug "${__dest_file_name} is a symlink" + debug `ls -l "${__dest_file_name}"` + # Okay, it's a symlink, but is it a dangling symlink? + if [ -r "${__dest_file_name}" ]; then + debug "Symlink is readable" + return "${__do_not_copy}" + else + debug "Symlink not readable. Can delete." + return "${__do_copy}" + fi + fi # end symlink + + # If there's a sample configuration file, remove the copied one. + __sample_conf="${__dest_file_name}.CSW" + if [ -r "${__sample_conf}" ]; then + if files_are_identical "${__sample_conf}" "${__dest_file_name}"; then + return "${__do_copy}" + else + return "${__do_not_copy}" + fi + fi + # If there's no sample configuration and the destination file exists, it + # shouldn't be overwritten. + return "${__do_not_copy}" +} + +is_dangling_symlink() { + [ -h "$1" -a ! -r "$1" ] +} + +run_already=0 + +while read confsrc confdst ; do + # We're not sure if the files to be migrated have already been copied or not. + + cp "$confsrc" "$confdst" + # Sourcing the file, it should contain the configuration. + if [ -r "$confsrc" ]; then + debug "Sourcing ${confsrc}" + . "$confsrc" + else + echo "${confsrc} is missing" + exit 1 + fi + + if [ -z "${MIGRATE_FILES}" ]; then + echo "ERROR! \$MIGRATE_FILES variable is empty." + exit 1 + fi + + if [ "${run_already}" -ne 0 ]; then + echo "ERROR! You can only use one configuration file." + exit 1 + else + run_already=1 + fi + + # The defaults, if not set already by the script. + SOURCE_DIR___default__="${SOURCE_DIR___default__:-opt/csw/etc}" + readonly SOURCE_DIR___default__ + ARCH_DIR___default__="${ARCH_DIR___default__:-opt/csw/etc/migration-archive}" + readonly ARCH_DIR___default__ + DEST_DIR___default__="${DEST_DIR___default__:-etc/opt/csw}" + readonly DEST_DIR___default__ + + for file_name in ${MIGRATE_FILES}; do + modifier_value=`sanitize "${file_name}"` + debug "Processing file: ${file_name}" + debug "modifier_value: ${modifier_value}" + + # Perhaps the following three segments of code could be turned into + # a function, but it would require complicated eval calls. + per_file_srcdir=`expand_modifiers SOURCE_DIR ${modifier_value}` + default_srcdir=`expand_modifiers SOURCE_DIR __default__` + srcdir="${per_file_srcdir:-${default_srcdir}}" + per_file_dstdir=`expand_modifiers DEST_DIR ${modifier_value}` + default_dstdir=`expand_modifiers DEST_DIR __default__` + dstdir="${per_file_dstdir:-${default_dstdir}}" + per_file_archdir=`expand_modifiers ARCH_DIR ${modifier_value}` + default_archdir=`expand_modifiers ARCH_DIR __default__` + archdir="${per_file_archdir:-${default_archdir}}" + srcpath="${PKG_INSTALL_ROOT}${srcdir}/${file_name}" + dstpath="${PKG_INSTALL_ROOT}${dstdir}/${file_name}" + archpath="${PKG_INSTALL_ROOT}${archdir}/${file_name}" + + # Make sure we have the environment we expect + if [ ! -d "${archdir}" ] + then + debug "Creating ${archdir}" + mkdir -m 755 -p "${archdir}" + if [ $? -ne 0 ] + then + echo "ERROR: Couldn't create '${archdir}', bailing out." + exit 1 + fi + fi + + # All variables are set, the main algorithm goes here. + + # Moving the file will only work in the global zone. The assumption is that + # the postinstall script is going to be run in the global zone first; by the + # time it gets to the non-global zones, the ${srcpath} will have been + # moved already. + if [ -r "${srcpath}" ] + then + place_signpost_for "${srcpath}" + debug "Moving '${srcpath}' to '${archpath}'" + mv "${srcpath}" "${archpath}" + if [ -r "${srcpath}" ]; then + echo "WARNING: '${srcpath}' still exists" + fi + fi + + # If the destination file is not there and the archived file is, copy it over. + if should_copy_archived_file "${archpath}" "${dstpath}"; then + echo "Copying '${archpath}' to '${dstpath}'" + + # Is it a dangling symlink? + if is_dangling_symlink "${dstpath}"; then + debug "Removing dangling symlink: '${dstpath}'" + rm "${dstpath}" + fi + + # Directories are copied in whole + if [ -d "${archpath}" ]; then + debug "(cd ${archpath}/..; tar cf - `basename ${archpath}` \ +| ( mkdir ${dstpath}; cd ${dstpath}; cd ..; tar xf -))" + (cd ${archpath}/..; tar cf - `basename ${archpath}` \ + | ( mkdir ${dstpath}; cd ${dstpath}; cd ..; tar xf -) \ + ) + elif [ -f "${archpath}" ]; then + debug cp "${archpath}" "${dstpath}" + cp "${archpath}" "${dstpath}" + else + echo "WARNING: ${archpath} is neither a file or directory." + fi + else + debug "Not copying '${archpath}' to '${dstpath}'." + fi + done +done + +exit "${return_code}" Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf 2009-10-18 22:56:27 UTC (rev 6899) @@ -0,0 +1,8 @@ +#!/bin/sh +# +# $Id$ + +while read dest ; do + echo "Removing $dest" + rm $dest +done Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 01:12:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 23:12:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6900] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6900 http://gar.svn.sourceforge.net/gar/?rev=6900&view=rev Author: wahwah Date: 2009-10-18 23:12:05 +0000 (Sun, 18 Oct 2009) Log Message: ----------- cswclassutils: updating checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 22:56:27 UTC (rev 6899) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 23:12:05 UTC (rev 6900) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -e9c9cafdd37be6f96797740711aee85c CSWcswclassutils.i.cswmigrateconf +3e0582eaf6b75c5e79c50a805acac8cb CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup @@ -11,7 +11,7 @@ d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf -add04169c99570731d8766ac5c38b771 CSWcswclassutils.r.cswmigrateconf +f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf a473d9cf739a6a33ac3a7306eb4a522c CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 01:18:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 23:18:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6901] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6901 http://gar.svn.sourceforge.net/gar/?rev=6901&view=rev Author: wahwah Date: 2009-10-18 23:18:21 +0000 (Sun, 18 Oct 2009) Log Message: ----------- cswclassutils: updating checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 23:12:05 UTC (rev 6900) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 23:18:21 UTC (rev 6901) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -3e0582eaf6b75c5e79c50a805acac8cb CSWcswclassutils.i.cswmigrateconf +bf517d6a2e43dbd894725b9701d15cf2 CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 19 01:24:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Oct 2009 23:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6902] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6902 http://gar.svn.sourceforge.net/gar/?rev=6902&view=rev Author: bdwalton Date: 2009-10-18 23:24:00 +0000 (Sun, 18 Oct 2009) Log Message: ----------- git: add CSWpmnetsmtpssl dep (previous addition killed mistakenly) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-18 23:18:21 UTC (rev 6901) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-18 23:24:00 UTC (rev 6902) @@ -33,7 +33,7 @@ REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror -REQUIRED_PKGS_CSWgit += CSWpmtermreadkey +REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl REQUIRED_PKGS_CSWgitk = CSWgit CSWtk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 09:47:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 07:47:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6903] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswmigrateconf Message-ID: Revision: 6903 http://gar.svn.sourceforge.net/gar/?rev=6903&view=rev Author: wahwah Date: 2009-10-19 07:47:57 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswmigrateconf: Fixed a bug in which the debug messages would always get printed, added 'give a chance to stop', made PKG_INSTALL_ROOT read only Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-18 23:24:00 UTC (rev 6902) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-19 07:47:57 UTC (rev 6903) @@ -15,6 +15,7 @@ set -u PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} +readonly PKG_INSTALL_ROOT return_code=0 @@ -36,7 +37,7 @@ if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then DEBUG=1 else - DEBUG= + DEBUG=0 fi give_a_chance_to_stop() { @@ -81,7 +82,7 @@ } debug() { - [ "${DEBUG}" ] & echo "$@" + [ "${DEBUG}" = "1" ] && echo "$@" } should_copy_archived_file() { @@ -141,6 +142,10 @@ # We're not sure if the files to be migrated have already been copied or not. cp "$confsrc" "$confdst" + + cat "${confdst}" + give_a_chance_to_stop + # Sourcing the file, it should contain the configuration. if [ -r "$confsrc" ]; then debug "Sourcing ${confsrc}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 09:49:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 07:49:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6904] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6904 http://gar.svn.sourceforge.net/gar/?rev=6904&view=rev Author: wahwah Date: 2009-10-19 07:49:31 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswmigrateconf: updating the checksum (Note that because of the use of the $Id$ tag, updating the checksum needs to be a separate step now) Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 07:47:57 UTC (rev 6903) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 07:49:31 UTC (rev 6904) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -bf517d6a2e43dbd894725b9701d15cf2 CSWcswclassutils.i.cswmigrateconf +2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 11:09:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 09:09:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6905] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6905 http://gar.svn.sourceforge.net/gar/?rev=6905&view=rev Author: wahwah Date: 2009-10-19 09:09:44 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswutils: better error reporting in submitpkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-19 07:49:31 UTC (rev 6904) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-19 09:09:44 UTC (rev 6905) @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 90 +SVN_REV = 93 MASTER_SITES = SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-10-19 07:49:31 UTC (rev 6904) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-10-19 09:09:44 UTC (rev 6905) @@ -1,11 +1,11 @@ 091b12575ebc0e45cf8c3d8b43d8b638 COPYING 30b6598a4453e3ce0c1fabeede5eb5f8 checkpkg 6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r90 +24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r93 9a637f6546cc50974159a987302d91c0 cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 createpkg a605598f30195f9ab1b29fc3944d3b31 createpkg.8 -a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r90 +a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r93 cd4496ee27bf86d5c8bc656c9c5974be stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 -989839890af2cbdc13e6bb37f3b95ba6 submit_to_newpkgs.py-r90 +3b102386ad1d2086dbe8f3be9d173fda submit_to_newpkgs.py-r93 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 11:11:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 09:11:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6906] csw/mgar/pkg/cswutils/Makefile Message-ID: Revision: 6906 http://gar.svn.sourceforge.net/gar/?rev=6906&view=rev Author: wahwah Date: 2009-10-19 09:10:59 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswutils: adding package-level Makefile Added Paths: ----------- csw/mgar/pkg/cswutils/Makefile Added: csw/mgar/pkg/cswutils/Makefile =================================================================== --- csw/mgar/pkg/cswutils/Makefile (rev 0) +++ csw/mgar/pkg/cswutils/Makefile 2009-10-19 09:10:59 UTC (rev 6906) @@ -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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 13:04:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 19 Oct 2009 11:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6907] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6907 http://gar.svn.sourceforge.net/gar/?rev=6907&view=rev Author: bonivart Date: 2009-10-19 11:04:41 +0000 (Mon, 19 Oct 2009) Log Message: ----------- pkgutil: version 1.8 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-19 09:10:59 UTC (rev 6906) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-19 11:04:41 UTC (rev 6907) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.7 +GARVERSION = 1.8b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -24,7 +24,10 @@ PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* +PKGFILES_CSWpkgutilplus += .*pkgutilplus.* +ARCHALL_CSWpkgutilplus = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).zip @@ -57,6 +60,7 @@ @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ # @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-19 09:10:59 UTC (rev 6906) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-19 11:04:41 UTC (rev 6907) @@ -1,5 +1,5 @@ -a16c6f81bc537d6172fd65d8da1aeecc download/CSWpkgutil.gspec -e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall -2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove -951b11e347d6f3f49cc8617ecab4ad62 download/CSWpkgutil.prototype -11c02a77d18f1fc11f23679b1b06efa8 download/pkgutil-1.7.zip +a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec +e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall +2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove +951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype +55ebb20ac1a91cc6663c3fc11005c3ef pkgutil-1.8b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 19 15:02:00 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 19 Oct 2009 13:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6908] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6908 http://gar.svn.sourceforge.net/gar/?rev=6908&view=rev Author: chninkel Date: 2009-10-19 13:02:00 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cyrus_imapd: added missing smf manifest Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-19 11:04:41 UTC (rev 6907) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-19 13:02:00 UTC (rev 6908) @@ -1,6 +1,6 @@ 585646739e9403c02e868900ebed892a CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall -219ba1dc6ec1593132019389064eeeff CSWcyrusimapd.prototype +940d00efcc42b92f05e92e6dd2764f61 CSWcyrusimapd.prototype 7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype 404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype d0b97b33e75ac75f89ee6236a2d53f05 README.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-19 11:04:41 UTC (rev 6907) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-19 13:02:00 UTC (rev 6908) @@ -4,6 +4,7 @@ d none /opt/csw/etc/cyrus 0755 root bin d none /opt/csw/etc/pkg/CSWcyrusimapd 0755 root bin f cswinitsmf /etc/opt/csw/init.d/cswcyrus 0755 root bin +f none /var/opt/csw/svc/manifest/network/cswcyrus.xml 0644 root sys f preserveconf /opt/csw/etc/cyrus/imapd.conf.CSW 0640 root mail f preserveconf /opt/csw/etc/cyrus/cyrus.conf.CSW 0640 root mail d none /opt/csw/var/cyrus 0755 cyrus mail This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 15:20:28 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 19 Oct 2009 13:20:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6909] csw/mgar/pkg Message-ID: Revision: 6909 http://gar.svn.sourceforge.net/gar/?rev=6909&view=rev Author: bonivart Date: 2009-10-19 13:20:28 +0000 (Mon, 19 Oct 2009) Log Message: ----------- oinkmaster: initial commit Added Paths: ----------- csw/mgar/pkg/oinkmaster/ csw/mgar/pkg/oinkmaster/branches/ csw/mgar/pkg/oinkmaster/tags/ csw/mgar/pkg/oinkmaster/trunk/ csw/mgar/pkg/oinkmaster/trunk/Makefile csw/mgar/pkg/oinkmaster/trunk/checksums csw/mgar/pkg/oinkmaster/trunk/files/ csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff Property changes on: csw/mgar/pkg/oinkmaster/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/oinkmaster/trunk/Makefile =================================================================== --- csw/mgar/pkg/oinkmaster/trunk/Makefile (rev 0) +++ csw/mgar/pkg/oinkmaster/trunk/Makefile 2009-10-19 13:20:28 UTC (rev 6909) @@ -0,0 +1,45 @@ +GARNAME = oinkmaster +GARVERSION = 2.0 +CATEGORIES = utils + +DESCRIPTION = Update and manage Snort rules +define BLURB + Update and manage Snort rules +endef + +MASTER_SITES += $(SF_MIRRORS) +SF_PROJ = oinkmaster +DISTFILES += $(GARNAME)-$(GARVERSION).tar.gz + +LICENSE = LICENSE + +REQUIRED_PKGS = CSWperl CSWwget +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PATCHFILES = patch-oinkmaster.pl.diff + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SAMPLECONF = /etc/opt/csw/oinkmaster.conf + +include gar/category.mk + +DOCLIST = ChangeLog FAQ INSTALL README README.gui README.templates UPGRADING template-examples.conf + +install-custom: + @echo "Installing $(GARNAME) (custom)" + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw + @ginstall -m 644 $(WORKSRC)/oinkmaster.conf $(DESTDIR)/etc/opt/csw + @ginstall -d -m 755 $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKSRC)/oinkmaster.pl $(DESTDIR)$(bindir) + @ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 + @ginstall -m 644 $(WORKSRC)/oinkmaster.1 $(DESTDIR)$(mandir)/man1 + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),ginstall -m 644 $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + $(MAKECOOKIE) Added: csw/mgar/pkg/oinkmaster/trunk/checksums =================================================================== --- csw/mgar/pkg/oinkmaster/trunk/checksums (rev 0) +++ csw/mgar/pkg/oinkmaster/trunk/checksums 2009-10-19 13:20:28 UTC (rev 6909) @@ -0,0 +1,2 @@ +d2a1b56f51cf40e919c63206ca4ec8f8 oinkmaster-2.0.tar.gz +bc490f53e3f43bd751b871d043494e4f patch-oinkmaster.pl.diff Added: csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff =================================================================== --- csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff (rev 0) +++ csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff 2009-10-19 13:20:28 UTC (rev 6909) @@ -0,0 +1,8 @@ +--- /oinkmaster.pl 2009-10-19 14:43:55.515734169 +0200 ++++ /oinkmaster.pl 2009-10-19 14:44:05.592041663 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + # $Id: oinkmaster.pl,v 1.406 2006/02/10 13:02:44 andreas_o Exp $ # + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 19 16:03:59 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Oct 2009 14:03:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6910] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6910 http://gar.svn.sourceforge.net/gar/?rev=6910&view=rev Author: bdwalton Date: 2009-10-19 14:03:35 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswclassutils: add /var/opt/csw/cswclassutils for use by class action scripts; use this directory from cswpycompile for the temp python code generated Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 13:20:28 UTC (rev 6909) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 14:03:35 UTC (rev 6910) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.24 +GARVERSION = 1.25 CATEGORIES = utils DESCRIPTION = CSW class action utilities @@ -34,6 +34,7 @@ @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/manifest @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method + @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/cswclassutils @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 13:20:28 UTC (rev 6909) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 14:03:35 UTC (rev 6910) @@ -5,7 +5,7 @@ fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf -4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile +927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup 4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-19 13:20:28 UTC (rev 6909) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-19 14:03:35 UTC (rev 6910) @@ -22,7 +22,7 @@ echo PACKAGE: $PKGINST fi -TMPPY=/tmp/pycomp.$$.`date +%Y%m%d%H%M%S`.py +TMPPY=/var/opt/csw/cswclassutils/pycomp.$$.`date +%Y%m%d%H%M%S`.py cat < $TMPPY import py_compile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 17:17:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 15:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6911] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6911 http://gar.svn.sourceforge.net/gar/?rev=6911&view=rev Author: wahwah Date: 2009-10-19 15:17:41 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cups-1.4.x: Version bump to 1.4.1, added a patch for usb-unix.c Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-19 14:03:35 UTC (rev 6910) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-19 15:17:41 UTC (rev 6911) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.0 +GARVERSION = 1.4.1 CATEGORIES = net define BLURB @@ -51,6 +51,7 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch +PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-19 14:03:35 UTC (rev 6910) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-19 15:17:41 UTC (rev 6911) @@ -1,7 +1,8 @@ 1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch +193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall -bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 +587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-10-19 15:17:41 UTC (rev 6911) @@ -0,0 +1,25 @@ +From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 19 Oct 2009 13:22:37 +0100 +Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332 + +--- + backend/usb-unix.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/backend/usb-unix.c b/backend/usb-unix.c +index c749253..8ce92b9 100644 +--- a/backend/usb-unix.c ++++ b/backend/usb-unix.c +@@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ + * 'side_cb()' - Handle side-channel requests... + */ + +-static void ++static int /* O - 0 on success, -1 on error */ + side_cb(int print_fd, /* I - Print file */ + int device_fd, /* I - Device file */ + int snmp_fd, /* I - SNMP socket (unused) */ +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 18:23:18 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 19 Oct 2009 16:23:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6912] csw/mgar/pkg/snort/trunk/Makefile Message-ID: Revision: 6912 http://gar.svn.sourceforge.net/gar/?rev=6912&view=rev Author: bonivart Date: 2009-10-19 16:23:18 +0000 (Mon, 19 Oct 2009) Log Message: ----------- snort: some cleanup Modified Paths: -------------- csw/mgar/pkg/snort/trunk/Makefile Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2009-10-19 15:17:41 UTC (rev 6911) +++ csw/mgar/pkg/snort/trunk/Makefile 2009-10-19 16:23:18 UTC (rev 6912) @@ -13,38 +13,32 @@ endef MASTER_SITES = http://dl.snort.org/snort-current/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#PACKAGES = -#CATALOGNAME_CSWx = -#SPKG_DESC_CSWx = -#ARCHALL_CSWx = 1 - REQUIRED_PKGS = CSWpcrert CSWlibpcap CSWgcc4corert -#REQUIRED_PKGS += CSWcswclassutils CSWosslrt CSWmysql4rt CSWzlib +#REQUIRED_PKGS += CSWosslrt CSWmysql4rt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib +CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin TEST_TARGET = check +SAMPLECONF = /etc/opt/csw/snort/snort.conf + include gar/category.mk post-install-modulated: - @mkdir -p $(DESTDIR)/opt/csw/etc - @cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW - @cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map - @cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map - @cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map - @cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config - @cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config -# @cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/snort + @cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/etc/opt/csw/snort/snort.conf + @cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/etc/opt/csw/snort/unicode.map + @cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/etc/opt/csw/snort/sid-msg.map + @cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/etc/opt/csw/snort/gen-msg.map + @cp $(WORKSRC)/etc/classification.config $(DESTDIR)/etc/opt/csw/snort/classification.config + @cp $(WORKSRC)/etc/reference.config $(DESTDIR)/etc/opt/csw/snort/reference.config +# @cp $(WORKSRC)/etc/generators $(DESTDIR)/etc/opt/csw/snort/generators @$(MAKECOOKIE) - -#post-install: -# ( rm -rf $(DESTDIR)/opt/csw/src ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 19 18:58:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Oct 2009 16:58:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6913] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6913 http://gar.svn.sourceforge.net/gar/?rev=6913&view=rev Author: bdwalton Date: 2009-10-19 16:58:08 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswclassutils: cswinetd -> use /var/opt/csw/cswclassutils Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 16:23:18 UTC (rev 6912) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 16:58:08 UTC (rev 6913) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.25 +GARVERSION = 1.26 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 16:23:18 UTC (rev 6912) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 16:58:08 UTC (rev 6913) @@ -1,7 +1,7 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING 9f7a2603bf91ea53e70f2fe5c4a56726 CSWcswclassutils.i.cswcpsampleconf 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd +0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-19 16:23:18 UTC (rev 6912) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-19 16:58:08 UTC (rev 6913) @@ -74,10 +74,12 @@ fi manifest=$outdir/$svcname-$proto.xml - echo "$inetdsvc" > /tmp/$svcname.$$ + TMPOUT=/var/opt/csw/cswclassutils/$svcname.$$ + echo "$inetdsvc" > $TMPOUT + # we use -f to force any in the specified inetd to take precedence - /usr/sbin/inetconv -f -i /tmp/$svcname.$$ -o $outdir || exit 2 + /usr/sbin/inetconv -f -i $TMPOUT -o $outdir || exit 2 if [ "$daemon" = "yes" ]; then /usr/sbin/inetadm -e svc:/network/$svcname/$proto:default else @@ -88,7 +90,7 @@ /usr/bin/chmod 644 $manifest /usr/bin/chown root:bin $manifest - rm /tmp/$svcname.$$ + rm $TMPOUT else [ -n "$DEBUG" ] && echo "For solaris 8 or 9" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 20 02:54:29 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 20 Oct 2009 00:54:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6914] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6914 http://gar.svn.sourceforge.net/gar/?rev=6914&view=rev Author: bdwalton Date: 2009-10-20 00:54:29 +0000 (Tue, 20 Oct 2009) Log Message: ----------- git: bump to 1.6.5.1 (all tests pass, both archs) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-19 16:58:08 UTC (rev 6913) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-20 00:54:29 UTC (rev 6914) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.5 +GARVERSION = 1.6.5.1 #xPATCHLEVEL = rc3 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 17:30:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 15:30:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6915] csw/mgar/gar/v2-git/ Message-ID: Revision: 6915 http://gar.svn.sourceforge.net/gar/?rev=6915&view=rev Author: wahwah Date: 2009-10-20 15:30:39 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Branching out to show the code to Dago: http://lists.opencsw.org/pipermail/maintainers/2009-October/004624.html Added Paths: ----------- csw/mgar/gar/v2-git/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 17:34:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 15:34:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6916] csw/mgar/gar/v2-git/gar.mk Message-ID: Revision: 6916 http://gar.svn.sourceforge.net/gar/?rev=6916&view=rev Author: wahwah Date: 2009-10-20 15:34:40 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Prototyping around gar-git integration. Modified Paths: -------------- csw/mgar/gar/v2-git/gar.mk Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2009-10-20 15:30:39 UTC (rev 6915) +++ csw/mgar/gar/v2-git/gar.mk 2009-10-20 15:34:40 UTC (rev 6916) @@ -345,9 +345,26 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated post-extract-git @$(DONADA) +post-extract-git: +ifeq ($(ENABLE_GIT_$(GARNAME)),1) + if [ -d "$(WORKSRC)" ];then \ + if [ -d "$(GIT_DIR)/.git" -a ! -d "$(WORKSRC)/.git" ]; then \ + echo rsync -rv "$(GIT_DIR)/$(GARNAME)-$(GARVERSION)-git/.git" $(WORKSRC); \ + git clone file://$(GIT_DIR)/$(GARNAME)-$(GARVERSION)-git $(WORKSRC)-git; \ + gmv -v $(WORKSRC)-git/.git $(WORKSRC); \ + grm -rfv $(WORKSRC)-git; \ + else \ + cd "$(WORKSRC)"; \ + git init; \ + git add .; \ + git commit -a -m "Initial import of $(GARNAME)-$(GARVERSION)."; \ + fi; \ + fi +endif + @$(DONADA) # returns true if extract has completed successfully, false # otherwise extract-p: @@ -366,9 +383,29 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated post-patch-git @$(DONADA) +post-patch-git: +ifeq ($(ENABLE_GIT_$(GARNAME)),1) + if [ -d "$(WORKSRC)" ]; then \ + cd "$(WORKSRC)"; \ + git add .; \ + git commit -a -m "GAR: automatic commit with patches for $(GARNAME)-$(GARVERSION)."; \ + echo "Patches have been submitted to git"; \ + fi + @# Only clone the repository if not already cloned. + if [ -d "$(WORKSRC)" -a -d "$(GIT_DIR)" -a ! -d "$(GIT_DIR)/$(GARNAME)-$(GARVERSION)" ]; then \ + cd "$(GIT_DIR)"; \ + git clone file://$(abspath $(WORKSRC)) $(GARNAME)-$(GARVERSION)-git; \ + cd $(GARNAME)-$(GARVERSION)-git; \ + git remote add gar-src file://$(abspath $(WORKSRC)); \ + git fetch gar-src; \ + fi + @# What if the repository has already been cloned? +endif + @$(DONADA) + # returns true if patch has completed successfully, false # otherwise patch-p: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 20 17:50:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Oct 2009 15:50:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6917] csw/mgar/pkg/tcpwrappers/trunk Message-ID: Revision: 6917 http://gar.svn.sourceforge.net/gar/?rev=6917&view=rev Author: dmichelsen Date: 2009-10-20 15:50:00 +0000 (Tue, 20 Oct 2009) Log Message: ----------- tcpwrappers: Add Phils touch Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/checksums csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch Modified: csw/mgar/pkg/tcpwrappers/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-10-20 15:34:40 UTC (rev 6916) +++ csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-10-20 15:50:00 UTC (rev 6917) @@ -1,6 +1,6 @@ -071bd69cb78b18888ea5e3da5c3127fa download/COPYING -b268880c14ab6d31140015275c82d6aa download/README -89e8f9d1ed25d8e809674af9bf3d18e6 download/man.patch -af28873e5c16c4f921237148e2507826 download/patch-cflags.diff -39ff14b0cc741a02a8427c4107c5d7d4 download/sharedlib.patch -ccbc2676977c31bbd43783abfbf2fdcf download/tcp_wrappers_7.6-ipv6.4.tar.gz +071bd69cb78b18888ea5e3da5c3127fa COPYING +b268880c14ab6d31140015275c82d6aa README +89e8f9d1ed25d8e809674af9bf3d18e6 man.patch +af28873e5c16c4f921237148e2507826 patch-cflags.diff +c82569b24080fc41c8b9bf9b25b831c2 sharedlib.patch +ccbc2676977c31bbd43783abfbf2fdcf tcp_wrappers_7.6-ipv6.4.tar.gz Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2009-10-20 15:34:40 UTC (rev 6916) +++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2009-10-20 15:50:00 UTC (rev 6917) @@ -1,6 +1,6 @@ diff -Naur tcp_wrappers_7.6-ipv6.4.orig/Makefile tcp_wrappers_7.6-ipv6.4.patched/Makefile --- tcp_wrappers_7.6-ipv6.4.orig/Makefile 2003-04-16 16:25:03.000000000 +0200 -+++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-09-11 18:58:37.916723372 +0200 ++++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-10-20 17:46:10.069122055 +0200 @@ -197,6 +197,24 @@ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ EXTRA_CFLAGS=-DUSE_STRERROR all @@ -64,10 +64,12 @@ diff -Naur tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c --- tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c 1970-01-01 01:00:00.000000000 +0100 -+++ tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c 2009-09-11 18:58:37.917838872 +0200 -@@ -0,0 +1,5 @@ ++++ tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c 2009-10-20 17:47:08.156958125 +0200 +@@ -0,0 +1,7 @@ +/* This must be compiled with Sun CC for the pragma */ +#pragma weak deny_severity +#pragma weak allow_severity ++#pragma weak hard_severity +int deny_severity=0; +int allow_severity=0; ++int hard_severity=0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 18:37:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 16:37:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6918] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswmigrateconf Message-ID: Revision: 6918 http://gar.svn.sourceforge.net/gar/?rev=6918&view=rev Author: wahwah Date: 2009-10-20 16:37:06 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cswmigrateconf: fixing an issue with the way PKG_INSTALL_ROOT is used (it doesn't have a trailing slash) Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-20 15:50:00 UTC (rev 6917) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-20 16:37:06 UTC (rev 6918) @@ -14,7 +14,9 @@ # Print errors when trying to read from an unset variable. set -u -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} +# PKG_INSTALL_ROOT does not have a trailing slash. It's for instance: /a +# http://docs.sun.com/app/docs/doc/820-4042/package-2?a=view +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-} readonly PKG_INSTALL_ROOT return_code=0 @@ -34,7 +36,7 @@ readonly deprecated_file_ext # Create /etc/opt/csw/cswclassutils.DEBUG to enable debugging of this script -if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then +if [ -r ${PKG_INSTALL_ROOT}/etc/opt/csw/cswclassutils.DEBUG ]; then DEBUG=1 else DEBUG=0 @@ -168,11 +170,11 @@ fi # The defaults, if not set already by the script. - SOURCE_DIR___default__="${SOURCE_DIR___default__:-opt/csw/etc}" + SOURCE_DIR___default__="${SOURCE_DIR___default__:-/opt/csw/etc}" readonly SOURCE_DIR___default__ - ARCH_DIR___default__="${ARCH_DIR___default__:-opt/csw/etc/migration-archive}" + ARCH_DIR___default__="${ARCH_DIR___default__:-/opt/csw/etc/migration-archive}" readonly ARCH_DIR___default__ - DEST_DIR___default__="${DEST_DIR___default__:-etc/opt/csw}" + DEST_DIR___default__="${DEST_DIR___default__:-/etc/opt/csw}" readonly DEST_DIR___default__ for file_name in ${MIGRATE_FILES}; do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 18:37:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 16:37:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6919] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6919 http://gar.svn.sourceforge.net/gar/?rev=6919&view=rev Author: wahwah Date: 2009-10-20 16:37:41 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cswmigrateconf: updating the checksum Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-20 16:37:06 UTC (rev 6918) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-20 16:37:41 UTC (rev 6919) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf +42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 20:11:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 18:11:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6920] csw/mgar/pkg/cups/branches Message-ID: Revision: 6920 http://gar.svn.sourceforge.net/gar/?rev=6920&view=rev Author: wahwah Date: 2009-10-20 18:11:20 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cups-1.4.0: Created a branch for 1.4.0 specifically, added testing patches for http://www.cups.org/str.php?L3381 Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4.0/ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch Property changes on: csw/mgar/pkg/cups/branches/cups-1.4.0 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-20 00:54:29 UTC (rev 6914) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-20 18:11:20 UTC (rev 6920) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.1 +GARVERSION = 1.4.0 CATEGORIES = net define BLURB @@ -51,7 +51,9 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch -PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +# PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +PATCHFILES += 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-20 00:54:29 UTC (rev 6914) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-20 18:11:20 UTC (rev 6920) @@ -1,8 +1,9 @@ -1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch -0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch -a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch -193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall -ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall -587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 +1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch +0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch +a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch +2fd940524ebf6d6c0c22f4e52e253911 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall +ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove +dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall +bc5e777d4320cecdd1a64de8035171a8 cups-1.4.0-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-20 18:11:20 UTC (rev 6920) @@ -0,0 +1,35 @@ +From 101afaf697b8cbd8d0194febbba3ea94d99086ab Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 15:05:58 +0200 +Subject: [PATCH] Mapping GNUTLS_E_INVALID_SESSION to EIO in http_read_ssl + +--- + cups/http.c | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..47b9c0a 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,17 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int bytes; ++ bytes = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (bytes < 0) { ++ if (bytes == GNUTLS_E_INVALID_SESSION) { ++ errno = EIO; /* Not sure which value to map it to. */ ++ } else if (bytes < 0 && !errno) { ++ /* Shouldn't happen! Need a warning or an error, or something similar. */ ++ DEBUG_printf(("gnutls_record_recv() returned a negative number but errno=0.")); ++ } ++ } ++ return bytes; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-20 18:11:20 UTC (rev 6920) @@ -0,0 +1,25 @@ +From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 13:35:40 +0200 +Subject: [PATCH] Fail compilation if no SSL impl chosen + +--- + cups/http.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 8b767c9..840e3fc 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + } + + return (result); ++# else ++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set." + # endif /* HAVE_LIBSSL */ + } + #endif /* HAVE_SSL */ +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:01:33 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:01:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6921] csw/mgar/pkg/x11 Message-ID: Revision: 6921 http://gar.svn.sourceforge.net/gar/?rev=6921&view=rev Author: wbonnet Date: 2009-10-20 19:01:33 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Add lib and proto subdirs Added Paths: ----------- csw/mgar/pkg/x11/lib/ csw/mgar/pkg/x11/proto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:35:56 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:35:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6922] csw/mgar/pkg/x11 Message-ID: Revision: 6922 http://gar.svn.sourceforge.net/gar/?rev=6922&view=rev Author: wbonnet Date: 2009-10-20 19:35:51 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.5 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_applewmproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_applewmproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:39:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6923] csw/mgar/pkg/x11 Message-ID: Revision: 6923 http://gar.svn.sourceforge.net/gar/?rev=6923&view=rev Author: wbonnet Date: 2009-10-20 19:39:05 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.5 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_bigreqsproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_bigreqsproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:42:04 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6924] csw/mgar/pkg/x11 Message-ID: Revision: 6924 http://gar.svn.sourceforge.net/gar/?rev=6924&view=rev Author: wbonnet Date: 2009-10-20 19:42:04 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_compositeproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_compositeproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:43:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:43:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6925] csw/mgar/pkg/x11/proto Message-ID: Revision: 6925 http://gar.svn.sourceforge.net/gar/?rev=6925&view=rev Author: wbonnet Date: 2009-10-20 19:43:20 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-20 19:42:04 UTC (rev 6924) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-20 19:43:20 UTC (rev 6925) @@ -1,5 +1,5 @@ PROTONAME = applewmproto -GARVERSION = 1.4.1 +GARVERSION = 1.0.3 CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 19:42:04 UTC (rev 6924) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 19:43:20 UTC (rev 6925) @@ -2,7 +2,7 @@ CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) -GARVERSION = 1.1.0 +GARVERSION = 1.0.2 DESCRIPTION = Prototype headers for BigReqs extension to X11 define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:44:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6926] csw/mgar/pkg/x11 Message-ID: Revision: 6926 http://gar.svn.sourceforge.net/gar/?rev=6926&view=rev Author: wbonnet Date: 2009-10-20 19:44:53 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_damageproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_damageproto/ Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile 2009-10-20 19:44:53 UTC (rev 6926) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = damageproto GARNAME = x11_$(PROTONAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:46:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6927] csw/mgar/pkg/x11 Message-ID: Revision: 6927 http://gar.svn.sourceforge.net/gar/?rev=6927&view=rev Author: wbonnet Date: 2009-10-20 19:46:08 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_dmxproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_dmxproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 22:03:15 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 20:03:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6928] csw/mgar/pkg/x11 Message-ID: Revision: 6928 http://gar.svn.sourceforge.net/gar/?rev=6928&view=rev Author: wbonnet Date: 2009-10-20 20:03:14 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_evieextproto/ csw/mgar/pkg/x11/proto/x11_fixesproto/ csw/mgar/pkg/x11/proto/x11_fontcacheproto/ csw/mgar/pkg/x11/proto/x11_fontsproto/ csw/mgar/pkg/x11/proto/x11_glproto/ csw/mgar/pkg/x11/proto/x11_inputproto/ csw/mgar/pkg/x11/proto/x11_kbproto/ csw/mgar/pkg/x11/proto/x11_randrproto/ csw/mgar/pkg/x11/proto/x11_recordproto/ csw/mgar/pkg/x11/proto/x11_renderproto/ csw/mgar/pkg/x11/proto/x11_resourceproto/ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/ csw/mgar/pkg/x11/proto/x11_trapproto/ csw/mgar/pkg/x11/proto/x11_videoproto/ csw/mgar/pkg/x11/proto/x11_windowswmproto/ csw/mgar/pkg/x11/proto/x11_xcmiscproto/ csw/mgar/pkg/x11/proto/x11_xextproto/ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/ csw/mgar/pkg/x11/proto/x11_xf86dgaproto/ csw/mgar/pkg/x11/proto/x11_xf86driproto/ csw/mgar/pkg/x11/proto/x11_xf86miscproto/ csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/ csw/mgar/pkg/x11/proto/x11_xineramaproto/ csw/mgar/pkg/x11/proto/x11_xproto/ Removed Paths: ------------- csw/mgar/pkg/x11/proto/x11_glproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_kbproto/tags/kbproto-1.0.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_recordproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_renderproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_videoproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_xextproto/tags/xextproto-7.0.5,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_xproto/tags/xproto-7.0.14,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/ csw/mgar/pkg/x11/x11_evieextproto/ csw/mgar/pkg/x11/x11_fixesproto/ csw/mgar/pkg/x11/x11_fontcacheproto/ csw/mgar/pkg/x11/x11_fontsproto/ csw/mgar/pkg/x11/x11_glproto/ csw/mgar/pkg/x11/x11_inputproto/ csw/mgar/pkg/x11/x11_kbproto/ csw/mgar/pkg/x11/x11_randrproto/ csw/mgar/pkg/x11/x11_recordproto/ csw/mgar/pkg/x11/x11_renderproto/ csw/mgar/pkg/x11/x11_resourceproto/ csw/mgar/pkg/x11/x11_scrnsaverproto/ csw/mgar/pkg/x11/x11_trapproto/ csw/mgar/pkg/x11/x11_videoproto/ csw/mgar/pkg/x11/x11_windowswmproto/ csw/mgar/pkg/x11/x11_xcmiscproto/ csw/mgar/pkg/x11/x11_xextproto/ csw/mgar/pkg/x11/x11_xf86bigfontproto/ csw/mgar/pkg/x11/x11_xf86dgaproto/ csw/mgar/pkg/x11/x11_xf86driproto/ csw/mgar/pkg/x11/x11_xf86miscproto/ csw/mgar/pkg/x11/x11_xf86vidmodeproto/ csw/mgar/pkg/x11/x11_xineramaproto/ csw/mgar/pkg/x11/x11_xproto/ Modified: csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.0.2 CATEGORIES = x11 PROTONAME = evieext GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 2.1.0 +GARVERSION = 2.0.2 CATEGORIES = x11 PROTONAME = fontsproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_glproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.4.10 +GARVERSION = 1.4.9 CATEGORIES = x11 PROTONAME = glproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.5.1 +GARVERSION = 1.4.4 PROTONAME = inputproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.3.0 +GARVERSION = 1.2.1 CATEGORIES = x11 PROTONAME = randrproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 0.11 +GARVERSION = 0.9.3 CATEGORIES = x11 PROTONAME = renderproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.0.2 CATEGORIES = x11 PROTONAME = resourceproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = scrnsaverproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 2.3.0 +GARVERSION = 2.2.2 CATEGORIES = x11 PROTONAME = videoproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.2 CATEGORIES = x11 PROTONAME = xcmiscproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 7.1.1 +GARVERSION = 7.0.3 PROTONAME = xextproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.2 CATEGORIES = x11 PROTONAME = xf86bigfontproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 2.1.0 +GARVERSION = 2.0.4 CATEGORIES = x11 PROTONAME = xf86driproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 7.0.15 +GARVERSION = 7.0.13 CATEGORIES = x11 PROTONAME = xproto GARNAME = x11_$(PROTONAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 22:04:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 20:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6929] csw/mgar/pkg/x11/proto/Makefile Message-ID: Revision: 6929 http://gar.svn.sourceforge.net/gar/?rev=6929&view=rev Author: wbonnet Date: 2009-10-20 20:04:23 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Added Paths: ----------- csw/mgar/pkg/x11/proto/Makefile Added: csw/mgar/pkg/x11/proto/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/Makefile (rev 0) +++ csw/mgar/pkg/x11/proto/Makefile 2009-10-20 20:04:23 UTC (rev 6929) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/proto directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 22:34:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 20:34:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6930] csw/mgar/pkg/x11/proto Message-ID: Revision: 6930 http://gar.svn.sourceforge.net/gar/?rev=6930&view=rev Author: wbonnet Date: 2009-10-20 20:34:55 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -822151ea24caf7c23ced6da7a14dfb4d download/applewmproto-1.4.1.tar.gz +774bf8e9633f0f38c49069a9ea56ae23 download/applewmproto-1.0.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -882d49cc3bb591dbdccdf9e680bd2e4b download/bigreqsproto-1.1.0.tar.gz +d43f7faa2aac2f0206ea19f031494af1 download/bigreqsproto-1.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -423516fd64e43e8671120056b0d9f597 download/damageproto-1.2.0.tar.gz +bce4477a6edd774dfca175ea46e1ba76 download/damageproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -68e61ce53caa495a3ad4085f66010eb8 download/evieext-1.1.0.tar.gz +cff7b68b228d255f582cb64879619a44 download/evieext-1.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -6819fc82585daac68cec17938b659bf0 download/fontsproto-2.1.0.tar.gz +6c1efa12ae50262b45c91e9a120632b7 download/fontsproto-2.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -ac89626ed6bced045d0515217bfffd4f download/glproto-1.4.10.tar.gz +216203b0fe4dd2ecb361265ac01ad348 download/glproto-1.4.9.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -2311483e8c175af3b4b5111413018dd1 download/inputproto-1.5.1.tar.gz +55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -5804ffeea0e40982258cc4618b8c6f07 download/randrproto-1.3.0.tar.gz +d6b6b024d71b689628bcaf27fd491f5b download/randrproto-1.2.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -57216f25b9a5edc561b83a7484cb17e8 download/renderproto-0.11.tar.gz +ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -587333b4995a3e11ebe4c8ba2742efaf download/resourceproto-1.1.0.tar.gz +198252b76e8082958cc2228d8dcc7c2f download/resourceproto-1.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -0ed88bdd6945ba207c4f734af48e7e25 download/scrnsaverproto-1.2.0.tar.gz +616ae17acad2b6033c981b8b526d5e67 download/scrnsaverproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -888543493cd69c6c78002ac59c3f077f download/videoproto-2.3.0.tar.gz +ace6f55cd4dcebf4b191c0c31755ed92 download/videoproto-2.2.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -bacfb0f3cb4d6e1a71770307bfdba129 download/xcmiscproto-1.2.0.tar.gz +3c380a728697ded97a39addfe1acf2cb download/xcmiscproto-1.1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz +6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -91b0733ff4cbe55808d96073258aa3d1 download/xf86bigfontproto-1.2.0.tar.gz +43d9fe9f92e5b8abd6e1328fdb022e7d download/xf86bigfontproto-1.1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -da848afcd5c41ac05e3aa994bdacdf1c download/xf86driproto-2.1.0.tar.gz +17a69691f2827b13ac4494f9c4af22b1 download/xf86driproto-2.0.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -9186713de3ec8a9fdd6ec3f4c4534fde download/xproto-7.0.15.tar.gz +4c736a7ba52beddaea87964047adf209 download/xproto-7.0.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 23:24:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 21:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6931] csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/ Makefile Message-ID: Revision: 6931 http://gar.svn.sourceforge.net/gar/?rev=6931&view=rev Author: wbonnet Date: 2009-10-20 21:24:23 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Fix package name Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 20:34:55 UTC (rev 6930) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 21:24:23 UTC (rev 6931) @@ -15,8 +15,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWx11applewmproto -CATALOGNAME_CSWx11applewmproto = x11_applewmproto +PACKAGES = CSWx11bigreqsproto +CATALOGNAME_CSWx11bigreqsproto = x11_bigreqsproto REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 21 04:06:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 21 Oct 2009 02:06:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6932] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 6932 http://gar.svn.sourceforge.net/gar/?rev=6932&view=rev Author: bdwalton Date: 2009-10-21 02:06:47 +0000 (Wed, 21 Oct 2009) Log Message: ----------- ruby: add suncc build support, with toggle to use gcc4 easily; bdb cleanup Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-20 21:24:23 UTC (rev 6931) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-21 02:06:47 UTC (rev 6932) @@ -4,10 +4,10 @@ GARVERSION = $(DISTVERSION) CATEGORIES = lang -# disable test scripts (all passed with 1.8.7p174) -# TEST_SCRIPTS = +TEST_SCRIPTS = +TEST_ARGS = test-all -PREREQUISITE_PKGS = CSWbdb3 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel +PREREQUISITE_PKGS = CSWbdb CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel PREREQUISITE_PKGS += CSWreadline CSWzlib PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel @@ -18,14 +18,14 @@ LICENSE = COPYING -REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv CSWgcc4corert +REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv REQUIRED_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib REQUIRED_PKGS_CSWrubydoc = CSWruby REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk -REQUIRED_PKGS_CSWrubydev = CSWruby CSWgcc4core CSWgfile +REQUIRED_PKGS_CSWrubydev = CSWruby CSWgfile REQUIRED_PKGS_CSWrubymode = CSWemacscommon @@ -76,12 +76,7 @@ # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698 PATCHFILES = rdoc_parse_order_fix.patch -GARCOMPILER = GNU -# This is for rbconfig.rb: without this, modules built may not get a proper -# setting. -EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread CONFIGURE_ARGS += --enable-shared @@ -104,6 +99,17 @@ COMPILE_ELISP = 1 +ifdef USEGCC +GARCOMPILER = GNU +REQUIRED_PKGS_CSWruby += CSWgcc4corert +REQUIRED_PKGS_CSWrubydev += CSWgcc4core +# This is for rbconfig.rb: without this, modules built may not get a proper +# setting. +EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) +else +SOS11_LD_FLAGS = +endif + include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 21 10:38:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 21 Oct 2009 08:38:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6933] csw/mgar/pkg Message-ID: Revision: 6933 http://gar.svn.sourceforge.net/gar/?rev=6933&view=rev Author: bonivart Date: 2009-10-21 08:38:41 +0000 (Wed, 21 Oct 2009) Log Message: ----------- diffuse: initial commit Added Paths: ----------- csw/mgar/pkg/diffuse/ csw/mgar/pkg/diffuse/branches/ csw/mgar/pkg/diffuse/tags/ csw/mgar/pkg/diffuse/trunk/ csw/mgar/pkg/diffuse/trunk/Makefile csw/mgar/pkg/diffuse/trunk/checksums csw/mgar/pkg/diffuse/trunk/files/ Property changes on: csw/mgar/pkg/diffuse/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/diffuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffuse/trunk/Makefile (rev 0) +++ csw/mgar/pkg/diffuse/trunk/Makefile 2009-10-21 08:38:41 UTC (rev 6933) @@ -0,0 +1,30 @@ +GARNAME = diffuse +GARVERSION = 0.4.1 +CATEGORIES = utils + +DESCRIPTION = Graphical tool for comparing and merging text files +define BLURB + Graphical tool for comparing and merging text files +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +REQUIRED_PKGS = CSWpython CSWpygtk +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @echo "Installing $(GARNAME) (custom)" + ( cd $(WORKSRC); \ + ./install.py --destdir=$(DESTDIR) --prefix=/opt/csw --sysconfdir=/etc/opt/csw --mandir=/opt/csw/share/man --files-only ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/diffuse/trunk/checksums =================================================================== --- csw/mgar/pkg/diffuse/trunk/checksums (rev 0) +++ csw/mgar/pkg/diffuse/trunk/checksums 2009-10-21 08:38:41 UTC (rev 6933) @@ -0,0 +1 @@ +dbdfc4f3ed50e66e2151dc6e2fa3e345 diffuse-0.4.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 12:29:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 10:29:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6934] csw/mgar/pkg/gnutls/Makefile Message-ID: Revision: 6934 http://gar.svn.sourceforge.net/gar/?rev=6934&view=rev Author: wahwah Date: 2009-10-21 10:29:02 +0000 (Wed, 21 Oct 2009) Log Message: ----------- gnutls: adding package-level Makefile Added Paths: ----------- csw/mgar/pkg/gnutls/Makefile Copied: csw/mgar/pkg/gnutls/Makefile (from rev 6443, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnutls/Makefile (rev 0) +++ csw/mgar/pkg/gnutls/Makefile 2009-10-21 10:29:02 UTC (rev 6934) @@ -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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 12:43:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 10:43:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6935] csw/mgar/pkg/cups/branches/cups-1.4.0 Message-ID: Revision: 6935 http://gar.svn.sourceforge.net/gar/?rev=6935&view=rev Author: wahwah Date: 2009-10-21 10:43:59 +0000 (Wed, 21 Oct 2009) Log Message: ----------- cups-1.4.0: A better patch for the cups-polld problem Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-21 10:29:02 UTC (rev 6934) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-21 10:43:59 UTC (rev 6935) @@ -21,13 +21,13 @@ # There's a problem with cups-polld going into a busy-wait loop when polling # print servers. # -# http://www.cups.org/str.php?L3257 +# http://www.cups.org/str.php?L3257 (closed) +# http://www.cups.org/str.php?L3381 (filed again) # # The problem with cups-polld seems to be going away when CUPS is compiled with # debugging symbols. The debugging options is turned on for this package, in # order to be able to debug the binary if it ever shows the problem. -# -# TODO: Check whether the issue is gone or not. + GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. @@ -52,7 +52,7 @@ PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch # PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -PATCHFILES += 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PREREQUISITE_PKGS = CSWggettext Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-21 10:29:02 UTC (rev 6934) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-21 10:43:59 UTC (rev 6935) @@ -1,7 +1,7 @@ 1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch -2fd940524ebf6d6c0c22f4e52e253911 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove Deleted: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-21 10:29:02 UTC (rev 6934) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-21 10:43:59 UTC (rev 6935) @@ -1,35 +0,0 @@ -From 101afaf697b8cbd8d0194febbba3ea94d99086ab Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Tue, 20 Oct 2009 15:05:58 +0200 -Subject: [PATCH] Mapping GNUTLS_E_INVALID_SESSION to EIO in http_read_ssl - ---- - cups/http.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -diff --git a/cups/http.c b/cups/http.c -index 840e3fc..47b9c0a 100644 ---- a/cups/http.c -+++ b/cups/http.c -@@ -2719,7 +2719,17 @@ http_read_ssl(http_t *http, /* I - Connection to server */ - return (SSL_read((SSL *)(http->tls), buf, len)); - - # elif defined(HAVE_GNUTLS) -- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); -+ int bytes; -+ bytes = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); -+ if (bytes < 0) { -+ if (bytes == GNUTLS_E_INVALID_SESSION) { -+ errno = EIO; /* Not sure which value to map it to. */ -+ } else if (bytes < 0 && !errno) { -+ /* Shouldn't happen! Need a warning or an error, or something similar. */ -+ DEBUG_printf(("gnutls_record_recv() returned a negative number but errno=0.")); -+ } -+ } -+ return bytes; - - # elif defined(HAVE_CDSASSL) - int result; /* Return value */ --- -1.6.5 - Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2009-10-21 10:43:59 UTC (rev 6935) @@ -0,0 +1,42 @@ +From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 21 Oct 2009 12:40:39 +0200 +Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno + +--- + cups/http.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..e255375 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int result; ++ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (result < 0 && !errno) { ++ switch (result) ++ { ++ case GNUTLS_E_INTERRUPTED : ++ errno = EINTR; ++ break; ++ case GNUTLS_E_AGAIN : ++ errno = EAGAIN; ++ break; ++ default : ++ errno = EPIPE; ++ break; ++ } ++ result = -1; ++ } ++ return result; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 16:46:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 14:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6936] csw/mgar/pkg/puppet/trunk/Makefile Message-ID: Revision: 6936 http://gar.svn.sourceforge.net/gar/?rev=6936&view=rev Author: wahwah Date: 2009-10-21 14:46:42 +0000 (Wed, 21 Oct 2009) Log Message: ----------- puppet: Enabling cswusergroup support Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-10-21 10:43:59 UTC (rev 6935) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-10-21 14:46:42 UTC (rev 6936) @@ -28,7 +28,7 @@ INITSMF = $(sysconfdir)/init\.d/cswpuppetd INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd -USERGROUP = $(sysconfdir)/pkg/CSWpuppet/cswusergroup +USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster # service isn't started upon the installation of CSWpuppet. @@ -57,9 +57,9 @@ include gar/category.mk install-puppet: - ginstall -d $(DESTDIR) - ginstall -d $(DESTDIR)$(sysconfdir)/puppet - ginstall -d $(DESTDIR)$(localstatedir)/puppet/run + ginstall -m 755 -d $(DESTDIR) + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet + ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d @@ -76,4 +76,7 @@ chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ fi \ done) + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 18:46:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 16:46:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6937] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6937 http://gar.svn.sourceforge.net/gar/?rev=6937&view=rev Author: wahwah Date: 2009-10-21 16:46:06 +0000 (Wed, 21 Oct 2009) Log Message: ----------- puppet: Reworked the init.d file. Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-10-21 14:46:42 UTC (rev 6936) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-10-21 16:46:06 UTC (rev 6937) @@ -1,5 +1,5 @@ -abaa404420106f9f28e9e1218b4e365b download/0001-pkgutil-support.patch -71174fc47265e5c81a0e32366563e5e4 download/cswpuppetd -fd5e49b7d2b7d288d5beb224d0cfa855 download/cswpuppetmasterd -3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup -288d46dee00acad64d0f3ecc6d8ba6fa download/puppet-0.24.8.tgz +abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch +3b7da4c98895e944262ed684e48e3b08 cswpuppetd +fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd +3ab0d4f9801075bc78b68b766b496fc7 cswusergroup +288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-10-21 14:46:42 UTC (rev 6936) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-10-21 16:46:06 UTC (rev 6937) @@ -2,66 +2,118 @@ # # $Id$ # -# This is the /etc/init.d file for puppetd -# Modified for CSW +# /etc/opt/csw/init.d/cswpuppetd # -# description: puppetd - Puppet Automation Client +# 2009-10-21 Maciej Blizinski # +# * Introduced start/stop/reload as functions +# * Distinguishing between reload and restart +# * Made the script zone-friendly +# * Supported custom pid file locations. . /lib/svc/share/smf_include.sh -prefix=/opt/csw -exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc -sbindir=/opt/csw/bin +prefix="/opt/csw" +exec_prefix="/opt/csw" +sysconfdir="/etc/csw/opt" +sbindir="/opt/csw/bin" +localstatedir="/var/opt/csw" -pidfile=/var/opt/csw/puppet/run/puppetd.pid -case "$1" in -start) - cd / - # Start daemons. +start_puppetd() { + cd / + # Start daemons. + ${sbindir}/puppetd +} - printf "Starting Puppet client services:" +reload_puppetd() { + if [ -r $pidfile ]; then + kill -HUP `cat $pidfile` + fi +} - ${sbindir}/puppetd +stop_puppetd() { + if [ -r $pidfile ]; then + pid=`cat $pidfile` + kill $pid + fi +} +get_current_pid() { + if [ -x /usr/bin/zonename ]; then + zone=`/usr/bin/zonename` + zoneopts="-z $zone" + else + zoneopts="" + fi + pgrep $zoneopts puppetd +} + +# Returns a line with certain string from a config file. +get_line_with() { + __s="$1" + __f="$2" + cat "${__f}" \ + | sed -e 's/^ *//' \ + | grep -v '^#' \ + | grep "${__s}" +} + +get_pid_file() { + # The default pid file is /var/opt/csw/puppet/run/puppetd.pid + # but a different pid file can be set in puppet.conf. + __pidfile="/var/opt/csw/puppet/run/puppetd.pid" + conffile="/etc/opt/csw/puppet/puppet.conf" + if [ -r "$conffile" ]; then + pid_line=`get_line_with pidfile ${conffile}` + if [ -n "${pid_line}" ]; then + echo "${pid_line}" | cut -d= -f2 | tr -d ' ' + return + fi + fi + echo "${__pidfile}" +} + +pidfile=`get_pid_file` + +case "$1" in + start) + printf "Starting Puppet client services:" + start_puppetd printf " puppetd" echo "" ;; -stop) + stop) printf "Stopping Puppet client services:" - kill `cat $pidfile` - + stop_puppetd printf " puppetd" echo "" ;; -restart) + restart) printf "Restarting Puppet client services:" - kill -HUP `cat $pidfile` - + stop_puppetd + start_puppetd printf " puppetd" echo "" ;; -reload) + reload) printf "Reloading Puppet client services:" - - kill -HUP `cat $pidfile` - + reload_puppetd printf " puppetd" echo "" ;; -status) + status) if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`pgrep puppetd` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi + pid=`cat $pidfile` + curpid=`get_current_pid` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi else - exit 1 + exit 1 fi + ;; esac exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Oct 21 21:05:10 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 21 Oct 2009 19:05:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6938] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 6938 http://gar.svn.sourceforge.net/gar/?rev=6938&view=rev Author: valholla Date: 2009-10-21 19:05:10 +0000 (Wed, 21 Oct 2009) Log Message: ----------- fix Makefile for new berkeley db layouts Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-10-21 16:46:06 UTC (rev 6937) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) @@ -27,12 +27,12 @@ WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn -PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn +PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn ARCHALL_CSWsvn-devel = 1 SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion -REQUIRED_PKGS_CSWsvn = CSWapache2rt CSWbdb CSWexpat CSWggettextrt +REQUIRED_PKGS_CSWsvn = CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt REQUIRED_PKGS_CSWsvn += CSWiconv CSWkrb5lib CSWlibnet CSWneon CSWoldaprt REQUIRED_PKGS_CSWsvn += CSWosslrt CSWsasl CSWzlib CSWsqlite3rt SPKG_DESC_CSWsvn-devel = Subversion Development Support @@ -44,19 +44,19 @@ SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn REQUIRED_PKGS_CSWjavasvn = CSWsvn CSWapache2rt CSWneon CSWoldaprt -REQUIRED_PKGS_CSWjavasvn += CSWbdb CSWexpat CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWjavasvn += CSWbdb47 CSWexpat CSWggettextrt CSWiconv SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion -REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl CSWapache2rt CSWbdb CSWexpat +REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl CSWapache2rt CSWbdb47 CSWexpat REQUIRED_PKGS_CSWpmsvn += CSWggettextrt CSWiconv CSWoldaprt -SPKG_DESC_CSWpysvn = Subversion Python Language Binding -CATALOGNAME_CSWpysvn = pysvn -REQUIRED_PKGS_CSWpysvn = CSWsvn CSWpython CSWapache2rt CSWbdb CSWexpat -REQUIRED_PKGS_CSWpysvn += CSWggettextrt CSWiconv CSWoldaprt +SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding +CATALOGNAME_CSWpythonsvn = pythonsvn +REQUIRED_PKGS_CSWpythonsvn = CSWsvn CSWpython CSWapache2rt CSWbdb47 CSWexpat +REQUIRED_PKGS_CSWpythonsvn += CSWggettextrt CSWiconv CSWoldaprt SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby CSWiconv CSWoldaprt -REQUIRED_PKGS_CSWrbsvn += CSWapache2rt CSWbdb CSWexpat CSWggettextrt +REQUIRED_PKGS_CSWrbsvn += CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWap2svn = $(prefix)/apache2.* @@ -64,8 +64,8 @@ PKGFILES_CSWpmsvn = $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* -PKGFILES_CSWpysvn = $(libdir)/python.* -PKGFILES_CSWpysvn += $(SVNLIB)/.*swig_py.* +PKGFILES_CSWpythonsvn = $(libdir)/python.* +PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWrbsvn = $(libdir)/ruby.* PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* @@ -90,17 +90,18 @@ NOISALIST = 1 LDFLAGS = -R/opt/csw/lib -L/opt/csw/lib -R/opt/csw/apache2/lib LDFLAGS += -L/opt/csw/apache2/lib -L$(SVNLIB) -lintl -liconv +LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib export LDFLAGS EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES_CSWpysvn = none cswpycompile -REQUIRED_PKGS_CSWpysvn += CSWcswclassutils +SPKG_CLASSES_CSWpythonsvn = none cswpycompile +REQUIRED_PKGS_CSWpythonsvn += CSWcswclassutils CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/include:/opt/csw/lib:db +CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb47/include:/opt/csw/bdb47/lib:db CONFIGURE_ARGS += --enable-javahl CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config @@ -109,6 +110,7 @@ CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-serf=$(prefix) TEST_TARGET = check # Tests take *forever* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 21 23:11:15 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 21:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6939] csw/mgar/pkg/x11 Message-ID: Revision: 6939 http://gar.svn.sourceforge.net/gar/?rev=6939&view=rev Author: wbonnet Date: 2009-10-21 21:11:14 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Move libraries to lib subdir. Change version to X11 R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile csw/mgar/pkg/x11/lib/libfs/trunk/Makefile csw/mgar/pkg/x11/lib/libice/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libdmx/ csw/mgar/pkg/x11/lib/libfontenc/ csw/mgar/pkg/x11/lib/libfs/ csw/mgar/pkg/x11/lib/libice/ csw/mgar/pkg/x11/lib/libsm/ csw/mgar/pkg/x11/lib/libx11/ csw/mgar/pkg/x11/lib/libxau/ csw/mgar/pkg/x11/lib/libxaw/ csw/mgar/pkg/x11/lib/libxcomposite/ csw/mgar/pkg/x11/lib/libxcursor/ csw/mgar/pkg/x11/lib/libxdamage/ csw/mgar/pkg/x11/lib/libxdmcp/ csw/mgar/pkg/x11/lib/libxext/ csw/mgar/pkg/x11/lib/libxfixes/ csw/mgar/pkg/x11/lib/libxfont/ csw/mgar/pkg/x11/lib/libxfontcache/ csw/mgar/pkg/x11/lib/libxft/ csw/mgar/pkg/x11/lib/libxi/ csw/mgar/pkg/x11/lib/libxinerama/ csw/mgar/pkg/x11/lib/libxmu/ csw/mgar/pkg/x11/lib/libxpm/ csw/mgar/pkg/x11/lib/libxrandr/ csw/mgar/pkg/x11/lib/libxres/ csw/mgar/pkg/x11/lib/libxscrnsaver/ csw/mgar/pkg/x11/lib/libxt/ Removed Paths: ------------- csw/mgar/pkg/x11/libdmx/ csw/mgar/pkg/x11/libfontenc/ csw/mgar/pkg/x11/libfs/ csw/mgar/pkg/x11/libice/ csw/mgar/pkg/x11/libsm/ csw/mgar/pkg/x11/libx11/ csw/mgar/pkg/x11/libxau/ csw/mgar/pkg/x11/libxaw/ csw/mgar/pkg/x11/libxcomposite/ csw/mgar/pkg/x11/libxcursor/ csw/mgar/pkg/x11/libxdamage/ csw/mgar/pkg/x11/libxdmcp/ csw/mgar/pkg/x11/libxext/ csw/mgar/pkg/x11/libxfixes/ csw/mgar/pkg/x11/libxfont/ csw/mgar/pkg/x11/libxfontcache/ csw/mgar/pkg/x11/libxft/ csw/mgar/pkg/x11/libxi/ csw/mgar/pkg/x11/libxinerama/ csw/mgar/pkg/x11/libxmu/ csw/mgar/pkg/x11/libxpm/ csw/mgar/pkg/x11/libxrandr/ csw/mgar/pkg/x11/libxres/ csw/mgar/pkg/x11/libxscrnsaver/ csw/mgar/pkg/x11/libxt/ Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfontenc/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libfontenc -GARVERSION = 1.0.5 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 font encoding library Modified: csw/mgar/pkg/x11/lib/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libfs/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libFS -GARVERSION = 1.0.2 +GARVERSION = 1.0.1 CATEGORIES = x11 DESCRIPTION = X11 Font Services library Modified: csw/mgar/pkg/x11/lib/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libice/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libICE -GARVERSION = 1.0.6 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 Inter-Client Exchange Library Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libsm -GARVERSION = 1.1.1 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = X11 Session Management library Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libx11 -GARVERSION = 1.2.2 +GARVERSION = 1.1.5 CATEGORIES = x11 DESCRIPTION = X11 client-side library Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxaw -GARVERSION = 1.0.6 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X Athena Widgets Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXcursor -GARVERSION = 1.1.10 +GARVERSION = 1.1.9 CATEGORIES = x11 DESCRIPTION = X client-side cursor loading library Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxext -GARVERSION = 1.0.5 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous extensions library1 Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfont/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXfont -GARVERSION = 1.4.0 +GARVERSION = 1.3.3 CATEGORIES = x11 DESCRIPTION = X11 font rasterisation library Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxi -GARVERSION = 1.2.1 +GARVERSION = 1.1.3 CATEGORIES = x11 DESCRIPTION = Client library for XInput Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxrandr/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXrandr -GARVERSION = 1.3.0 +GARVERSION = 1.2.3 CATEGORIES = x11 DESCRIPTION = X11 RandR extension library Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXScrnSaver -GARVERSION = 1.2.0 +GARVERSION = 1.1.3 CATEGORIES = x11 DESCRIPTION = The XScrnSaver Library Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxt -GARVERSION = 1.0.6 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 toolkit intrinsics library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 21 23:20:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 21:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6940] csw/mgar/pkg/x11 Message-ID: Revision: 6940 http://gar.svn.sourceforge.net/gar/?rev=6940&view=rev Author: wbonnet Date: 2009-10-21 21:20:14 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Move libraries to lib subdir. Change version to X11 R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libxkbfile/ csw/mgar/pkg/x11/lib/libxtst/ csw/mgar/pkg/x11/lib/libxv/ csw/mgar/pkg/x11/lib/libxvmc/ csw/mgar/pkg/x11/lib/libxxf86dga/ csw/mgar/pkg/x11/lib/libxxf86misc/ csw/mgar/pkg/x11/lib/libxxf86vm/ csw/mgar/pkg/x11/lib/xrender/ csw/mgar/pkg/x11/lib/xtrans/ Removed Paths: ------------- csw/mgar/pkg/x11/libxkbfile/ csw/mgar/pkg/x11/libxtst/ csw/mgar/pkg/x11/libxv/ csw/mgar/pkg/x11/libxvmc/ csw/mgar/pkg/x11/libxxf86dga/ csw/mgar/pkg/x11/libxxf86misc/ csw/mgar/pkg/x11/libxxf86vm/ csw/mgar/pkg/x11/xrender/ csw/mgar/pkg/x11/xtrans/ Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2009-10-21 21:20:14 UTC (rev 6940) @@ -1,5 +1,5 @@ GARNAME = xtrans -GARVERSION = 1.2.3 +GARVERSION = 1.2.1 CATEGORIES = x11 DESCRIPTION = X transport library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 21 23:34:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 21:34:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6941] csw/mgar/pkg/x11/lib Message-ID: Revision: 6941 http://gar.svn.sourceforge.net/gar/?rev=6941&view=rev Author: wbonnet Date: 2009-10-21 21:34:42 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfs/trunk/checksums csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums csw/mgar/pkg/x11/lib/libxtst/trunk/checksums csw/mgar/pkg/x11/lib/xtrans/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/Makefile Added: csw/mgar/pkg/x11/lib/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/Makefile (rev 0) +++ csw/mgar/pkg/x11/lib/Makefile 2009-10-21 21:34:42 UTC (rev 6941) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/lib directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + Modified: csw/mgar/pkg/x11/lib/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -ecf2d6a27da053500283e803efa2a808 download/libFS-1.0.2.tar.bz2 +81521249353fa33be7a4bb0062c2fbb9 libFS-1.0.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 +0726a845fe5a56551de2718c9f6b0e35 libxkbfile-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.3.tar.bz2 +090c1ad04e34982eada5cf3b1a0792fd libXtst-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -9e9dcfb9555bbe4eae7ceeb33d9d710e download/xtrans-1.2.3.tar.gz +5b7f447f6fe92cbc4f17441aaee0bf55 xtrans-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 22 00:12:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 22:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6942] csw/mgar/pkg/x11/lib Message-ID: Revision: 6942 http://gar.svn.sourceforge.net/gar/?rev=6942&view=rev Author: wbonnet Date: 2009-10-21 22:12:21 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Move libraries to lib subdir. Change version to X11 R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile csw/mgar/pkg/x11/lib/libdmx/trunk/checksums csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums csw/mgar/pkg/x11/lib/libice/trunk/checksums csw/mgar/pkg/x11/lib/libsm/trunk/checksums csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums csw/mgar/pkg/x11/lib/libxfont/trunk/checksums csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxmu/trunk/checksums csw/mgar/pkg/x11/lib/libxpm/trunk/checksums csw/mgar/pkg/x11/lib/libxres/trunk/checksums csw/mgar/pkg/x11/lib/libxt/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-10-21 22:12:21 UTC (rev 6942) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibdmx = $(DESCRIPTION) SPKG_DESC_CSWlibdmxdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWdmxproto +PREREQUISITE_PKGS = CSWx11dmxproto REQUIRED_PKGS_CSWlibdmx = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibdmxdevel = CSWlibdmx Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 +4d866967210d06098fc9f302ed4c79b1 libdmx-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -4f0d8191819be9f2bdf9dad49a65e43b download/libfontenc-1.0.5.tar.bz2 +5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -2d39bc924af24325dae589e9a849180c download/libICE-1.0.6.tar.bz2 +4ab4e67e0b8845aa201e984153087f4a libICE-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -6889a455496aaaa65b1fa05fc518d179 download/libSM-1.1.1.tar.bz2 +05a04c2b6382fb0054f6c70494e22733 libSM-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -7dcdad1c10daea872cb3355af414b2ca download/libXcursor-1.1.10.tar.bz2 +99b7554037a92b260891091e81815a0a libXcursor-1.1.9.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 +10facf2bc7cbd5e5c1a698b8a210a582 libXdmcp-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -3a8e06b25912ef339d70a8ba003da9b5 download/libXfont-1.4.0.tar.bz2 +4f174b9613f87cf00d731da428a1b194 libXfont-1.3.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -cfb36307e8e7ffafe40848dba24e0b11 download/libXi-1.2.1.tar.bz2 +7c510abb0cad8dc20493fb27ff7859d8 libXi-1.1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -48b432e84035c664ece80a33695d5254 download/libXmu-1.0.4.tar.gz +48b432e84035c664ece80a33695d5254 libXmu-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 +cd15ee542d9f515538b4462a6f79d977 libXpm-3.5.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 +de66ffb657aba64c9d6dbdeabb757f3e libXres-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -953930ddf9fdaa1405732c7f01e9e599 download/libXt-1.0.6.tar.bz2 +f3bdd67785ace8cd0b23249e9d8c9975 libXt-1.0.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 22 17:21:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 22 Oct 2009 15:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6943] csw/mgar/gar/v2 Message-ID: Revision: 6943 http://gar.svn.sourceforge.net/gar/?rev=6943&view=rev Author: dmichelsen Date: 2009-10-22 15:21:34 +0000 (Thu, 22 Oct 2009) Log Message: ----------- mGAR v2: Explicitly set umask instead of pax-arg, as it bails out on symlinks Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-21 22:12:21 UTC (rev 6942) +++ csw/mgar/gar/v2/gar.mk 2009-10-22 15:21:34 UTC (rev 6943) @@ -692,14 +692,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -707,7 +707,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -715,7 +715,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -723,7 +723,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-10-21 22:12:21 UTC (rev 6942) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-10-22 15:21:34 UTC (rev 6943) @@ -547,7 +547,7 @@ if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \ echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \ ) \ - mkdir -p $(PKGROOT)$$LICENSEDIR && \ + umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ rm -f $(PKGROOT)$$LICENSEDIR/license && \ cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ fi \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:29:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6944] csw/mgar/pkg/cswpkglogger/trunk Message-ID: Revision: 6944 http://gar.svn.sourceforge.net/gar/?rev=6944&view=rev Author: bdwalton Date: 2009-10-23 00:29:08 +0000 (Fri, 23 Oct 2009) Log Message: ----------- add license, readme, tweak scripts and gar recipe Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/Makefile csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade Modified: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-22 15:21:34 UTC (rev 6943) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:08 UTC (rev 6944) @@ -6,6 +6,8 @@ define BLURB This set of hook scripts will log package maintenance actions to syslog. It is dependent on the use of a CSW package tool that is 'hook aware.' +Install, upgrade and removal actions are logged, both on success and on +failure. Currently, the default of user.notice is used. endef MASTER_SITES = @@ -20,6 +22,9 @@ include gar/category.mk +post-extract-modulated: $(WORKSRC) + cp $(FILEDIR)/gpl-3.0.txt $(WORKSRC)/COPYING + HOOKDIR=$(DESTDIR)/etc/opt/csw/pkg-hooks POSTHOOKS = postinstall postupgrade postremove PREHOOKS = preupgrade @@ -27,7 +32,7 @@ install-custom: @echo Installing CSWcswpkglogger files... - @( ginstall -m 0755 -d $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/cswpkglogger/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ Modified: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-22 15:21:34 UTC (rev 6943) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-23 00:29:08 UTC (rev 6944) @@ -7,7 +7,7 @@ VER=$2 function logdie() { - logger -t "CSW Package Logger" "$1" + logger -t "cswpkglogger" "$1" exit 0 } @@ -33,7 +33,7 @@ if [ -d /var/sadm/pkg/${PKG} ]; then SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) - pf=/var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} + pf=/var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} if [ -f ${pf} ]; then PREVVER=$(cat ${pf} 2>/dev/null) rm -f ${pf} Modified: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-22 15:21:34 UTC (rev 6943) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-23 00:29:08 UTC (rev 6944) @@ -8,4 +8,4 @@ SYSTEMVER=$(pkgparam ${PKG} VERSION) # store previous version so we can log smarter things if upgrade fails. -echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:29:50 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6945] csw/mgar/pkg/cswpkglogger/trunk Message-ID: Revision: 6945 http://gar.svn.sourceforge.net/gar/?rev=6945&view=rev Author: bdwalton Date: 2009-10-23 00:29:50 +0000 (Fri, 23 Oct 2009) Log Message: ----------- actually add files; depend on bash Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswpkglogger/trunk/files/README csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt Modified: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:08 UTC (rev 6944) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:50 UTC (rev 6945) @@ -10,6 +10,8 @@ failure. Currently, the default of user.notice is used. endef +REQUIRED_PKGS = CSWbash + MASTER_SITES = DISTFILES = Added: csw/mgar/pkg/cswpkglogger/trunk/files/README =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/README (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:29:50 UTC (rev 6945) @@ -0,0 +1,11 @@ +This small package performs logging on package maintenance actions. +It logs install, upgrade and removal actions to the user.notice +facility. Successes and failures are logged. There is no 'switch' to +disable the logging, simply remove the package that provided the hook +scripts. + +If you experience problems with this package, contact: + +Ben Walton + +These scripts are licensed under the GPL v3. Added: csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt 2009-10-23 00:29:50 UTC (rev 6945) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:39:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:39:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6946] csw/mgar/pkg/cswpkglogger/trunk Message-ID: Revision: 6946 http://gar.svn.sourceforge.net/gar/?rev=6946&view=rev Author: bdwalton Date: 2009-10-23 00:39:49 +0000 (Fri, 23 Oct 2009) Log Message: ----------- tweak and install the README Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/Makefile csw/mgar/pkg/cswpkglogger/trunk/files/README Modified: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:50 UTC (rev 6945) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:39:49 UTC (rev 6946) @@ -35,6 +35,7 @@ install-custom: @echo Installing CSWcswpkglogger files... @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/cswpkglogger/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)/opt/csw/share/doc/cswpkglogger/; \ ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ Modified: csw/mgar/pkg/cswpkglogger/trunk/files/README =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:29:50 UTC (rev 6945) +++ csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:39:49 UTC (rev 6946) @@ -1,8 +1,8 @@ This small package performs logging on package maintenance actions. It logs install, upgrade and removal actions to the user.notice -facility. Successes and failures are logged. There is no 'switch' to -disable the logging, simply remove the package that provided the hook -scripts. +facility. Successes and failures are logged. There are no options +for these scripts. They are always active. Remove the package to +disable them. If you experience problems with this package, contact: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:44:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6947] csw/mgar/pkg/cswpkglogger/trunk/files/README Message-ID: Revision: 6947 http://gar.svn.sourceforge.net/gar/?rev=6947&view=rev Author: bdwalton Date: 2009-10-23 00:44:17 +0000 (Fri, 23 Oct 2009) Log Message: ----------- tweak README Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/files/README Modified: csw/mgar/pkg/cswpkglogger/trunk/files/README =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:39:49 UTC (rev 6946) +++ csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:44:17 UTC (rev 6947) @@ -4,8 +4,13 @@ for these scripts. They are always active. Remove the package to disable them. -If you experience problems with this package, contact: +For this functionality to work, you must use a package management tool +that supports the hook functionality described at: -Ben Walton +http://wiki.opencsw.org/package-hooks +Currently, this means pkgutil v1.7 or later. + These scripts are licensed under the GPL v3. + +Ben Walton This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 12:11:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 10:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6948] csw/mgar/pkg/cups/branches/cups-1.4.0 Message-ID: Revision: 6948 http://gar.svn.sourceforge.net/gar/?rev=6948&view=rev Author: wahwah Date: 2009-10-23 10:11:21 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups-1.4.0: Solaris zone support. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-23 00:44:17 UTC (rev 6947) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-23 10:11:21 UTC (rev 6948) @@ -54,6 +54,7 @@ # PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 00:44:17 UTC (rev 6947) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 10:11:21 UTC (rev 6948) @@ -3,6 +3,7 @@ a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch 2009-10-23 10:11:21 UTC (rev 6948) @@ -0,0 +1,42 @@ +From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 23 Oct 2009 11:08:23 +0100 +Subject: [PATCH] Solaris zone support in init script + +--- + init/cups.sh.in | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/init/cups.sh.in b/init/cups.sh.in +index 2ff418c..d714b19 100755 +--- a/init/cups.sh.in ++++ b/init/cups.sh.in +@@ -148,7 +148,7 @@ case "`uname`" in + HP-UX* | AIX* | SINIX*) + pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; +- IRIX* | SunOS*) ++ IRIX*) + pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; + UnixWare*) +@@ -161,6 +161,16 @@ case "`uname`" in + Linux* | *BSD* | Darwin*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; ++ SunOS*) ++ if [ -x /usr/bin/zonename ]; then ++ zonename=`/usr/bin/zonename` ++ zoneopts="-z $zonename" ++ else ++ zoneopts= ++ fi ++ # The backslash before the ^ is important. ++ pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$` ++ ;; + *) + pid="" + ;; +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 14:22:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6949] csw/mgar/pkg/cups/branches/cups-1.4.0 Message-ID: Revision: 6949 http://gar.svn.sourceforge.net/gar/?rev=6949&view=rev Author: wahwah Date: 2009-10-23 12:22:59 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups-1.4.0: Fixed the use of PKG_INSTALL_PATH (it doesn't have a trailing slash) Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 10:11:21 UTC (rev 6948) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 12:22:59 UTC (rev 6949) @@ -4,7 +4,7 @@ bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch 44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch -dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove -dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall bc5e777d4320cecdd1a64de8035171a8 cups-1.4.0-source.tar.bz2 Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall 2009-10-23 10:11:21 UTC (rev 6948) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall 2009-10-23 12:22:59 UTC (rev 6949) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall 2009-10-23 10:11:21 UTC (rev 6948) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall 2009-10-23 12:22:59 UTC (rev 6949) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 14:36:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6950] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6950 http://gar.svn.sourceforge.net/gar/?rev=6950&view=rev Author: wahwah Date: 2009-10-23 12:36:40 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups-1.4.1: Merging fixes for the cups-polld issue. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch Property Changed: ---------------- csw/mgar/pkg/cups/branches/cups-1.4/ Property changes on: csw/mgar/pkg/cups/branches/cups-1.4 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-pbuild + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/cups/branches/cups-1.4.0:6915-6949 Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-23 12:36:40 UTC (rev 6950) @@ -21,13 +21,13 @@ # There's a problem with cups-polld going into a busy-wait loop when polling # print servers. # -# http://www.cups.org/str.php?L3257 +# http://www.cups.org/str.php?L3257 (closed) +# http://www.cups.org/str.php?L3381 (filed again) # # The problem with cups-polld seems to be going away when CUPS is compiled with # debugging symbols. The debugging options is turned on for this package, in # order to be able to debug the binary if it ever shows the problem. -# -# TODO: Check whether the issue is gone or not. + GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. @@ -52,6 +52,9 @@ PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-23 12:36:40 UTC (rev 6950) @@ -2,7 +2,10 @@ 0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch 193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall +bbf0295c76cd06b5311ac3a3467fd431 download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +0dd35cc0938696577104852781ec1df6 download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 download/0007-Solaris-zone-support-in-init-script.patch +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsd.preinstall 587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2009-10-23 12:36:40 UTC (rev 6950) @@ -0,0 +1,42 @@ +From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 21 Oct 2009 12:40:39 +0200 +Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno + +--- + cups/http.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..e255375 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int result; ++ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (result < 0 && !errno) { ++ switch (result) ++ { ++ case GNUTLS_E_INTERRUPTED : ++ errno = EINTR; ++ break; ++ case GNUTLS_E_AGAIN : ++ errno = EAGAIN; ++ break; ++ default : ++ errno = EPIPE; ++ break; ++ } ++ result = -1; ++ } ++ return result; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-23 12:36:40 UTC (rev 6950) @@ -0,0 +1,25 @@ +From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 13:35:40 +0200 +Subject: [PATCH] Fail compilation if no SSL impl chosen + +--- + cups/http.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 8b767c9..840e3fc 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + } + + return (result); ++# else ++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set." + # endif /* HAVE_LIBSSL */ + } + #endif /* HAVE_SSL */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch 2009-10-23 12:36:40 UTC (rev 6950) @@ -0,0 +1,42 @@ +From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 23 Oct 2009 11:08:23 +0100 +Subject: [PATCH] Solaris zone support in init script + +--- + init/cups.sh.in | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/init/cups.sh.in b/init/cups.sh.in +index 2ff418c..d714b19 100755 +--- a/init/cups.sh.in ++++ b/init/cups.sh.in +@@ -148,7 +148,7 @@ case "`uname`" in + HP-UX* | AIX* | SINIX*) + pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; +- IRIX* | SunOS*) ++ IRIX*) + pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; + UnixWare*) +@@ -161,6 +161,16 @@ case "`uname`" in + Linux* | *BSD* | Darwin*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; ++ SunOS*) ++ if [ -x /usr/bin/zonename ]; then ++ zonename=`/usr/bin/zonename` ++ zoneopts="-z $zonename" ++ else ++ zoneopts= ++ fi ++ # The backslash before the ^ is important. ++ pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$` ++ ;; + *) + pid="" + ;; +-- +1.6.3.2 + Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-10-23 12:36:40 UTC (rev 6950) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-10-23 12:36:40 UTC (rev 6950) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 23 14:49:49 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:49:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6951] csw/mgar/pkg/cpan/HTML-Parser/trunk Message-ID: Revision: 6951 http://gar.svn.sourceforge.net/gar/?rev=6951&view=rev Author: bonivart Date: 2009-10-23 12:49:49 +0000 (Fri, 23 Oct 2009) Log Message: ----------- html::parser: update to 3.63 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2009-10-23 12:36:40 UTC (rev 6950) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2009-10-23 12:49:49 UTC (rev 6951) @@ -1,5 +1,5 @@ GARNAME = HTML-Parser -GARVERSION = 3.61 +GARVERSION = 3.63 CATEGORIES = cpan AUTHOR = GAAS Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2009-10-23 12:36:40 UTC (rev 6950) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2009-10-23 12:49:49 UTC (rev 6951) @@ -1,2 +1,2 @@ -f130661b0b1fe17619c2b60b729ebd39 download/COPYING -098d9551721d29d55a0a4ad83a3ebef5 download/HTML-Parser-3.61.tar.gz +f130661b0b1fe17619c2b60b729ebd39 COPYING +64d1d54411ea71f89c3bab23bfd14abc HTML-Parser-3.63.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 14:50:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:50:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6952] csw/mgar/pkg/cups/trunk Message-ID: Revision: 6952 http://gar.svn.sourceforge.net/gar/?rev=6952&view=rev Author: wahwah Date: 2009-10-23 12:50:35 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups: Merging version 1.4.1 into trunk Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall Removed Paths: ------------- csw/mgar/pkg/cups/trunk/files/CSWcups.depend csw/mgar/pkg/cups/trunk/files/CSWcups.gspec csw/mgar/pkg/cups/trunk/files/CSWcups.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsdev.depend csw/mgar/pkg/cups/trunk/files/CSWcupsdev.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsdev.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsdoc.depend csw/mgar/pkg/cups/trunk/files/CSWcupsdoc.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsdoc.prototype csw/mgar/pkg/cups/trunk/files/CSWlibcups.depend csw/mgar/pkg/cups/trunk/files/CSWlibcups.gspec csw/mgar/pkg/cups/trunk/files/CSWlibcups.prototype csw/mgar/pkg/cups/trunk/files/Makedefs.in.patch csw/mgar/pkg/cups/trunk/files/checkinstall csw/mgar/pkg/cups/trunk/files/create_rc.d.sh csw/mgar/pkg/cups/trunk/files/cswcups csw/mgar/pkg/cups/trunk/files/cups.xml csw/mgar/pkg/cups/trunk/files/i.smfno csw/mgar/pkg/cups/trunk/files/i.smfyes csw/mgar/pkg/cups/trunk/files/space Property Changed: ---------------- csw/mgar/pkg/cups/trunk/ csw/mgar/pkg/cups/trunk/Makefile Property changes on: csw/mgar/pkg/cups/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/cups/branches/cups-1.4:6190-6950 /csw/mgar/pkg/cups/branches/cups-1.4.0:6915-6949 /csw/mgar/pkg/cups/branches/cups-with-classutils:5613-6189 Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +1,9 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = cups -GARVERSION = 1.3.11 +GARVERSION = 1.4.1 CATEGORIES = net define BLURB @@ -7,41 +11,159 @@ systems. It is developed and maintained by Easy Software Products to promote a standard printing solution and is the standard printing system in MacOS(R) X and most Linux(R) distributions. + + http://www.cups.org/str.php?L3324 endef +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +# There's a problem with cups-polld going into a busy-wait loop when polling +# print servers. +# +# http://www.cups.org/str.php?L3257 (closed) +# http://www.cups.org/str.php?L3381 (filed again) +# +# The problem with cups-polld seems to be going away when CUPS is compiled with +# debugging symbols. The debugging options is turned on for this package, in +# order to be able to debug the binary if it ever shows the problem. + +GARFLAVOR = DBG + # These are the source mirrors published on the CUPS home-page. -CUPS_MIRRORS = http://ftp.easysw.com/pub +CUPS_MIRRORS = http://ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp2.easysw.com/pub CUPS_MIRRORS += ftp://ftp3.easysw.com/pub CUPS_MIRRORS += http://www.nu6.org/_/mirror/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub + # Complete the mirror paths by adding /cups/x.y.z/ at the end. -FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) +FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -DISTFILES = cups-$(GARVERSION)-source.tar.bz2 -DISTFILES += $(call admfiles,CSWlibcups,depend prototype) -DISTFILES += $(call admfiles,CSWcupsd,depend prototype postinstall preremove \ - postremove) -DISTFILES += $(call admfiles,CSWcupsclient,depend prototype) -DISTFILES += $(call admfiles,CSWcupsdoc,depend prototype) -DISTFILES += $(call admfiles,CSWcupsdev,depend prototype) -DISTFILES += $(call admfiles,CSWcups,depend prototype) +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 +DISTFILES += CSWcupsclient.preinstall +DISTFILES += CSWcupsd.preinstall +DISTFILES += CSWcupsd.postremove -DISTFILES += i.smfyes i.smfno space checkinstall +PATCHFILES = 0001-cswcups-for-service-name.patch +PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch +PATCHFILES += 0003-Reference-counting-for-printers-only.patch +PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch -REQUIRED_PKGS = CSWkrb5lib CSWosslrt -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWoldapdevel +PREREQUISITE_PKGS = CSWggettext +PREREQUISITE_PKGS += CSWjpeg +PREREQUISITE_PKGS += CSWkrb5libdev +PREREQUISITE_PKGS += CSWoldapdevel +PREREQUISITE_PKGS += CSWossldevel +PREREQUISITE_PKGS += CSWtiff +PREREQUISITE_PKGS += CSWzlib +PREREQUISITE_PKGS += SUNWhea +PREREQUISITE_PKGS += SUNWlibm +PREREQUISITE_PKGS += SUNWslpu -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 +SPKG_CLASSES = none cswcpsampleconf cswinitsmf + +PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups + +ARCHALL_CSWcupsdoc = 1 +ARCHALL_CSWcupsdev = 1 + +REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient +REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 +REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc +REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt +REQUIRED_PKGS_CSWcupsdoc = CSWcswclassutils +REQUIRED_PKGS_CSWcupsdev = CSWcswclassutils +REQUIRED_PKGS_CSWlibcups = CSWcswclassutils CSWjpeg CSWpng CSWtiff CSWzlib +REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt + +PKGFILES_CSWlibcups = $(libdir)/libcups.* + +PKGFILES_CSWcupsdoc = $(datadir)/doc +PKGFILES_CSWcupsdoc += $(datadir)/doc/.* +PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* + +PKGFILES_CSWcupsdev = $(includedir)/cups/?.* +PKGFILES_CSWcupsdev += $(mandir)/man1/cups-config.1 +PKGFILES_CSWcupsdev += $(bindir)/cups-config +PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* +PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* + +PKGFILES_CSWcupsd = $(sysconfdir)/.* +PKGFILES_CSWcupsd += $(mandir)/man1m +PKGFILES_CSWcupsd += $(mandir)/man1m/cups(filter|d|-polld|-deviced|-driverd|-lpd).* +PKGFILES_CSWcupsd += $(mandir)/man7/(backend|filter).7 +PKGFILES_CSWcupsd += $(mandir)/man5/(cups-snmp.conf|subscriptions.conf).5 +PKGFILES_CSWcupsd += $(mandir)/man5/(mime.convs|classes.conf|cupsd.conf).5 +PKGFILES_CSWcupsd += $(mandir)/man5/(mime.types|printers.conf|mailto.conf).5 +PKGFILES_CSWcupsd += $(datadir)/cups +PKGFILES_CSWcupsd += $(datadir)/cups/(fonts|templates|charmaps|model).* +PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).* +PKGFILES_CSWcupsd += $(datadir)/locale/.* +PKGFILES_CSWcupsd += $(datadir)/applications/.* +PKGFILES_CSWcupsd += $(datadir)/cups/mime.* +PKGFILES_CSWcupsd += $(datadir)/icons.* +PKGFILES_CSWcupsd += $(libdir)/cups/.* +PKGFILES_CSWcupsd += $(libdir)/svc/.* +PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po) +PKGFILES_CSWcupsd += $(sbindir)/(cupsfilter|cupsd) +PKGFILES_CSWcupsd += $(localstatedir)/.* + +PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) +PKGFILES_CSWcupsclient += $(sbindir)/cups(accept|reject) +PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move)) +PKGFILES_CSWcupsclient += $(bindir)/(cancel|cupstest(dsc|ppd)) +PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat)) +PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1 +PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 +PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1 +PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1 +PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups|)(accept|reject)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(en|dis)able\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(addsmb|ctl)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/lp(admin|c|info|move)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 +PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 +PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 + +SPKG_DESC_CSWcups = Common Unix Printing System +SPKG_DESC_CSWlibcups = CUPS libraries +SPKG_DESC_CSWcupsd = CUPS daemon +SPKG_DESC_CSWcupsclient = CUPS client binaries +SPKG_DESC_CSWcupsdoc = CUPS documentation +SPKG_DESC_CSWcupsdev = CUPS header files + +# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html +SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW +INITSMF = $(sysconfdir)/init\.d/cswcups + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib -CONFIGURE_ARGS = $(DIRPATHS) --enable-pdftops +CONFIGURE_ARGS = $(DIRPATHS) --enable-pdftops +CONFIGURE_ARGS += --with-menudir=$(datadir)/applications +CONFIGURE_ARGS += --localedir=$(datadir)/locale +CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) +CONFIGURE_ARGS += --with-icondir=$(datadir)/icons +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --enable-debug-guards +CONFIGURE_ARGS_DBG += --enable-debug-printfs + +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + + # This is a hack that's needed, because configure (Makedefs) will otherwise # plase -ltiff, etc. first and -L/opt/csw/lib afterwards, thus being unable # to find any of the image libraries. @@ -56,54 +178,27 @@ export DSTROOT # Don't run tests (at least for now); there are some LD_LIBRARY_PATH issues -TEST_TARGET = +TEST_TARGET = SPKG_SOURCEURL = http://www.cups.org/ -include gar/category.mk - PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups -post-configure: - (test -d $(PRIVATE_CUPS_INC) || mkdir -p $(PRIVATE_CUPS_INC); \ - cd $(WORKSRC)/cups; \ - cp -p adminutil.h array.h cups.h dir.h file.h http.h i18n.h ipp.h \ - language.h md5.h ppd.h transcode.h $(PRIVATE_CUPS_INC); \ - cd ../filter; \ - cp -p image.h raster.h $(PRIVATE_CUPS_INC)) +# CUPS uses the 'OPTIM' variable to set the optimization flags. +OPTIM_DBG = -g -xO0 +OPTIM = $(OPTIM_$(GARFLAVOR)) +export OPTIM -post-install: - (test -d $(DESTDIR)$(prefix)/share || \ - mkdir $(DESTDIR)$(prefix)/share; \ - cd $(DESTDIR)$(prefix)/share; \ - if [ ! -d locale ]; then \ - test -d ../lib/locale && mv ../lib/locale .; \ - cd locale; \ - for i in *; do \ - echo "Processing $$i..."; \ - cd $$i; \ - mkdir LC_MESSAGES; \ - mv cups*.po LC_MESSAGES; \ - cd ..; \ - done \ - fi) - (cd $(DESTDIR); \ - if [ -d usr/share ]; then \ - cd usr/share; \ - gtar cf - * | gtar xf - -C ./$(prefix)/share; \ - cd ../..; \ - rm -rf usr/share; \ - fi) - (cd $(DESTDIR)$(prefix)/etc/cups; \ +include gar/category.mk + +post-install-modulated: + (cd $(DESTDIR)$(sysconfdir)/cups; \ + echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ for i in cupsd.conf; do \ if [ -r "$$i" ]; then \ echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ + mv "$$i" "$$i.CSW"; \ + chmod 0644 "$$i.CSW"; \ fi \ done) - files/create_rc.d.sh $(DESTDIR) - mkdir -p $(DESTDIR)$(prefix)/var/svc/manifest/application/print - cp -p files/cups.xml $(DESTDIR)$(prefix)/var/svc/manifest/application/print - mkdir -p $(DESTDIR)$(prefix)/lib/svc/method - cp -p files/cswcups \ - $(DESTDIR)$(prefix)/lib/svc/method/svc-cups + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/cups/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/checksums 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,30 +1,11 @@ -7f65bae0054cd8335824942595d867ef download/cups-1.2.3-source.tar.bz2 -528650aba3b56541f75370ef09541850 download/cups-1.2.4-source.tar.bz2 -bf44783d9b46130bee9f2995e6055470 download/cups-1.2.7-source.tar.bz2 -cf63f451c356e6cabb08972d4d11c365 download/cups-1.3.9-source.tar.bz2 -2d4c205b6bf46118e5729f297f6c86f4 download/CSWlibcups.gspec -b935020156288e961d4616b67ed6282f download/CSWlibcups.depend -8d0be59e5a223ee3f393dd7428b361f7 download/CSWlibcups.prototype -6754b7828a6689c73f88a725e530ecad download/CSWcupsd.gspec -cb99c644910343ca3a15f602207542c4 download/CSWcupsd.depend -6a2cdf81c09ebd10a5aad39007a379a9 download/CSWcupsd.prototype -983e667bd1e48083d53f1a81ac0a532b download/CSWcupsd.postinstall -088e288b9d1df2ae98a95ba8aeed0fc9 download/CSWcupsd.preremove -76fde99d51b374ae83bfafd2434654fe download/CSWcupsd.postremove -1d70187f4b8b2e9198112a4a46df8ec8 download/CSWcupsclient.gspec -887ada7324b06e36e6e85a15928a5dd2 download/CSWcupsclient.depend -cb019efac2edf3bbcb995535abc02126 download/CSWcupsclient.prototype -36fa60a8b6f50bed29e1cedcb614635a download/CSWcupsdoc.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWcupsdoc.depend -9034bf572363d3448c3a162b8412178f download/CSWcupsdoc.prototype -b48a4b028e872afd97fcbc978f475a5c download/CSWcupsdev.gspec -51ec8b485aa9cb40f94ab748cfe6e039 download/CSWcupsdev.depend -237928d30262573d3c37bebbffe6bb61 download/CSWcupsdev.prototype -a9639c24fb955bb3b56991e0e5b55fd7 download/CSWcups.gspec -c43f5fba2adc1d80c36d25e6772cd809 download/CSWcups.depend -d41d8cd98f00b204e9800998ecf8427e download/CSWcups.prototype -867f8d3ecf9dbd00e75ef2f9929ac827 download/i.smfyes -023011fb893a6c7c65a596559a3bc3e9 download/i.smfno -f49c3339aa897df97abf1baf54582fb8 download/space -fab3f277553e2df50af55dfa29109c02 download/checkinstall -fb8245ae67c27d343009536858d97a48 download/Makedefs.in.patch +1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch +0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch +a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch +193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +bbf0295c76cd06b5311ac3a3467fd431 download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +0dd35cc0938696577104852781ec1df6 download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 download/0007-Solaris-zone-support-in-init-script.patch +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsclient.preinstall +ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsd.preinstall +587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 Copied: csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,72 @@ +From 7ef5a09e7257782a5f8b4d9bcf681a399ef82996 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 16:41:17 +0100 +Subject: [PATCH 1/3] cswcups for service name + +--- + Makefile | 12 ++++++------ + locale/Makefile | 3 ++- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 91be6e5..a1ff6f8 100644 +--- a/Makefile ++++ b/Makefile +@@ -178,18 +178,18 @@ install-data: + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + for level in $(RCLEVELS); do \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ + if test `uname` = HP-UX; then \ + level=`expr $$level - 1`; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ + fi; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ + done; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +@@ -227,7 +227,7 @@ install-data: + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test "x$(MENUDIR)" != x; then \ +- echo Installing desktop menu...; \ ++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ + fi +@@ -290,7 +290,7 @@ uninstall: + -$(RMDIR) $(BINDIR) + echo Uninstalling startup script... + if test "x$(INITDIR)" != x; then \ +- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ + $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +diff --git a/locale/Makefile b/locale/Makefile +index 6241b66..f76b8bc 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -75,7 +75,8 @@ install-languages: + for loc in $(LANGUAGES) ; do \ + if test -f cups_$$loc.po; then \ + $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ +- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ ++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ ++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ + fi ; \ + done + +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,24 @@ +From ee9340922a5a998e05b2ec123233f2bbf57a84a3 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:33:00 +0100 +Subject: [PATCH 2/3] Adding the refcount member to mime_type_t + +--- + scheduler/mime.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.h b/scheduler/mime.h +index 0194964..4bd64c2 100644 +--- a/scheduler/mime.h ++++ b/scheduler/mime.h +@@ -85,6 +85,7 @@ typedef struct _mime_magic_s /**** MIME Magic Data ****/ + + typedef struct _mime_type_s /**** MIME Type Data ****/ + { ++ int refcount; /* To allow sharing of this struct */ + mime_magic_t *rules; /* Rules used to detect this type */ + int priority; /* Priority of this type */ + char super[MIME_MAX_SUPER], /* Super-type name ("image", "application", etc.) */ +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,56 @@ +From b22d9f6339a2d367dd5493f8fb0e06041b26d80a Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:52:18 +0100 +Subject: [PATCH 3/3] Reference counting for printers only. + +--- + scheduler/mime.c | 7 +++++++ + scheduler/printers.c | 1 + + scheduler/type.c | 1 + + 3 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.c b/scheduler/mime.c +index 890f2ea..1cabf64 100644 +--- a/scheduler/mime.c ++++ b/scheduler/mime.c +@@ -156,6 +156,13 @@ mimeDeleteType(mime_t *mime, /* I - MIME database */ + if (!mime || !mt) + return; + ++ mt->refcount--; ++ if (mt->refcount) { ++ /* ++ * Other references to this instance exist, not removing. ++ */ ++ return; ++ } + cupsArrayRemove(mime->types, mt); + + delete_rules(mt->rules); +diff --git a/scheduler/printers.c b/scheduler/printers.c +index 1430946..629b86d 100644 +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -127,6 +127,7 @@ cupsdAddPrinter(const char *name) /* I - Name of printer */ + p->accepting = 0; + p->shared = DefaultShared; + p->filetype = mimeAddType(MimeDatabase, "printer", name); ++ p->filetype->refcount++; + + cupsdSetString(&p->job_sheets[0], "none"); + cupsdSetString(&p->job_sheets[1], "none"); +diff --git a/scheduler/type.c b/scheduler/type.c +index 6443506..faf4381 100644 +--- a/scheduler/type.c ++++ b/scheduler/type.c +@@ -124,6 +124,7 @@ mimeAddType(mime_t *mime, /* I - MIME database */ + strlen(type) + 1)) == NULL) + return (NULL); + ++ temp->refcount = 0; /* Callers are responsible for incrementing the counter */ + strlcpy(temp->super, super, sizeof(temp->super)); + strcpy(temp->type, type); /* Safe: temp->type is allocated */ + temp->priority = 100; +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,25 @@ +From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 19 Oct 2009 13:22:37 +0100 +Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332 + +--- + backend/usb-unix.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/backend/usb-unix.c b/backend/usb-unix.c +index c749253..8ce92b9 100644 +--- a/backend/usb-unix.c ++++ b/backend/usb-unix.c +@@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ + * 'side_cb()' - Handle side-channel requests... + */ + +-static void ++static int /* O - 0 on success, -1 on error */ + side_cb(int print_fd, /* I - Print file */ + int device_fd, /* I - Device file */ + int snmp_fd, /* I - SNMP socket (unused) */ +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,42 @@ +From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 21 Oct 2009 12:40:39 +0200 +Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno + +--- + cups/http.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..e255375 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int result; ++ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (result < 0 && !errno) { ++ switch (result) ++ { ++ case GNUTLS_E_INTERRUPTED : ++ errno = EINTR; ++ break; ++ case GNUTLS_E_AGAIN : ++ errno = EAGAIN; ++ break; ++ default : ++ errno = EPIPE; ++ break; ++ } ++ result = -1; ++ } ++ return result; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,25 @@ +From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 13:35:40 +0200 +Subject: [PATCH] Fail compilation if no SSL impl chosen + +--- + cups/http.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 8b767c9..840e3fc 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + } + + return (result); ++# else ++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set." + # endif /* HAVE_LIBSSL */ + } + #endif /* HAVE_SSL */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,42 @@ +From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 23 Oct 2009 11:08:23 +0100 +Subject: [PATCH] Solaris zone support in init script + +--- + init/cups.sh.in | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/init/cups.sh.in b/init/cups.sh.in +index 2ff418c..d714b19 100755 +--- a/init/cups.sh.in ++++ b/init/cups.sh.in +@@ -148,7 +148,7 @@ case "`uname`" in + HP-UX* | AIX* | SINIX*) + pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; +- IRIX* | SunOS*) ++ IRIX*) + pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; + UnixWare*) +@@ -161,6 +161,16 @@ case "`uname`" in + Linux* | *BSD* | Darwin*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; ++ SunOS*) ++ if [ -x /usr/bin/zonename ]; then ++ zonename=`/usr/bin/zonename` ++ zoneopts="-z $zonename" ++ else ++ zoneopts= ++ fi ++ # The backslash before the ^ is important. ++ pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$` ++ ;; + *) + pid="" + ;; +-- +1.6.3.2 + Deleted: csw/mgar/pkg/cups/trunk/files/CSWcups.depend =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcups.depend 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcups.depend 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -P CSWlibcups Libraries for the Common UNIX Printing System -P CSWcupsclient Client portion of the Common UNIX Printing System -P CSWcupsd Server portion of the Common UNIX Printing System -P CSWcupsdev Development files for the Common UNIX Printing System -P CSWcupsdoc Documentation for the Common UNIX Printing System Deleted: csw/mgar/pkg/cups/trunk/files/CSWcups.gspec =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcups.gspec 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcups.gspec 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,6 +0,0 @@ -%var bitname cups -%var pkgname CSWcups -%var arch all -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%var desc The Common UNIX Printing System -#%copyright url file://%{WORKSRC}/LICENSE.txt Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -P CSWlibcups libcups - Libraries for the Common UNIX Printing System -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWgnutls gnutls - GNU Transport Layer Security lib and tools -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -%var bitname cupsclient -%var pkgname CSWcupsclient -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%var desc Client portion of the Common UNIX Printing System -%copyright url file://%{WORKSRC}/LICENSE.txt Copied: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall) =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall (rev 0) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,45 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,52 +0,0 @@ -d none /opt/csw 0755 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/cupstestdsc 0755 root bin -f none /opt/csw/bin/lpr 0755 root bin -f none /opt/csw/bin/lpq 0755 root bin -f none /opt/csw/bin/cancel 0755 root bin -f none /opt/csw/bin/lprm 0755 root bin -f none /opt/csw/bin/lppasswd 0755 root bin -f none /opt/csw/bin/lp 0755 root bin -f none /opt/csw/bin/lpoptions 0755 root bin -f none /opt/csw/bin/cupstestppd 0755 root bin -f none /opt/csw/bin/lpstat 0755 root bin -d none /opt/csw/sbin 0755 root bin -s none /opt/csw/sbin/cupsdisable=accept -s none /opt/csw/sbin/cupsenable=accept -f none /opt/csw/sbin/cupsaddsmb 0755 root bin -s none /opt/csw/sbin/reject=accept -f none /opt/csw/sbin/lpadmin 0755 root bin -f none /opt/csw/sbin/lpinfo 0755 root bin -f none /opt/csw/sbin/cupsctl 0755 root bin -f none /opt/csw/sbin/accept 0755 root bin -f none /opt/csw/sbin/lpmove 0755 root bin -f none /opt/csw/sbin/lpc 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/lpstat.1 0644 root bin -f none /opt/csw/share/man/man1/cupstestdsc.1 0644 root bin -f none /opt/csw/share/man/man1/cancel.1 0644 root bin -f none /opt/csw/share/man/man1/lpq.1 0644 root bin -f none /opt/csw/share/man/man1/cupstestppd.1 0644 root bin -f none /opt/csw/share/man/man1/lp.1 0644 root bin -f none /opt/csw/share/man/man1/lppasswd.1 0644 root bin -f none /opt/csw/share/man/man1/lpoptions.1 0644 root bin -f none /opt/csw/share/man/man1/lpr.1 0644 root bin -f none /opt/csw/share/man/man1/lprm.1 0644 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/lpinfo.1m 0644 root bin -f none /opt/csw/share/man/man1m/accept.1m 0644 root bin -f none /opt/csw/share/man/man1m/cupsctl.1m 0644 root bin -s none /opt/csw/share/man/man1m/reject.1m=accept.1m -f none /opt/csw/share/man/man1m/cupsenable.1m 0644 root bin -f none /opt/csw/share/man/man1m/lpc.1m 0644 root bin -f none /opt/csw/share/man/man1m/cupsaddsmb.1m 0644 root bin -f none /opt/csw/share/man/man1m/lpadmin.1m 0644 root bin -s none /opt/csw/share/man/man1m/cupsdisable.1m=cupsenable.1m -f none /opt/csw/share/man/man1m/lpmove.1m 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/client.conf.5 0644 root bin -i copyright=CSWcupsclient.copyright -i depend=CSWcupsclient.depend -i pkginfo=CSWcupsclient.pkginfo Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,7 +0,0 @@ -P CSWlibcups libcups - Libraries for the Common UNIX Printing System -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWgnutls gnutls - GNU Transport Layer Security lib and tools -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWzlib zlib - Zlib Data Compression Library -P CSWoldaprt OpenLDAP runtime libraries (oldaprt) -P CSWkrb5lib MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -%var bitname cupsd -%var pkgname CSWcupsd -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%var desc Server portion of the Common UNIX Printing System -%copyright url file://%{WORKSRC}/LICENSE.txt Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,62 +0,0 @@ -#!/sbin/sh - -CONFDIR=$BASEDIR/opt/csw/etc/cups -CONFFILES="cupsd.conf classes.conf client.conf printers.conf mime.convs \ - mime.types" -PATH=/bin:/usr/bin:"$PATH" -export PATH - -class=smfno -test -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm && class=smfyes - -# stop cups, but ONLY if we are doing a "direct" -# install, rather than a jumpstart install or something. -case "$PKG_ROOT_DIR" in - ""|"/") - if [ "$smf" = "yes" ]; then - /usr/sbin/svcadm disable -s svc:application/print/cswcups:default - /usr/sbin/svccfg delete svc:application/print/cswcups:default - else - test -x $BASEDIR/etc/init.d/cswcups && $BASEDIR/etc/init.d/cswcups stop - fi - ;; -esac - - -### Set up config-file related stuff - -for file in $CONFFILES; do - confpath="$CONFDIR/$file" - if [ -r "$confpath" ]; then - echo "Not touching existing $confpath" - else - if [ -r "$confpath.CSW" ]; then - echo "Copying $confpath.CSW to $confpath" - cp -p "$confpath.CSW" "$confpath" - else - echo "Skipping $confpath.CSW..." - fi - fi -done - -# start cups, but ONLY if we are doing a "direct" -# install, rather than a jumpstart install or something. -case "$PKG_ROOT_DIR" in - ""|"/") - if [ "$class" = "smfno" ]; then - if [ -f $BASEDIR/etc/init.d/cswcups ]; then - $BASEDIR/etc/init.d/cswcups start - echo "If you do *NOT* want to start cupsd during system-boot" - echo " rm $CONFDIR/cupsd.conf" - echo "or" - echo " mv $CONFDIR/cupsd.conf $CONFDIR/cupsd.conf.OFF" - fi - else - echo "Registering CUPS with SMF..." - /usr/sbin/svccfg import $BASEDIR/opt/csw/var/svc/manifest/application/print/cups.xml - /usr/sbin/svcadm enable svc:application/print/cswcups - fi - ;; -esac - -exit 0 Modified: csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,6 +1,6 @@ #!/sbin/sh -etccups=${BASEDIR}opt/csw/etc/cups +etccups=${BASEDIR}/etc/opt/csw/cups if [ -d "$etccups" ]; then echo "" Copied: csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall) =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall (rev 0) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,45 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,38 +0,0 @@ -#!/sbin/sh - -CONFDIR=$BASEDIR/opt/csw/etc/cups -CONFFILES="classes.conf client.conf cupsd.conf printers.conf mime.convs \ - mime.types" - -PATH=/bin:/usr/bin:"$PATH" -export PATH - -smf=no -test -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm && smf=yes - -# stop cups, but ONLY if we are doing a "direct" -# install, rather than a jumpstart install or something. -case "$PKG_ROOT_DIR" in - ""|"/") - if [ "$smf" = "yes" ]; then - echo "Stopping and deregistering CUPS..." - /usr/sbin/svcadm disable -s svc:application/print/cswcups:default - /usr/sbin/svccfg delete svc:application/print/cswcups:default - else - echo "Stopping CUPS..." - test -x $BASEDIR/etc/init.d/cswcups && $BASEDIR/etc/init.d/cswcups stop - fi - ;; -esac - -for file in $CONFFILES; do - confpath="$CONFDIR/$file" - test -r "$confpath.CSW" || continue - diff "$confpath" "$confpath.CSW" >/dev/null 2>&1 - if [ $? != 0 ]; then - echo "Not touching modified $confpath" - else - echo "Removing unmodified $confpath" - rm -f "$confpath" - fi -done Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,1035 +0,0 @@ -d smfno /etc 0755 root bin -d smfno /etc/init.d 0755 root bin -f smfno /etc/init.d/cswcups 0755 root sys -d smfno /etc/rc0.d 0755 root bin -s smfno /etc/rc0.d/K00cswcups=../init.d/cswcups -d smfno /etc/rc2.d 0755 root bin -s smfno /etc/rc2.d/K00cswcups=../init.d/cswcups -d smfno /etc/rc3.d 0755 root bin -s smfno /etc/rc3.d/S99cswcups=../init.d/cswcups -d smfno /etc/rcS.d 0755 root bin -s smfno /etc/rcS.d/K00cswcups=../init.d/cswcups -d smfno /etc/rc1.d 0755 root bin -s smfno /etc/rc1.d/K00cswcups=../init.d/cswcups -d smfyes /opt/csw/lib/svc 0755 root bin -d smfyes /opt/csw/lib/svc/method 0755 root bin -f smfyes /opt/csw/lib/svc/method/svc-cups 0755 root bin -d smfyes /opt/csw/var/svc 0755 root bin -d smfyes /opt/csw/var/svc/manifest 0755 root bin -d smfyes /opt/csw/var/svc/manifest/application 0755 root bin -d smfyes /opt/csw/var/svc/manifest/application/print 0755 root bin -f smfyes /opt/csw/var/svc/manifest/application/print/cups.xml 0644 root bin -d none /opt/csw 0755 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/cups 0755 root lp -d none /opt/csw/etc/cups/ssl 0700 root sys -f none /opt/csw/etc/cups/cupsd.conf.CSW 0640 root sys -d none /opt/csw/etc/cups/ppd 0755 root lp -f none /opt/csw/etc/cups/cupsd.conf.default 0640 root sys -f none /opt/csw/etc/cups/mime.convs 0644 root sys -f none /opt/csw/etc/cups/mime.types 0644 root sys -f none /opt/csw/etc/cups/snmp.conf 0640 root sys -d none /opt/csw/etc/cups/interfaces 0755 root sys -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/cupsfilter.1m 0644 root bin -f none /opt/csw/share/man/man1m/cupsd.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-polld.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-deviced.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-driverd.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-lpd.1m 0644 root bin -d none /opt/csw/share/man/man7 0755 root bin -f none /opt/csw/share/man/man7/backend.7 0644 root bin -f none /opt/csw/share/man/man7/filter.7 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/cups-snmp.conf.5 0644 root bin -f none /opt/csw/share/man/man5/subscriptions.conf.5 0644 root bin -f none /opt/csw/share/man/man5/mime.convs.5 0644 root bin -f none /opt/csw/share/man/man5/classes.conf.5 0644 root bin -f none /opt/csw/share/man/man5/cupsd.conf.5 0644 root bin -f none /opt/csw/share/man/man5/mime.types.5 0644 root bin -f none /opt/csw/share/man/man5/printers.conf.5 0644 root bin -f none /opt/csw/share/man/man5/mailto.conf.5 0644 root bin -d none /opt/csw/share/cups 0755 root bin -d none /opt/csw/share/cups/fonts 0755 root bin -f none /opt/csw/share/cups/fonts/Courier-Bold 0644 root bin -f none /opt/csw/share/cups/fonts/Courier-BoldOblique 0644 root bin -f none /opt/csw/share/cups/fonts/Symbol 0644 root bin -f none /opt/csw/share/cups/fonts/Courier 0644 root bin -f none /opt/csw/share/cups/fonts/Courier-Oblique 0644 root bin -d none /opt/csw/share/cups/templates 0755 root bin -f none /opt/csw/share/cups/templates/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-model.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/et 0755 root bin -f none /opt/csw/share/cups/templates/et/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printers.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/pl 0755 root bin -f none /opt/csw/share/cups/templates/pl/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-modified.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/es 0755 root bin -f none /opt/csw/share/cups/templates/es/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-device.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/he 0755 root bin -f none /opt/csw/share/cups/templates/he/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/test-page.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/fr 0755 root bin -f none /opt/csw/share/cups/templates/fr/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-uri.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/zh_TW 0755 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/set-printer-options-trailer.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/de 0755 root bin -f none /opt/csw/share/cups/templates/de/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/modify-class.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/ja 0755 root bin -f none /opt/csw/share/cups/templates/ja/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/error-op.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/sv 0755 root bin -f none /opt/csw/share/cups/templates/sv/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pager.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/id 0755 root bin -f none /opt/csw/share/cups/templates/id/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-boolean.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/it 0755 root bin -f none /opt/csw/share/cups/templates/it/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printers-header.tmpl 0644 root bin -d none /opt/csw/share/cups/charmaps 0755 root bin -f none /opt/csw/share/cups/charmaps/windows-1258.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/iso-8859-16.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/windows-1251.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/windows-1256.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/iso-8859-11.txt 0644 root bin @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 15:04:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:04:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6953] csw/mgar/pkg/cups/branches/cups-1.4/ Message-ID: Revision: 6953 http://gar.svn.sourceforge.net/gar/?rev=6953&view=rev Author: wahwah Date: 2009-10-23 13:04:04 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups: removing branch 1.4 Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 15:14:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6954] csw/mgar/pkg Message-ID: Revision: 6954 http://gar.svn.sourceforge.net/gar/?rev=6954&view=rev Author: bdwalton Date: 2009-10-23 13:14:58 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cswpkgsyslog: rename from cswpkglogger Added Paths: ----------- csw/mgar/pkg/cswpkgsyslog/ Removed Paths: ------------- csw/mgar/pkg/cswpkglogger/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 15:20:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:20:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6955] csw/mgar/pkg/cswpkgsyslog/trunk Message-ID: Revision: 6955 http://gar.svn.sourceforge.net/gar/?rev=6955&view=rev Author: bdwalton Date: 2009-10-23 13:20:00 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cswpkgsyslog: update scripts and gar recipe for new name Modified Paths: -------------- csw/mgar/pkg/cswpkgsyslog/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade Removed Paths: ------------- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade Modified: csw/mgar/pkg/cswpkgsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/Makefile 2009-10-23 13:14:58 UTC (rev 6954) +++ csw/mgar/pkg/cswpkgsyslog/trunk/Makefile 2009-10-23 13:20:00 UTC (rev 6955) @@ -1,4 +1,4 @@ -GARNAME = cswpkglogger +GARNAME = cswpkgsyslog GARVERSION = 1.0 CATEGORIES = utils @@ -33,10 +33,10 @@ HOOKS = $(PREHOOKS) $(POSTHOOKS) install-custom: - @echo Installing CSWcswpkglogger files... - @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/cswpkglogger/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ - ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)/opt/csw/share/doc/cswpkglogger/; \ - ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ - ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ - ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ - ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-preupgrade $(HOOKDIR)/preupgrade.d/;) + @echo Installing CSW$(GARNAME) files... + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/; \ + ginstall -m 0755 $(FILEDIR)/01-CSW$(GARNAME)-postupgrade $(HOOKDIR)/postupgrade.d/; \ + ln $(HOOKDIR)/postupgrade.d/01-CSW$(GARNAME)-postupgrade $(HOOKDIR)/postinstall.d/01-CSW$(GARNAME)-postinstall; \ + ln $(HOOKDIR)/postupgrade.d/01-CSW$(GARNAME)-postupgrade $(HOOKDIR)/postremove.d/01-CSW$(GARNAME)-postremove; \ + ginstall -m 0755 $(FILEDIR)/01-CSW$(GARNAME)-preupgrade $(HOOKDIR)/preupgrade.d/;) Deleted: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-23 13:14:58 UTC (rev 6954) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -1,62 +0,0 @@ -#!/opt/csw/bin/bash - -script=$0 - -set -- ${1/-/ } -PKG=$1 -VER=$2 - -function logdie() { - logger -t "cswpkglogger" "$1" - exit 0 -} - -function success() { - case ${script} in - *install) MSG="installed ${PKG} ${VER}";; - *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; - *remove) MSG="removed ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -function failure() { - case ${script} in - *install) MSG="Failed to install ${PKG} ${VER}";; - *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; - *remove) MSG="Failed to remove ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -if [ -d /var/sadm/pkg/${PKG} ]; then - SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) - pf=/var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} - if [ -f ${pf} ]; then - PREVVER=$(cat ${pf} 2>/dev/null) - rm -f ${pf} - fi - - case ${script} in - *remove) - failure - ;; - *install|*upgrade) - case "${VER}" in - ${SYSTEMVER}) success ${PREVVER};; - *) failure ${SYSTEMVER};; - esac - ;; - esac -else - case ${script} in - *remove) - success - ;; - *install|*upgrade) - failure - ;; - esac -fi Deleted: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-23 13:14:58 UTC (rev 6954) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -1,11 +0,0 @@ -#!/opt/csw/bin/bash - -set -- ${1/-/ } - -PKG=$1 -VER=$2 - -SYSTEMVER=$(pkgparam ${PKG} VERSION) - -# store previous version so we can log smarter things if upgrade fails. -echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} Added: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade (rev 0) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/bash + +script=$0 + +set -- ${1/-/ } +PKG=$1 +VER=$2 + +function logdie() { + logger -t "cswpkgsyslog" "$1" + exit 0 +} + +function success() { + case ${script} in + *install) MSG="installed ${PKG} ${VER}";; + *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; + *remove) MSG="removed ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +function failure() { + case ${script} in + *install) MSG="Failed to install ${PKG} ${VER}";; + *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; + *remove) MSG="Failed to remove ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +if [ -d /var/sadm/pkg/${PKG} ]; then + SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) + pf=/var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} + if [ -f ${pf} ]; then + PREVVER=$(cat ${pf} 2>/dev/null) + rm -f ${pf} + fi + + case ${script} in + *remove) + failure + ;; + *install|*upgrade) + case "${VER}" in + ${SYSTEMVER}) success ${PREVVER};; + *) failure ${SYSTEMVER};; + esac + ;; + esac +else + case ${script} in + *remove) + success + ;; + *install|*upgrade) + failure + ;; + esac +fi Property changes on: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade (rev 0) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -- ${1/-/ } + +PKG=$1 +VER=$2 + +SYSTEMVER=$(pkgparam ${PKG} VERSION) + +# store previous version so we can log smarter things if upgrade fails. +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} Property changes on: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 15:27:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6956] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 6956 http://gar.svn.sourceforge.net/gar/?rev=6956&view=rev Author: wahwah Date: 2009-10-23 13:27:44 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups: Disabling the debug mode. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 13:20:00 UTC (rev 6955) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 13:27:44 UTC (rev 6956) @@ -28,7 +28,7 @@ # debugging symbols. The debugging options is turned on for this package, in # order to be able to debug the binary if it ever shows the problem. -GARFLAVOR = DBG +# GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. CUPS_MIRRORS = http://ftp.easysw.com/pub This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 24 19:08:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 24 Oct 2009 17:08:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6958] csw/mgar/gar/v2/categories/x11/category.mk Message-ID: Revision: 6958 http://gar.svn.sourceforge.net/gar/?rev=6958&view=rev Author: wbonnet Date: 2009-10-24 17:08:46 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Change the upstream source path Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2009-10-24 13:26:32 UTC (rev 6957) +++ csw/mgar/gar/v2/categories/x11/category.mk 2009-10-24 17:08:46 UTC (rev 6958) @@ -1,6 +1,11 @@ # X11 -X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ -X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ + +# Version of X11 +X11_RELEASE_VERSION = X11R7.4 + +# Definition of the URL to access sources +X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 24 15:26:33 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Oct 2009 13:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6957] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 6957 http://gar.svn.sourceforge.net/gar/?rev=6957&view=rev Author: bdwalton Date: 2009-10-24 13:26:32 +0000 (Sat, 24 Oct 2009) Log Message: ----------- ruby: depend on CSWbdb47 explicitly and point configure at it properly Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-23 13:27:44 UTC (rev 6956) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-24 13:26:32 UTC (rev 6957) @@ -7,7 +7,7 @@ TEST_SCRIPTS = TEST_ARGS = test-all -PREREQUISITE_PKGS = CSWbdb CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel +PREREQUISITE_PKGS = CSWbdb47 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel PREREQUISITE_PKGS += CSWreadline CSWzlib PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel @@ -18,7 +18,7 @@ LICENSE = COPYING -REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv +REQUIRED_PKGS_CSWruby = CSWbdb47 CSWgdbm CSWiconv REQUIRED_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib REQUIRED_PKGS_CSWrubydoc = CSWruby @@ -82,7 +82,7 @@ CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-tcl-dir=$(prefix) CONFIGURE_ARGS += --with-tk-dir=$(prefix) -CONFIGURE_ARGS += --with-dbm-dir=$(prefix) +CONFIGURE_ARGS += --with-dbm-dir=$(prefix)/bdb47 CONFIGURE_ARGS += --with-gdbm-dir=$(prefix) CONFIGURE_ARGS += --with-iconv-dir=$(prefix) CONFIGURE_ARGS += --with-openssl-dir=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 24 23:51:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 24 Oct 2009 21:51:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6959] csw/mgar/pkg/x11 Message-ID: Revision: 6959 http://gar.svn.sourceforge.net/gar/?rev=6959&view=rev Author: wbonnet Date: 2009-10-24 21:51:24 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Move to lib subdir Modified Paths: -------------- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums csw/mgar/pkg/x11/lib/libfs/trunk/checksums csw/mgar/pkg/x11/lib/libice/trunk/checksums csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/checksums csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/checksums csw/mgar/pkg/x11/lib/libxau/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/checksums csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/checksums csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/checksums csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile csw/mgar/pkg/x11/lib/libxmu/trunk/checksums csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile csw/mgar/pkg/x11/lib/libxpm/trunk/checksums csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums csw/mgar/pkg/x11/lib/libxres/trunk/checksums csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums csw/mgar/pkg/x11/lib/libxt/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/checksums csw/mgar/pkg/x11/lib/libxtst/trunk/checksums csw/mgar/pkg/x11/lib/libxv/trunk/Makefile csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/lib/xtrans/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/libpthread-stubs/ Removed Paths: ------------- csw/mgar/pkg/x11/libpthread-stubs/ Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -4d866967210d06098fc9f302ed4c79b1 libdmx-1.0.2.tar.bz2 +4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 +5cd16a2e51ca7b96a3081c7486ff98b9 download/libfontenc-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -81521249353fa33be7a4bb0062c2fbb9 libFS-1.0.1.tar.bz2 +81521249353fa33be7a4bb0062c2fbb9 download/libFS-1.0.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -4ab4e67e0b8845aa201e984153087f4a libICE-1.0.4.tar.bz2 +4ab4e67e0b8845aa201e984153087f4a download/libICE-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWlibicedevel +# PREREQUISITE_PKGS = CSWlibicedevel REQUIRED_PKGS = CSWlibice PACKAGES = CSWlibsm CSWlibsmdevel Modified: csw/mgar/pkg/x11/lib/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -05a04c2b6382fb0054f6c70494e22733 libSM-1.1.0.tar.bz2 +05a04c2b6382fb0054f6c70494e22733 download/libSM-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -12,14 +12,14 @@ MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTNAME = libX11-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = patch-stdint.diff +# PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 -PATCHFILES += patch-xlib-sentinel.diff +# PATCHFILES += patch-xlib-sentinel.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWxkbproto CSWinputproto CSWlibpthreadstubs CSWlibxcbdevel +PREREQUISITE_PKGS = CSWxcbproto CSWx11xextproto CSWxtrans CSWx11inputproto CSWlibpthreadstubs CSWlibxcbdevel PACKAGES = CSWlibx11 CSWlibx11devel Modified: csw/mgar/pkg/x11/lib/libx11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1,3 +1,3 @@ -c9b3a015e710e49303a48538149a4bd5 download/libX11-1.2.2.tar.gz +2feb39a0de6f05b25c308268691d960c download/libX11-1.1.5.tar.gz 667f63d38722e29d6fd36b6648bbb757 download/patch-stdint.diff 4e6f6f42902f849eba8d88ab15fa3697 download/patch-xlib-sentinel.diff Modified: csw/mgar/pkg/x11/lib/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -12,8 +12,8 @@ DISTNAME = libXau-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto -PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs +# PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto +# PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -15,7 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # xproto x11 xext xextproto xt xmu xpm -PREREQUISITE_PKGS = CSWlibxpmdevel +# PREREQUISITE_PKGS = CSWlibxpmdevel PACKAGES = CSWlibxaw CSWlibxawdevel Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.tar.bz2 +73671d8f1cf36fdd81395328cc3539c9 download/libXaw-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxcomposite = $(DESCRIPTION) SPKG_DESC_CSWlibxcompositedevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWcompositeproto +# PREREQUISITE_PKGS = CSWcompositeproto REQUIRED_PKGS_CSWlibxcompositedevel = CSWlibxcomposite REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -99b7554037a92b260891091e81815a0a libXcursor-1.1.9.tar.bz2 +99b7554037a92b260891091e81815a0a download/libXcursor-1.1.9.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -25,7 +25,7 @@ REQUIRED_PKGS_CSWlibxdamagedevel = CSWlibxdamage -PREREQUISITE_PKGS = CSWdamageproto +# PREREQUISITE_PKGS = CSWdamageproto PKGFILES_CSWlibxdamagedevel = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -10facf2bc7cbd5e5c1a698b8a210a582 libXdmcp-1.0.2.tar.bz2 +10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -17,7 +17,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxextproto CSWlibx11devel CSWlibxaudevel +PREREQUISITE_PKGS = CSWx11xextproto CSWlibx11devel CSWlibxaudevel PACKAGES = CSWlibxext CSWlibxextdevel Modified: csw/mgar/pkg/x11/lib/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -aa11d859cc8e9a0bad3bb55e1666547b download/libXext-1.0.5.tar.bz2 +a91f1f722ac80c597cf0b75dcb8b48c0 download/libXext-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxfixes = $(DESCRIPTION) SPKG_DESC_CSWlibxfixesdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWfixesproto +# PREREQUISITE_PKGS = CSWfixesproto REQUIRED_PKGS_CSWlibxfixes = CSWlibx11 REQUIRED_PKGS_CSWlibxfixesdevel = CSWlibxfixes Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxfont = $(DESCRIPTION) SPKG_DESC_CSWlibxfontdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWlibfontencdevel +# PREREQUISITE_PKGS = CSWlibfontencdevel REQUIRED_PKGS_CSWlibxfontdevel = CSWlibxfont REQUIRED_PKGS_CSWlibxfont = CSWftype2 CSWlibfontenc CSWzlib Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -4f174b9613f87cf00d731da428a1b194 libXfont-1.3.3.tar.bz2 +4f174b9613f87cf00d731da428a1b194 download/libXfont-1.3.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxfontcache = $(DESCRIPTION) SPKG_DESC_CSWlibxfontcachedevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWfontcacheproto +# PREREQUISITE_PKGS = CSWfontcacheproto REQUIRED_PKGS_CSWlibxfontcachedevel = CSWlibxfontcache REQUIRED_PKGS_CSWlibxfontcache = CSWlibx11 CSWlibxext Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -13,7 +13,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#PREREQUISITE_PKGS = CSWlibxpmdevel +PREREQUISITE_PKGS = CSWx11xproto CSWlibx11devel CSWx11xextproto CSWlibxextdevel CSWx11inputproto PACKAGES = CSWlibxi CSWlibxidevel Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -7c510abb0cad8dc20493fb27ff7859d8 libXi-1.1.3.tar.bz2 +7c510abb0cad8dc20493fb27ff7859d8 download/libXi-1.1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 libxkbfile-1.0.5.tar.bz2 +0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWlibxtdevel CSWlibxextdevel +# PREREQUISITE_PKGS = CSWlibxtdevel CSWlibxextdevel PACKAGES = CSWlibxmu CSWlibxmudevel Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -48b432e84035c664ece80a33695d5254 libXmu-1.0.4.tar.gz +48b432e84035c664ece80a33695d5254 download/libXmu-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -25,6 +25,8 @@ SPKG_DESC_CSWlibxpm = X11 pixmap library SPKG_DESC_CSWlibxpmdevel = X11 pixmap library development files +PREREQUISITE_PKGS = CSWx11xproto CSWlibx11devel + REQUIRED_PKGS_CSWlibxpm = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxt REQUIRED_PKGS_CSWlibxpmdevel = CSWlibxpm REQUIRED_PKGS_CSWxpm = CSWlibxpm Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -cd15ee542d9f515538b4462a6f79d977 libXpm-3.5.7.tar.bz2 +cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -25,7 +25,7 @@ REQUIRED_PKGS_CSWlibxrandrdevel = CSWlibxrandr -PREREQUISITE_PKGS = CSWrandrproto CSWlibxextdevel +# PREREQUISITE_PKGS = CSWrandrproto CSWlibxextdevel PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibxrandr = CSWlibx11 CSWlibxext CSWlibxrender Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -68eb59c3b7524db6ffd78746ee893d1d download/libXrandr-1.3.0.tar.bz2 +5cd67cc02a50c9644ba0a1846ea3b08e download/libXrandr-1.2.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -de66ffb657aba64c9d6dbdeabb757f3e libXres-1.0.3.tar.bz2 +de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxscrnsaver = $(DESCRIPTION) SPKG_DESC_CSWlibxscrnsaverdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWscrnsaverproto +# PREREQUISITE_PKGS = CSWscrnsaverproto REQUIRED_PKGS_CSWlibxscrnsaver = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibxscrnsaverdevel = CSWlibxscrnsaver Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -33e54f64b55f22d8bbe822a5b62568cb download/libXScrnSaver-1.2.0.tar.bz2 +93f84b6797f2f29cae1ce23b0355d00d download/libXScrnSaver-1.1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWlibsmdevel +# PREREQUISITE_PKGS = CSWlibsmdevel PACKAGES = CSWlibxt CSWlibxtdevel Modified: csw/mgar/pkg/x11/lib/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -f3bdd67785ace8cd0b23249e9d8c9975 libXt-1.0.5.tar.bz2 +f3bdd67785ace8cd0b23249e9d8c9975 download/libXt-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -090c1ad04e34982eada5cf3b1a0792fd libXtst-1.0.3.tar.bz2 +090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxv/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxv/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxv/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWxvideoproto +# PREREQUISITE_PKGS = CSWxvideoproto PACKAGES = CSWlibxv CSWlibxvdevel Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxvmc = $(DESCRIPTION) SPKG_DESC_CSWlibxvmcdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWlibxvdevel CSWxvideoproto +# PREREQUISITE_PKGS = CSWlibxvdevel CSWxvideoproto REQUIRED_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv REQUIRED_PKGS_CSWlibxvmcdevel = CSWlibxvmc Modified: csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxxf86dga = $(DESCRIPTION) SPKG_DESC_CSWlibxxf86dgadevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWxf86dgaproto +# PREREQUISITE_PKGS = CSWxf86dgaproto REQUIRED_PKGS_CSWlibxxf86dga = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibxxf86dgadevel = CSWlibxxf86dga Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -5b7f447f6fe92cbc4f17441aaee0bf55 xtrans-1.2.1.tar.gz +5b7f447f6fe92cbc4f17441aaee0bf55 download/xtrans-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 25 00:57:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Oct 2009 22:57:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6960] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 6960 http://gar.svn.sourceforge.net/gar/?rev=6960&view=rev Author: bdwalton Date: 2009-10-24 22:57:35 +0000 (Sat, 24 Oct 2009) Log Message: ----------- ruby: have the -tk package explicitly depend on tcl instead of via tk Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-24 22:57:35 UTC (rev 6960) @@ -23,7 +23,7 @@ REQUIRED_PKGS_CSWrubydoc = CSWruby -REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk +REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl REQUIRED_PKGS_CSWrubydev = CSWruby CSWgfile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 25 14:43:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Oct 2009 13:43:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6961] csw/mgar/pkg Message-ID: Revision: 6961 http://gar.svn.sourceforge.net/gar/?rev=6961&view=rev Author: wahwah Date: 2009-10-25 13:43:39 +0000 (Sun, 25 Oct 2009) Log Message: ----------- pius: initial commit Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile csw/mgar/pkg/pius/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pius/ Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-24 22:57:35 UTC (rev 6960) +++ csw/mgar/pkg/pius/trunk/Makefile 2009-10-25 13:43:39 UTC (rev 6961) @@ -2,181 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = pius +GARVERSION = 2.0.3 +CATEGORIES = apps +DESCRIPTION = A tool for signing and email all UIDs on a set of PGP keys. define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://www.phildev.net/pius/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = pgpius +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWpython +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = pius +TEST_SCRIPTS = +include gar/category.mk -#include gar/category.mk +install-pius: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/pius $(DESTDIR)$(bindir) + ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(datadir)/doc/$(GARNAME) + ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/pius/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-24 22:57:35 UTC (rev 6960) +++ csw/mgar/pkg/pius/trunk/checksums 2009-10-25 13:43:39 UTC (rev 6961) @@ -0,0 +1 @@ +081aecec3d47c6e860e9cb5644e95cb3 pius-2.0.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 25 18:09:17 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 25 Oct 2009 17:09:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6962] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6962 http://gar.svn.sourceforge.net/gar/?rev=6962&view=rev Author: bonivart Date: 2009-10-25 17:09:17 +0000 (Sun, 25 Oct 2009) Log Message: ----------- pkgutil: update to 1.8 beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-25 13:43:39 UTC (rev 6961) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-25 17:09:17 UTC (rev 6962) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8b1 +GARVERSION = 1.8b2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 13:43:39 UTC (rev 6961) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 17:09:17 UTC (rev 6962) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -55ebb20ac1a91cc6663c3fc11005c3ef pkgutil-1.8b1.zip +73f84d81b59a5e6191656529eaf0562e pkgutil-1.8b2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 25 19:10:01 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 25 Oct 2009 18:10:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6963] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 6963 http://gar.svn.sourceforge.net/gar/?rev=6963&view=rev Author: bonivart Date: 2009-10-25 18:09:51 +0000 (Sun, 25 Oct 2009) Log Message: ----------- pkgutil: hook fix Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 17:09:17 UTC (rev 6962) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 18:09:51 UTC (rev 6963) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -73f84d81b59a5e6191656529eaf0562e pkgutil-1.8b2.zip +e32847e2c0a01549f17444426b13ff2d pkgutil-1.8b2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 19:29:08 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 18:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6964] csw/mgar/pkg/ncmpc/trunk/ Message-ID: Revision: 6964 http://gar.svn.sourceforge.net/gar/?rev=6964&view=rev Author: trygvis Date: 2009-10-25 18:29:05 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Switching to gar v2. Property Changed: ---------------- csw/mgar/pkg/ncmpc/trunk/ Property changes on: csw/mgar/pkg/ncmpc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 25 20:40:41 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 25 Oct 2009 19:40:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6965] csw/mgar/gar/v2/bin/gitproxy Message-ID: Revision: 6965 http://gar.svn.sourceforge.net/gar/?rev=6965&view=rev Author: bdwalton Date: 2009-10-25 19:40:41 +0000 (Sun, 25 Oct 2009) Log Message: ----------- gar: gitproxy should send error output to stderr Modified Paths: -------------- csw/mgar/gar/v2/bin/gitproxy Modified: csw/mgar/gar/v2/bin/gitproxy =================================================================== --- csw/mgar/gar/v2/bin/gitproxy 2009-10-25 18:29:05 UTC (rev 6964) +++ csw/mgar/gar/v2/bin/gitproxy 2009-10-25 19:40:41 UTC (rev 6965) @@ -15,6 +15,6 @@ nc ${PROXYHOST} ${PROXYPORT} | (read a; read a; cat ) else - echo Please set http_proxy in your environment. + echo Please set http_proxy in your environment. >&2 exit 1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 20:55:04 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 19:55:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6966] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6966 http://gar.svn.sourceforge.net/gar/?rev=6966&view=rev Author: trygvis Date: 2009-10-25 19:55:04 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Using my own fork of cgit. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 19:40:41 UTC (rev 6965) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 19:55:04 UTC (rev 6966) @@ -24,8 +24,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#GIT_REPOS = git://github.com/trygvis/cgit.git -GIT_REPOS = http://localhost/cgit/cgit +GIT_REPOS = git://github.com/trygvis/cgit.git #GIT_TREEISH_cgit = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) GIT_TREEISH_cgit = solaris @@ -39,7 +38,6 @@ # UPSTREAM_MASTER_SITES = PATCHFILES = 0001-cgit.conf -PATCHFILES += 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff CONFIGURE_SCRIPTS = Deleted: csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff =================================================================== --- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff 2009-10-25 19:40:41 UTC (rev 6965) +++ csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff 2009-10-25 19:55:04 UTC (rev 6966) @@ -1,887 +0,0 @@ -diff --git a/Makefile b/Makefile -index 60d8c58..cb7875e 100644 ---- a/Makefile -+++ b/Makefile -@@ -90,6 +90,7 @@ OBJECTS += ui-refs.o - OBJECTS += ui-repolist.o - OBJECTS += ui-shared.o - OBJECTS += ui-snapshot.o -+OBJECTS += ui-ssdiff.o - OBJECTS += ui-stats.o - OBJECTS += ui-summary.o - OBJECTS += ui-tag.o -diff --git a/cgit.c b/cgit.c -index bd37788..84f44ba 100644 ---- a/cgit.c -+++ b/cgit.c -@@ -182,6 +182,8 @@ void config_cb(const char *name, const char *value) - ctx.cfg.summary_branches = atoi(value); - else if (!strcmp(name, "summary-tags")) - ctx.cfg.summary_tags = atoi(value); -+ else if (!strcmp(name, "side-by-side-diffs")) -+ ctx.cfg.ssdiff = atoi(value); - else if (!strcmp(name, "agefile")) - ctx.cfg.agefile = xstrdup(value); - else if (!strcmp(name, "renamelimit")) -@@ -209,6 +211,8 @@ static void querystring_cb(const char *name, const char *value) - } else if (!strcmp(name, "p")) { - ctx.qry.page = xstrdup(value); - } else if (!strcmp(name, "url")) { -+ if (*value == '/') -+ value++; - ctx.qry.url = xstrdup(value); - cgit_parse_url(value); - } else if (!strcmp(name, "qt")) { -@@ -238,6 +242,8 @@ static void querystring_cb(const char *name, const char *value) - ctx.qry.showmsg = atoi(value); - } else if (!strcmp(name, "period")) { - ctx.qry.period = xstrdup(value); -+ } else if (!strcmp(name, "ss")) { -+ ctx.qry.ssdiff = atoi(value); - } - } - -@@ -279,6 +285,7 @@ static void prepare_context(struct cgit_context *ctx) - ctx->cfg.summary_branches = 10; - ctx->cfg.summary_log = 10; - ctx->cfg.summary_tags = 10; -+ ctx->cfg.ssdiff = 0; - ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); - ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); - ctx->env.https = xstrdupn(getenv("HTTPS")); -diff --git a/cgit.css b/cgit.css -index c47ebc9..3f37165 100644 ---- a/cgit.css -+++ b/cgit.css -@@ -601,3 +601,92 @@ table.hgraph div.bar { - background-color: #eee; - height: 1em; - } -+ -+table.ssdiff { -+ width: 100%; -+} -+ -+table.ssdiff td { -+ font-size: 75%; -+ font-family: monospace; -+ white-space: pre; -+ padding: 1px 4px 1px 4px; -+ border-left: solid 1px #aaa; -+ border-right: solid 1px #aaa; -+} -+ -+table.ssdiff td.add { -+ color: black; -+ background: #cfc; -+ min-width: 50%; -+} -+ -+table.ssdiff td.add_dark { -+ color: black; -+ background: #aca; -+ min-width: 50%; -+} -+ -+table.ssdiff td.del { -+ color: black; -+ background: #fcc; -+ min-width: 50%; -+} -+ -+table.ssdiff td.del_dark { -+ color: black; -+ background: #caa; -+ min-width: 50%; -+} -+ -+table.ssdiff td.changed { -+ color: black; -+ background: #ffc; -+ min-width: 50%; -+} -+ -+table.ssdiff td.changed_dark { -+ color: black; -+ background: #cca; -+ min-width: 50%; -+} -+ -+table.ssdiff td.lineno { -+ color: black; -+ background: #eee; -+ text-align: right; -+ width: 3em; -+ min-width: 3em; -+} -+ -+table.ssdiff td.hunk { -+ color: #black; -+ background: #ccf; -+ border-top: solid 1px #aaa; -+ border-bottom: solid 1px #aaa; -+} -+ -+table.ssdiff td.head { -+ border-top: solid 1px #aaa; -+ border-bottom: solid 1px #aaa; -+} -+ -+table.ssdiff td.head div.head { -+ font-weight: bold; -+ color: black; -+} -+ -+table.ssdiff td.foot { -+ border-top: solid 1px #aaa; -+ border-left: none; -+ border-right: none; -+ border-bottom: none; -+} -+ -+table.ssdiff td.space { -+ border: none; -+} -+ -+table.ssdiff td.space div { -+ min-height: 3em; -+} -\ No newline at end of file -diff --git a/cgit.h b/cgit.h -index 6c6c460..b7b0adb 100644 ---- a/cgit.h -+++ b/cgit.h -@@ -143,6 +143,7 @@ struct cgit_query { - int nohead; - char *sort; - int showmsg; -+ int ssdiff; - }; - - struct cgit_config { -@@ -194,6 +195,7 @@ struct cgit_config { - int summary_branches; - int summary_log; - int summary_tags; -+ int ssdiff; - struct string_list mimetypes; - struct cgit_filter *about_filter; - struct cgit_filter *commit_filter; -diff --git a/cgitrc.5.txt b/cgitrc.5.txt -index 0c13485..d0fd9a1 100644 ---- a/cgitrc.5.txt -+++ b/cgitrc.5.txt -@@ -241,6 +241,10 @@ section:: - after this option will inherit the current section name. Default value: - none. - -+side-by-side-diffs:: -+ If set to "1" shows side-by-side diffs instead of unidiffs per -+ default. Default value: "0". -+ - snapshots:: - Text which specifies the default set of snapshot formats generated by - cgit. The value is a space-separated list of zero or more of the -diff --git a/ui-commit.c b/ui-commit.c -index f5b0ae5..b5e3c01 100644 ---- a/ui-commit.c -+++ b/ui-commit.c -@@ -58,9 +58,14 @@ void cgit_print_commit(char *hex) - html("\n"); - html("commit"); - tmp = sha1_to_hex(commit->object.sha1); -- cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); -+ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); - html(" ("); - cgit_patch_link("patch", NULL, NULL, NULL, tmp); -+ html(") ("); -+ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) -+ cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); -+ else -+ cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); - html(")\n"); - html("tree"); - tmp = xstrdup(hex); -@@ -78,10 +83,10 @@ void cgit_print_commit(char *hex) - html("parent" - ""); - cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, -- ctx.qry.head, sha1_to_hex(p->item->object.sha1)); -+ ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); - html(" ("); - cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, -- sha1_to_hex(p->item->object.sha1), NULL); -+ sha1_to_hex(p->item->object.sha1), NULL, 0); - html(")"); - parents++; - } -diff --git a/ui-diff.c b/ui-diff.c -index 2196745..a92a768 100644 ---- a/ui-diff.c -+++ b/ui-diff.c -@@ -9,6 +9,7 @@ - #include "cgit.h" - #include "html.h" - #include "ui-shared.h" -+#include "ui-ssdiff.h" - - unsigned char old_rev_sha1[20]; - unsigned char new_rev_sha1[20]; -@@ -32,6 +33,7 @@ static struct fileinfo { - int binary:1; - } *items; - -+static int use_ssdiff = 0; - - static void print_fileinfo(struct fileinfo *info) - { -@@ -83,7 +85,7 @@ static void print_fileinfo(struct fileinfo *info) - } - htmlf("", class); - cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, -- ctx.qry.sha2, info->new_path); -+ ctx.qry.sha2, info->new_path, 0); - if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) - htmlf(" (%s from %s)", - info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", -@@ -158,7 +160,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1, - - html("
"); - cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, -- ctx.qry.sha2, NULL); -+ ctx.qry.sha2, NULL, 0); - html("
"); - html(""); - max_changes = 0; -@@ -246,26 +248,54 @@ static void header(unsigned char *sha1, char *path1, int mode1, - html(""); - } - -+static void print_ssdiff_link() -+{ -+ if (!strcmp(ctx.qry.page, "diff")) { -+ if (use_ssdiff) -+ cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, -+ ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); -+ else -+ cgit_diff_link("Side-by-side diff", NULL, NULL, -+ ctx.qry.head, ctx.qry.sha1, -+ ctx.qry.sha2, ctx.qry.path, 1); -+ } -+} -+ - static void filepair_cb(struct diff_filepair *pair) - { - unsigned long old_size = 0; - unsigned long new_size = 0; - int binary = 0; -+ linediff_fn print_line_fn = print_line; - -+ if (use_ssdiff) { -+ cgit_ssdiff_header_begin(); -+ print_line_fn = cgit_ssdiff_line_cb; -+ } - header(pair->one->sha1, pair->one->path, pair->one->mode, - pair->two->sha1, pair->two->path, pair->two->mode); -+ if (use_ssdiff) -+ cgit_ssdiff_header_end(); - if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { - if (S_ISGITLINK(pair->one->mode)) -- print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); -+ print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); - if (S_ISGITLINK(pair->two->mode)) -- print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); -+ print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); -+ if (use_ssdiff) -+ cgit_ssdiff_footer(); - return; - } -- if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, -- &new_size, &binary, print_line)) -+ if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, -+ &new_size, &binary, print_line_fn)) - cgit_print_error("Error running diff"); -- if (binary) -- html("Binary files differ"); -+ if (binary) { -+ if (use_ssdiff) -+ html(""); -+ else -+ html("Binary files differ"); -+ } -+ if (use_ssdiff) -+ cgit_ssdiff_footer(); - } - - void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) -@@ -303,11 +333,21 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi - if (!commit2 || parse_commit(commit2)) - cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); - } -+ -+ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) -+ use_ssdiff = 1; -+ -+ print_ssdiff_link(); - cgit_print_diffstat(old_rev_sha1, new_rev_sha1); - -- html("
Binary files differ
"); -- html("", - ctx.qry.showmsg ? " class='logsubject'" : ""); - cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, -- sha1_to_hex(commit->object.sha1)); -+ sha1_to_hex(commit->object.sha1), 0); - show_commit_decorations(commit); - html(""); -+ if (old_line_no > 0) -+ htmlf(""); -+ -+ if (new_line_no > 0) -+ htmlf(""); -+} -+ -+static void print_deferred_old_lines() -+{ -+ struct deferred_lines *iter_old, *tmp; -+ -+ iter_old = deferred_old; -+ while (iter_old) { -+ print_ssdiff_line("del", iter_old->line_no, -+ iter_old->line, -1, NULL); -+ tmp = iter_old->next; -+ free(iter_old); -+ iter_old = tmp; -+ } -+} -+ -+static void print_deferred_new_lines() -+{ -+ struct deferred_lines *iter_new, *tmp; -+ -+ iter_new = deferred_new; -+ while (iter_new) { -+ print_ssdiff_line("add", -1, NULL, iter_new->line_no, -+ iter_new->line); -+ tmp = iter_new->next; -+ free(iter_new); -+ iter_new = tmp; -+ } -+} -+ -+static void print_deferred_changed_lines() -+{ -+ struct deferred_lines *iter_old, *iter_new, *tmp; -+ -+ iter_old = deferred_old; -+ iter_new = deferred_new; -+ while (iter_old || iter_new) { -+ if (iter_old && iter_new) -+ print_ssdiff_line("changed", iter_old->line_no, -+ iter_old->line, -+ iter_new->line_no, iter_new->line); -+ else if (iter_old) -+ print_ssdiff_line("changed", iter_old->line_no, -+ iter_old->line, -1, NULL); -+ else if (iter_new) -+ print_ssdiff_line("changed", -1, NULL, -+ iter_new->line_no, iter_new->line); -+ -+ if (iter_old) { -+ tmp = iter_old->next; -+ free(iter_old); -+ iter_old = tmp; -+ } -+ -+ if (iter_new) { -+ tmp = iter_new->next; -+ free(iter_new); -+ iter_new = tmp; -+ } -+ } -+} -+ -+void cgit_ssdiff_print_deferred_lines() -+{ -+ if (!deferred_old && !deferred_new) -+ return; -+ -+ if (deferred_old && !deferred_new) -+ print_deferred_old_lines(); -+ else if (!deferred_old && deferred_new) -+ print_deferred_new_lines(); -+ else -+ print_deferred_changed_lines(); -+ -+ deferred_old = deferred_old_last = NULL; -+ deferred_new = deferred_new_last = NULL; -+} -+ -+/* -+ * print a single line returned from xdiff -+ */ -+void cgit_ssdiff_line_cb(char *line, int len) -+{ -+ char c = line[len - 1]; -+ -+ line[len - 1] = '\0'; -+ -+ if (line[0] == '@') { -+ current_old_line = line_from_hunk(line, '-'); -+ current_new_line = line_from_hunk(line, '+'); -+ } -+ -+ if (line[0] == ' ') { -+ if (deferred_old || deferred_new) -+ cgit_ssdiff_print_deferred_lines(); -+ print_ssdiff_line("ctx", current_old_line, line, -+ current_new_line, line); -+ current_old_line += 1; -+ current_new_line += 1; -+ } else if (line[0] == '+') { -+ deferred_new_add(line, current_new_line); -+ current_new_line += 1; -+ } else if (line[0] == '-') { -+ deferred_old_add(line, current_old_line); -+ current_old_line += 1; -+ } else if (line[0] == '@') { -+ html(""); -+ } else { -+ html(""); -+ } -+ line[len - 1] = c; -+} -+ -+void cgit_ssdiff_header_begin() -+{ -+ current_old_line = -1; -+ current_new_line = -1; -+ html(""); -+ html(""); -+} -+ -+void cgit_ssdiff_footer() -+{ -+ if (deferred_old || deferred_new) -+ cgit_ssdiff_print_deferred_lines(); -+ html(""); -+} -diff --git a/ui-ssdiff.h b/ui-ssdiff.h -new file mode 100644 -index 0000000..64b4b12 ---- /dev/null -+++ b/ui-ssdiff.h -@@ -0,0 +1,13 @@ -+#ifndef UI_SSDIFF_H -+#define UI_SSDIFF_H -+ -+extern void cgit_ssdiff_print_deferred_lines(); -+ -+extern void cgit_ssdiff_line_cb(char *line, int len); -+ -+extern void cgit_ssdiff_header_begin(); -+extern void cgit_ssdiff_header_end(); -+ -+extern void cgit_ssdiff_footer(); -+ -+#endif /* UI_SSDIFF_H */ -diff --git a/ui-tag.c b/ui-tag.c -index c2d72af..39e4cb8 100644 ---- a/ui-tag.c -+++ b/ui-tag.c -@@ -30,6 +30,14 @@ static void print_tag_content(char *buf) - } - } - -+void print_download_links(char *revname) -+{ -+ html(""); -+} -+ - void cgit_print_tag(char *revname) - { - unsigned char sha1[20]; -@@ -56,16 +64,16 @@ void cgit_print_tag(char *revname) - return; - } - html("
"); -+ if (use_ssdiff) { -+ html(""); -+ } else { -+ html("
"); -+ html(""); -+ if (!use_ssdiff) -+ html(""); - html("
"); -+ } - cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); -- html("
"); - } -diff --git a/ui-log.c b/ui-log.c -index f3132c9..0947604 100644 ---- a/ui-log.c -+++ b/ui-log.c -@@ -66,7 +66,7 @@ void show_commit_decorations(struct commit *commit) - else { - strncpy(buf, deco->name, sizeof(buf) - 1); - cgit_commit_link(buf, NULL, "deco", ctx.qry.head, -- sha1_to_hex(commit->object.sha1)); -+ sha1_to_hex(commit->object.sha1), 0); - } - deco = deco->next; - } -@@ -89,7 +89,7 @@ void print_commit(struct commit *commit) - htmlf("		"); - html_txt(info->author); -diff --git a/ui-refs.c b/ui-refs.c -index d3b4f6e..33d9bec 100644 ---- a/ui-refs.c -+++ b/ui-refs.c -@@ -74,7 +74,7 @@ static int print_branch(struct refinfo *ref) - html(""); - - if (ref->object->type == OBJ_COMMIT) { -- cgit_commit_link(info->subject, NULL, NULL, name, NULL); -+ cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0); - html(""); - html_txt(info->author); - html(""); -diff --git a/ui-repolist.c b/ui-repolist.c -index 3ef2e99..0a0b6ca 100644 ---- a/ui-repolist.c -+++ b/ui-repolist.c -@@ -94,7 +94,7 @@ int is_in_url(struct cgit_repo *repo) - - void print_sort_header(const char *title, const char *sort) - { -- htmlf(""); -+ html_txt(name); -+ html(""); - } - - void cgit_refs_link(char *name, char *title, char *class, char *head, -@@ -341,7 +357,8 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head, - } - - void cgit_diff_link(char *name, char *title, char *class, char *head, -- char *new_rev, char *old_rev, char *path) -+ char *new_rev, char *old_rev, char *path, -+ int toggle_ssdiff) - { - char *delim; - -@@ -356,6 +373,11 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, - html(delim); - html("id2="); - html_url_arg(old_rev); -+ delim = "&"; -+ } -+ if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { -+ html(delim); -+ html("ss=1"); - } - html("'>"); - html_txt(name); -@@ -383,7 +405,7 @@ void cgit_object_link(struct object *obj) - shortrev[10] = '\0'; - if (obj->type == OBJ_COMMIT) { - cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, -- ctx.qry.head, fullrev); -+ ctx.qry.head, fullrev, 0); - return; - } else if (obj->type == OBJ_TREE) - page = "tree"; -@@ -695,9 +717,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) - cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, - ctx->qry.sha1, NULL); - cgit_commit_link("commit", NULL, hc(cmd, "commit"), -- ctx->qry.head, ctx->qry.sha1); -+ ctx->qry.head, ctx->qry.sha1, 0); - cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, -- ctx->qry.sha1, ctx->qry.sha2, NULL); -+ ctx->qry.sha1, ctx->qry.sha2, NULL, 0); - if (ctx->repo->max_stats) - cgit_stats_link("stats", NULL, hc(cmd, "stats"), - ctx->qry.head, NULL); -@@ -760,13 +782,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head, - const char *hex, int snapshots) - { - const struct cgit_snapshot_format* f; -+ char *prefix; - char *filename; -+ unsigned char sha1[20]; - -+ if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && -+ (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) -+ hex++; -+ prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); - for (f = cgit_snapshot_formats; f->suffix; f++) { - if (!(snapshots & f->bit)) - continue; -- filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, -- f->suffix); -+ filename = fmt("%s%s", prefix, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); - html("
"); - } -diff --git a/ui-shared.h b/ui-shared.h -index bff4826..9ebc1f9 100644 ---- a/ui-shared.h -+++ b/ui-shared.h -@@ -3,6 +3,7 @@ - - extern char *cgit_httpscheme(); - extern char *cgit_hosturl(); -+extern char *cgit_rooturl(); - extern char *cgit_repourl(const char *reponame); - extern char *cgit_fileurl(const char *reponame, const char *pagename, - const char *filename, const char *query); -@@ -22,7 +23,7 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path, int ofs, char *grep, - char *pattern, int showmsg); - extern void cgit_commit_link(char *name, char *title, char *class, char *head, -- char *rev); -+ char *rev, int toggle_ssdiff); - extern void cgit_patch_link(char *name, char *title, char *class, char *head, - char *rev); - extern void cgit_refs_link(char *name, char *title, char *class, char *head, -@@ -30,7 +31,8 @@ extern void cgit_refs_link(char *name, char *title, char *class, char *head, - extern void cgit_snapshot_link(char *name, char *title, char *class, - char *head, char *rev, char *archivename); - extern void cgit_diff_link(char *name, char *title, char *class, char *head, -- char *new_rev, char *old_rev, char *path); -+ char *new_rev, char *old_rev, char *path, -+ int toggle_ssdiff); - extern void cgit_stats_link(char *name, char *title, char *class, char *head, - char *path); - extern void cgit_object_link(struct object *obj); -diff --git a/ui-ssdiff.c b/ui-ssdiff.c -new file mode 100644 -index 0000000..5673642 ---- /dev/null -+++ b/ui-ssdiff.c -@@ -0,0 +1,274 @@ -+#include "cgit.h" -+#include "html.h" -+#include "ui-shared.h" -+ -+extern int use_ssdiff; -+ -+static int current_old_line, current_new_line; -+ -+struct deferred_lines { -+ int line_no; -+ char *line; -+ struct deferred_lines *next; -+}; -+ -+static struct deferred_lines *deferred_old, *deferred_old_last; -+static struct deferred_lines *deferred_new, *deferred_new_last; -+ -+static int line_from_hunk(char *line, char type) -+{ -+ char *buf1, *buf2; -+ int len; -+ -+ buf1 = strchr(line, type); -+ if (buf1 == NULL) -+ return 0; -+ buf1 += 1; -+ buf2 = strchr(buf1, ','); -+ if (buf2 == NULL) -+ return 0; -+ len = buf2 - buf1; -+ buf2 = xmalloc(len + 1); -+ strncpy(buf2, buf1, len); -+ buf2[len] = '\0'; -+ int res = atoi(buf2); -+ free(buf2); -+ return res; -+} -+ -+static char *replace_tabs(char *line) -+{ -+ char *prev_buf = line; -+ char *cur_buf; -+ int linelen = strlen(line); -+ int n_tabs = 0; -+ int i; -+ char *result; -+ char *spaces = " "; -+ -+ if (linelen == 0) { -+ result = xmalloc(1); -+ result[0] = '\0'; -+ return result; -+ } -+ -+ for (i = 0; i < linelen; i++) -+ if (line[i] == '\t') -+ n_tabs += 1; -+ result = xmalloc(linelen + n_tabs * 8 + 1); -+ result[0] = '\0'; -+ -+ while (1) { -+ cur_buf = strchr(prev_buf, '\t'); -+ if (!cur_buf) { -+ strcat(result, prev_buf); -+ break; -+ } else { -+ strcat(result, " "); -+ strncat(result, spaces, 8 - (strlen(result) % 8)); -+ strncat(result, prev_buf, cur_buf - prev_buf); -+ } -+ prev_buf = cur_buf + 1; -+ } -+ return result; -+} -+ -+static void deferred_old_add(char *line, int line_no) -+{ -+ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); -+ item->line = xstrdup(line); -+ item->line_no = line_no; -+ item->next = NULL; -+ if (deferred_old) { -+ deferred_old_last->next = item; -+ deferred_old_last = item; -+ } else { -+ deferred_old = deferred_old_last = item; -+ } -+} -+ -+static void deferred_new_add(char *line, int line_no) -+{ -+ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); -+ item->line = xstrdup(line); -+ item->line_no = line_no; -+ item->next = NULL; -+ if (deferred_new) { -+ deferred_new_last->next = item; -+ deferred_new_last = item; -+ } else { -+ deferred_new = deferred_new_last = item; -+ } -+} -+ -+static void print_ssdiff_line(char *class, int old_line_no, char *old_line, -+ int new_line_no, char *new_line) -+{ -+ html("
%d", -+ old_line_no, class); -+ else if (old_line) -+ htmlf("", class); -+ else -+ htmlf("", class); -+ -+ if (old_line) { -+ old_line = replace_tabs(old_line + 1); -+ html_txt(old_line); -+ free(old_line); -+ } -+ -+ html("%d", -+ new_line_no, class); -+ else if (new_line) -+ htmlf("", class); -+ else -+ htmlf("", class); -+ -+ if (new_line) { -+ new_line = replace_tabs(new_line + 1); -+ html_txt(new_line); -+ free(new_line); -+ } -+ -+ html("
"); -+ html_txt(line); -+ html("
"); -+ html_txt(line); -+ html("
"); -+} -+ -+void cgit_ssdiff_header_end() -+{ -+ html("
download"); -+ cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, -+ revname, ctx.repo->snapshots); -+ html("
\n"); -- htmlf("\n", sha1_to_hex(sha1)); - if (info->tagger_date > 0) { -- html("\n"); - } - if (info->tagger) { -- html("\n"); - } -- html("\n"); -+ if (ctx.repo->snapshots) -+ print_download_links(revname); - html("
Tag name"); -+ htmlf("
tag name"); - html_txt(revname); - htmlf(" (%s)
Tag date"); -+ html("
tag date"); - cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); - html("
Tagged by"); -+ html("
tagged by"); - html_txt(info->tagger); - if (info->tagger_email && !ctx.cfg.noplainemail) { - html(" "); -@@ -73,19 +81,23 @@ void cgit_print_tag(char *revname) - } - html("
Tagged object"); -+ html("
tagged object"); - cgit_object_link(tag->tagged); - html("
\n"); - print_tag_content(info->msg); - } else { - html("\n"); -- htmlf("\n"); -- html("\n"); -+ if (ctx.repo->snapshots) -+ print_download_links(revname); - html("
Tag name"); -+ htmlf("
tag name"); - html_txt(revname); - html("
Tagged object"); -+ html("
Tagged object"); - cgit_object_link(obj); - html("
\n"); - } - return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 25 21:10:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 25 Oct 2009 20:10:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6967] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 6967 http://gar.svn.sourceforge.net/gar/?rev=6967&view=rev Author: dmichelsen Date: 2009-10-25 20:10:41 +0000 (Sun, 25 Oct 2009) Log Message: ----------- sysstat: Update to 20091024 and prototype modifiers Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2009-10-25 19:55:04 UTC (rev 6966) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2009-10-25 20:10:41 UTC (rev 6967) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20090805 +GARVERSION = 20091024 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -54,7 +54,9 @@ # only done via sysstatd which uses isaexec. ISAEXEC_FILES = $(sbindir)/sysstatd -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/sysstatd$$$$/ { $$$$4 = "4755" } { print }' +PROTOTYPE_MODIFIERS = makesuid +PROTOTYPE_FILES_makesuid = .*/sysstatd +PROTOTYPE_PERMS_makesuid = 4755 include gar/category.mk Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2009-10-25 19:55:04 UTC (rev 6966) +++ csw/mgar/pkg/sysstat/trunk/checksums 2009-10-25 20:10:41 UTC (rev 6967) @@ -1,2 +1,2 @@ -7a7f0f67bb68484b56375d4a922fb63f download/patch-onlyisaexec-sysstatd.diff -a188538c719f3b1ee1e994268ee779e0 download/sysstat-20090805.tgz +7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff +747dc25cec5c888b1dacf78730d726c0 sysstat-20091024.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 25 21:18:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 25 Oct 2009 20:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6968] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 6968 http://gar.svn.sourceforge.net/gar/?rev=6968&view=rev Author: dmichelsen Date: 2009-10-25 20:18:53 +0000 (Sun, 25 Oct 2009) Log Message: ----------- msmtp: Update to 1.4.19 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2009-10-25 20:10:41 UTC (rev 6967) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2009-10-25 20:18:53 UTC (rev 6968) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.18 +GARVERSION = 1.4.19 CATEGORIES = net DESCRIPTION = SMTP client Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2009-10-25 20:10:41 UTC (rev 6967) +++ csw/mgar/pkg/msmtp/trunk/checksums 2009-10-25 20:18:53 UTC (rev 6968) @@ -1 +1 @@ -74f80b41c058a0ee34819d6bf5ff3b1a download/msmtp-1.4.18.tar.bz2 +f0afdc943bf7c8a3a3bf3fe1a73072c4 msmtp-1.4.19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 22:47:29 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 21:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6969] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6969 http://gar.svn.sourceforge.net/gar/?rev=6969&view=rev Author: trygvis Date: 2009-10-25 21:47:29 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Solaris 8 does not have setenv. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/checksums csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 20:18:53 UTC (rev 6968) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:47:29 UTC (rev 6969) @@ -1,4 +1,3 @@ -b013ec63820f1841df1cddaa35d66ed3 0001-cgit.conf -ab2c07418eec63118a2da512a99d7e34 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff +dbc9295d49d58ce0af5de283557a1ed9 0001-cgit.conf 27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW 03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW Modified: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 20:18:53 UTC (rev 6968) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 21:47:29 UTC (rev 6969) @@ -1,9 +1,7 @@ --- a/dev/null 2009-09-18 13:04:46.000000000 +0200 +++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 -@@ -0,0 +1,32 @@ +@@ -0,0 +1,31 @@ +# Sun Studio -+CC=/opt/studio/ss11/SUNWspro/bin/cc -+#CFLAGS += -v +MMFLAGS = -xM1 + +# GCC @@ -25,6 +23,7 @@ +EXTLIBS = -lsocket -lnsl -lgit -lxdiff +NEEDS_LIBICONV=1 +NO_STRCASESTR=1 ++NO_SETENV=1 + +# OpenCSW +CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 22:48:47 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 21:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6970] csw/mgar/pkg/cgit/trunk/checksums Message-ID: Revision: 6970 http://gar.svn.sourceforge.net/gar/?rev=6970&view=rev Author: trygvis Date: 2009-10-25 21:48:47 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Updating checksums. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/checksums Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:47:29 UTC (rev 6969) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:48:47 UTC (rev 6970) @@ -1,3 +1,3 @@ -dbc9295d49d58ce0af5de283557a1ed9 0001-cgit.conf +4a9a3700c36b422090feb1da68afebd2 0001-cgit.conf 27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW 03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 23:08:57 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 22:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6971] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6971 http://gar.svn.sourceforge.net/gar/?rev=6971&view=rev Author: trygvis Date: 2009-10-25 22:08:57 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Getting closer. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 21:48:47 UTC (rev 6970) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 22:08:57 UTC (rev 6971) @@ -26,7 +26,7 @@ GIT_REPOS = git://github.com/trygvis/cgit.git #GIT_TREEISH_cgit = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) -GIT_TREEISH_cgit = solaris +GIT_TREEISH_cgit.git = solaris DISTFILES = apache.conf.CSW cgitrc.CSW Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:48:47 UTC (rev 6970) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 22:08:57 UTC (rev 6971) @@ -1,3 +1,3 @@ -4a9a3700c36b422090feb1da68afebd2 0001-cgit.conf +5bce8ac0de1a5e08e864c56c56906233 0001-cgit.conf 27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW 03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW Modified: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 21:48:47 UTC (rev 6970) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 22:08:57 UTC (rev 6971) @@ -2,6 +2,7 @@ +++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 @@ -0,0 +1,31 @@ +# Sun Studio ++CFLAGS += -DNO_SETENV +MMFLAGS = -xM1 + +# GCC @@ -23,7 +24,6 @@ +EXTLIBS = -lsocket -lnsl -lgit -lxdiff +NEEDS_LIBICONV=1 +NO_STRCASESTR=1 -+NO_SETENV=1 + +# OpenCSW +CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 26 02:57:14 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 26 Oct 2009 01:57:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6972] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 6972 http://gar.svn.sourceforge.net/gar/?rev=6972&view=rev Author: bdwalton Date: 2009-10-26 01:57:14 +0000 (Mon, 26 Oct 2009) Log Message: ----------- ruby: setup support for switching rbconfig.rb for alternation gem compilation settings, etc Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby/trunk/files/README.csw csw/mgar/pkg/ruby/trunk/files/cswrbconfig csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-25 22:08:57 UTC (rev 6971) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-26 01:57:14 UTC (rev 6972) @@ -114,11 +114,23 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) -PI_TARGETS = samples rbconfig rbscripts rubymode +RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.8/rbconfig.rb +PI_TARGETS = samples rbconfig rbscripts rubymode multiconfig + post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) +multiconfig: + @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" + @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 + @gcp $(FILEDIR)/rbconfig.rb.GCC4 $(DESTDIR)/$(RBCONFIG).GCC4 + @gln -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) + @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ + @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig + @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ + @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/ruby/ + rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode rubymode: @echo " ===> Installing and Compilingn ruby-mode elisp" Added: csw/mgar/pkg/ruby/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/ruby/trunk/files/README.csw (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/README.csw 2009-10-26 01:57:14 UTC (rev 6972) @@ -0,0 +1,11 @@ +It is possible to switch rbconfig.rb files in order to use alternate +compilation options or even compilers. CSWruby ships with settings +for Sun Studio 11 (what ruby was built with) and GCC4. Our +distribution of ruby sees rbconfig.rb be a symlink to +rbconfig.rb.SOS11 by default. To switch your settings, use the +cswrbconfig tool provided. Running it with no arguments will provide +more details and list available configurations. + +Please file a bug on CSWruby if you have problems using this tool. + +Ben Walton Added: csw/mgar/pkg/ruby/trunk/files/cswrbconfig =================================================================== --- csw/mgar/pkg/ruby/trunk/files/cswrbconfig (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/cswrbconfig 2009-10-26 01:57:14 UTC (rev 6972) @@ -0,0 +1,54 @@ +#!/opt/csw/bin/ruby -w + +ARCH = %x{uname -p}.chomp +CONFD = "/opt/csw/lib/ruby/1.8/#{ARCH}-solaris2.8" +RBC = File.join(CONFD, "rbconfig.rb") +CUR_RBC = File.readlink(RBC).gsub(/.*\./, '') + +CONF_OPTS = Dir.glob("#{CONFD}/rbconfig.rb.*").map! { |c| c.gsub(/.*\./, '') } + +def usage(errstr) + puts "ERROR: #{errstr}" + puts <<-"EOF" + +Usage: #{File.basename($0)} + +This tool allows you to switch rbconfig.rb between options available +on your system. The benefit of this is that you can build native gems +using options other than those used to build Ruby itself (Sun Studio +11 -> sos11), including alternate compilers. + +rbconfig.rb is found in #{CONFD}. + +Existing options are determined by the presence of rbconfig.rb.FOO +files in #{CONFD}. + +The current value is: #{CUR_RBC} + +The options present on your system are: + EOF + + puts CONF_OPTS.join("\n") + exit(1) +end + +if ARGV.size.eql?(0) + usage("No argument specified.") +else + usage("Something is wrong with your rbconfig.rb symlink setup.") unless File.symlink?(RBC) and File.exists?(RBC) + + usage("No action required.") if CUR_RBC.eql?(ARGV[0]) + + usage("Invalid rbconfig option.") unless CONF_OPTS.include?(ARGV[0]) + + opt_rbc = RBC + '.' + ARGV[0] + + usage("Selection option is valid but there's something wrong with the file it refers to (#{opt_rbc}).") unless File.exists?(opt_rbc) and File.file?(opt_rbc) + + begin + File.unlink(RBC) + File.symlink(opt_rbc, RBC) + rescue + usage("Error while switching rbconfig.rb symlink. Please inspect the situation in #{CONFD}.") + end +end Property changes on: csw/mgar/pkg/ruby/trunk/files/cswrbconfig ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 2009-10-26 01:57:14 UTC (rev 6972) @@ -0,0 +1,182 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module Config + RUBY_VERSION == "1.8.7" or + raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["EXEEXT"] = "" + CONFIG["ruby_install_name"] = "ruby" + CONFIG["RUBY_INSTALL_NAME"] = "ruby" + CONFIG["RUBY_SO_NAME"] = "ruby" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["psdir"] = "$(docdir)" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["ECHO_C"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_T"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " + CONFIG["build_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["target_alias"] = "" + CONFIG["MAJOR"] = "1" + CONFIG["MINOR"] = "8" + CONFIG["TEENY"] = "7" + CONFIG["build"] = "i386-pc-solaris2.8" + CONFIG["build_cpu"] = "i386" + CONFIG["build_vendor"] = "pc" + CONFIG["build_os"] = "solaris2.8" + CONFIG["host"] = "i386-pc-solaris2.8" + CONFIG["host_cpu"] = "i386" + CONFIG["host_vendor"] = "pc" + CONFIG["host_os"] = "solaris2.8" + CONFIG["target"] = "i386-pc-solaris2.8" + CONFIG["target_cpu"] = "i386" + CONFIG["target_vendor"] = "pc" + CONFIG["target_os"] = "solaris2.8" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC $(cflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["OBJEXT"] = "o" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GNU_LD"] = "no" + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["OUTFLAG"] = "-o " + CONFIG["YACC"] = "bison -y" + CONFIG["YFLAGS"] = "" + CONFIG["RANLIB"] = "ranlib" + CONFIG["AR"] = "ar" + CONFIG["AS"] = "as" + CONFIG["ASFLAGS"] = "" + CONFIG["NM"] = "" + CONFIG["WINDRES"] = "" + CONFIG["DLLWRAP"] = "" + CONFIG["OBJDUMP"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["SET_MAKE"] = "" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["RM"] = "rm -f" + CONFIG["CP"] = "cp" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["ALLOCA"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["STATIC"] = "" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["DLEXT"] = "so" + CONFIG["DLEXT2"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["LINK_SO"] = "" + CONFIG["LIBPATHFLAG"] = " -L%1$-s" + CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["TRY_LINK"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["EXTSTATIC"] = "" + CONFIG["setup"] = "Setup" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["EXTOUT"] = ".ext" + CONFIG["ARCHFILE"] = "" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["cflags"] = "$(optflags) $(debugflags)" + CONFIG["optflags"] = "" + CONFIG["debugflags"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" + CONFIG["rubyw_install_name"] = "" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" + CONFIG["SOLIBS"] = "$(LIBS)" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["ENABLE_SHARED"] = "yes" + CONFIG["MAINLIBS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["arch"] = "i386-solaris2.8" + CONFIG["sitearch"] = "i386-solaris2.8" + CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" + CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["MANTYPE"] = "man" + CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" + CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def Config::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + Config::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + Config::expand(val) + end +end +RbConfig = Config # compatibility for ruby-1.9 +CROSS_COMPILING = nil unless defined? CROSS_COMPILING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 26 09:36:02 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 26 Oct 2009 08:36:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6973] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 6973 http://gar.svn.sourceforge.net/gar/?rev=6973&view=rev Author: bonivart Date: 2009-10-26 08:36:02 +0000 (Mon, 26 Oct 2009) Log Message: ----------- pkgutil: updated source for beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 01:57:14 UTC (rev 6972) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 08:36:02 UTC (rev 6973) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -e32847e2c0a01549f17444426b13ff2d pkgutil-1.8b2.zip +ee8bac4ae4678a2c587051357f886d38 pkgutil-1.8b2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Mon Oct 26 14:04:55 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Mon, 26 Oct 2009 13:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6974] csw/mgar/pkg Message-ID: Revision: 6974 http://gar.svn.sourceforge.net/gar/?rev=6974&view=rev Author: aubreyli Date: 2009-10-26 13:04:55 +0000 (Mon, 26 Oct 2009) Log Message: ----------- cscope: initial commit Added Paths: ----------- csw/mgar/pkg/cscope/ csw/mgar/pkg/cscope/branches/ csw/mgar/pkg/cscope/tags/ csw/mgar/pkg/cscope/trunk/ csw/mgar/pkg/cscope/trunk/Makefile csw/mgar/pkg/cscope/trunk/checksums csw/mgar/pkg/cscope/trunk/files/ csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec Property changes on: csw/mgar/pkg/cscope/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cscope/trunk/Makefile =================================================================== --- csw/mgar/pkg/cscope/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cscope/trunk/Makefile 2009-10-26 13:04:55 UTC (rev 6974) @@ -0,0 +1,31 @@ +GARNAME = cscope +GARVERSION = 15.7a +CATEGORIES = utils + +DESCRIPTION = A text screen-based source browser +define BLURB + cscope is a developer's tool for browsing source code. It has an impeccable + Unix pedigree, having been originally developed at Bell Labs back in the days + of the PDP-11. Cscope was part of the official AT&T Unix distribution for many + years, and has been used to manage projects involving 20 million lines of code! +endef + +MASTER_SITES = http://ncu.dl.sourceforge.net/project/cscope/cscope/$(GARVERSION)/ + +DISTFILES = $(DISTNAME).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# Test suite won't run as root! +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/cscope/trunk/checksums =================================================================== --- csw/mgar/pkg/cscope/trunk/checksums (rev 0) +++ csw/mgar/pkg/cscope/trunk/checksums 2009-10-26 13:04:55 UTC (rev 6974) @@ -0,0 +1 @@ +da43987622ace8c36bbf14c15a350ec1 cscope-15.7a.tar.bz2 Added: csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec =================================================================== --- csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec (rev 0) +++ csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec 2009-10-26 13:04:55 UTC (rev 6974) @@ -0,0 +1,4 @@ +%var bitname cscope +%var pkgname CSWcscope +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Mon Oct 26 14:13:55 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Mon, 26 Oct 2009 13:13:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6975] csw/mgar/pkg/cscope/Makefile Message-ID: Revision: 6975 http://gar.svn.sourceforge.net/gar/?rev=6975&view=rev Author: aubreyli Date: 2009-10-26 13:13:55 +0000 (Mon, 26 Oct 2009) Log Message: ----------- add package-level Makefile Added Paths: ----------- csw/mgar/pkg/cscope/Makefile Added: csw/mgar/pkg/cscope/Makefile =================================================================== --- csw/mgar/pkg/cscope/Makefile (rev 0) +++ csw/mgar/pkg/cscope/Makefile 2009-10-26 13:13:55 UTC (rev 6975) @@ -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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 26 15:50:09 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 26 Oct 2009 14:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6976] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6976 http://gar.svn.sourceforge.net/gar/?rev=6976&view=rev Author: bonivart Date: 2009-10-26 14:50:09 +0000 (Mon, 26 Oct 2009) Log Message: ----------- pkgutil: add logging hook Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-26 13:13:55 UTC (rev 6975) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-26 14:50:09 UTC (rev 6976) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8b2 +GARVERSION = 1.8b3 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -45,29 +45,30 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(sysconfdir) - @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)plus - @ginstall -d $(DESTDIR)$(mandir)/man1 -# @ginstall -d $(DESTDIR)/usr/sadm/install/scripts - @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages - @ginstall -d $(DESTDIR)/etc/opt/csw - @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @cp $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log + @ginstall -m 755 -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)$(sysconfdir) + @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ - @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ -# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil -# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil - @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW - @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages + @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW +# @ginstall -m 755 -d $(DESTDIR)/usr/sadm/install/scripts +# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil +# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 13:13:55 UTC (rev 6975) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 14:50:09 UTC (rev 6976) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -ee8bac4ae4678a2c587051357f886d38 pkgutil-1.8b2.zip +9641cba108ea4aad1e2608263ec48fb2 pkgutil-1.8b3.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Oct 26 15:51:51 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Oct 2009 14:51:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6977] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 6977 http://gar.svn.sourceforge.net/gar/?rev=6977&view=rev Author: d_pocock Date: 2009-10-26 14:51:49 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Update for testing 3.1.4 Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums Removed Paths: ------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-17 11:39:21 UTC (rev 6330) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) @@ -1,160 +0,0 @@ -GARNAME = ganglia -GARVERSION = 3.1.3 -CATEGORIES = utils - -# How should we set this? -# There is a release number in configure.in, maybe use that? -# RELVER = - -USER_GMOND = nobody -# nobody shouldn't really be allowed to own any files -# maybe we should add a ganglia user to own the RRD files? -USER_GMETAD = nobody - -DESCRIPTION = A scalable distributed monitoring system -define BLURB - Ganglia is a scalable distributed monitoring system for high-performance computing - systems such as clusters and Grids. It is based on a hierarchical design targeted - at federations of clusters. -endef - -SF_PROJ = ganglia -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad - -PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython - -CATALOGNAME_CSWganglia = ganglia -CATALOGNAME_CSWgangliart = ganglia_rt -CATALOGNAME_CSWgangliaagent = ganglia_agent -CATALOGNAME_CSWgangliamodpython = ganglia_modpython -CATALOGNAME_CSWgangliadevel = ganglia_devel -CATALOGNAME_CSWgangliagmetad = ganglia_gmetad -CATALOGNAME_CSWgangliaweb = ganglia_web - -SPKG_DESC_CSWganglia = Dummy package -SPKG_DESC_CSWgangliart = Ganglia runtime libraries -SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond -SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics -SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development -SPKG_DESC_CSWgangliagmetad = Ganglia gmetad -SPKG_DESC_CSWgangliaweb = Ganglia web - -PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd - -REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent += CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent -REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd -REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad -REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -# This is attachment #45 from Ganglia bug -# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 -#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch - -CONFIGURE_ARGS = $(DIRPATHS) - -# Don't build gmetad (not tested yet on Solaris, more deps required to build) -#CONFIGURE_ARGS += --without-gmetad -CONFIGURE_ARGS += --with-gmetad - -# Reduce dependencies, no gettext: -CONFIGURE_ARGS += --disable-nls - -# Use apr from CSWapache2rt -CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config - -# Include the status module -CONFIGURE_ARGS += --with-status - -# When we enable this, modpython will have to go in a separate package, -# otherwise CSWgangliaagent will have lots of dependencies -# TODO: define a CSWgangliamodpython package -# Depends: some issues exist getting the Python support working on Solaris, -# Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --disable-python -#CONFIGURE_ARGS += --with-python=/opt/csw - -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(GARVERSION),3.1.3) -TEST_SCRIPTS = -endif - -INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom - -WWWROOT = /opt/csw/share/www -WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /etc/opt/csw/ganglia - -PKGFILES_CSWganglia = -PKGFILES_CSWgangliart = $(libdir)/libganglia.* -PKGFILES_CSWgangliamodpython = .*python.* -PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* - -PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - -# For gmond -INITSMF = /etc/opt/csw/init.d/cswgmond -# For gmetad -INITSMF += /etc/opt/csw/init.d/cswgmetad - -PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ -$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ -{ print }' - - -#ARCHALL_CSWgangliadevel = 1 -#ARCHALL_CSWgangliaweb = 1 - -include gar/category.mk - -install-custom: - @ginstall -D $(DOWNLOADDIR)/cswgmond \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmond - @ginstall -D $(DOWNLOADDIR)/cswgmetad \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmetad - @ginstall -d $(DESTDIR)$(WWWGANGLIA) - @cd $(WORKSRC)/web; \ - cp -R * $(DESTDIR)$(WWWGANGLIA) - @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php - @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in - @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ - $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d - @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf -# @ginstall -D $(FILEDIR)/gmond.conf \ -# $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf - @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf -ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf -endif - @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds - - - Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile (from rev 6435, csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) @@ -0,0 +1,161 @@ +GARNAME = ganglia +GARVERSION = 3.1.4 +CATEGORIES = utils + +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + +DESCRIPTION = A scalable distributed monitoring system +define BLURB + Ganglia is a scalable distributed monitoring system for high-performance computing + systems such as clusters and Grids. It is based on a hierarchical design targeted + at federations of clusters. +endef + +SF_PROJ = ganglia +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad + +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython + +CATALOGNAME_CSWganglia = ganglia +CATALOGNAME_CSWgangliart = ganglia_rt +CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web + +SPKG_DESC_CSWganglia = Dummy package +SPKG_DESC_CSWgangliart = Ganglia runtime libraries +SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web + +PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd + +REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent += CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent +REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad +REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# This is attachment #45 from Ganglia bug +# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 +#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +# Don't build gmetad (not tested yet on Solaris, more deps required to build) +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad + +# Reduce dependencies, no gettext: +CONFIGURE_ARGS += --disable-nls + +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --disable-python +#CONFIGURE_ARGS += --with-python=/opt/csw + +# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, +# so we skip it. This should be re-assessed with each new release +# from upstream. Proposed fixes for the test suite to be submitted +# upstream. +ifeq ($(GARVERSION),3.1.3) +TEST_SCRIPTS = +endif + +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) + +PKGFILES_CSWganglia = +PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* + +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + +include gar/category.mk + +install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + @cd $(WORKSRC)/gmond/modules/conf.d; \ + cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-17 11:39:21 UTC (rev 6330) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums 2009-10-26 14:51:49 UTC (rev 6977) @@ -1,6 +0,0 @@ -f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall -c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove -25d302948e25837bf17757d5e23e4955 download/cswgmetad -c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -cd502229ea934b433fa2ddc6fd3a2706 download/ganglia-3.1.3.tar.gz -2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums (from rev 6424, csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums 2009-10-26 14:51:49 UTC (rev 6977) @@ -0,0 +1,6 @@ +f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 download/cswgmetad +c6bb96c949dbb989d06ebb36b6af885d download/cswgmond +b040c8b8efe3fd3973e4b1e5f687133a download/ganglia-3.1.4.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Oct 26 16:06:34 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Oct 2009 15:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6978] csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/ Makefile Message-ID: Revision: 6978 http://gar.svn.sourceforge.net/gar/?rev=6978&view=rev Author: d_pocock Date: 2009-10-26 15:06:31 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Extend test-exemption to 3.1.4 package Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 15:06:31 UTC (rev 6978) @@ -94,6 +94,9 @@ ifeq ($(GARVERSION),3.1.3) TEST_SCRIPTS = endif +ifeq ($(GARVERSION),3.1.4) +TEST_SCRIPTS = +endif INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 26 16:06:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 26 Oct 2009 15:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6979] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 6979 http://gar.svn.sourceforge.net/gar/?rev=6979&view=rev Author: bdwalton Date: 2009-10-26 15:06:49 +0000 (Mon, 26 Oct 2009) Log Message: ----------- asciidoc: force /opt/csw/bin into path for a2x via patch Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/checksums csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2009-10-26 15:06:31 UTC (rev 6978) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2009-10-26 15:06:49 UTC (rev 6979) @@ -1,3 +1,3 @@ -4f81539ae1a7796a55770bfb977e063a download/add-csw-gnu-path-to-a2x.patch -9f21d6e352b3ab668f9def3eb7497da2 download/asciidoc-8.4.5.tar.gz -ec48eeea1eafdaa7e507bc11327f6eae download/handle-csw-etc-paths.patch +62c15a6f036ca40ad0dffb0b14ad6630 add-csw-gnu-path-to-a2x.patch +9f21d6e352b3ab668f9def3eb7497da2 asciidoc-8.4.5.tar.gz +ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch Modified: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2009-10-26 15:06:31 UTC (rev 6978) +++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2009-10-26 15:06:49 UTC (rev 6979) @@ -5,7 +5,7 @@ # under the terms of the GNU General Public License (GPL). # -+PATH=/opt/csw/gnu:$PATH ++PATH=/opt/csw/gnu:/opt/csw/bin:$PATH +export PATH + VERSION=1.0.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Oct 26 17:32:37 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Oct 2009 16:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6980] csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/ Makefile Message-ID: Revision: 6980 http://gar.svn.sourceforge.net/gar/?rev=6980&view=rev Author: d_pocock Date: 2009-10-26 16:32:37 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Use PRESERVECONF for all config files Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 15:06:49 UTC (rev 6979) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 16:32:37 UTC (rev 6980) @@ -113,6 +113,11 @@ PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW +PRESERVECONF += $(WWWGANGLIA)/conf.php # For gmond INITSMF = /etc/opt/csw/init.d/cswgmond @@ -138,25 +143,26 @@ @cd $(WORKSRC)/web; \ cp -R * $(DESTDIR)$(WWWGANGLIA) @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW # @ginstall -D $(FILEDIR)/gmond.conf \ # $(DESTDIR)$(ETCGANGLIA)/gmond.conf @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW endif @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 26 17:56:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Oct 2009 16:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6981] csw/mgar/pkg/shared-mime-info Message-ID: Revision: 6981 http://gar.svn.sourceforge.net/gar/?rev=6981&view=rev Author: dmichelsen Date: 2009-10-26 16:56:04 +0000 (Mon, 26 Oct 2009) Log Message: ----------- shared-mime-info: Convert to mGAR Added Paths: ----------- csw/mgar/pkg/shared-mime-info/Makefile csw/mgar/pkg/shared-mime-info/branches/ csw/mgar/pkg/shared-mime-info/tags/ csw/mgar/pkg/shared-mime-info/tags/legacy/ csw/mgar/pkg/shared-mime-info/trunk/Makefile csw/mgar/pkg/shared-mime-info/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/shared-mime-info/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/shared-mime-info/trunk/ Copied: csw/mgar/pkg/shared-mime-info/Makefile (from rev 6855, csw/mgar/pkg/automake/Makefile) =================================================================== --- csw/mgar/pkg/shared-mime-info/Makefile (rev 0) +++ csw/mgar/pkg/shared-mime-info/Makefile 2009-10-26 16:56:04 UTC (rev 6981) @@ -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) Property changes on: csw/mgar/pkg/shared-mime-info/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/shared-mime-info/trunk/Makefile (from rev 6855, csw/mgar/pkg/gperf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile (rev 0) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2009-10-26 16:56:04 UTC (rev 6981) @@ -0,0 +1,27 @@ +GARNAME = shared-mime-info +GARVERSION = 0.70 +CATEGORIES = lib + +DESCRIPTION = Freedesktop.org common MIME database +define BLURB + The shared-mime-info package contains the core database of common types and + the *update-mime-database* command used to extend it. It requires glib2 to be + installed for building the update command. Additionally, it uses intltool for + translations, though this is only a dependency for the maintainers. This + database is translated at Transifex. +endef + +MASTER_SITES = http://freedesktop.org/~hadess/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + Added: csw/mgar/pkg/shared-mime-info/trunk/checksums =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/checksums (rev 0) +++ csw/mgar/pkg/shared-mime-info/trunk/checksums 2009-10-26 16:56:04 UTC (rev 6981) @@ -0,0 +1 @@ +9032d98f14b8e13e0fea4bf45ca23401 shared-mime-info-0.70.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 26 18:19:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Oct 2009 17:19:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6982] csw/mgar/pkg/shared-mime-info/trunk/Makefile Message-ID: Revision: 6982 http://gar.svn.sourceforge.net/gar/?rev=6982&view=rev Author: dmichelsen Date: 2009-10-26 17:19:01 +0000 (Mon, 26 Oct 2009) Log Message: ----------- shared-mime-info: Adjust package parameters Modified Paths: -------------- csw/mgar/pkg/shared-mime-info/trunk/Makefile Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile 2009-10-26 16:56:04 UTC (rev 6981) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) @@ -17,11 +17,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PREREQUISITE_PKGS = CSWgnulinks + +PACKAGES = CSWsharedmimeinfo +CATALOGNAME = shared_mime_info + SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibxml2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 26 21:31:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Oct 2009 20:31:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6983] csw/mgar/pkg/x11 Message-ID: Revision: 6983 http://gar.svn.sourceforge.net/gar/?rev=6983&view=rev Author: wbonnet Date: 2009-10-26 20:31:50 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Swtich to version 7.5 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/checksums csw/mgar/pkg/x11/libxcb/trunk/Makefile csw/mgar/pkg/x11/libxcb/trunk/checksums csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_dri2proto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_dri2proto/ Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -19,7 +19,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxcbproto CSWx11xextproto CSWxtrans CSWx11inputproto CSWlibpthreadstubs CSWlibxcbdevel +PREREQUISITE_PKGS = CSWx11xextproto CSWxtrans CSWx11inputproto CSWlibpthreadstubs CSWlibxcbdevel PACKAGES = CSWlibx11 CSWlibx11devel Modified: csw/mgar/pkg/x11/lib/libx11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,3 +1 @@ -2feb39a0de6f05b25c308268691d960c download/libX11-1.1.5.tar.gz -667f63d38722e29d6fd36b6648bbb757 download/patch-stdint.diff -4e6f6f42902f849eba8d88ab15fa3697 download/patch-xlib-sentinel.diff +2feb39a0de6f05b25c308268691d960c libX11-1.1.5.tar.gz Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,5 +1,5 @@ GARNAME = libxcb -GARVERSION = 1.3 +GARVERSION = 1.2 CATEGORIES = x11 DESCRIPTION = The XCB library Modified: csw/mgar/pkg/x11/libxcb/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/libxcb/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) @@ -1 +1 @@ -0c61161743e42bf5d26d4618125f069c download/libxcb-1.3.tar.gz +f55c731d32ec1a555c77ebbbc8f386aa libxcb-1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,5 +1,5 @@ PROTONAME = applewmproto -GARVERSION = 1.0.3 +GARVERSION = 1.4.1 CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -2,7 +2,7 @@ CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 DESCRIPTION = Prototype headers for BigReqs extension to X11 define BLURB Modified: csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 0.4 +GARVERSION = 0.4.1 CATEGORIES = x11 PROTONAME = compositeproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = damageproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.2.2 +GARVERSION = 2.3 CATEGORIES = x11 PROTONAME = dmxproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 4.0 +GARVERSION = 4.1.1 CATEGORIES = x11 PROTONAME = fixesproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.0.2 +GARVERSION = 2.1.0 CATEGORIES = x11 PROTONAME = fontsproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.4.9 +GARVERSION = 1.4.10 CATEGORIES = x11 PROTONAME = glproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.4.4 +GARVERSION = 2.0 PROTONAME = inputproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 PROTONAME = kbproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.1 +GARVERSION = 1.3.1 CATEGORIES = x11 PROTONAME = randrproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.13.2 +GARVERSION = 1.14 CATEGORIES = x11 PROTONAME = recordproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 0.9.3 +GARVERSION = 0.11 CATEGORIES = x11 PROTONAME = renderproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = resourceproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = scrnsaverproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,5 +1,5 @@ -GARVERSION = 2.2.2 -CATEGORIES = x11 +GARVERSION = 2.3 +CATEGORIES = x11.0 PROTONAME = videoproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = x11 PROTONAME = windowswmproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.2 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = xcmiscproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 7.0.3 +GARVERSION = 7.1.1 PROTONAME = xextproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.2 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = xf86bigfontproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.0.3 +GARVERSION = 2.1 CATEGORIES = x11 PROTONAME = xf86dgaproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.0.4 +GARVERSION = 2.1.0 CATEGORIES = x11 PROTONAME = xf86driproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.2.2 +GARVERSION = 2.3 CATEGORIES = x11 PROTONAME = xf86vidmodeproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.2 +GARVERSION = 1.2 CATEGORIES = x11 PROTONAME = xineramaproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 7.0.13 +GARVERSION = 7.0.16 CATEGORIES = x11 PROTONAME = xproto GARNAME = x11_$(PROTONAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 26 21:59:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Oct 2009 20:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6984] csw/mgar/pkg/x11 Message-ID: Revision: 6984 http://gar.svn.sourceforge.net/gar/?rev=6984&view=rev Author: wbonnet Date: 2009-10-26 20:59:06 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Swtich to version 7.5 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/individual/ csw/mgar/pkg/x11/individual/Makefile csw/mgar/pkg/x11/individual/x11_evieextproto/ csw/mgar/pkg/x11/individual/x11_fontcacheproto/ csw/mgar/pkg/x11/individual/x11_trapproto/ csw/mgar/pkg/x11/individual/x11_xf86miscproto/ csw/mgar/pkg/x11/xcb/ csw/mgar/pkg/x11/xcb/Makefile Removed Paths: ------------- csw/mgar/pkg/x11/proto/x11_evieextproto/ csw/mgar/pkg/x11/proto/x11_fontcacheproto/ csw/mgar/pkg/x11/proto/x11_trapproto/ csw/mgar/pkg/x11/proto/x11_xf86miscproto/ Added: csw/mgar/pkg/x11/individual/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/Makefile (rev 0) +++ csw/mgar/pkg/x11/individual/Makefile 2009-10-26 20:59:06 UTC (rev 6984) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/individual directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -774bf8e9633f0f38c49069a9ea56ae23 download/applewmproto-1.0.3.tar.gz +822151ea24caf7c23ced6da7a14dfb4d applewmproto-1.4.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -d43f7faa2aac2f0206ea19f031494af1 download/bigreqsproto-1.0.2.tar.gz +882d49cc3bb591dbdccdf9e680bd2e4b bigreqsproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -33a79f6ba950bc5b41e077c951871bd5 download/compositeproto-0.4.tar.gz +6994a209774fe7877fd8e0c9fafe2466 compositeproto-0.4.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -bce4477a6edd774dfca175ea46e1ba76 download/damageproto-1.1.0.tar.gz +423516fd64e43e8671120056b0d9f597 damageproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -c76b374240fdb37af3ff62cbd484ec72 download/dmxproto-2.2.2.tar.gz +595b6a86540497b3ccadfb597df10546 dmxproto-2.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -4815a9ac0682528aba50759b6f611acb download/dri2proto-2.1.tar.gz +4815a9ac0682528aba50759b6f611acb dri2proto-2.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -ed4af7fbf04a51aca684c259784520f3 download/fixesproto-4.0.tar.gz +95806b9b648639d4c3e5b226d10927c0 fixesproto-4.1.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -6c1efa12ae50262b45c91e9a120632b7 download/fontsproto-2.0.2.tar.gz +6819fc82585daac68cec17938b659bf0 fontsproto-2.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -216203b0fe4dd2ecb361265ac01ad348 download/glproto-1.4.9.tar.gz +ac89626ed6bced045d0515217bfffd4f glproto-1.4.10.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz +13d91739cf70a781f1db24d8d3677574 inputproto-2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz +4deef518a03bc94a7a25902bb7c98dd6 kbproto-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -d6b6b024d71b689628bcaf27fd491f5b download/randrproto-1.2.1.tar.gz +15266124b9e2dfcfb25ce6cba24cdd66 randrproto-1.3.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -a184f8939a7ecae064857e7932a929b2 download/recordproto-1.13.2.tar.gz +60038c2ef058ee5ac04a645a37c072ce recordproto-1.14.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +57216f25b9a5edc561b83a7484cb17e8 renderproto-0.11.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -198252b76e8082958cc2228d8dcc7c2f download/resourceproto-1.0.2.tar.gz +587333b4995a3e11ebe4c8ba2742efaf resourceproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -616ae17acad2b6033c981b8b526d5e67 download/scrnsaverproto-1.1.0.tar.gz +0ed88bdd6945ba207c4f734af48e7e25 scrnsaverproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -a306fcd4afa9c5f981b8c1b45c725dec download/windowswmproto-1.0.3.tar.gz +558db92a8e4e1b07e9c62eca3f04dd8d windowswmproto-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -3c380a728697ded97a39addfe1acf2cb download/xcmiscproto-1.1.2.tar.gz +bacfb0f3cb4d6e1a71770307bfdba129 xcmiscproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz +6c55283718dbeb826bcf899b9e89faba xextproto-7.1.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -43d9fe9f92e5b8abd6e1328fdb022e7d download/xf86bigfontproto-1.1.2.tar.gz +91b0733ff4cbe55808d96073258aa3d1 xf86bigfontproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -f73c1d99b557249662bc75b9b872b61b download/xf86dgaproto-2.0.3.tar.gz +1fe79dc07857ad3e1fb8b8f2bdd70d1b xf86dgaproto-2.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -17a69691f2827b13ac4494f9c4af22b1 download/xf86driproto-2.0.4.tar.gz +da848afcd5c41ac05e3aa994bdacdf1c xf86driproto-2.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -67c93ee2c2c4941e866d96d63329a471 download/xf86vidmodeproto-2.2.2.tar.gz +934b400f2f8d1bcab20bb056e0910291 xf86vidmodeproto-2.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -1ad90ffc98d49c0dc5abb11e78b8d1aa download/xineramaproto-1.1.2.tar.gz +1e98484ffa9b0eb6ab9d00cd53bfe74f xineramaproto-1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -4c736a7ba52beddaea87964047adf209 download/xproto-7.0.13.tar.gz +6e6b6510ccd568f82093ebd7ae58700b xproto-7.0.16.tar.gz Added: csw/mgar/pkg/x11/xcb/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcb/Makefile 2009-10-26 20:59:06 UTC (rev 6984) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/xcb directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 26 22:14:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Oct 2009 21:14:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6985] csw/mgar/pkg/x11 Message-ID: Revision: 6985 http://gar.svn.sourceforge.net/gar/?rev=6985&view=rev Author: wbonnet Date: 2009-10-26 21:14:05 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Swtich to version 7.5 Modified Paths: -------------- csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_printproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/individual/x11_printproto/ csw/mgar/pkg/x11/individual/x11_xf86rushproto/ csw/mgar/pkg/x11/xcb/libxcb/ csw/mgar/pkg/x11/xcb/x11_xcbproto/ csw/mgar/pkg/x11/xcb/xcb-util/ Removed Paths: ------------- csw/mgar/pkg/x11/libxcb/ csw/mgar/pkg/x11/x11_printproto/ csw/mgar/pkg/x11/x11_xcbproto/ csw/mgar/pkg/x11/x11_xf86rushproto/ csw/mgar/pkg/x11/xcb-util/ Modified: csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = evieext GARNAME = x11_$(PROTONAME) @@ -9,7 +9,7 @@ EvIE protocol headers from modular X.org X11 endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -cff7b68b228d255f582cb64879619a44 download/evieext-1.0.2.tar.gz +68e61ce53caa495a3ad4085f66010eb8 evieext-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -1,4 +1,4 @@ -GARVERSION = 0.1.2 +GARVERSION = 0.1.3 CATEGORIES = x11 PROTONAME = fontcacheproto GARNAME = x11_$(PROTONAME) @@ -9,7 +9,7 @@ Prototype headers for the Fontcache library from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -dc8c34a8c3559bf3b008bcdf7ba5a743 download/fontcacheproto-0.1.2.tar.gz +5a91ab914ffbfbc856e6fcde52e6f3e3 fontcacheproto-0.1.3.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_printproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -9,7 +9,7 @@ X11 print extension wire protocol Headers endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_printproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/x11_printproto/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_printproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -9726f053b3d4cbd245766de70408c30b download/printproto-1.0.4.tar.gz +9726f053b3d4cbd245766de70408c30b printproto-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -9,7 +9,7 @@ Trap protocol headers from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -1344759ae8d7d923e64f5eec078a679b download/trapproto-3.4.3.tar.gz +1344759ae8d7d923e64f5eec078a679b trapproto-3.4.3.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -1,4 +1,4 @@ -GARVERSION = 0.9.2 +GARVERSION = 0.9.3 CATEGORIES = x11 PROTONAME = xf86miscproto GARNAME = x11_$(PROTONAME) @@ -9,7 +9,7 @@ X.Org XF86Misc protocol headers from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -c4f03f37e2afd9c7f1b1f33db1e9c75a download/xf86miscproto-0.9.2.tar.gz +c6432f04f84929c94fa05b3a466c489d xf86miscproto-0.9.3.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -9,7 +9,7 @@ X.Org XF86Rush protocol headers from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/x11_xf86rushproto/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -6a6389473332ace01146cccfef228576 download/xf86rushproto-1.1.2.tar.gz +6a6389473332ace01146cccfef228576 xf86rushproto-1.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Mon Oct 26 23:27:01 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Mon, 26 Oct 2009 22:27:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6986] csw/mgar/pkg/cgit/trunk/Makefile Message-ID: Revision: 6986 http://gar.svn.sourceforge.net/gar/?rev=6986&view=rev Author: trygvis Date: 2009-10-26 22:27:01 +0000 (Mon, 26 Oct 2009) Log Message: ----------- o Adding documentation to cgit. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-26 22:27:01 UTC (rev 6986) @@ -44,6 +44,9 @@ # Disable tests for now, need a round GNU'ism removal there too TEST_SCRIPTS = +# pdf-doc does not work yet +INSTALL_ARGS += man-doc html-doc + PRESERVECONF = /etc/opt/csw/cgit/apache.conf.CSW PRESERVECONF += /etc/opt/csw/cgit/cgitrc.CSW @@ -51,10 +54,16 @@ pre-extract-modulated: git-extract-cgit post-install-modulated: - @mkdir -p $(DESTDIR)/etc/opt/csw/cgit/ + @mkdir -p $(DESTDIR)/etc/opt/csw/cgit + @mkdir -p $(DESTDIR)/opt/csw/share/man/man5 + @mkdir -p $(DESTDIR)/opt/csw/share/doc/cgit @cp $(FILEDIR)/apache.conf.CSW \ $(FILEDIR)/cgitrc.CSW \ $(DESTDIR)/etc/opt/csw/cgit/ -# @$(MAKECOOKIE) + @cp $(WORKSRC)/cgitrc.5 $(DESTDIR)/opt/csw/share/man/man5 + @cp $(WORKSRC)/cgitrc.5.txt $(DESTDIR)/opt/csw/share/doc/cgit + @cp $(WORKSRC)/cgitrc.5.html $(DESTDIR)/opt/csw/share/doc/cgit +# @cp $(WORKSRC)/cgitrc.5.pdf $(DESTDIR)/opt/csw/share/doc/cgit + @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Tue Oct 27 06:06:40 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Tue, 27 Oct 2009 05:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6987] csw/mgar/pkg/cscope/trunk/files/ Message-ID: Revision: 6987 http://gar.svn.sourceforge.net/gar/?rev=6987&view=rev Author: aubreyli Date: 2009-10-27 05:06:40 +0000 (Tue, 27 Oct 2009) Log Message: ----------- remove deprecated gspec file Removed Paths: ------------- csw/mgar/pkg/cscope/trunk/files/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 08:55:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 07:55:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6988] csw/mgar/pkg Message-ID: Revision: 6988 http://gar.svn.sourceforge.net/gar/?rev=6988&view=rev Author: dmichelsen Date: 2009-10-27 07:55:30 +0000 (Tue, 27 Oct 2009) Log Message: ----------- xjobs: Initial commit Added Paths: ----------- csw/mgar/pkg/xjobs/ csw/mgar/pkg/xjobs/branches/ csw/mgar/pkg/xjobs/tags/ csw/mgar/pkg/xjobs/trunk/ csw/mgar/pkg/xjobs/trunk/Makefile csw/mgar/pkg/xjobs/trunk/checksums csw/mgar/pkg/xjobs/trunk/files/ Property changes on: csw/mgar/pkg/xjobs/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2009-10-27 07:55:30 UTC (rev 6988) @@ -0,0 +1,28 @@ +GARNAME = xjobs +GARVERSION = 20091012 +CATEGORIES = utils + +DESCRIPTION = Executes jobs in parallel similar to xargs +define BLURB + xjobs reads job descriptions line by line and executes them in parallel. + It limits the number of parallel executing jobs and starts new jobs when + jobs finish. Therefore, it combines the arguments from every input line + with the utility and arguments given on the command line. If no utility + is given as an argument to xjobs, then the first argument on every job + line will be used as utility. To execute utility xjobs searches the + directories given in the PATH environment variable and uses the first + file found in these directories. +endef + +MASTER_SITES = http://www.maier-komor.de/xjobs/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +CONFIGURE_ARGS = $(DIRPATHS) + +# No tests available +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/xjobs/trunk/checksums =================================================================== --- csw/mgar/pkg/xjobs/trunk/checksums (rev 0) +++ csw/mgar/pkg/xjobs/trunk/checksums 2009-10-27 07:55:30 UTC (rev 6988) @@ -0,0 +1 @@ +276bd941a1fc178d2a4d79a0870e533a xjobs-20091012.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 10:13:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 09:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6989] csw/mgar/pkg/xjobs/trunk/Makefile Message-ID: Revision: 6989 http://gar.svn.sourceforge.net/gar/?rev=6989&view=rev Author: dmichelsen Date: 2009-10-27 09:13:32 +0000 (Tue, 27 Oct 2009) Log Message: ----------- xjobs: Adjust sourceurl Modified Paths: -------------- csw/mgar/pkg/xjobs/trunk/Makefile Modified: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile 2009-10-27 07:55:30 UTC (rev 6988) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2009-10-27 09:13:32 UTC (rev 6989) @@ -17,6 +17,8 @@ MASTER_SITES = http://www.maier-komor.de/xjobs/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SPKG_SOURCEURL = http://www.maier-komor.de/xjobs.html + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Tue Oct 27 12:42:59 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Tue, 27 Oct 2009 11:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6990] csw/mgar/pkg/cscope/trunk/Makefile Message-ID: Revision: 6990 http://gar.svn.sourceforge.net/gar/?rev=6990&view=rev Author: aubreyli Date: 2009-10-27 11:42:59 +0000 (Tue, 27 Oct 2009) Log Message: ----------- change to use predefined SF mirrors Modified Paths: -------------- csw/mgar/pkg/cscope/trunk/Makefile Modified: csw/mgar/pkg/cscope/trunk/Makefile =================================================================== --- csw/mgar/pkg/cscope/trunk/Makefile 2009-10-27 09:13:32 UTC (rev 6989) +++ csw/mgar/pkg/cscope/trunk/Makefile 2009-10-27 11:42:59 UTC (rev 6990) @@ -10,7 +10,8 @@ years, and has been used to manage projects involving 20 million lines of code! endef -MASTER_SITES = http://ncu.dl.sourceforge.net/project/cscope/cscope/$(GARVERSION)/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = cscope DISTFILES = $(DISTNAME).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Oct 27 16:44:39 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 27 Oct 2009 15:44:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6991] csw/mgar/pkg/libconfuse/trunk/Makefile Message-ID: Revision: 6991 http://gar.svn.sourceforge.net/gar/?rev=6991&view=rev Author: d_pocock Date: 2009-10-27 15:44:39 +0000 (Tue, 27 Oct 2009) Log Message: ----------- Enable 64 bit libraries Modified Paths: -------------- csw/mgar/pkg/libconfuse/trunk/Makefile Modified: csw/mgar/pkg/libconfuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/libconfuse/trunk/Makefile 2009-10-27 11:42:59 UTC (rev 6990) +++ csw/mgar/pkg/libconfuse/trunk/Makefile 2009-10-27 15:44:39 UTC (rev 6991) @@ -37,6 +37,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-nls This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 17:08:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 16:08:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6992] csw/mgar/pkg/cpan/Log-Log4perl/trunk Message-ID: Revision: 6992 http://gar.svn.sourceforge.net/gar/?rev=6992&view=rev Author: dmichelsen Date: 2009-10-27 16:08:30 +0000 (Tue, 27 Oct 2009) Log Message: ----------- cpan/Log-Log4perl: Update to 1.25 Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2009-10-27 15:44:39 UTC (rev 6991) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2009-10-27 16:08:30 UTC (rev 6992) @@ -1,5 +1,5 @@ GARNAME = Log-Log4perl -GARVERSION = 1.21 +GARVERSION = 1.25 CATEGORIES = cpan AUTHOR = MSCHILLI Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2009-10-27 15:44:39 UTC (rev 6991) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2009-10-27 16:08:30 UTC (rev 6992) @@ -1 +1 @@ -66bfe59ecb3741e9f271750198c3196e download/Log-Log4perl-1.21.tar.gz +d189f9c74b6811b2bc9d0c508041cd7a Log-Log4perl-1.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 17:13:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 16:13:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6993] csw/mgar/pkg/cpan/Log-Dispatch/trunk Message-ID: Revision: 6993 http://gar.svn.sourceforge.net/gar/?rev=6993&view=rev Author: dmichelsen Date: 2009-10-27 16:13:53 +0000 (Tue, 27 Oct 2009) Log Message: ----------- cpan/Log-Dispatch: Update to mGAR v2 and 2.26 Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/ Property changes on: csw/mgar/pkg/cpan/Log-Dispatch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2009-10-27 16:08:30 UTC (rev 6992) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2009-10-27 16:13:53 UTC (rev 6993) @@ -1,19 +1,21 @@ GARNAME = Log-Dispatch -GARVERSION = 2.16 +GARVERSION = 2.26 CATEGORIES = cpan AUTHOR = DROLSKY -DESCRIPTION = dispatches messages to one or more outputs +DESCRIPTION = Dispatch messages to noe or more outputs define BLURB This module manages a set of Log::Dispatch::* objects, allowing you to add and remove output objects as desired. endef -DISTFILES += $(call admfiles,CSWpmlogdispatch,depend prototype) +REQUIRED_PKGS = CSWpmprmsvldt CSWpmunivrequire -DEPENDS += cpan/Module-Build -DEPENDS += cpan/Params-Validate +PACKAGES = CSWpmlogdispatch +CATALOGNAME = pm_logdispatch -CONFIGURE_ARGS = destdir=$(DESTDIR) +LICENSE = LICENSE +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums 2009-10-27 16:08:30 UTC (rev 6992) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums 2009-10-27 16:13:53 UTC (rev 6993) @@ -1,4 +1 @@ -bb8029dae2684ba7f5ca49541fb1c968 download/CSWpmlogdispatch.gspec -66c00b9c919ee28412f1fe211fca754d download/CSWpmlogdispatch.depend -5f724cc582bdb0087b361fede9cb0003 download/CSWpmlogdispatch.prototype -2ae53fb2d5bc71ab6f7da8a7e520e9e2 download/Log-Dispatch-2.16.tar.gz +d15559297f7c73a311ede78f97174d2a Log-Dispatch-2.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 28 10:14:04 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 28 Oct 2009 09:14:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6994] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6994 http://gar.svn.sourceforge.net/gar/?rev=6994&view=rev Author: bonivart Date: 2009-10-28 09:14:03 +0000 (Wed, 28 Oct 2009) Log Message: ----------- cswclassutils: fix for #3959 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-28 09:14:03 UTC (rev 6994) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.26 +GARVERSION = 1.27 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-28 09:14:03 UTC (rev 6994) @@ -1,10 +1,10 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING -9f7a2603bf91ea53e70f2fe5c4a56726 CSWcswclassutils.i.cswcpsampleconf +b98588da7f4feff19c3d5c0d365ae0a9 CSWcswclassutils.i.cswcpsampleconf 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf -9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf +9f125ebe17392ffa9a244e49a187206d CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup 4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-28 09:14:03 UTC (rev 6994) @@ -31,6 +31,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-28 09:14:03 UTC (rev 6994) @@ -39,6 +39,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 13:40:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 12:40:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6995] csw/mgar/pkg/libmhash/trunk Message-ID: Revision: 6995 http://gar.svn.sourceforge.net/gar/?rev=6995&view=rev Author: dmichelsen Date: 2009-10-28 12:40:19 +0000 (Wed, 28 Oct 2009) Log Message: ----------- libmhash: Fix optimization bug Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile csw/mgar/pkg/libmhash/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmhash/trunk/files/README Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 09:14:03 UTC (rev 6994) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 12:40:19 UTC (rev 6995) @@ -18,8 +18,17 @@ BUILD64 = 1 NOISALIST = 1 + +# sparcv9 compile fails with optimization beyond -xO1 at HAVAL256: FAIL: frag_test +# Please see files/README for details. + +ifeq ($(ISA),sparcv9) +OPT_FLAGS_SOS = -xO1 +endif + CONFIGURE_ARGS = $(DIRPATHS) +# Always run testsuite as the code is prone to optimization errors TEST_TARGET = check PACKAGES = CSWlibmhash Modified: csw/mgar/pkg/libmhash/trunk/checksums =================================================================== --- csw/mgar/pkg/libmhash/trunk/checksums 2009-10-28 09:14:03 UTC (rev 6994) +++ csw/mgar/pkg/libmhash/trunk/checksums 2009-10-28 12:40:19 UTC (rev 6995) @@ -1 +1 @@ -f91c74f9ccab2b574a98be5bc31eb280 download/mhash-0.9.9.9.tar.bz2 +f91c74f9ccab2b574a98be5bc31eb280 mhash-0.9.9.9.tar.bz2 Added: csw/mgar/pkg/libmhash/trunk/files/README =================================================================== --- csw/mgar/pkg/libmhash/trunk/files/README (rev 0) +++ csw/mgar/pkg/libmhash/trunk/files/README 2009-10-28 12:40:19 UTC (rev 6995) @@ -0,0 +1,107 @@ +Optimization error when compiling on sparcv9 with -xO2 or greater +----------------------------------------------------------------- + +The cause is unclear and the code is in general picky about alignment +and not written in a robust way. There are several bugs reported against +differnet versions of libmhash regarding alignment which may or may not +lead to this problem. Details follow: + + +Checking fragmentation capabilities of HAVAL256: FAIL: frag_test + +build8s% cd work/build-isa-sparcv9/mhash-0.9.9.9/src/ +build8s% mdb .libs/ +driver frag_test hmac_test keygen_test rest_test +build8s% mdb .libs/frag_test core +mdb: warning: core file is from SunOS 5.10 Generic_138888-07; shared text mappings may not match installed libraries +Loading modules: [ ] +> ::stack +libmhash.so.2`mutils_word32nswap+0xb8(100104990, 20, 1f, 6c24cc00, 1, 20754a1616aa27a) +libmhash.so.2`havalTransform3+0xc(1001047d4, ffffffff7fffefcd, 100104880, 143367, a19b3906, 1f3213955f32139) +libmhash.so.2`havalUpdate+0x130(1001047d0, ffffffff7fffefcc, 81, ffffffffffffffff, 1001047f4, 408) +libmhash.so.2`mhash+0x14(100101fd0, ffffffff7fffefcc, 81, fffffffffffffffd, 0, 7ffeff021eb8) +frag_test+0x98(100, 81, 1, 958, ffffffff7fffefcc, 80) +main+0x8c(1c, 7ffeff1329ce, 1, 100101620, 100001038, 100101588) +_start+0x17c(0, ffffffff7ffff238, 0, 1, 7ffeffe0d6cc, 7ffefff10000) +> ::dis mutils_word32nswap +libmhash.so.2`mutils_word32nswap: save %sp, -0xb0, %sp +libmhash.so.2`mutils_word32nswap+4: btst 0xff, %i2 +libmhash.so.2`mutils_word32nswap+8: bne,pn %icc,+0x24 +libmhash.so.2`mutils_word32nswap+0xc: mov %i0, %l4 +libmhash.so.2`mutils_word32nswap+0x10: sll %i1, 2, %l6 +libmhash.so.2`mutils_word32nswap+0x14: call +0x12d494 <0x7ffeff131aa0> +libmhash.so.2`mutils_word32nswap+0x18: srl %l6, 0, %o0 +libmhash.so.2`mutils_word32nswap+0x1c: brnz,pn %o0, +0x14 +libmhash.so.2`mutils_word32nswap+0x20: mov %o0, %i0 +libmhash.so.2`mutils_word32nswap+0x24: ret +libmhash.so.2`mutils_word32nswap+0x28: restore %g0, 0, %o0 +libmhash.so.2`mutils_word32nswap+0x2c: mov %l4, %i0 +libmhash.so.2`mutils_word32nswap+0x30: cmp %i1, 0 +libmhash.so.2`mutils_word32nswap+0x34: bleu,pn %icc,+0x264 +libmhash.so.2`mutils_word32nswap+0x38: cmp %i1, 4 +libmhash.so.2`mutils_word32nswap+0x3c: bl,pn %icc,+0x200 +libmhash.so.2`mutils_word32nswap+0x40: mov %i0, %l6 +libmhash.so.2`mutils_word32nswap+0x44: sra %i1, 0, %o0 +libmhash.so.2`mutils_word32nswap+0x48: sub %i0, %l4, %l7 +libmhash.so.2`mutils_word32nswap+0x4c: srax %l7, 0x3f, %g4 +libmhash.so.2`mutils_word32nswap+0x50: sethi %hi(0x7ffffc00), %l1 +libmhash.so.2`mutils_word32nswap+0x54: srl %i1, 0, %l2 +libmhash.so.2`mutils_word32nswap+0x58: xor %l7, %g4, %g5 +libmhash.so.2`mutils_word32nswap+0x5c: sllx %o0, 2, %g3 +libmhash.so.2`mutils_word32nswap+0x60: add %l1, 0x3fe, %l0 +libmhash.so.2`mutils_word32nswap+0x64: sub %g5, %g4, %g2 +libmhash.so.2`mutils_word32nswap+0x68: sub %l2, %l0, %o2 +libmhash.so.2`mutils_word32nswap+0x6c: srlx %o2, 0x3f, %o1 +libmhash.so.2`mutils_word32nswap+0x70: cmp %g2, %g3 +libmhash.so.2`mutils_word32nswap+0x74: clr %g1 +libmhash.so.2`mutils_word32nswap+0x78: and %o1, 1, %i4 +libmhash.so.2`mutils_word32nswap+0x7c: movge %xcc,1, %g1 +libmhash.so.2`mutils_word32nswap+0x80: btst %g1, %i4 +libmhash.so.2`mutils_word32nswap+0x84: be,a,pn %icc,+0x1bc +libmhash.so.2`mutils_word32nswap+0x88: clr %l2 +libmhash.so.2`mutils_word32nswap+0x8c: sethi %hi(0xfc00), %l5 +libmhash.so.2`mutils_word32nswap+0x90: add %i1, 0, %g4 +libmhash.so.2`mutils_word32nswap+0x94: add %l5, 0x300, %l3 +libmhash.so.2`mutils_word32nswap+0x98: add %i1, -1, %i2 +libmhash.so.2`mutils_word32nswap+0x9c: clr %l1 +libmhash.so.2`mutils_word32nswap+0xa0: sethi %hi(0xff000000), %l2 +libmhash.so.2`mutils_word32nswap+0xa4: sethi %hi(0xff0000), %l5 +libmhash.so.2`mutils_word32nswap+0xa8: cmp %g4, 5 +libmhash.so.2`mutils_word32nswap+0xac: bl,pn %icc,+0x13c +libmhash.so.2`mutils_word32nswap+0xb0: sub %i2, 3, %o7 +libmhash.so.2`mutils_word32nswap+0xb4: add %l1, 1, %l1 +libmhash.so.2`mutils_word32nswap+0xb8: ld [%l4], %g5 +libmhash.so.2`mutils_word32nswap+0xbc: add %l4, 4, %l4 +libmhash.so.2`mutils_word32nswap+0xc0: and %g5, %l5, %o1 + + +> ::regs +%g0 = 0x0000000000000000 %l0 = 0x000000007ffffffe +%g1 = 0x0000000000000001 %l1 = 0x0000000000000001 +%g2 = 0x00000001801059c3 %l2 = 0x00000000ff000000 +%g3 = 0x0000000000000080 %l3 = 0x000000000000ff00 +%g4 = 0x0000000000000020 %l4 = 0xffffffff7fffefcd +%g5 = 0x00000001801059c3 %l5 = 0x0000000000ff0000 +%g6 = 0x0000000000000000 %l6 = 0x0000000100104990 +%g7 = 0x0000000000000000 %l7 = 0x00000001801059c3 + +%o0 = 0x0000000000000020 %i0 = 0x0000000100104990 +%o1 = 0x0000000000000001 %i1 = 0x0000000000000020 +%o2 = 0xffffffff80000022 %i2 = 0x000000000000001f +%o3 = 0x000000007f7e7e7e %i3 = 0x000000006c24cc00 +%o4 = 0x00000000007e0000 %i4 = 0x0000000000000001 +%o5 = 0x0000000100104990 %i5 = 0x020754a1616aa27a +%o6 = 0xffffffff7fffe151 %i6 = 0xffffffff7fffe201 +%o7 = 0x000000000000001c %i7 = 0x00007ffeff0190ec libmhash.so.2`havalTransform3+0xc + + %ccr = 0x00 xcc=nzvc icc=nzvc + %y = 0x0000000000000000 + %pc = 0x00007ffeff0046b0 libmhash.so.2`mutils_word32nswap+0xb8 + %npc = 0x00007ffeff0046b4 libmhash.so.2`mutils_word32nswap+0xbc + %sp = 0xffffffff7fffe151 + %fp = 0xffffffff7fffe201 + + %asi = 0x82 +%fprs = 0x07 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 15:39:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 14:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6996] csw/mgar/pkg/libmhash/trunk/Makefile Message-ID: Revision: 6996 http://gar.svn.sourceforge.net/gar/?rev=6996&view=rev Author: dmichelsen Date: 2009-10-28 14:39:56 +0000 (Wed, 28 Oct 2009) Log Message: ----------- libmhash: Comment out clashing defines with including software Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 12:40:19 UTC (rev 6995) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 14:39:56 UTC (rev 6996) @@ -34,3 +34,12 @@ PACKAGES = CSWlibmhash include gar/category.mk + +# Don't include the most common defines. In general it is a bad idea to include +# the config file as it may collide with the config file from the main package +# using libmhash. +post-install-modulated: + perl -pi -e 's,^(#define (?:PACKAGE|PACKAGE_BUGREPORT|PACKAGE_NAME|PACKAGE_STRING|PACKAGE_TARNAME|PACKAGE_VERSION|VERSION) .*),/* \1 */,' \ + $(DESTDIR)$(includedir)/mutils/mhash_config.h + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 16:17:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 15:17:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6997] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ Message-ID: Revision: 6997 http://gar.svn.sourceforge.net/gar/?rev=6997&view=rev Author: dmichelsen Date: 2009-10-28 15:17:27 +0000 (Wed, 28 Oct 2009) Log Message: ----------- sasl: Make branch for mGAR v2 migration Added Paths: ----------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 16:21:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 15:21:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6998] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 Message-ID: Revision: 6998 http://gar.svn.sourceforge.net/gar/?rev=6998&view=rev Author: dmichelsen Date: 2009-10-28 15:21:45 +0000 (Wed, 28 Oct 2009) Log Message: ----------- sasl-2.1.23-mGARv2: Pull in dynamic gspecs Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums Added Paths: ----------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2009-10-28 15:17:27 UTC (rev 6997) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2009-10-28 15:21:45 UTC (rev 6998) @@ -1,5 +1,5 @@ GARNAME = sasl -GARVERSION = 2.1.22 +GARVERSION = 2.1.23 CATEGORIES = lib DESCRIPTION = Simple Authentication and Security Layer @@ -12,7 +12,7 @@ endef # Source location -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ # Visitor information SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ @@ -21,34 +21,52 @@ DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -BUILD_ENV = _REENTRANT=1 - -TEST_TARGET = check - -SED=/usr/bin/sed -EGREP=/usr/bin/egrep -max_cmd_line=65535 - # SASL libraries and utilities -DISTFILES += $(call admfiles,CSWsasl,$(ADMSTANDARD) $(ADMISCRIPTS)) +DISTFILES += CSWsasl.preinstall CSWsasl.postinstall # SASL authentication server -DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) +#DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) # SASL sql plugin -DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) +#DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) # SASL gssapi plugin -DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) +#DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) +DISTFILES += cswusergroup + # Init files for SASLAUTHD DISTFILES += cswsaslauthd.init saslauthd.init.CSW PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff -#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql -EXTRA_LIBS += /opt/csw/bdb4/lib +CATALOGNAME_CSWsasl = sasl +CATALOGNAME_CSWsaslauthd = saslauthd +CATALOGNAME_CSWsaslgssapi = sasl_gssapi +CATALOGNAME_CSWsaslsql = sasl_sql + +REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb4 +REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib +REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib +REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite + +SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer +SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon +SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding +SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 + +# Do not use LD_OPTIONS as it breaks tests by using the installed libraries +# before the newly built ones. +EXTRA_LDFLAGS = $(RUNPATH_LINKER_FLAGS) +LD_OPTIONS = + +BUILD_ENV = _REENTRANT=1 + +EXTRA_LIBS += /opt/csw/bdb47/lib EXTRA_LIBS += /opt/csw/mysql4/lib EXTRA_LIBS += /opt/csw/postgresql/lib @@ -56,8 +74,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql -CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb4/lib -CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb4/include/ +CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb47/lib +CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd CONFIGURE_ARGS += --with-ipctype=unix CONFIGURE_ARGS += --with-ldap=/opt/csw @@ -68,13 +86,18 @@ CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 CONFIGURE_ARGS += --enable-login +SED=/usr/bin/sed +EGREP=/usr/bin/egrep +max_cmd_line=65535 -all: .DEFAULT -.DEFAULT: - @true +TEST_TARGET = check -post-install: testsaslauthd install-testsaslauthd install-doc +#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +include gar/category.mk + +post-install-modulated: testsaslauthd install-testsaslauthd install-doc + DOC_FILES = rfc1321.txt \ rfc1939.txt \ rfc2104.txt \ @@ -139,5 +162,3 @@ cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW - -include gar/category.mk Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2009-10-28 15:17:27 UTC (rev 6997) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2009-10-28 15:21:45 UTC (rev 6998) @@ -1,22 +1,8 @@ -45dde9d19193ae9dd388eb68b2027bc9 download/cyrus-sasl-2.1.22.tar.gz -f4a742f252ee3b840ffe062d4288e4d4 download/CSWsasl.gspec -b8dd69fab29e6e9706536229572dbca5 download/CSWsasl.prototype -773caf5b10e823266e785ec1ac5ea20e download/CSWsasl.depend -2762eafea57ec2e5e28e5a5a95937fa7 download/CSWsasl.preinstall -614bb55932ed32486c1fd57a0059059a download/CSWsasl.postinstall -b9b51f830b9524f2d6f35fe428cbce5a download/CSWsaslauthd.gspec -8974319c29e07c5b44470c85d91859c8 download/CSWsaslauthd.prototype -1114b8288fe48e24922fca60ef00da79 download/CSWsaslauthd.depend -ab89fa9937d1337e30de070bb8b0174b download/CSWsaslauthd.postinstall -177c98fa0d192eafe569a3c379388652 download/CSWsaslauthd.preremove -e2962c2cfefee8bada31b15af8817b52 download/CSWsaslsql.gspec -5936c0208fc18f2a47f716013171cdf2 download/CSWsaslsql.prototype -1dbe229bbe3c1f944f95a1ecef65fa49 download/CSWsaslsql.depend -033ca04bd0d1d5467495af765a890df2 download/CSWsaslgssapi.gspec -486fb367a3d53ad5125f7678065bfd8d download/CSWsaslgssapi.prototype -4c009a25ddbe4325f515a8d605a62ec6 download/CSWsaslgssapi.depend -b2491dcfbb2be4a4a09f3003cffb1bc7 download/cswsaslauthd.init -b190992e18cc7add35a6934d896a1130 download/saslauthd.init.CSW -40b526754554c46d5b134f5ca21fe371 download/saslauthd-doc.diff -21cbef68d9f2dc2447326cbda8bf842e download/saslauthd-groff.diff -48af784184961368ce250c7b33d207b8 download/ltmain.diff +614bb55932ed32486c1fd57a0059059a CSWsasl.postinstall +2762eafea57ec2e5e28e5a5a95937fa7 CSWsasl.preinstall +b2491dcfbb2be4a4a09f3003cffb1bc7 cswsaslauthd.init +2eb0e48106f0e9cd8001e654f267ecbc cyrus-sasl-2.1.23.tar.gz +48af784184961368ce250c7b33d207b8 ltmain.diff +40b526754554c46d5b134f5ca21fe371 saslauthd-doc.diff +21cbef68d9f2dc2447326cbda8bf842e saslauthd-groff.diff +b190992e18cc7add35a6934d896a1130 saslauthd.init.CSW Added: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup (rev 0) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup 2009-10-28 15:21:45 UTC (rev 6998) @@ -0,0 +1 @@ +:sasl:::::: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 28 16:46:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 28 Oct 2009 15:46:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6999] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6999 http://gar.svn.sourceforge.net/gar/?rev=6999&view=rev Author: bonivart Date: 2009-10-28 15:46:40 +0000 (Wed, 28 Oct 2009) Log Message: ----------- cswclassutils: minor fixes #3959 and #3873 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-28 15:46:40 UTC (rev 6999) @@ -1,17 +1,17 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING -b98588da7f4feff19c3d5c0d365ae0a9 CSWcswclassutils.i.cswcpsampleconf +fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf -9f125ebe17392ffa9a244e49a187206d CSWcswclassutils.i.cswpreserveconf +c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup -4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf +d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf -a473d9cf739a6a33ac3a7306eb4a522c CSWcswclassutils.r.cswpreserveconf +96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -31,7 +31,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest - [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -39,7 +39,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest - [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -23,7 +23,7 @@ if cmp $confdest $dest >/dev/null ; then echo $confdest is identical to sample config file $dest echo Removing $confdest - rm $confdest + rm -f $confdest fi - rm $dest + rm -f $dest done Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -28,7 +28,7 @@ if cmp $confdest $dest >/dev/null ; then echo $confdest is identical to sample config file $dest echo Removing $confdest - rm $confdest + rm -f $confdest else echo "preserving $confdest to $preservedconf" mkdir -p $preservedir @@ -37,5 +37,5 @@ fi # Any way it shakes out, we always remove the "sample conf" - rm $dest + rm -f $dest done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 17:51:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 16:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7000] csw/mgar/pkg Message-ID: Revision: 7000 http://gar.svn.sourceforge.net/gar/?rev=7000&view=rev Author: dmichelsen Date: 2009-10-28 16:51:57 +0000 (Wed, 28 Oct 2009) Log Message: ----------- aide: Initial commit Added Paths: ----------- csw/mgar/pkg/aide/ csw/mgar/pkg/aide/branches/ csw/mgar/pkg/aide/tags/ csw/mgar/pkg/aide/trunk/ csw/mgar/pkg/aide/trunk/Makefile csw/mgar/pkg/aide/trunk/checksums csw/mgar/pkg/aide/trunk/files/ csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch Property changes on: csw/mgar/pkg/aide/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile (rev 0) +++ csw/mgar/pkg/aide/trunk/Makefile 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,50 @@ +GARNAME = aide +GARVERSION = 0.13.1 +CATEGORIES = utils + +DESCRIPTION = Advanced Intrusion Detection Environment +define BLURB + AIDE (Advanced Intrusion Detection Environment) is a free + replacement for Tripwire. It does the same things as the + semi-free Tripwire and more. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Disable Sun ACLs for now until bug #2887984 is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 +#PATCHFILES = 0001-Fix-ACL-ifdef-logic.patch + +# Add patch until bug #2888035 is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=2888035&group_id=86976&atid=581579 +PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq +REQUIRED_PKGS += CSWoldaprt CSWosslrt CSWzlib + +EXTRA_LIB = $(prefix)/postgresql/lib +EXTRA_INC = $(prefix)/postgresql/include + +EXTRA_CPPFLAGS = -D__const=const + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-curl + +# Disable Sun ACLs for now until bug #2887984 is fixed (see above) +#CONFIGURE_ARGS += --with-sun-acl + +CONFIGURE_ARGS += --with-psql +# Add extra libraries until bug #2888028 is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=2888028&group_id=86976&atid=581579 +EXTRA_LINKER_FLAGS = -lgcrypt -lgpg-error + +# Disable tests until bug #2888084 is fixed +# http://sourceforge.net/tracker/?func=detail&aid=2888084&group_id=86976&atid=581579 +#TEST_TARGET = check +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums (rev 0) +++ csw/mgar/pkg/aide/trunk/checksums 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,2 @@ +c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch +27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz Added: csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch =================================================================== --- csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch (rev 0) +++ csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,30 @@ +From 18d19087b6f54812b5b3c363231e81a79456bf2a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 28 Oct 2009 14:31:38 +0100 +Subject: [PATCH 1/2] Fix ACL ifdef logic + +--- + include/db_config.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/db_config.h b/include/db_config.h +index 3ba0973..3b9c82a 100644 +--- a/include/db_config.h ++++ b/include/db_config.h +@@ -52,12 +52,12 @@ typedef struct acl_type{ + #ifndef WITH_ACL + # error "No ACL support ... but POSIX ACL support." + #endif +-#endif + + typedef struct acl_type { + char *acl_a; /* ACCESS */ + char *acl_d; /* DEFAULT, directories only */ + } acl_type; ++#endif + + #ifdef WITH_XATTR /* Do generic user Xattrs. */ + #include +-- +1.6.5 + Added: csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch =================================================================== --- csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch (rev 0) +++ csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,33 @@ +From f072fece494256e6f7cc6ff06f79c059f18c9be9 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 28 Oct 2009 15:35:37 +0100 +Subject: [PATCH 2/2] Add missing prototypes for db_sql + +--- + include/db_sql.h | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/include/db_sql.h b/include/db_sql.h +index 0907393..ecb1c41 100644 +--- a/include/db_sql.h ++++ b/include/db_sql.h +@@ -22,7 +22,7 @@ + #define _DB_SQL_H_INCLUDED + + +-static __attribute__ ((used)) const char* db_sql_types[] = { ++static const char* db_sql_types[] = { + "text unique primary key",/* "name", */ + "text", /* "lname", */ + "int", /* "perm", */ +@@ -51,5 +51,7 @@ static __attribute__ ((used)) const char* db_sql_types[] = { + + int db_close_sql(void*); + db_line* db_readline_sql(int db, db_config* conf); ++int db_writeline_sql(db_line* line,db_config* conf); ++int db_writespec_sql(db_config* conf); + + #endif +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 09:11:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 08:11:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7001] csw/mgar/pkg/libpopt/trunk Message-ID: Revision: 7001 http://gar.svn.sourceforge.net/gar/?rev=7001&view=rev Author: dmichelsen Date: 2009-10-29 08:11:46 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libpopt: Fix failing test Modified Paths: -------------- csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libpopt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch Modified: csw/mgar/pkg/libpopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-28 16:51:57 UTC (rev 7000) +++ csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-29 08:11:46 UTC (rev 7001) @@ -17,6 +17,10 @@ MASTER_SITES = http://rpm5.org/files/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# This fixes a minor failing check. See for details +# http://www.mail-archive.com/popt-devel at rpm5.org/msg00155.html +PATCHFILES = 0001-Fix-failing-tests.patch + PACKAGES = CSWlibpopt UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libpopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libpopt/trunk/checksums 2009-10-28 16:51:57 UTC (rev 7000) +++ csw/mgar/pkg/libpopt/trunk/checksums 2009-10-29 08:11:46 UTC (rev 7001) @@ -1 +1,2 @@ -c61ef795fa450eb692602a661ec8d7f1 download/popt-1.15.tar.gz +4999ab4e862297b281b78f2a0ac6ebd5 0001-Fix-failing-tests.patch +c61ef795fa450eb692602a661ec8d7f1 popt-1.15.tar.gz Added: csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch =================================================================== --- csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch (rev 0) +++ csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch 2009-10-29 08:11:46 UTC (rev 7001) @@ -0,0 +1,34 @@ +From 47be5f0af0829a29d86ad7025648a0309b49ea21 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 09:04:42 +0100 +Subject: [PATCH] Fix failing tests + +--- + testit.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testit.sh b/testit.sh +index 0a0ba09..4b667b5 100755 +--- a/testit.sh ++++ b/testit.sh +@@ -111,7 +111,7 @@ run test1 "test1 - 53" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset + run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr + + run test1 "test1 - 55" "\ +-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] ++Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] + [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] + [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG] + [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT] +@@ -120,7 +120,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] + [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage + + run test1 "test1 - 56" "\ +-Usage: lt-test1 [OPTION...] ++Usage: test1 [OPTION...] + --arg1 First argument with a really long + description. After all, we have to test + argument help wrapping somehow, right? +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 29 09:40:04 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Oct 2009 08:40:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7002] csw/mgar/pkg/nicstat/trunk Message-ID: Revision: 7002 http://gar.svn.sourceforge.net/gar/?rev=7002&view=rev Author: bonivart Date: 2009-10-29 08:40:04 +0000 (Thu, 29 Oct 2009) Log Message: ----------- nicstat: update to 1.21 Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-29 08:11:46 UTC (rev 7001) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-29 08:40:04 UTC (rev 7002) @@ -1,5 +1,5 @@ GARNAME = nicstat -GARVERSION = 1.20 +GARVERSION = 1.21 CATEGORIES = net DESCRIPTION = Network monitoring tool @@ -43,8 +43,10 @@ install-custom: @echo " ==> Install $(GARNAME) (custom)" - @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d -m 755 $(DESTDIR)$(bindir) @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(mandir)/man1 + @ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/README.txt $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums 2009-10-29 08:11:46 UTC (rev 7001) +++ csw/mgar/pkg/nicstat/trunk/checksums 2009-10-29 08:40:04 UTC (rev 7002) @@ -1 +1 @@ -9cf3090944d01d6ad3c7cc9762207fea download/nicstat-1.20.tar.gz +14b7411916fa317920803d82346098dc nicstat-1.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 10:04:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 09:04:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7003] csw/mgar/pkg/orca/trunk Message-ID: Revision: 7003 http://gar.svn.sourceforge.net/gar/?rev=7003&view=rev Author: dmichelsen Date: 2009-10-29 09:04:27 +0000 (Thu, 29 Oct 2009) Log Message: ----------- orca: Move to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/orca/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype csw/mgar/pkg/orca/trunk/files/CSWorca.depend csw/mgar/pkg/orca/trunk/files/CSWorca.gspec csw/mgar/pkg/orca/trunk/files/CSWorca.prototype Property Changed: ---------------- csw/mgar/pkg/orca/trunk/ Property changes on: csw/mgar/pkg/orca/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 09:04:27 UTC (rev 7003) @@ -28,33 +28,58 @@ MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWorca,depend prototype) +DISTFILES += CSWorca-web.postinstall CSWorca-web.preremove DISTFILES += csworcallator.init csworcallator.xml svc-csworcallator DISTFILES += csworca_services -DISTFILES += $(call admfiles,CSWorca-web,depend prototype postinstall preremove) +PACKAGES = CSWorca CSWorca-web + +CATALOGNAME_CSWorca = orca +CATALOGNAME_CSWorca-web = orca_web + PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch +SPKG_SOURCEURL = http://www.orcaware.com/orca + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit +REQUIRED_PKGS_CSWorca = CSWcswclassutils CSWsetoolkit CSWperl CSWpmtimedate +REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 +REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 + #libdir = $(exec_prefix)/lib/$(GARNAME) localstatedir = /var/opt/csw COMMON_EXPORTS += perlcswlib CONFIGURE_ARGS = $(DIRPATHS) \ - --with-html-dir=$(prefix)/apache2/share/htdocs/orca \ + --with-html-dir=$(sharedstatedir)/www/orca \ --disable-librrdtool SPKG_CLASSES = none cswinitsmf +PKGFILES_CSWorca-web = $(prefix)/apache2/.* +PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.* +PKGFILES_CSWorca-web += $(bindir)/orca +PKGFILES_CSWorca-web += $(sysconfdir)/.*\.cfg +PKGFILES_CSWorca-web += $(libdir)/perl/.* +PKGFILES_CSWorca-web += $(mandir)/man1/orca\.1 +PKGFILES_CSWorca-web += /var/opt/csw/.* + include gar/category.mk -post-install: +post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d @ginstall $(WORKDIR)/csworcallator.init $(DESTDIR)$(sysconfdir)/init.d/csworcallator @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) + +post-merge: + @ginstall -d $(PKGROOT)/var/opt/csw/orca/rrd/orcallator + @ginstall -d $(PKGROOT)$(prefix)/share/www/orca/orcallator + @ginstall -d $(PKGROOT)$(prefix)/apache2/share/htdocs + @ln -s $(prefix)/share/www/orca $(PKGROOT)$(prefix)/apache2/share/htdocs/orca + @$(MAKECOOKIE) Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/checksums 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,14 +1,8 @@ ba8e48e429008f53037e85fef2fcfe36 download/orca-snapshot-r535.tar.bz2 -1f3d702565394052096bf75229d656d5 download/CSWorca.gspec -6958db760831c504e21947338d0cac33 download/CSWorca.depend -9cef0b5c1675ebd7a5f4d1427b5cce27 download/CSWorca.prototype +401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall +03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove 72c1eaa8d3f1ab48363e7ed5792e2855 download/csworcallator.init a99644ffcc9164d9d0f4df2b44c61917 download/csworcallator.xml 23a2b76456b96c5fcff4a1d92c02e140 download/svc-csworcallator 4c74f4f1449fabd0838d0cd71678144c download/csworca_services -029c3cdd385c06b30aed79ea7e6f553f download/CSWorca-web.gspec -0390894875ef40b9b40b42bab9f9fdab download/CSWorca-web.depend -7ea5b03e8ae1c4f017a2c775a0c10f98 download/CSWorca-web.prototype -401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall -03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove ce08f37aa52f7b27bc82cc9c976d56b4 download/orca-snapshot-r535-se-3.5.0.patch Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,5 +0,0 @@ -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpmtimedate pm_timedate - Parse date strings into time values -P CSWpmmathinterpolate pm_mathinterpolate - Useful routines for interpolating data sets -P CSWrrd rrdtool - Round Robin Database graphing tool -P CSWapache2 apache2 - Apache 2.2 web server Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,4 +0,0 @@ -%var bitname orca_web -%var pkgname CSWorca-web -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,36 +0,0 @@ -d none /opt/csw/apache2/share/htdocs/orca 0755 root bin -d none /opt/csw/apache2/share/htdocs/orca/orcallator 0755 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/orca 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/orca_services.cfg.CSW=/opt/csw/etc/orca_services.cfg 0644 root bin -f none /opt/csw/etc/orcallator.cfg.CSW=/opt/csw/etc/orcallator.cfg 0644 root bin -f none /opt/csw/etc/procallator.cfg.CSW=/opt/csw/etc/procallator.cfg 0644 root bin -f none /opt/csw/etc/winallator.cfg.CSW=/opt/csw/etc/winallator.cfg 0644 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Orca 0755 root bin -f none /opt/csw/lib/perl/csw/Orca/Config.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/Constants.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/DataFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/HTMLFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/ImageFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/NewState.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/OldState.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/OpenFileHash.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/RRDFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/SourceFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/SourceFileIDs.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/Utils.pm 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/orca.1 0644 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/orca 0755 root bin -d none /var/opt/csw/orca/rrd 0755 root bin -d none /var/opt/csw/orca/rrd/orcallator 0755 root bin -i copyright=CSWorca-web.copyright -i depend=CSWorca-web.depend -i pkginfo=CSWorca-web.pkginfo Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.depend =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca.depend 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca.depend 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,8 +0,0 @@ -P CSWcswclassutils cswclassutils - CSW class action utilities -P CSWsetoolkit setoolkit - A system performance monitoring tool -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpmtimedate pm_timedate - Parse date strings into time values -P CSWpmmathinterpolate pm_mathinterpolate - Useful routines for interpolating data sets -P CSWrrd rrdtool - Round Robin Database graphing tool -P CSWgawk gawk - GNU AWK -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.gspec =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca.gspec 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca.gspec 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,9 +0,0 @@ -%var bitname orca -%var pkgname CSWorca -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING -%prototype:merge -f cswinitsmf /opt/csw/etc/init.d/csworcallator 0755 root bin -f cswinitsmf /opt/csw/etc/init.d/csworca_services 0755 root bin -%depend:merge -P CSWcswclassutils cswclassutils - CSW class action utilities Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.prototype =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca.prototype 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca.prototype 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,26 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/orca_services_running 0755 root bin -f none /opt/csw/bin/orcallator_column 0755 root bin -f none /opt/csw/bin/orcallator_running 0755 root bin -f none /opt/csw/bin/procallator 0755 root bin -f none /opt/csw/bin/restart_orca_services 0755 root bin -f none /opt/csw/bin/restart_orcallator 0755 root bin -f none /opt/csw/bin/start_orca_services 0755 root bin -f none /opt/csw/bin/start_orcallator 0755 root bin -f none /opt/csw/bin/stop_orca_services 0755 root bin -f none /opt/csw/bin/stop_orcallator 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/orca_services.cfg 0644 root bin -d none /opt/csw/etc/init.d 0755 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/orca 0755 root bin -f none /opt/csw/lib/orca/orcallator.se 0644 root bin -d none /opt/csw/libexec 0755 root bin -f none /opt/csw/libexec/orca_services 0755 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/orca 0755 root bin -d none /var/opt/csw/orca/orcallator 0755 root bin -d none /var/opt/csw/orca/orca_services 0755 root bin -i copyright=CSWorca.copyright -i depend=CSWorca.depend -i pkginfo=CSWorca.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 29 10:14:58 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Oct 2009 09:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7004] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 7004 http://gar.svn.sourceforge.net/gar/?rev=7004&view=rev Author: bonivart Date: 2009-10-29 09:14:57 +0000 (Thu, 29 Oct 2009) Log Message: ----------- clamav: update to 0.95.3 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/Makefile 2009-10-29 09:14:57 UTC (rev 7004) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.95.2 +GARVERSION = 0.95.3 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -33,6 +33,9 @@ # add usergroup class SPKG_CLASSES_CSWclamav = none cswusergroup ugfiles cswcpsampleconf cswinitsmf +PATCHFILES = CSWclamav.freshclam.conf.p +PATCHFILES += CSWclamav.clamd.conf.p + OPT_FLAGS_SOS = -xO2 CONFIGURE_ARGS = $(DIRPATHS) @@ -63,7 +66,7 @@ TEST_TARGET = check # can not run checkpkg due to libs in separate package -ENABLE_CHECK=0 +#ENABLE_CHECK=0 include gar/category.mk @@ -81,11 +84,7 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter - @( cd $(DESTDIR)$(sysconfdir) ; \ - gpatch < ../../../../../$(FILEDIR)/CSWclamav.clamd.conf.p ) @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW - @( cd $(DESTDIR)$(sysconfdir) ; \ - gpatch < ../../../../../$(FILEDIR)/CSWclamav.freshclam.conf.p ) @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @mv $(DESTDIR)$(sysconfdir)/clamav-milter.conf $(DESTDIR)$(sysconfdir)/clamav-milter.conf.CSW @ginstall -d $(DESTDIR)$(sysconfdir)/CSWclamav Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/checksums 2009-10-29 09:14:57 UTC (rev 7004) @@ -1 +1,3 @@ -930362397d30e01ba81b5f24c1046d48 download/clamav-0.95.2.tar.gz +83ab77147b8ff549a371e1042526102c CSWclamav.clamd.conf.p +6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p +eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2009-10-29 09:14:57 UTC (rev 7004) @@ -1,5 +1,5 @@ ---- clamd.conf 2008-12-18 10:50:45.033181389 +0100 -+++ clamd.conf 2008-12-18 10:46:07.995146244 +0100 +--- /etc/clamd.conf 2008-12-18 10:50:45.033181389 +0100 ++++ /etc/clamd.conf 2008-12-18 10:46:07.995146244 +0100 @@ -5,7 +5,7 @@ Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p 2009-10-29 09:14:57 UTC (rev 7004) @@ -1,5 +1,5 @@ ---- freshclam.conf 2008-12-18 10:50:48.949505178 +0100 -+++ freshclam.conf 2008-12-18 10:46:14.856162590 +0100 +--- /etc/freshclam.conf 2008-12-18 10:50:48.949505178 +0100 ++++ /etc/freshclam.conf 2008-12-18 10:46:14.856162590 +0100 @@ -5,7 +5,7 @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 11:18:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 10:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7005] csw/mgar/pkg Message-ID: Revision: 7005 http://gar.svn.sourceforge.net/gar/?rev=7005&view=rev Author: dmichelsen Date: 2009-10-29 10:18:42 +0000 (Thu, 29 Oct 2009) Log Message: ----------- jack: Initial commit Added Paths: ----------- csw/mgar/pkg/jack/ csw/mgar/pkg/jack/branches/ csw/mgar/pkg/jack/tags/ csw/mgar/pkg/jack/trunk/ csw/mgar/pkg/jack/trunk/Makefile csw/mgar/pkg/jack/trunk/checksums csw/mgar/pkg/jack/trunk/files/ Property changes on: csw/mgar/pkg/jack/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/jack/trunk/Makefile =================================================================== --- csw/mgar/pkg/jack/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jack/trunk/Makefile 2009-10-29 10:18:42 UTC (rev 7005) @@ -0,0 +1,34 @@ +GARNAME = jack +GARVERSION = 1.9.3 +CATEGORIES = lib + +DESCRIPTION = A system for handling real-time, low latency audio and MIDI +define BLURB + JACK is system for handling real-time, low latency audio (and MIDI). It runs + on GNU/Linux, Solaris, FreeBSD, OS X and Windows (and can be ported to other + POSIX-conformant platforms). It can connect a number of different applications + to an audio device, as well as allowing them to share audio between themselves. + Its clients can run in their own processes (ie. as normal applications), or can + they can run within the JACK server (ie. as a "plugin"). JACK also has support + for distributing audio processing across a network, both fast & reliable LANs + as well as slower, less reliable WANs. +endef + +MASTER_SITES = http://www.grame.fr/~letz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/waf +CONFIGURE_ARGS = configure --prefix=$(prefix) + +BUILD_SCRIPTS = $(WORKSRC)/waf +BUILD_ARGS = build + +INSTALL_SCRIPTS = $(WORKSRC)/waf +INSTALL_ARGS = install --destdir=$(DESTDIR) + +include gar/category.mk Added: csw/mgar/pkg/jack/trunk/checksums =================================================================== --- csw/mgar/pkg/jack/trunk/checksums (rev 0) +++ csw/mgar/pkg/jack/trunk/checksums 2009-10-29 10:18:42 UTC (rev 7005) @@ -0,0 +1 @@ +b83e6c48345410d693550cec90a89f4e jack-1.9.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 11:19:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 10:19:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7006] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 7006 http://gar.svn.sourceforge.net/gar/?rev=7006&view=rev Author: dmichelsen Date: 2009-10-29 10:19:17 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Add rudimentary WAF support Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-29 10:18:42 UTC (rev 7005) +++ csw/mgar/gar/v2/gar.lib.mk 2009-10-29 10:19:17 UTC (rev 7006) @@ -498,6 +498,12 @@ @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +configure-%/waf: + @echo " ==> Running waf configure in $*" + cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + #################### BUILD RULES #################### # build from a standard gnu-style makefile's default rule. @@ -537,6 +543,12 @@ @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +build-%/waf: + @echo " ==> Running waf build in $*" + @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) + @$(MAKECOOKIE) + # This can be: build, build_py, build_ext, build_clib, build_scripts # See setup.py --help-commands for details PYBUILD_CMD ?= build @@ -615,6 +627,12 @@ @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +install-%/waf: + @echo " ==> Running waf install in $*" + @$(cd $* ; (INSTALL_ENV) ./waf install $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + # This can be: install, install_lib, install_headers, install_scripts, # or install_data. See setup.py --help-commands for details. PYINSTALL_CMD ?= install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Oct 29 11:48:38 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 29 Oct 2009 10:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7007] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7007 http://gar.svn.sourceforge.net/gar/?rev=7007&view=rev Author: d_pocock Date: 2009-10-29 10:48:38 +0000 (Thu, 29 Oct 2009) Log Message: ----------- apr: Changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/apr/trunk/ Property changes on: csw/mgar/pkg/apr/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 10:19:17 UTC (rev 7006) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 10:48:38 UTC (rev 7007) @@ -1,5 +1,5 @@ GARNAME = apr -GARVERSION = 1.2.2 +GARVERSION = 1.3.8 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime @@ -18,12 +18,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --enable-layout=csw CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -# Tests verified: 1.2.2 +# Tests verified: 1.3.8 TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 12:18:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 11:18:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7008] csw/mgar/pkg/orca/trunk Message-ID: Revision: 7008 http://gar.svn.sourceforge.net/gar/?rev=7008&view=rev Author: dmichelsen Date: 2009-10-29 11:18:23 +0000 (Thu, 29 Oct 2009) Log Message: ----------- orca: Move to cswutils gar integration Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/orca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/orca/trunk/files/csworcallator Removed Paths: ------------- csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove csw/mgar/pkg/orca/trunk/files/csworcallator.init Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:18:23 UTC (rev 7008) @@ -28,8 +28,7 @@ MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += CSWorca-web.postinstall CSWorca-web.preremove -DISTFILES += csworcallator.init csworcallator.xml svc-csworcallator +DISTFILES += csworcallator csworcallator.xml svc-csworcallator DISTFILES += csworca_services PACKAGES = CSWorca CSWorca-web @@ -37,6 +36,9 @@ CATALOGNAME_CSWorca = orca CATALOGNAME_CSWorca-web = orca_web +SPKG_DESC_CSWorca = Performance Data Collector +SPKG_DESC_CSWorcs-web = Performance Data Viewer + PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch SPKG_SOURCEURL = http://www.orcaware.com/orca @@ -50,7 +52,7 @@ REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 -#libdir = $(exec_prefix)/lib/$(GARNAME) +sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw COMMON_EXPORTS += perlcswlib @@ -59,8 +61,19 @@ --with-html-dir=$(sharedstatedir)/www/orca \ --disable-librrdtool -SPKG_CLASSES = none cswinitsmf +# Exclude se-libraries for old SE Toolkit versions. We depend on 3.5.0 which +# includes all needed se-libraries. +EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/SE/.* +PRESERVECONF = /etc/opt/csw/orcallator.cfg +PRESERVECONF += /etc/opt/csw/winallator.cfg +PRESERVECONF += /etc/opt/csw/procallator.cfg +PRESERVECONF += /etc/opt/csw/orca_services.cfg + +INITSMF = /etc/opt/csw/init.d/csworcallator + +ARCHALL = 1 + PKGFILES_CSWorca-web = $(prefix)/apache2/.* PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.* PKGFILES_CSWorca-web += $(bindir)/orca @@ -73,8 +86,9 @@ post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d - @ginstall $(WORKDIR)/csworcallator.init $(DESTDIR)$(sysconfdir)/init.d/csworcallator - @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services + @# TBD: Use custom manifest for Solaris 10 SMF support + @#ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator + @#ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) post-merge: Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/checksums 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,8 +1,6 @@ -ba8e48e429008f53037e85fef2fcfe36 download/orca-snapshot-r535.tar.bz2 -401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall -03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove -72c1eaa8d3f1ab48363e7ed5792e2855 download/csworcallator.init -a99644ffcc9164d9d0f4df2b44c61917 download/csworcallator.xml -23a2b76456b96c5fcff4a1d92c02e140 download/svc-csworcallator -4c74f4f1449fabd0838d0cd71678144c download/csworca_services -ce08f37aa52f7b27bc82cc9c976d56b4 download/orca-snapshot-r535-se-3.5.0.patch +4c74f4f1449fabd0838d0cd71678144c csworca_services +72c1eaa8d3f1ab48363e7ed5792e2855 csworcallator +a99644ffcc9164d9d0f4df2b44c61917 csworcallator.xml +ce08f37aa52f7b27bc82cc9c976d56b4 orca-snapshot-r535-se-3.5.0.patch +ba8e48e429008f53037e85fef2fcfe36 orca-snapshot-r535.tar.bz2 +23a2b76456b96c5fcff4a1d92c02e140 svc-csworcallator Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,25 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -ORCA_ETCDIR=${CSW_PREFIX}/etc - -# Copy templates -template_list="\ - orcallator.cfg \ - winallator.cfg \ - procallator.cfg \ - orca_services.cfg" - -echo Copying CSW templates: -for file in $template_list -do - filepath=${ORCA_ETCDIR}/$file - if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then - echo " creating $filepath" - cp $filepath.CSW $filepath - else - echo " preserving $filepath" - fi -done - -exit 0 Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,25 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -ORCA_ETCDIR=${CSW_PREFIX}/etc - -# Copy templates -template_list="\ - orcallator.cfg \ - winallator.cfg \ - procallator.cfg \ - orca_services.cfg" - -echo Removing unmodified CSW templates: -for file in $template_list -do - filepath=${ORCA_ETCDIR}/$file - if [ -f "${filepath}" ] && [ -f "${filepath}.CSW" ] && cmp -s "${filepath}" "${filepath}.CSW"; then - echo " removing $filepath" - rm -f "${filepath}" - else - echo " preserving $filepath" - fi -done - -exit 0 Copied: csw/mgar/pkg/orca/trunk/files/csworcallator (from rev 6981, csw/mgar/pkg/orca/trunk/files/csworcallator.init) =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworcallator (rev 0) +++ csw/mgar/pkg/orca/trunk/files/csworcallator 2009-10-29 11:18:23 UTC (rev 7008) @@ -0,0 +1,39 @@ +#!/bin/sh + +# $HeadURL: file:///var/www/svn/repositories-public/orcaware-public/orca/trunk/data_gatherers/orcallator/S99orcallator.sh.in $ +# $LastChangedRevision: 495 $ +# $LastChangedDate: 2005-09-15 21:11:11 -0700 (Thu, 15 Sep 2005) $ +# $LastChangedBy: blair at orcaware.com $ + +prefix=/opt/csw +exec_prefix=/opt/csw +bindir=/opt/csw/bin + +start_orcallator="$bindir/start_orcallator" +stop_orcallator="$bindir/stop_orcallator" + +case "$1" in + start) + if test -x $start_orcallator; then + umask 022 + $start_orcallator + else + echo "$0: $start_orcallator does not exist or is not executable." + fi + ;; + + stop) + if test -x $stop_orcallator; then + $stop_orcallator + else + echo "$0: $stop_orcallator does not exist or is not executable." + fi + ;; + + *) + echo "usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 Deleted: csw/mgar/pkg/orca/trunk/files/csworcallator.init =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworcallator.init 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/files/csworcallator.init 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,39 +0,0 @@ -#!/bin/sh - -# $HeadURL: file:///var/www/svn/repositories-public/orcaware-public/orca/trunk/data_gatherers/orcallator/S99orcallator.sh.in $ -# $LastChangedRevision: 495 $ -# $LastChangedDate: 2005-09-15 21:11:11 -0700 (Thu, 15 Sep 2005) $ -# $LastChangedBy: blair at orcaware.com $ - -prefix=/opt/csw -exec_prefix=/opt/csw -bindir=/opt/csw/bin - -start_orcallator="$bindir/start_orcallator" -stop_orcallator="$bindir/stop_orcallator" - -case "$1" in - start) - if test -x $start_orcallator; then - umask 022 - $start_orcallator - else - echo "$0: $start_orcallator does not exist or is not executable." - fi - ;; - - stop) - if test -x $stop_orcallator; then - $stop_orcallator - else - echo "$0: $stop_orcallator does not exist or is not executable." - fi - ;; - - *) - echo "usage: $0 {start|stop}" - exit 1 - ;; -esac - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 12:20:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 11:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7009] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 7009 http://gar.svn.sourceforge.net/gar/?rev=7009&view=rev Author: dmichelsen Date: 2009-10-29 11:20:10 +0000 (Thu, 29 Oct 2009) Log Message: ----------- orca: Remove manual dependency to CSWcswclassutils Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:18:23 UTC (rev 7008) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:20:10 UTC (rev 7009) @@ -48,7 +48,7 @@ PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit -REQUIRED_PKGS_CSWorca = CSWcswclassutils CSWsetoolkit CSWperl CSWpmtimedate +REQUIRED_PKGS_CSWorca = CSWsetoolkit CSWperl CSWpmtimedate REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Oct 29 12:45:25 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 29 Oct 2009 11:45:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7010] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7010 http://gar.svn.sourceforge.net/gar/?rev=7010&view=rev Author: d_pocock Date: 2009-10-29 11:45:24 +0000 (Thu, 29 Oct 2009) Log Message: ----------- apr: Update for 1.3.8 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 11:20:10 UTC (rev 7009) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 11:45:24 UTC (rev 7010) @@ -11,8 +11,8 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWapr,depend prototype) -DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) +#DISTFILES += $(call admfiles,CSWapr,depend prototype) +#DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) DISTFILES += config.layout # We define upstream file regex so we can be notifed of new upstream software release @@ -30,9 +30,11 @@ include gar/category.mk -pre-configure: +pre-configure-modulated: install-layout + +install-layout: @sed -e s,INSTALL_PREFIX,$(prefix),g \ - $(WORKDIR)/config.layout > $(WORKSRC)/config.layout + $(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout @$(MAKECOOKIE) post-install: create-link fix-libtool Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2009-10-29 11:20:10 UTC (rev 7009) +++ csw/mgar/pkg/apr/trunk/checksums 2009-10-29 11:45:24 UTC (rev 7010) @@ -1,8 +1,2 @@ -f96e3b04ccf86ed28a0734d7efc5bb65 download/apr-1.2.2.tar.gz -efb208c380eaad52f811f5acfc2240d5 download/CSWapr.gspec -eb66075bd809a52ede5c72017f4a37db download/CSWapr.depend -40788f50594b61f91d919572b946bfd5 download/CSWapr.prototype -b0eba1bbbc7d6e6f5e7609c3eb8fd6d0 download/CSWapr-devel.gspec -ee102496e024ae19e83998586140d43e download/CSWapr-devel.depend -352fb2c88c0fd659803bad284a6061b8 download/CSWapr-devel.prototype -263cd22b83bd6593398013792c2a3ce4 download/config.layout +310fac12285d94a162c488f4b8f1aabc apr-1.3.8.tar.gz +263cd22b83bd6593398013792c2a3ce4 config.layout This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:31:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:31:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7011] csw/mgar/gar Message-ID: Revision: 7011 http://gar.svn.sourceforge.net/gar/?rev=7011&view=rev Author: dmichelsen Date: 2009-10-29 13:31:06 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Merge in collapsed modulations Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Removed Paths: ------------- csw/mgar/gar/v2-collapsed-modulations/ Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-29 11:45:24 UTC (rev 7010) +++ csw/mgar/gar/v2/gar.mk 2009-10-29 13:31:06 UTC (rev 7011) @@ -191,6 +191,48 @@ $(eval $(call _modulate,$(MODULATORS))) +# --- This next block allows you to use collapsed ISAs in modulations +# isa-default-... instead of isa-sparcv8-... and isa-i386-... +# isa-default64-... instead of isa-sparcv9-... and isa-amd64-... +# isa-extra-... instead of any other ISA (if default64 is undefined it falls back to 'extra') + +__collapsedisa = $(strip $(or $(and $(filter $(ISA_DEFAULT_sparc) $(ISA_DEFAULT_i386),$(1)),default),\ + $(and $(filter $(ISA_DEFAULT64_sparc) $(ISA_DEFAULT64_i386),$(1)),default64),\ + extra)) + +__collapsedisa64 = default64 +__collapsedisaextra = extra + +__isacollapsedmodulation_1 = $(call tolower,$(1))-$(if $(filter ISA,$(1)),$(call $(2),$(ISA)),$($(1))) +__isacollapsedmodulation = $(if $(word 2,$(1)),\ + $(foreach P,$(call __isacollapsedmodulation_1,$(firstword $(1)),$(2)),\ + $(addprefix $(P)-,$(call __isacollapsedmodulation,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call __isacollapsedmodulation_1,$(1),$(2))) + +# This is the name of the current modulation but with the ISA i386, sparcv8 and amd64, sparcv9 replaced +# with the collapsed name 'default', 'default64' and everything else as 'extra'. +MODULATION_ISACOLLAPSED = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)) + +# This is the name of the current modulation but with the ISA replaced with 'default64' +MODULATION_ISACOLLAPSED64 = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa64)) + +# This is the name of the current modulation but with the ISA replaced with 'extra' +MODULATION_ISACOLLAPSEDEXTRA = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra)) + +# $(warning Mod: $(MODULATION) ISA: $(ISA) coll: $(MODULATION_ISACOLLAPSED) 64: $(MODULATION_ISACOLLAPSED64) extra: $(MODULATION_ISACOLLAPSEDEXTRA)) + +# Call this function to get either the modulation-specific value or the default. +# Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) +define modulationvalue +$(strip $(or $($(1)_$(MODULATION)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ +)) +endef + +# --- end of collapsed ISA modulations + #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules @@ -553,10 +595,15 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) +MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) +MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) + +MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-extra ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif # These directories get relocated into their ISA subdirectories This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:32:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:32:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7012] csw/mgar/pkg/octave Message-ID: Revision: 7012 http://gar.svn.sourceforge.net/gar/?rev=7012&view=rev Author: dmichelsen Date: 2009-10-29 13:32:44 +0000 (Thu, 29 Oct 2009) Log Message: ----------- octave: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/octave/branches/ csw/mgar/pkg/octave/tags/ csw/mgar/pkg/octave/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/octave/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:39:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:39:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7013] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 7013 http://gar.svn.sourceforge.net/gar/?rev=7013&view=rev Author: dmichelsen Date: 2009-10-29 13:39:34 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libsndfile: Add a bunch of patches and fixes Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsndfile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2009-10-29 13:32:44 UTC (rev 7012) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2009-10-29 13:39:34 UTC (rev 7013) @@ -33,18 +33,31 @@ MASTER_SITES = http://www.mega-nerd.com/libsndfile/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch +PATCHFILES += 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch +PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch +PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch -REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg +REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) SPKG_SOURCEURL = http://www.mega-nerd.com/libsndfile/ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -TEST_SCRIPTS = +# EXTRA_CFLAGS = -features=extensions +# EXTRA_CXXFLAGS = -features=extensions + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_CFLAGS = -features=extensions -EXTRA_CXXFLAGS = -features=extensions +TEST_TARGET = check +# We want only 64 bit libs, no 64 bit executables +MERGE_DIRS_isa-extra = $(libdir) + +# Relocate docs to standard location +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(BUILD_PREFIX)/share/doc/$(GARNAME),' + include gar/category.mk Modified: csw/mgar/pkg/libsndfile/trunk/checksums =================================================================== --- csw/mgar/pkg/libsndfile/trunk/checksums 2009-10-29 13:32:44 UTC (rev 7012) +++ csw/mgar/pkg/libsndfile/trunk/checksums 2009-10-29 13:39:34 UTC (rev 7013) @@ -1 +1,5 @@ -e0553e12c7a467af44693e95e2eac668 download/libsndfile-1.0.20.tar.gz +5a1c6c4bfb8b8426d8ebc8d67814a7c8 0001-Add-lrintf-workaround-to-regtest.patch +ab0c6ea20d4bda60f6f6dd4fa4c26871 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch +599bd5f64872bbddf993ce0815d28417 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch +732c648739e94cb5fd2e70d983390318 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch +e0553e12c7a467af44693e95e2eac668 libsndfile-1.0.20.tar.gz Added: csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,25 @@ +From 5c8520d2cf626fbdc8aecbf20e2e97eeb4bc56ee Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 13:09:13 +0100 +Subject: [PATCH 1/3] Add lrintf workaround to regtest + +--- + regtest/checksum.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/regtest/checksum.c b/regtest/checksum.c +index 863fbed..9e638d1 100644 +--- a/regtest/checksum.c ++++ b/regtest/checksum.c +@@ -35,6 +35,8 @@ + + #define ARRAY_LEN(x) ((int) (sizeof (x)) / (sizeof ((x) [0]))) + ++#define lrintf(f) ((int32_t)rint(f)) ++ + static int short_checksum (SNDFILE * file, int start) ; + static int int_checksum (SNDFILE * file, int start) ; + static int float_checksum (SNDFILE * file, int start) ; +-- +1.6.5 + Added: csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,28 @@ +From 4f81962de709e59c180ed95e3a7ed4e49af38b95 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 12:41:49 +0100 +Subject: [PATCH] Add workaround for missing libm function lrint and lrintf + +--- + src/common.h | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/src/common.h b/src/common.h +index f41f96a..f4ba69a 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -839,5 +839,11 @@ int sf_dither_float (const SF_DITHER_INFO *dither, const float *in, float *out, + int sf_dither_double (const SF_DITHER_INFO *dither, const double *in, double *out, int count) ; + #endif + ++/* Taken from http://www.mail-archive.com/qemu-devel at nongnu.org/msg00314.html */ ++#define lrint(d) ((int32_t)rint(d)) ++#define llrint(d) ((int64_t)rint(d)) ++#define lrintf(f) ((int32_t)rint(f)) ++#define llrintf(f) ((int64_t)rint(f)) ++ + #endif /* SNDFILE_COMMON_H */ + +-- +1.6.5 + Added: csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,35 @@ +From a21ce86ac37888255ad9a4018c27f866e3ff1ebf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 13:22:02 +0100 +Subject: [PATCH 2/3] Workaround mising stdint.h and Sun Studio shortcoming + +--- + tests/utils.h | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/tests/utils.h b/tests/utils.h +index ee70e2c..9a108cd 100644 +--- a/tests/utils.h ++++ b/tests/utils.h +@@ -29,7 +29,17 @@ + extern "C" { + #endif /* __cplusplus */ + +-#include ++#include ++#define lrint(d) ((int32_t)rint(d)) ++#define lrintf(f) ((int32_t)rint(f)) ++ ++# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \ ++ (defined(__SUNPRO_C) && defined(__C99FEATURES__)) ++# define __func__ __func__ ++# else ++# define __func__ "" ++# endif ++ + #include + + #define SF_COUNT_TO_LONG(x) ((long) (x)) +-- +1.6.5 + Added: csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,25 @@ +From a1350cd6d86051e18b4513f1e7babce8fd5d00e0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 14:00:09 +0100 +Subject: [PATCH 3/3] Disable stop-on-error until cpp_test refcount error is fixed + +--- + tests/test_wrapper.sh.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/test_wrapper.sh.in b/tests/test_wrapper.sh.in +index 7fb2d8e..8a0557d 100755 +--- a/tests/test_wrapper.sh.in ++++ b/tests/test_wrapper.sh.in +@@ -12,7 +12,7 @@ if [ ! -f sfversion ]; then + sfversion=`./sfversion` + + # Force exit on errors. +-set -e ++# set -e + + # generic-tests + uname -a +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:47:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:47:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7014] csw/mgar/gar/v2/category.mk Message-ID: Revision: 7014 http://gar.svn.sourceforge.net/gar/?rev=7014&view=rev Author: dmichelsen Date: 2009-10-29 13:47:23 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Fix error message on unknown categories Modified Paths: -------------- csw/mgar/gar/v2/category.mk Modified: csw/mgar/gar/v2/category.mk =================================================================== --- csw/mgar/gar/v2/category.mk 2009-10-29 13:39:34 UTC (rev 7013) +++ csw/mgar/gar/v2/category.mk 2009-10-29 13:47:23 UTC (rev 7014) @@ -2,8 +2,8 @@ # This makefile is to be included from Makefiles in each category # directory. -ifeq (,$(CATEGORIES)) - $(error Please set CATEGORIES to one of $(wildcard categories/*)) +ifeq (,$(wildcard gar/categories/$(CATEGORIES)/category.mk)) + $(error The category '$(CATEGORIES)' is invalid. Valid categories are $(patsubst gar/categories/%,%,$(wildcard gar/categories/*))) endif include gar/categories/$(CATEGORIES)/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:59:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7015] csw/mgar/pkg Message-ID: Revision: 7015 http://gar.svn.sourceforge.net/gar/?rev=7015&view=rev Author: dmichelsen Date: 2009-10-29 13:59:22 +0000 (Thu, 29 Oct 2009) Log Message: ----------- disktype: Initial commit Added Paths: ----------- csw/mgar/pkg/disktype/ csw/mgar/pkg/disktype/branches/ csw/mgar/pkg/disktype/tags/ csw/mgar/pkg/disktype/trunk/ csw/mgar/pkg/disktype/trunk/Makefile csw/mgar/pkg/disktype/trunk/checksums csw/mgar/pkg/disktype/trunk/files/ Property changes on: csw/mgar/pkg/disktype/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/disktype/trunk/Makefile =================================================================== --- csw/mgar/pkg/disktype/trunk/Makefile (rev 0) +++ csw/mgar/pkg/disktype/trunk/Makefile 2009-10-29 13:59:22 UTC (rev 7015) @@ -0,0 +1,33 @@ +GARNAME = disktype +GARVERSION = 9 +CATEGORIES = utils + +DESCRIPTION = Detection of content format of a disk or disk image +define BLURB + The purpose of disktype is to detect the content format of a disk or + disk image. It knows about common file systems, partition tables, and boot codes. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +SPKG_SOURCEURL = http://disktype.sourceforge.net/ + +CONFIGURE_SCRIPTS = +BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/disktype $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/disktype.1 $(DESTDIR)$(mandir)/man1/ + @$(MAKECOOKIE) Added: csw/mgar/pkg/disktype/trunk/checksums =================================================================== --- csw/mgar/pkg/disktype/trunk/checksums (rev 0) +++ csw/mgar/pkg/disktype/trunk/checksums 2009-10-29 13:59:22 UTC (rev 7015) @@ -0,0 +1 @@ +25a673f162b9c01cd565109202559489 disktype-9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 15:48:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 14:48:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7016] csw/mgar/pkg/sqlite3 Message-ID: Revision: 7016 http://gar.svn.sourceforge.net/gar/?rev=7016&view=rev Author: dmichelsen Date: 2009-10-29 14:48:41 +0000 (Thu, 29 Oct 2009) Log Message: ----------- sqlite3: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/sqlite3/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 15:49:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 14:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7017] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7017 http://gar.svn.sourceforge.net/gar/?rev=7017&view=rev Author: dmichelsen Date: 2009-10-29 14:49:36 +0000 (Thu, 29 Oct 2009) Log Message: ----------- sqlite: Update to dynamic gspec and other modern GAR features Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sqlite3/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,67 +1,49 @@ GARNAME = sqlite3 -GARVERSION = 3.6.16 +GARVERSION = 3.6.19 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library define BLURB -SQLite is a in-process library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. + SQLite is a in-process library that implements a self-contained, serverless, + zero-configuration, transactional SQL database engine. endef # Download informations -MASTER_SITES = http://sqlite.org/ -DISTFILES = sqlite-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles, CSWsqlite3, ) -DISTFILES += $(call admfiles, CSWsqlite3devel, ) -DISTFILES += $(call admfiles, CSWsqlite3rt, ) -DISTFILES += copyright.html +MASTER_SITES = http://sqlite.org/ +DISTNAME = sqlite-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING +PATCHFILES = gar-base.diff +PATCHFILES += shell.c.diff + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz -# Package description -SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) +PACKAGES = CSWsqlite3 CSWsqlite3rt CSWsqlite3devel + +CATALOGNAME_CSWsqlite3 = sqlite3 +CATALOGNAME_CSWsqlite3rt = sqlite3_rt +CATALOGNAME_CSWsqlite3devel = sqlite3_devel + +SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) +SPKG_DESC_CSWsqlite3rt = $(SPKG_DESC_CSWsqlite3) runtime SPKG_DESC_CSWsqlite3devel = $(SPKG_DESC_CSWsqlite3) development package -SPKG_DESC_CSWsqlite3rt = $(SPKG_DESC_CSWsqlite3) runtime -# Dynamic prototype -PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -PKGFILES_CSWsqlite3devel += /opt/csw/share/doc/sqlite3devel/copyright.html -PKGFILES_CSWsqlite3 = /opt/csw/share/doc/sqlite3/copyright.html -PKGFILES_CSWsqlite3 += /opt/csw/bin/.* +PKGFILES_CSWsqlite3 = $(bindir)/.* +PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -# Dependencies -REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt +REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt REQUIRED_PKGS_CSWsqlite3devel = CSWsqlite3 -# Build the 64 bits binaries -NO_ISAEXEC = 1 -EXTRA_BUILD_ISAS_sparc = sparcv9 +BUILD64 = 1 +NO_ISAEXEC = 1 -# Add some patches to the sources -PATCHFILES = gar-base.diff -PATCHFILES += shell.c.diff - -# Do not execute make test step -TEST_SCRIPTS = none - # Make configure options -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threadsafe --disable-debug -test-none: - @$(MAKECOOKIE) +TEST_SCRIPTS = -post-extract: - ( cd $(WORKROOTDIR) ; for i in build-isa-* ; do mv $$i/sqlite-$(GARVERSION) $$i/$(GARNAME)-$(GARVERSION) ; done ) - @$(MAKECOOKIE) - -pre-install: - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)devel - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)rt - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)devel - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)rt - include gar/category.mk Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,7 +1,4 @@ -796042e754828aa346facd2214deff95 download/CSWsqlite3.gspec -b6cc9c2a8d9135f74f8bc2dcd486056f download/CSWsqlite3devel.gspec -e331063f1e79a20e465ed63bfcea15a8 download/CSWsqlite3rt.gspec -a0e12a72a1f5b972624c712532dc27d7 download/copyright.html -80d638505872be7ffa238d43f0e268b2 download/gar-base.diff -1a2be927ceacfa534501b9f4675bce83 download/shell.c.diff -d7c57e91fbeb630c19f82eec3ef73dae download/sqlite-3.6.16.tar.gz +22bb7b924e2ecb13997abcf15966f674 COPYING +80d638505872be7ffa238d43f0e268b2 gar-base.diff +1a2be927ceacfa534501b9f4675bce83 shell.c.diff +aa03cc24a52851bb204fc1e489e195e8 sqlite-3.6.19.tar.gz Added: csw/mgar/pkg/sqlite3/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/sqlite3/trunk/files/COPYING 2009-10-29 14:49:36 UTC (rev 7017) @@ -0,0 +1,188 @@ + + +SQLite Copyright + + + + + +
+ + + +
+
Small. Fast. Reliable.
Choose any three.
+ +
+
+
+ About + Sitemap + Documentation + Download + License + News + Developers + Support +
+
+ + + +

SQLite Copyright

+ + + +
+
+SQLite is in the
+Public Domain +
+ +

+All of the deliverable code in SQLite has been dedicated to the +public domain +by the authors. +All code authors, and representatives of the companies they work for, +have signed affidavits dedicating their contributions to +the public domain and originals of +those signed affidavits are stored in a firesafe at the main offices +of Hwaci. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute +the original SQLite code, either in source code form or as a compiled binary, +for any purpose, commercial or non-commercial, and by any means. +

+ +

+The previous paragraph applies to the deliverable code in SQLite - +those parts of the SQLite library that you actually bundle and +ship with a larger application. Portions of the documentation and +some code used as part of the build process might fall under +other licenses. The details here are unclear. We do not worry +about the licensing of the documentation and build code so much +because none of these things are part of the core deliverable +SQLite library. +

+ +

+All of the deliverable code in SQLite has been written from scratch. +No code has been taken from other projects or from the open +internet. Every line of code can be traced back to its original +author, and all of those authors have public domain dedications +on file. So the SQLite code base is clean and is +uncontaminated with licensed code from other projects. +

+ +

Obtaining An Explicit License To Use SQLite

+ +

+Even though SQLite is in the public domain and does not require +a license, some users want to obtain a license anyway. Some reasons +for obtaining a license include: +

+ +
    +
  • You are using SQLite in a jurisdiction that does not recognize + the public domain.
    • +
  • You are using SQLite in a jurisdiction that does not recognize + the right of an author to dedicate their work to the public + domain.
    • +
  • You want to hold a tangible legal document + as evidence that you have the legal right to use and distribute + SQLite.
    • +
  • Your legal department tells you that you have to purchase a license. +
    • +
+ +

+If you feel like you really have to purchase a license for SQLite, +Hwaci, the company that employs +the architect and principal developers of SQLite, will +sell you +one. +

+ +

Contributed Code

+ +

+In order to keep SQLite completely free and unencumbered by copyright, +all new contributors to the SQLite code base are asked to dedicate +their contributions to the public domain. +If you want to send a patch or enhancement for possible inclusion in the +SQLite source tree, please accompany the patch with the following statement: +

+ +
+The author or authors of this code dedicate any and all copyright interest +in this code to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and successors. +We intend this dedication to be an overt act of relinquishment in +perpetuity of all present and future rights to this code under copyright law. +
+ +

+We are not able to accept patches or changes to +SQLite that are not accompanied by a statement such as the above. +In addition, if you make +changes or enhancements as an employee, then a simple statement such as the +above is insufficient. You must also send by surface mail a copyright release +signed by a company officer. +A signed original of the copyright release should be mailed to:

+ +
+Hwaci
+6200 Maple Cove Lane
+Charlotte, NC 28269
+USA +
+ +

+A template copyright release is available +in PDF or +HTML. +You can use this release to make future changes. +

+ Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,9 +0,0 @@ -%var bitname sqlite3 -%var pkgname CSWsqlite3 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - - -Please see /opt/csw/share/doc/%{GARNAME} for license information - - Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,8 +0,0 @@ -%var bitname sqlite3_devel -%var pkgname CSWsqlite3devel -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME} for license information - Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,9 +0,0 @@ -%var bitname sqlite3_rt -%var pkgname CSWsqlite3rt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - - -Please see /opt/csw/share/doc/%{GARNAME} for license information - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 15:56:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 14:56:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7018] csw/mgar/pkg/libmad Message-ID: Revision: 7018 http://gar.svn.sourceforge.net/gar/?rev=7018&view=rev Author: dmichelsen Date: 2009-10-29 14:56:26 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libmad: Initial commit Modified Paths: -------------- csw/mgar/pkg/libmad/trunk/Makefile csw/mgar/pkg/libmad/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmad/Makefile csw/mgar/pkg/libmad/branches/ csw/mgar/pkg/libmad/trunk/ csw/mgar/pkg/libmad/trunk/files/mad-32.pc csw/mgar/pkg/libmad/trunk/files/mad-64.pc Copied: csw/mgar/pkg/libmad/Makefile (from rev 6625, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libmad/Makefile (rev 0) +++ csw/mgar/pkg/libmad/Makefile 2009-10-29 14:56:26 UTC (rev 7018) @@ -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/libmad/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/libmad/trunk/Makefile 2009-10-29 14:56:26 UTC (rev 7018) @@ -1,182 +1,33 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = libmad +GARVERSION = 0.15.1b CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. + +DESCRIPTION = MPEG Audio Decoder define BLURB - + MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the + MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG 2.5 + format. All three audio layers - Layer I, Layer II, and Layer III (i.e. MP3) - + are fully implemented. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release + +SF_PROJ = mad +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += mad-32.pc mad-64.pc + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +SPKG_SOURCEURL = http://www.underbit.com/products/mad/ + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 + +TEST_TARGET = check + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(libdir)/pkgconfig + ginstall $(WORKDIR)/mad-$(MEMORYMODEL).pc $(DESTDIR)$(libdir)/pkgconfig/mad.pc + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libmad/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/libmad/trunk/checksums 2009-10-29 14:56:26 UTC (rev 7018) @@ -0,0 +1,3 @@ +1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz +eae4572422d62cf508f2525bc48068cf mad-32.pc +55173875569f2f723a74950299264711 mad-64.pc Added: csw/mgar/pkg/libmad/trunk/files/mad-32.pc =================================================================== --- csw/mgar/pkg/libmad/trunk/files/mad-32.pc (rev 0) +++ csw/mgar/pkg/libmad/trunk/files/mad-32.pc 2009-10-29 14:56:26 UTC (rev 7018) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: mad +Description: MPEG Audio Decoder +Requires: +Version: 0.15.1b +Libs: -L${libdir} -lmad -lm +Cflags: -I${includedir} Added: csw/mgar/pkg/libmad/trunk/files/mad-64.pc =================================================================== --- csw/mgar/pkg/libmad/trunk/files/mad-64.pc (rev 0) +++ csw/mgar/pkg/libmad/trunk/files/mad-64.pc 2009-10-29 14:56:26 UTC (rev 7018) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib/64 +includedir=${prefix}/include + +Name: mad +Description: MPEG Audio Decoder +Requires: +Version: 0.15.1b +Libs: -L${libdir} -lmad -lm +Cflags: -I${includedir} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 16:07:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 15:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7019] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7019 http://gar.svn.sourceforge.net/gar/?rev=7019&view=rev Author: dmichelsen Date: 2009-10-29 15:07:06 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Fix stupid typo in umask application Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-29 14:56:26 UTC (rev 7018) +++ csw/mgar/gar/v2/gar.mk 2009-10-29 15:07:06 UTC (rev 7019) @@ -746,7 +746,7 @@ # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -754,7 +754,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -762,7 +762,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -770,7 +770,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 16:47:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 15:47:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7020] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7020 http://gar.svn.sourceforge.net/gar/?rev=7020&view=rev Author: dmichelsen Date: 2009-10-29 15:47:27 +0000 (Thu, 29 Oct 2009) Log Message: ----------- apr: Adjust install destinations for 64 bit Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype csw/mgar/pkg/apr/trunk/files/CSWapr.depend csw/mgar/pkg/apr/trunk/files/CSWapr.gspec csw/mgar/pkg/apr/trunk/files/CSWapr.prototype Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 15:47:27 UTC (rev 7020) @@ -11,9 +11,6 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWapr,depend prototype) -#DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) -DISTFILES += config.layout # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -25,26 +22,30 @@ CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -# Tests verified: 1.3.8 -TEST_SCRIPTS = +TEST_TARGET = check include gar/category.mk -pre-configure-modulated: install-layout - -install-layout: - @sed -e s,INSTALL_PREFIX,$(prefix),g \ - $(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout +post-extract-modulated: + ginstall -d $(WORKSRC) + (echo "# csw layout";\ + echo "";\ + echo " prefix: $(prefix)";\ + echo " exec_prefix: $(exec_prefix)";\ + echo " bindir: $(bindir)";\ + echo " sbindir: $(sbindir)";\ + echo " libdir: $(libdir)";\ + echo " libexecdir: $(libdir)/apr/modules";\ + echo " mandir: $(mandir)";\ + echo " datadir: $(datadir)/apr";\ + echo " includedir: $(includedir)/apr-$${APR_MAJOR_VERSION}";\ + echo " localstatedir: /var/run";\ + echo " runtimedir: /var/run";\ + echo " infodir: $(infodir)";\ + echo " libsuffix: -$${APR_MAJOR_VERSION}";\ + echo "") >$(WORKSRC)/config.layout @$(MAKECOOKIE) -post-install: create-link fix-libtool - -create-link: - @( cd $(DESTDIR)$(bindir) ; ln -s apr-1-config apr-config ) +post-install-modulated: + gln -s apr-1-config $(DESTDIR)$(bindir)/apr-config @$(MAKECOOKIE) - -fix-libtool: - @sed -i -e s,/export/home/comand/bin/sed,$(bindir)/gsed,g \ - $(DESTDIR)$(datadir)/apr/build-1/libtool - @$(MAKECOOKIE) - Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend 2009-10-29 15:47:27 UTC (rev 7020) @@ -1 +0,0 @@ -P CSWapr apr - Apache Portable Runtime Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,5 +0,0 @@ -%var bitname apr_devel -%var pkgname CSWapr-devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache Portable Runtime -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,52 +0,0 @@ -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/apr-1 0755 root bin -f none /opt/csw/include/apr-1/apr.h 0644 root bin -f none /opt/csw/include/apr-1/apr_allocator.h 0644 root bin -f none /opt/csw/include/apr-1/apr_atomic.h 0644 root bin -f none /opt/csw/include/apr-1/apr_dso.h 0644 root bin -f none /opt/csw/include/apr-1/apr_env.h 0644 root bin -f none /opt/csw/include/apr-1/apr_errno.h 0644 root bin -f none /opt/csw/include/apr-1/apr_file_info.h 0644 root bin -f none /opt/csw/include/apr-1/apr_file_io.h 0644 root bin -f none /opt/csw/include/apr-1/apr_fnmatch.h 0644 root bin -f none /opt/csw/include/apr-1/apr_general.h 0644 root bin -f none /opt/csw/include/apr-1/apr_getopt.h 0644 root bin -f none /opt/csw/include/apr-1/apr_global_mutex.h 0644 root bin -f none /opt/csw/include/apr-1/apr_hash.h 0644 root bin -f none /opt/csw/include/apr-1/apr_inherit.h 0644 root bin -f none /opt/csw/include/apr-1/apr_lib.h 0644 root bin -f none /opt/csw/include/apr-1/apr_mmap.h 0644 root bin -f none /opt/csw/include/apr-1/apr_network_io.h 0644 root bin -f none /opt/csw/include/apr-1/apr_poll.h 0644 root bin -f none /opt/csw/include/apr-1/apr_pools.h 0644 root bin -f none /opt/csw/include/apr-1/apr_portable.h 0644 root bin -f none /opt/csw/include/apr-1/apr_proc_mutex.h 0644 root bin -f none /opt/csw/include/apr-1/apr_random.h 0644 root bin -f none /opt/csw/include/apr-1/apr_ring.h 0644 root bin -f none /opt/csw/include/apr-1/apr_shm.h 0644 root bin -f none /opt/csw/include/apr-1/apr_signal.h 0644 root bin -f none /opt/csw/include/apr-1/apr_strings.h 0644 root bin -f none /opt/csw/include/apr-1/apr_support.h 0644 root bin -f none /opt/csw/include/apr-1/apr_tables.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_cond.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_mutex.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_proc.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_rwlock.h 0644 root bin -f none /opt/csw/include/apr-1/apr_time.h 0644 root bin -f none /opt/csw/include/apr-1/apr_user.h 0644 root bin -f none /opt/csw/include/apr-1/apr_version.h 0644 root bin -f none /opt/csw/include/apr-1/apr_want.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/apr.exp 0644 root bin -f none /opt/csw/lib/libapr-1.a 0644 root bin -f none /opt/csw/lib/libapr-1.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/apr-1.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/apr 0755 root bin -d none /opt/csw/share/apr/build-1 0755 root bin -f none /opt/csw/share/apr/build-1/apr_rules.mk 0644 root bin -f none /opt/csw/share/apr/build-1/libtool 0755 root bin -f none /opt/csw/share/apr/build-1/make_exports.awk 0644 root bin -f none /opt/csw/share/apr/build-1/make_var_export.awk 0644 root bin -f none /opt/csw/share/apr/build-1/mkdir.sh 0755 root bin Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.depend =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr.depend 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr.depend 2009-10-29 15:47:27 UTC (rev 7020) @@ -1 +0,0 @@ -I CSWapache2rt Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.gspec =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr.gspec 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr.gspec 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,4 +0,0 @@ -%var bitname apr -%var pkgname CSWapr -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.prototype =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr.prototype 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr.prototype 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,7 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/apr-1-config 0755 root bin -s none /opt/csw/bin/apr-config=apr-1-config root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libapr-1.so.0.2.2 0755 root bin -s none /opt/csw/lib/libapr-1.so.0=libapr-1.so.0.2.2 root bin -s none /opt/csw/lib/libapr-1.so=libapr-1.so.0.2.2 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:07:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7021] csw/mgar/pkg Message-ID: Revision: 7021 http://gar.svn.sourceforge.net/gar/?rev=7021&view=rev Author: dmichelsen Date: 2009-10-29 16:07:00 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cswcommon: Initial commit of stub package Added Paths: ----------- csw/mgar/pkg/cswcommon/ csw/mgar/pkg/cswcommon/branches/ csw/mgar/pkg/cswcommon/tags/ csw/mgar/pkg/cswcommon/trunk/ csw/mgar/pkg/cswcommon/trunk/Makefile csw/mgar/pkg/cswcommon/trunk/files/ csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg csw/mgar/pkg/cswcommon/trunk/files/map2dirlist csw/mgar/pkg/cswcommon/trunk/files/pkgmap Property changes on: csw/mgar/pkg/cswcommon/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cswcommon/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswcommon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/Makefile 2009-10-29 16:07:00 UTC (rev 7021) @@ -0,0 +1,24 @@ +GARNAME = cswcommon +GARVERSION = 1.4.6 +CATEGORIES = utils + +DESCRIPTION = Installs some useful standard CSW filesystem symlinks and files +define BLURB +endef + +#MASTER_SITES = http://mirror.opencsw.org/opencsw/current/$(shell uname -p)/5.8 +MASTER_SITES = http://mirror.opencsw.org/opencsw/current/sparc/5.8/ +DISTFILES = common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg + +PACKAGES = common + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/cswcommon/trunk/files/map2dirlist =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/map2dirlist (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/files/map2dirlist 2009-10-29 16:07:00 UTC (rev 7021) @@ -0,0 +1,8 @@ +#!/usr/bin/perl + +open F, "pkgmap"; +while( ) { + chomp; + my @l = split /\s+/; + +} Added: csw/mgar/pkg/cswcommon/trunk/files/pkgmap =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/pkgmap (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/files/pkgmap 2009-10-29 16:07:00 UTC (rev 7021) @@ -0,0 +1,150 @@ +: 1 164 +1 d none /etc/opt/csw 0755 root bin +1 d none /opt/csw 0755 root bin +1 d none /opt/csw/bin 0755 root bin +1 s none /opt/csw/bin/sparc=sparcv8 +1 d none /opt/csw/bin/sparcv8 0755 root bin +1 d none /opt/csw/bin/sparcv8plus 0755 root bin +1 d none /opt/csw/bin/sparcv8plus+vis 0755 root bin +1 d none /opt/csw/bin/sparcv9 0755 root bin +1 s none /opt/csw/doc=share/doc +1 d none /opt/csw/etc 0755 root bin +1 d none /opt/csw/include 0755 root bin +1 s none /opt/csw/info=share/info +1 d none /opt/csw/lib 0755 root bin +1 s none /opt/csw/lib/32=. +1 s none /opt/csw/lib/64=sparcv9 +1 d none /opt/csw/lib/X11 0755 root bin +1 d none /opt/csw/lib/X11/app-defaults 0755 root bin +1 s none /opt/csw/lib/locale=../share/locale +1 s none /opt/csw/lib/sparc=. +1 s none /opt/csw/lib/sparcv8=. +1 d none /opt/csw/lib/sparcv8plus 0755 root bin +1 d none /opt/csw/lib/sparcv8plus+vis 0755 root bin +1 d none /opt/csw/lib/sparcv9 0755 root bin +1 s none /opt/csw/man=share/man +1 d none /opt/csw/sbin 0755 root bin +1 d none /opt/csw/share 0755 root bin +1 d none /opt/csw/share/doc 0755 root bin +1 d none /opt/csw/share/info 0755 root bin +1 d none /opt/csw/share/locale 0755 root bin +1 d none /opt/csw/share/locale/az 0755 root bin +1 d none /opt/csw/share/locale/az/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/be 0755 root bin +1 d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/bg 0755 root bin +1 d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/bg/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ca 0755 root bin +1 d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/cs 0755 root bin +1 d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/cs/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/da 0755 root bin +1 d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/da/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/de 0755 root bin +1 d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/de/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/el 0755 root bin +1 d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/el/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/en at boldquot 0755 root bin +1 d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/en at quot 0755 root bin +1 d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/es 0755 root bin +1 d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/es/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/et 0755 root bin +1 d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/eu 0755 root bin +1 d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/fi 0755 root bin +1 d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/fr 0755 root bin +1 d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/fr/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ga 0755 root bin +1 d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/gl 0755 root bin +1 d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/gl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/he 0755 root bin +1 d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/hr 0755 root bin +1 d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/hu 0755 root bin +1 d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/id 0755 root bin +1 d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/it 0755 root bin +1 d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/it/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ja 0755 root bin +1 d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/ja/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ko 0755 root bin +1 d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/ko/LC_TIME=LC_MESSAGES +1 f none /opt/csw/share/locale/locale.alias 0644 root bin 2676 12726 1083469567 +1 d none /opt/csw/share/locale/lt 0755 root bin +1 d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/nl 0755 root bin +1 d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/nl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/nn 0755 root bin +1 d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/no 0755 root bin +1 d none /opt/csw/share/locale/no/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/no/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/pl 0755 root bin +1 d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/pl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/pt 0755 root bin +1 d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/pt/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/pt_BR 0755 root bin +1 d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/pt_BR/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ro 0755 root bin +1 d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/ru 0755 root bin +1 d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/ru/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/sk 0755 root bin +1 d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/sk/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/sl 0755 root bin +1 d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/sl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/sp 0755 root bin +1 d none /opt/csw/share/locale/sp/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/sr 0755 root bin +1 d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/sv 0755 root bin +1 d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/sv/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/tr 0755 root bin +1 d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/uk 0755 root bin +1 d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/vi 0755 root bin +1 d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/wa 0755 root bin +1 d none /opt/csw/share/locale/wa/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/zh 0755 root bin +1 d none /opt/csw/share/locale/zh/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/zh/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/zh_CN 0755 root bin +1 d none /opt/csw/share/locale/zh_CN.GB2312 0755 root bin +1 d none /opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/zh_TW 0755 root bin +1 d none /opt/csw/share/locale/zh_TW.Big5 0755 root bin +1 d none /opt/csw/share/locale/zh_TW.Big5/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/man 0755 root bin +1 d none /opt/csw/var 0755 root bin +1 d none /var/opt/csw 0755 root bin +1 i checkinstall 2162 37599 1137116436 +1 i pkginfo 382 32403 1224265997 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:08:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:08:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7022] csw/mgar/pkg/lsof/trunk Message-ID: Revision: 7022 http://gar.svn.sourceforge.net/gar/?rev=7022&view=rev Author: dmichelsen Date: 2009-10-29 16:08:48 +0000 (Thu, 29 Oct 2009) Log Message: ----------- lsof: Initial commit Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lsof/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lsof/trunk/files/ csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec Property Changed: ---------------- csw/mgar/pkg/lsof/trunk/ Property changes on: csw/mgar/pkg/lsof/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2009-10-29 16:07:00 UTC (rev 7021) +++ csw/mgar/pkg/lsof/trunk/Makefile 2009-10-29 16:08:48 UTC (rev 7022) @@ -1,5 +1,5 @@ GARNAME = lsof -GARVERSION = 4.77 +GARVERSION = 4.81 CATEGORIES = utils DESCRIPTION = List open files @@ -11,36 +11,57 @@ endef MASTER_SITES = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ - TOPDIST = $(GARNAME)_$(GARVERSION) SRCDIST = $(TOPDIST)_src -#DISTFILES = $(TOPDIST).tar.bz2 +DISTFILES = $(TOPDIST).tar.bz2 WORKSRC = $(WORKDIR)/$(TOPDIST)/$(SRCDIST) +SPKG_SOURCEURL = http://people.freebsd.org/~abe/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.bz2 +BUILD64 = 1 + CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = -n solariscc TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom +# Environment variables affecting Solaris builds: +# SOLARIS_23P101318 If this environment variable has a non-NULL value, the +# SOLARIS_24P101945 If this environment variable has a non-NULL value, the +# SOLARIS_24P102303 If this environment variable has a non-NULL value, the +# SOLARIS_26PR_GWINDOWS If this environment variable has a value of "Y" or "y", +# SOLARIS_26PR_LDT If this environment variable has a value of "Y" or "y", +# SOLARIS_CCDIR specifies the path to the Sun C compiler -- i.e., when +# SOLARIS_INSTR specifies the Sun C compiler target instruction set +# SOLARIS_KERNBITS specifies the number of bits in the Solaris 7, 8, 9 or +# SOLARIS_VSOCK If this environment variable has a value of "Y" or "y", +# SOLARIS_VXFSINCL This environment variable defines the path to the +# SOLARIS_VXFSLIB This environment variable defines the path to the + +CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS +SOLARIS_CCDIR = $(CC_HOME) +SOLARIS_INSTR = $(ISA) +SOLARIS_KERNBITS = $(MEMORYMODEL) + include gar/category.mk -post-extract: +post-extract-modulated: @echo " ==> Extracting source distribution" @( cd $(WORKDIR)/$(TOPDIST) ; tar xf $(SRCDIST).tar ) configure-custom: @echo " ==> Configuring in $(WORKSRC)" - @( cd $(WORKSRC) ; ./Configure $(CONFIGURE_ARGS) ) + ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) ) -test-custom: +test-custom-modulated: @echo " ==> Testing in $(WORKSRC)/tests" @$(MAKE) -C $(WORKSRC)/tests -install-custom: +install-custom-modulated: @echo " ==> Installing $(GARNAME) $(GARVERSION)" @( cd $(WORKSRC) ; \ install -m 2755 -g sys lsof $(DESTDIR)$(bindir) ; \ Modified: csw/mgar/pkg/lsof/trunk/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2009-10-29 16:07:00 UTC (rev 7021) +++ csw/mgar/pkg/lsof/trunk/checksums 2009-10-29 16:08:48 UTC (rev 7022) @@ -1 +1 @@ -42921 1370 download/lsof_4.71.tar.bz2 +c482bda0764a8e618f87682347b22a87 download/lsof_4.81.tar.bz2 Copied: csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec (from rev 2905, csw/mgar/pkg/top/trunk/files/CSWtop.gspec) =================================================================== --- csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec (rev 0) +++ csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec 2009-10-29 16:08:48 UTC (rev 7022) @@ -0,0 +1,4 @@ +%var bitname lsof +%var pkgname CSWlsof +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:24:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:24:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7023] csw/mgar/pkg Message-ID: Revision: 7023 http://gar.svn.sourceforge.net/gar/?rev=7023&view=rev Author: dmichelsen Date: 2009-10-29 16:24:58 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libstlport: Initial commit, doesn't work yet Added Paths: ----------- csw/mgar/pkg/libstlport/ csw/mgar/pkg/libstlport/branches/ csw/mgar/pkg/libstlport/tags/ csw/mgar/pkg/libstlport/trunk/ csw/mgar/pkg/libstlport/trunk/Makefile csw/mgar/pkg/libstlport/trunk/checksums csw/mgar/pkg/libstlport/trunk/files/ Property changes on: csw/mgar/pkg/libstlport/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libstlport/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstlport/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libstlport/trunk/Makefile 2009-10-29 16:24:58 UTC (rev 7023) @@ -0,0 +1,21 @@ +GARNAME = libstlport +GARVERSION = 5.2.1 +CATEGORIES = lib + +DESCRIPTION = A multiplatform C++ standard library implementation +define BLURB + STLport is a multiplatform C++ Standard Library implementation. +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = stlport +DISTNAME = STLport-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libstlport/trunk/checksums =================================================================== --- csw/mgar/pkg/libstlport/trunk/checksums (rev 0) +++ csw/mgar/pkg/libstlport/trunk/checksums 2009-10-29 16:24:58 UTC (rev 7023) @@ -0,0 +1 @@ +b20ace9f4a487b2614dfbb205bee112c download/STLport-5.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:26:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7024] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7024 http://gar.svn.sourceforge.net/gar/?rev=7024&view=rev Author: dmichelsen Date: 2009-10-29 16:26:32 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libmcrypt: Update configure options, tests still don't work Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-10-29 16:24:58 UTC (rev 7023) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-10-29 16:26:32 UTC (rev 7024) @@ -14,12 +14,13 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes TEST_TARGET = check Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-10-29 16:24:58 UTC (rev 7023) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-10-29 16:26:32 UTC (rev 7024) @@ -1 +1 @@ -c4f491dd411a09e9de3b8702ea6f73eb download/libmcrypt-2.5.8.tar.bz2 +c4f491dd411a09e9de3b8702ea6f73eb libmcrypt-2.5.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:27:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:27:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7025] csw/mgar/pkg/ntop/trunk Message-ID: Revision: 7025 http://gar.svn.sourceforge.net/gar/?rev=7025&view=rev Author: dmichelsen Date: 2009-10-29 16:27:39 +0000 (Thu, 29 Oct 2009) Log Message: ----------- ntop: Update to 3.3.9 Modified Paths: -------------- csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ntop/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec Property Changed: ---------------- csw/mgar/pkg/ntop/trunk/ Property changes on: csw/mgar/pkg/ntop/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2009-10-29 16:26:32 UTC (rev 7024) +++ csw/mgar/pkg/ntop/trunk/Makefile 2009-10-29 16:27:39 UTC (rev 7025) @@ -1,5 +1,5 @@ GARNAME = ntop -GARVERSION = 2.2 +GARVERSION = 3.3.9 CATEGORIES = net DESCRIPTION = A network traffic usage monitor. @@ -12,17 +12,16 @@ and RRD for persistently storing traffic statistics. endef -MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += $(call admfiles,CSWntop,) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# PATCHFILES = intdef.diff + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -LIBDEPS += utils/rrdtool - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/ntop/trunk/checksums =================================================================== --- csw/mgar/pkg/ntop/trunk/checksums 2009-10-29 16:26:32 UTC (rev 7024) +++ csw/mgar/pkg/ntop/trunk/checksums 2009-10-29 16:27:39 UTC (rev 7025) @@ -1,2 +1 @@ -4586e4173fcab64d2394502603fc73aa download/ntop-2.2.tgz -6ce544627c6cea03d09d0710fb223035 download/CSWntop.gspec +0c22038e0f2aa003110437b5a5d5a6a5 download/ntop-3.3.9.tar.gz Deleted: csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec =================================================================== --- csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec 2009-10-29 16:26:32 UTC (rev 7024) +++ csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec 2009-10-29 16:27:39 UTC (rev 7025) @@ -1,4 +0,0 @@ -%var bitname ntop -%var pkgname CSWntop -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:28:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:28:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7026] csw/mgar/pkg Message-ID: Revision: 7026 http://gar.svn.sourceforge.net/gar/?rev=7026&view=rev Author: dmichelsen Date: 2009-10-29 16:28:17 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libdatrie: Initial commit Added Paths: ----------- csw/mgar/pkg/libdatrie/ csw/mgar/pkg/libdatrie/branches/ csw/mgar/pkg/libdatrie/tags/ csw/mgar/pkg/libdatrie/trunk/ csw/mgar/pkg/libdatrie/trunk/Makefile csw/mgar/pkg/libdatrie/trunk/checksums csw/mgar/pkg/libdatrie/trunk/files/ Property changes on: csw/mgar/pkg/libdatrie/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libdatrie/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdatrie/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libdatrie/trunk/Makefile 2009-10-29 16:28:17 UTC (rev 7026) @@ -0,0 +1,25 @@ +GARNAME = libdatrie +GARVERSION = 0.2.2 +CATEGORIES = lib + +DESCRIPTION = Double array tree library +define BLURB +endef + +MASTER_SITES = ftp://linux.thai.net/pub/ThaiLinux/software/libthai/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://linux.thai.net/~thep/datrie/datrie.html + +REQUIRED_PKGS = CSWiconv + +EXTRA_LINKER_FLAGS = -liconv +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libdatrie/trunk/checksums =================================================================== --- csw/mgar/pkg/libdatrie/trunk/checksums (rev 0) +++ csw/mgar/pkg/libdatrie/trunk/checksums 2009-10-29 16:28:17 UTC (rev 7026) @@ -0,0 +1 @@ +d1c93faf0c0d63e620c525c561940fdd libdatrie-0.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:29:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:29:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7027] csw/mgar/pkg/tcl/trunk Message-ID: Revision: 7027 http://gar.svn.sourceforge.net/gar/?rev=7027&view=rev Author: dmichelsen Date: 2009-10-29 16:29:58 +0000 (Thu, 29 Oct 2009) Log Message: ----------- tcp: Add patch for 64 bit compilcation, may need more work Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2009-10-29 16:28:17 UTC (rev 7026) +++ csw/mgar/pkg/tcl/trunk/Makefile 2009-10-29 16:29:58 UTC (rev 7027) @@ -12,6 +12,11 @@ DISTNAME = $(GARNAME)$(GARVERSION) DISTFILES = $(DISTNAME)-src.tar.gz +# Patch to use libsunmath on x86 from +# http://sourceforge.net/tracker/index.php?func=detail&aid=1839067&group_id=10894&atid=110894 +PATCHFILES = patch-libsunmath-amd64.diff +PATCHDIR = $(WORKDIR)/$(DISTNAME) + SPKG_SOURCEURL = http://www.tcl.tk/ # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/tcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2009-10-29 16:28:17 UTC (rev 7026) +++ csw/mgar/pkg/tcl/trunk/checksums 2009-10-29 16:29:58 UTC (rev 7027) @@ -1 +1,2 @@ +8c1bdbe43c9337c01287d074803d9767 download/patch-libsunmath-amd64.diff f70ad8f78b5e4a9f792fe101f22b125f download/tcl8.5.7-src.tar.gz Added: csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff =================================================================== --- csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff (rev 0) +++ csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff 2009-10-29 16:29:58 UTC (rev 7027) @@ -0,0 +1,60 @@ +diff -Naur tcl8.5.7.orig/unix/configure tcl8.5.7.patched/unix/configure +--- tcl8.5.7.orig/unix/configure 2009-04-15 21:30:05.000000000 +0200 ++++ tcl8.5.7.patched/unix/configure 2009-08-19 17:28:51.563281904 +0200 +@@ -8424,7 +8424,7 @@ + + + else +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64"; then + + if test "$GCC" = yes; then + +@@ -8475,7 +8475,7 @@ + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64" -o "$arch" = "i386"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +@@ -8658,7 +8658,7 @@ + #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" + + else +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64"; then + + SHLIB_LD="$SHLIB_LD -m64 -static-libgcc" + +diff -Naur tcl8.5.7.orig/unix/tcl.m4 tcl8.5.7.patched/unix/tcl.m4 +--- tcl8.5.7.orig/unix/tcl.m4 2009-04-15 21:30:05.000000000 +0200 ++++ tcl8.5.7.patched/unix/tcl.m4 2009-08-19 17:30:12.073868365 +0200 +@@ -1920,7 +1920,7 @@ + # Solaris 64 uses this as well + #LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64" + ]) +- ], [AS_IF([test "$arch" = "amd64 i386"], [ ++ ], [AS_IF([test "$arch" = "amd64"], [ + AS_IF([test "$GCC" = yes], [ + case $system in + SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) +@@ -1951,7 +1951,7 @@ + AS_IF([test "$GCC" = yes],[use_sunmath=no],[ + arch=`isainfo` + AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) +- AS_IF([test "$arch" = "amd64 i386"], [ ++ AS_IF([test "$arch" = "amd64" -o "$arch" = "i386"], [ + AC_MSG_RESULT([yes]) + MATH_LIBS="-lsunmath $MATH_LIBS" + AC_CHECK_HEADER(sunmath.h) +@@ -1982,7 +1982,7 @@ + # path, remove so name and append 'sparcv9' + #v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..." + #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" +- ], [AS_IF([test "$arch" = "amd64 i386"], [ ++ ], [AS_IF([test "$arch" = "amd64"], [ + SHLIB_LD="$SHLIB_LD -m64 -static-libgcc" + ])]) + ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:39:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7028] csw/mgar/pkg Message-ID: Revision: 7028 http://gar.svn.sourceforge.net/gar/?rev=7028&view=rev Author: dmichelsen Date: 2009-10-29 16:39:55 +0000 (Thu, 29 Oct 2009) Log Message: ----------- enscript: Initial commit, more work needed Added Paths: ----------- csw/mgar/pkg/enscript/ csw/mgar/pkg/enscript/branches/ csw/mgar/pkg/enscript/tags/ csw/mgar/pkg/enscript/trunk/ csw/mgar/pkg/enscript/trunk/Makefile csw/mgar/pkg/enscript/trunk/checksums csw/mgar/pkg/enscript/trunk/files/ Property changes on: csw/mgar/pkg/enscript/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/enscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/enscript/trunk/Makefile (rev 0) +++ csw/mgar/pkg/enscript/trunk/Makefile 2009-10-29 16:39:55 UTC (rev 7028) @@ -0,0 +1,24 @@ +GARNAME = enscript +GARVERSION = 1.6.4 +CATEGORIES = utils + +DESCRIPTION = GNU enscript converts ASCII files to PostScript +define BLURB + GNU enscript is a free replacement for the Adobe's enscript program. + Enscript converts ASCII files to PostScript and spools generated PostScript + output to the specified printer or leaves it to file. Enscript can be easily + extended to handle different output media and it has many options that can + be used to customize printouts. +endef + +MASTER_SITES = http://www.iki.fi/mtr/genscript/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.codento.com/people/mtr/genscript/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/enscript/trunk/checksums =================================================================== --- csw/mgar/pkg/enscript/trunk/checksums (rev 0) +++ csw/mgar/pkg/enscript/trunk/checksums 2009-10-29 16:39:55 UTC (rev 7028) @@ -0,0 +1 @@ +b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:44:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7029] csw/mgar/pkg/cpan/MIME-Types/trunk Message-ID: Revision: 7029 http://gar.svn.sourceforge.net/gar/?rev=7029&view=rev Author: dmichelsen Date: 2009-10-29 16:44:53 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/MIME-Types: Update to 1.27 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile csw/mgar/pkg/cpan/MIME-Types/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/MIME-Types/trunk/ Property changes on: csw/mgar/pkg/cpan/MIME-Types/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2009-10-29 16:39:55 UTC (rev 7028) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2009-10-29 16:44:53 UTC (rev 7029) @@ -1,9 +1,9 @@ GARNAME = MIME-Types -GARVERSION = 1.18 +GARVERSION = 1.27 CATEGORIES = cpan AUTHOR = MARKOV -DESCRIPTION = definition of MIME types +DESCRIPTION = Perl MIME::Types module define BLURB This module maintains a set of MIME::Type objects, which each describe one known mime type. There are many types defined by RFCs and vendors, so the @@ -11,6 +11,9 @@ additional information. endef -DISTFILES += CSWpmmimetypes.gspec +PACKAGES = CSWpmmimetypes +CATALOGNAME = pm_mimetypes +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2009-10-29 16:39:55 UTC (rev 7028) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2009-10-29 16:44:53 UTC (rev 7029) @@ -1,2 +1 @@ -033d1ea7b50ff868b8e3de42b76bb48f download/CSWpmmimetypes.gspec -fec1a57dfc4a0d7177b98fd75844685b download/MIME-Types-1.18.tar.gz +9407dfdd3a5adb7bf569ed2a184f1640 download/MIME-Types-1.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:49:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:49:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7030] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk Message-ID: Revision: 7030 http://gar.svn.sourceforge.net/gar/?rev=7030&view=rev Author: dmichelsen Date: 2009-10-29 16:49:44 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-Random: Update to 0.04 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.depend csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:44:53 UTC (rev 7029) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:49:44 UTC (rev 7030) @@ -1,16 +1,17 @@ GARNAME = Crypt-OpenSSL-Random -GARVERSION = 0.03 +GARVERSION = 0.04 CATEGORIES = cpan AUTHOR = IROBERTS -DESCRIPTION = routines for accessing the OpenSSL pseudo-random number generator +DESCRIPTION = Perl Crypt::OpenSSL::Random module define BLURB Crypt::OpenSSL::Random provides the ability to seed and query the OpenSSL library's pseudo-random number generator endef -DISTFILES += CSWpmcryptosslrand.gspec CSWpmcryptosslrand.depend +PACKAGES = CSWpmcryptosslrand +CATALOGNAME = pm_cryptosslrand -DEPENDS += lib/openssl +REQUIRED_PKGS = CSWosslrt include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums 2009-10-29 16:44:53 UTC (rev 7029) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums 2009-10-29 16:49:44 UTC (rev 7030) @@ -1,3 +1 @@ -013f7b0465d767679e216f82fc97b164 download/CSWpmcryptosslrand.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmcryptosslrand.depend -c6bae9c3ced1e08ffcd57120bf247a7a download/Crypt-OpenSSL-Random-0.03.tar.gz +c56ac5dbdd46122eb9b8da59613b7b0a Crypt-OpenSSL-Random-0.04.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec 2009-10-29 16:44:53 UTC (rev 7029) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec 2009-10-29 16:49:44 UTC (rev 7030) @@ -1,3 +0,0 @@ -%var bitname pm_cryptosslrand -%var pkgname CSWpmcryptosslrand -%include url file://%{PKGLIB}/csw_cpan.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:54:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7031] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Makefile Message-ID: Revision: 7031 http://gar.svn.sourceforge.net/gar/?rev=7031&view=rev Author: dmichelsen Date: 2009-10-29 16:54:04 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-Random: Fix package name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:49:44 UTC (rev 7030) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:54:04 UTC (rev 7031) @@ -9,7 +9,7 @@ library's pseudo-random number generator endef -PACKAGES = CSWpmcryptosslrand +PACKAGES = CSWpmcryptosslrandom CATALOGNAME = pm_cryptosslrand REQUIRED_PKGS = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:55:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:55:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7032] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk Message-ID: Revision: 7032 http://gar.svn.sourceforge.net/gar/?rev=7032&view=rev Author: dmichelsen Date: 2009-10-29 16:55:37 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-RSA: Update to mGAR v2 and 0.25 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:55:37 UTC (rev 7032) @@ -1,5 +1,5 @@ GARNAME = Crypt-OpenSSL-RSA -GARVERSION = 0.24 +GARVERSION = 0.25 CATEGORIES = cpan AUTHOR = IROBERTS @@ -10,9 +10,9 @@ decryption, signatures and signature verification. endef -DISTFILES += CSWpmcryptosslrsa.gspec CSWpmcryptosslrsa.depend +PACKAGES = CSWpmcryptosslrsa +CATALOGNAME = pm_cryptosslrsa -DEPENDS += lib/openssl -DEPENDS += cpan/Crypt-OpenSSL-Random +REQUIRED_PKGS = CSWpmcryptosslrandom include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums 2009-10-29 16:55:37 UTC (rev 7032) @@ -1,3 +1 @@ -7e98cda84fa7101190074dfa8cafc502 download/CSWpmcryptosslrsa.gspec -aca262f7c659e3e83c4644ff585d5f9d download/CSWpmcryptosslrsa.depend -5760e2678cd9e1aa33b40d5d216899c8 download/Crypt-OpenSSL-RSA-0.24.tar.gz +fdf19c9093f47cffb851ae937d053c14 Crypt-OpenSSL-RSA-0.25.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend 2009-10-29 16:55:37 UTC (rev 7032) @@ -1 +0,0 @@ -P CSWpmcryptosslrand pm_cryptosslrand - routines for accessing the OpenSSL pseudo-random number generator Deleted: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec 2009-10-29 16:55:37 UTC (rev 7032) @@ -1,7 +0,0 @@ -%var bitname pm_cryptosslrsa -%var pkgname CSWpmcryptosslrsa -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001-2004 Ian Robertson. Crypt::OpenSSL::RSA is free -software; you may redistribute it and/or modify it under the same -terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:57:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:57:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7033] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Makefile Message-ID: Revision: 7033 http://gar.svn.sourceforge.net/gar/?rev=7033&view=rev Author: dmichelsen Date: 2009-10-29 16:57:00 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-Random: Adjust catalog to conform to released package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:55:37 UTC (rev 7032) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:57:00 UTC (rev 7033) @@ -10,7 +10,7 @@ endef PACKAGES = CSWpmcryptosslrandom -CATALOGNAME = pm_cryptosslrand +CATALOGNAME = pm_osslrandom REQUIRED_PKGS = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:58:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7034] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Message-ID: Revision: 7034 http://gar.svn.sourceforge.net/gar/?rev=7034&view=rev Author: dmichelsen Date: 2009-10-29 16:58:10 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-RSA: Adjust catalog name to conform to released package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:57:00 UTC (rev 7033) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:58:10 UTC (rev 7034) @@ -11,7 +11,7 @@ endef PACKAGES = CSWpmcryptosslrsa -CATALOGNAME = pm_cryptosslrsa +CATALOGNAME = pm_osslrsa REQUIRED_PKGS = CSWpmcryptosslrandom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:08:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:08:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7035] csw/mgar/pkg/cpan Message-ID: Revision: 7035 http://gar.svn.sourceforge.net/gar/?rev=7035&view=rev Author: dmichelsen Date: 2009-10-29 17:08:25 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Text-CSV: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Text-CSV/ csw/mgar/pkg/cpan/Text-CSV/branches/ csw/mgar/pkg/cpan/Text-CSV/tags/ csw/mgar/pkg/cpan/Text-CSV/trunk/ csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV/trunk/checksums csw/mgar/pkg/cpan/Text-CSV/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Text-CSV/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile 2009-10-29 17:08:25 UTC (rev 7035) @@ -0,0 +1,18 @@ +GARNAME = Text-CSV +GARVERSION = 1.15 +CATEGORIES = cpan +AUTHOR = MAKAMAKA + +DESCRIPTION = Perl Text::CSV module +define BLURB + Text::CSV provides facilities for the composition and decomposition of + comma-separated values. An instance of the Text::CSV class can combine + fields into a CSV string and parse a CSV string into fields. +endef + +PACKAGES = CSWpmtextcsv +CATALOGNAME = pm_textcsv + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Text-CSV/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-CSV/trunk/checksums 2009-10-29 17:08:25 UTC (rev 7035) @@ -0,0 +1 @@ +26f636d041ef941b19e3de62cb141c01 Text-CSV-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:15:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:15:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7036] csw/mgar/pkg/cpan/Text-CSV_XS/trunk Message-ID: Revision: 7036 http://gar.svn.sourceforge.net/gar/?rev=7036&view=rev Author: dmichelsen Date: 2009-10-29 17:15:00 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Text-CSV_XS: Update to 0.69 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-CSV_XS/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-29 17:08:25 UTC (rev 7035) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-29 17:15:00 UTC (rev 7036) @@ -1,15 +1,19 @@ GARNAME = Text-CSV_XS -GARVERSION = 0.23 +GARVERSION = 0.69 CATEGORIES = cpan -AUTHOR = JWIED +AUTHOR = HMBRAND -DESCRIPTION = comma-separated values manipulation routines +DESCRIPTION = Comma-separated values manipulation routines define BLURB Text::CSV_XS provides facilities for the composition and decomposition of comma-separated values. An instance of the Text::CSV_XS class can combine fields into a CSV string and parse a CSV string into fields. endef -DISTFILES += CSWpmtextcsvxs.gspec +PACKAGES = CSWpmtextcsvxs +CATALOGNAME = pm_textcsvxs +# This module uses .tgz instead of .tar.gz :-( +MODDIST = $(GARNAME)-$(GARVERSION).tgz + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2009-10-29 17:08:25 UTC (rev 7035) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2009-10-29 17:15:00 UTC (rev 7036) @@ -1,2 +1 @@ -9a78bc23ae87e940d4e196d6f1a1664a download/CSWpmtextcsvxs.gspec -936eca163a09e92353565ad37ee7a4fa download/Text-CSV_XS-0.23.tar.gz +8788c57a50704265e35171746473b404 Text-CSV_XS-0.69.tgz Deleted: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec 2009-10-29 17:08:25 UTC (rev 7035) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec 2009-10-29 17:15:00 UTC (rev 7036) @@ -1,9 +0,0 @@ -%var bitname pm_textcsvxs -%var pkgname CSWpmtextcsvxs -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1998 Jochen Wiedmann. All rights reserved. -Portions Copyright (c) 1997 Alan Citterman. All rights reserved. - -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:21:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7037] csw/mgar/pkg/cpan/Spiffy/trunk Message-ID: Revision: 7037 http://gar.svn.sourceforge.net/gar/?rev=7037&view=rev Author: dmichelsen Date: 2009-10-29 17:21:03 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Spiffy: Update to mGAR v2 and dynamic gspec Modified Paths: -------------- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile csw/mgar/pkg/cpan/Spiffy/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Spiffy/trunk/ Property changes on: csw/mgar/pkg/cpan/Spiffy/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Spiffy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2009-10-29 17:15:00 UTC (rev 7036) +++ csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2009-10-29 17:21:03 UTC (rev 7037) @@ -12,6 +12,9 @@ and (perhaps someday) standard way. endef -DISTFILES += CSWpmspiffy.gspec +PACKAGES = CSWpmspiffy +CATALOGNAME = pm_spiffy +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Spiffy/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/checksums 2009-10-29 17:15:00 UTC (rev 7036) +++ csw/mgar/pkg/cpan/Spiffy/trunk/checksums 2009-10-29 17:21:03 UTC (rev 7037) @@ -1,2 +1 @@ -db405e1b83f57a1292cbba47088f90c7 download/CSWpmspiffy.gspec -49860ccf2127c6d2af3d98560ffae644 download/Spiffy-0.30.tar.gz +49860ccf2127c6d2af3d98560ffae644 Spiffy-0.30.tar.gz Deleted: csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec 2009-10-29 17:15:00 UTC (rev 7036) +++ csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec 2009-10-29 17:21:03 UTC (rev 7037) @@ -1,11 +0,0 @@ -%var bitname pm_spiffy -%var pkgname CSWpmspiffy -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2004. Brian Ingerson. All rights reserved. - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -See This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:25:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:25:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7038] csw/mgar/pkg/cpan/Unicode-String/trunk Message-ID: Revision: 7038 http://gar.svn.sourceforge.net/gar/?rev=7038&view=rev Author: dmichelsen Date: 2009-10-29 17:25:24 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Unicode-String: Update to mGAR v2 and 2.09 Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile csw/mgar/pkg/cpan/Unicode-String/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/Unicode-String/trunk/ Property changes on: csw/mgar/pkg/cpan/Unicode-String/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile 2009-10-29 17:21:03 UTC (rev 7037) +++ csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile 2009-10-29 17:25:24 UTC (rev 7038) @@ -13,6 +13,7 @@ character set, but uses a 16-bit encoding to support full multilingual text. endef -DISTFILES += CSWpmunistr.gspec +PACKAGES = CSWpmunicodestring +CATALOGNAME = pm_unicodestring include gar/category.mk Modified: csw/mgar/pkg/cpan/Unicode-String/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unicode-String/trunk/checksums 2009-10-29 17:21:03 UTC (rev 7037) +++ csw/mgar/pkg/cpan/Unicode-String/trunk/checksums 2009-10-29 17:25:24 UTC (rev 7038) @@ -1,2 +1 @@ -6f4d5c8b3941384567ce5cd17c8a1eaf download/CSWpmunistr.gspec -553e68e603723bf7c631f8701ab0d678 download/Unicode-String-2.09.tar.gz +553e68e603723bf7c631f8701ab0d678 Unicode-String-2.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:28:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:28:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7039] csw/mgar/pkg/cpan/Unicode-Map/trunk Message-ID: Revision: 7039 http://gar.svn.sourceforge.net/gar/?rev=7039&view=rev Author: dmichelsen Date: 2009-10-29 17:28:53 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Unicode-Map: Update to mGAR v2 and 0.112 Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/ Property changes on: csw/mgar/pkg/cpan/Unicode-Map/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2009-10-29 17:25:24 UTC (rev 7038) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2009-10-29 17:28:53 UTC (rev 7039) @@ -3,13 +3,14 @@ CATEGORIES = cpan AUTHOR = MSCHWARTZ -DESCRIPTION = maps charsets from and to utf16 unicode +DESCRIPTION = Maps charsets from and to utf16 unicode define BLURB This module converts strings from and to 2-byte Unicode UCS2 format. All mappings happen via 2 byte UTF16 encodings, not via 1 byte UTF8 encoding. To transform these use Unicode::String. endef -DISTFILES += CSWpmunimap.gspec +PACKAGES = CSWpmunicodemap +CATALOGNAME = pm_unicodemap include gar/category.mk Modified: csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums 2009-10-29 17:25:24 UTC (rev 7038) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums 2009-10-29 17:28:53 UTC (rev 7039) @@ -1,2 +1 @@ -8115666ca2b4dbf98516981538af0be4 download/CSWpmunimap.gspec -edaa8fc5ddf0e5d805e274283dd0625d download/Unicode-Map-0.112.tar.gz +edaa8fc5ddf0e5d805e274283dd0625d Unicode-Map-0.112.tar.gz Deleted: csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec 2009-10-29 17:25:24 UTC (rev 7038) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec 2009-10-29 17:28:53 UTC (rev 7039) @@ -1,4 +0,0 @@ -%var bitname pm_unicodemap -%var pkgname CSWpmunimap -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:34:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7040] csw/mgar/pkg/cpan/XML-Simple/trunk Message-ID: Revision: 7040 http://gar.svn.sourceforge.net/gar/?rev=7040&view=rev Author: dmichelsen Date: 2009-10-29 17:34:17 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/XML-Simple: Update to 2.18 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile csw/mgar/pkg/cpan/XML-Simple/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/XML-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,5 +1,5 @@ GARNAME = XML-Simple -GARVERSION = 2.16 +GARVERSION = 2.18 CATEGORIES = cpan AUTHOR = GRANTM @@ -10,8 +10,11 @@ Two functions are exported: XMLin() and XMLout(). endef -DISTFILES += CSWpmxmlsimple.gspec CSWpmxmlsimple.depend +PACKAGES = CSWpmxmlsimple +CATALOGNAME = pm_xmlsimple -DEPENDS += cpan/XML-Parser cpan/XML-SAX +REQUIRED_PKGS = CSWpmxmlparser CSWpmxmlsax +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/checksums 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/checksums 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,3 +1 @@ -6cf9cdc28f032cb32b214e05818073d2 download/CSWpmxmlsimple.gspec -8b69c4c06401dc54f306758f42ab8bb1 download/CSWpmxmlsimple.depend -80c0980ff63d77b871de41acc7175df7 download/XML-Simple-2.16.tar.gz +593aa8001e5c301cdcdb4bb3b63abc33 XML-Simple-2.18.tar.gz Deleted: csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,2 +0,0 @@ -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents -P CSWpmxmlsax pm_xmlsax - Simple API for XML Deleted: csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,9 +0,0 @@ -%var bitname pm_xmlsimple -%var pkgname CSWpmxmlsimple -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1999-2004 Grant McLean - -This library is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 08:37:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 07:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7041] csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Message-ID: Revision: 7041 http://gar.svn.sourceforge.net/gar/?rev=7041&view=rev Author: dmichelsen Date: 2009-10-30 07:37:24 +0000 (Fri, 30 Oct 2009) Log Message: ----------- cpan/Text-CSV_XS: Fix package name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-29 17:34:17 UTC (rev 7040) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-30 07:37:24 UTC (rev 7041) @@ -10,7 +10,9 @@ fields into a CSV string and parse a CSV string into fields. endef -PACKAGES = CSWpmtextcsvxs +# XXX: This package name contains a type, it was released this way a long time +# ago and should be renamed sometime. +PACKAGES = CSWpmttextcsvxs CATALOGNAME = pm_textcsvxs # This module uses .tgz instead of .tar.gz :-( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 08:48:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 07:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7042] csw/mgar/pkg/libmhash/trunk/Makefile Message-ID: Revision: 7042 http://gar.svn.sourceforge.net/gar/?rev=7042&view=rev Author: dmichelsen Date: 2009-10-30 07:48:58 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libmhash: Fix sourceurl Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-30 07:37:24 UTC (rev 7041) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-30 07:48:58 UTC (rev 7042) @@ -14,6 +14,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +SPKG_SOURCEURL = http://mhash.sourceforge.net/ + EXTRA_CPPFLAGS = -D__const=const BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 08:58:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 07:58:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7043] csw/mgar/pkg/mantis/trunk/Makefile Message-ID: Revision: 7043 http://gar.svn.sourceforge.net/gar/?rev=7043&view=rev Author: dmichelsen Date: 2009-10-30 07:58:54 +0000 (Fri, 30 Oct 2009) Log Message: ----------- mantis: Add dependency to CSWphp5session Modified Paths: -------------- csw/mgar/pkg/mantis/trunk/Makefile Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2009-10-30 07:48:58 UTC (rev 7042) +++ csw/mgar/pkg/mantis/trunk/Makefile 2009-10-30 07:58:54 UTC (rev 7043) @@ -22,7 +22,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = doc/LICENSE -REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5mysql +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5mysql CSWphp5session ARCHALL = 1 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 09:52:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 08:52:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7044] csw/mgar/pkg Message-ID: Revision: 7044 http://gar.svn.sourceforge.net/gar/?rev=7044&view=rev Author: dmichelsen Date: 2009-10-30 08:52:56 +0000 (Fri, 30 Oct 2009) Log Message: ----------- xearth: Initial commit Added Paths: ----------- csw/mgar/pkg/xearth/ csw/mgar/pkg/xearth/branches/ csw/mgar/pkg/xearth/tags/ csw/mgar/pkg/xearth/trunk/ csw/mgar/pkg/xearth/trunk/Makefile csw/mgar/pkg/xearth/trunk/checksums csw/mgar/pkg/xearth/trunk/files/ Property changes on: csw/mgar/pkg/xearth/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xearth/trunk/Makefile =================================================================== --- csw/mgar/pkg/xearth/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xearth/trunk/Makefile 2009-10-30 08:52:56 UTC (rev 7044) @@ -0,0 +1,39 @@ +GARNAME = xearth +GARVERSION = 1.1 +CATEGORIES = apps + +DESCRIPTION = X11 earth backdrop +define BLURB + Xearth sets the X root window to an image of the Earth, as seen from + your favorite vantage point in space, correctly shaded for the current + position of the Sun. By default, xearth updates the displayed image every + five minutes. The time between updates can be changed using either X resource + or a command-line option. Xearth can also be configured to either create + and render into its own top-level X window or render directly into PPM or + GIF files; see the man page for details. +endef + +MASTER_SITES = http://groups.csail.mit.edu/cag/pub/tuna/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://hewgill.com/xearth/original/ + +LICENSE = README + +NORUNPATH = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/xearth $(DESTDIR)$(bindir)/xearth + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/xearth.man $(DESTDIR)$(mandir)/man1/xearth.1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/xearth/trunk/checksums =================================================================== --- csw/mgar/pkg/xearth/trunk/checksums (rev 0) +++ csw/mgar/pkg/xearth/trunk/checksums 2009-10-30 08:52:56 UTC (rev 7044) @@ -0,0 +1 @@ +6e409dffaa8dc5fae1064e38935ab61f xearth-1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 10:39:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 09:39:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7045] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 7045 http://gar.svn.sourceforge.net/gar/?rev=7045&view=rev Author: dmichelsen Date: 2009-10-30 09:39:35 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libsdl: Update to 1.2.14 and new X11 Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libsdl/trunk/checksums Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 08:52:56 UTC (rev 7044) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 09:39:35 UTC (rev 7045) @@ -1,5 +1,5 @@ GARNAME = SDL -GARVERSION = 1.2.13 +GARVERSION = 1.2.14 CATEGORIES = lib DESCRIPTION = Simple DirectMedia Layer library @@ -12,12 +12,13 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -REQUIRED_PKGS = CSWiconv - SPKG_SOURCEURL = http://www.libsdl.org/ PACKAGES = CSWlibsdl CSWlibsdldevel +REQUIRED_PKGS_CSWlibsdl = CSWiconv CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibsdldevel = CSWlibsdl + CATALOGNAME_CSWlibsdl = libsdl CATALOGNAME_CSWlibsdldevel = libsdl_devel @@ -32,6 +33,8 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) PKGFILES_CSWlibsdldevel = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/libsdl/trunk/checksums =================================================================== --- csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 08:52:56 UTC (rev 7044) +++ csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 09:39:35 UTC (rev 7045) @@ -1,3 +1 @@ -c6660feea2a6834de10bc71b2f8e4d88 download/SDL-1.2.13.tar.gz -60483a03ebdc960fc70c67cebc151245 download/CSWlibsdl.gspec -4f601b50d7651c90d045ded68e990967 download/CSWlibsdl.prototype +e52086d1b508fa0b76c52ee30b55bec4 SDL-1.2.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 11:25:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 10:25:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7046] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 7046 http://gar.svn.sourceforge.net/gar/?rev=7046&view=rev Author: dmichelsen Date: 2009-10-30 10:25:13 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libsdl: Patch for 64 bit x86 assembly Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libsdl/trunk/checksums Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 09:39:35 UTC (rev 7045) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 10:25:13 UTC (rev 7046) @@ -11,6 +11,7 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-nasm-options.patch SPKG_SOURCEURL = http://www.libsdl.org/ Modified: csw/mgar/pkg/libsdl/trunk/checksums =================================================================== --- csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 09:39:35 UTC (rev 7045) +++ csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 10:25:13 UTC (rev 7046) @@ -1 +1,2 @@ +0d8f5ca93aa0c6d035e4f516393fc89a 0001-Fix-nasm-options.patch e52086d1b508fa0b76c52ee30b55bec4 SDL-1.2.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 12:29:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 11:29:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7047] csw/mgar/pkg/libsdl/trunk/files/ 0001-Fix-nasm-options.patch Message-ID: Revision: 7047 http://gar.svn.sourceforge.net/gar/?rev=7047&view=rev Author: dmichelsen Date: 2009-10-30 11:29:51 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libsdl: Patch for 64 bit x86 assembly Added Paths: ----------- csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch Added: csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch (rev 0) +++ csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch 2009-10-30 11:29:51 UTC (rev 7047) @@ -0,0 +1,25 @@ +From 735a89c8e05c6fa0684deb6e7019192959abb869 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 30 Oct 2009 11:09:15 +0100 +Subject: [PATCH] Fix nasm options + +--- + build-scripts/strip_fPIC.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build-scripts/strip_fPIC.sh b/build-scripts/strip_fPIC.sh +index 45d34ba..5953112 100755 +--- a/build-scripts/strip_fPIC.sh ++++ b/build-scripts/strip_fPIC.sh +@@ -5,7 +5,7 @@ + command="" + while [ $# -gt 0 ]; do + case "$1" in +- -fPIC) ++ -fPIC|-KPIC) + # Ignore -fPIC option + ;; + -fno-common) +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 12:48:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 11:48:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7048] csw/mgar/pkg/disktype/trunk Message-ID: Revision: 7048 http://gar.svn.sourceforge.net/gar/?rev=7048&view=rev Author: dmichelsen Date: 2009-10-30 11:48:36 +0000 (Fri, 30 Oct 2009) Log Message: ----------- disktype: Fix manpage reported in bug #1055 Modified Paths: -------------- csw/mgar/pkg/disktype/trunk/Makefile csw/mgar/pkg/disktype/trunk/checksums Added Paths: ----------- csw/mgar/pkg/disktype/trunk/files/disktype.1 Modified: csw/mgar/pkg/disktype/trunk/Makefile =================================================================== --- csw/mgar/pkg/disktype/trunk/Makefile 2009-10-30 11:29:51 UTC (rev 7047) +++ csw/mgar/pkg/disktype/trunk/Makefile 2009-10-30 11:48:36 UTC (rev 7048) @@ -11,6 +11,11 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# The provided manpage doesn't work with Solaris nroff. +# See for details bug #1055: +# http://www.opencsw.org/mantis/view.php?id=1055 +DISTFILES += disktype.1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,5 +34,5 @@ ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/disktype $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(mandir)/man1 - ginstall $(WORKSRC)/disktype.1 $(DESTDIR)$(mandir)/man1/ + ginstall $(WORKDIR)/disktype.1 $(DESTDIR)$(mandir)/man1/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/disktype/trunk/checksums =================================================================== --- csw/mgar/pkg/disktype/trunk/checksums 2009-10-30 11:29:51 UTC (rev 7047) +++ csw/mgar/pkg/disktype/trunk/checksums 2009-10-30 11:48:36 UTC (rev 7048) @@ -1 +1,2 @@ 25a673f162b9c01cd565109202559489 disktype-9.tar.gz +12fd51f4b22d7ca8d3517bbfdc7a163b disktype.1 Added: csw/mgar/pkg/disktype/trunk/files/disktype.1 =================================================================== --- csw/mgar/pkg/disktype/trunk/files/disktype.1 (rev 0) +++ csw/mgar/pkg/disktype/trunk/files/disktype.1 2009-10-30 11:48:36 UTC (rev 7048) @@ -0,0 +1,79 @@ +.TH DISKTYPE 1 "Feb 21, 2005" +.SH NAME +disktype - disk format detector +.\" +.SH SYNOPSIS +disktype file... +.\" +.SH DESCRIPTION +The purpose of +disktype +is to detect the content format of a disk or +disk image. It knows about common file systems, partition tables, and +boot codes. +.\" +.SH USAGE +disktype +can be run with any number of regular files or +device special files as arguments. They will be analyzed in the order +given, and the results printed to standard output. There are no +switches in this version. Note that running disktype on device files +like your hard disk will likely require root rights. +.PP +See the online documentation at +for some example command lines. +.\" +.SH RECOGNIZED FORMATS +The following formats are recognized by this version of +disktype +.TP 4 +.I File systems: +FAT12/FAT16/FAT32, NTFS, HPFS, MFS, HFS, HFS Plus, +ISO9660, ext2/ext3, Minix, ReiserFS, Reiser4, Linux romfs, Linux +cramfs, Linux squashfs, UFS (some variations), SysV FS (some +variations), JFS, XFS, Amiga FS/FFS, BeOS BFS, QNX4 FS, UDF, 3DO +CD-ROM file system, Veritas VxFS, Xbox DVD file system. +.TP 4 +.I Partitioning: +DOS/PC style, Apple, Amiga "Rigid Disk", ATARI ST (AHDI3), +BSD disklabel, Linux RAID physical disks, Linux LVM1 physical volumes, +Linux LVM2 physical volumes, Solaris x86 disklabel (vtoc), +Solaris SPARC disklabel. +.TP 4 +.I Other structures: +Debian split floppy header, Linux swap. +.TP 4 +.I Disk images: +Raw CD image (.bin), Virtual PC hard disk image, +Apple UDIF disk image (limited). +.TP 4 +.I Boot codes: +LILO, GRUB, SYSLINUX, ISOLINUX, Linux kernel, FreeBSD loader, +Sega Dreamcast (?). +.TP 4 +.I Compression formats: +gzip, compress, bzip2. +.TP 4 +.I Archive formats: +tar, cpio, bar, dump/restore. +.PP +Compressed files (gzip, compress, bzip2 formats) will also have their +contents analyzed using transparent decompression. The appropriate +compression program must be installed on the system, i.e. gzip(1) +for the gzip and compress formats, bzip2(1) for the bzip2 format. +.PP +Disk images in general will also have their contents analyzed using +the proper mapping, with the exception of the Apple UDIF format. +.PP +See the online documentation at +for more details on the supported formats and their quirks. +.\" +.SH HOMEPAGE +http://disktype.sourceforge.net/ +.\" +.SH AUTHOR +Christoph Pfisterer +.\" +.SH "SEE ALSO" +.BR file(1), +.BR gpart(8) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 13:04:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 12:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7049] csw/mgar/pkg/pca/trunk Message-ID: Revision: 7049 http://gar.svn.sourceforge.net/gar/?rev=7049&view=rev Author: dmichelsen Date: 2009-10-30 12:04:51 +0000 (Fri, 30 Oct 2009) Log Message: ----------- pca: Update to 20091030-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-10-30 11:48:36 UTC (rev 7048) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-10-30 12:04:51 UTC (rev 7049) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20090827-01 +GARVERSION = 20091030-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-10-30 11:48:36 UTC (rev 7048) +++ csw/mgar/pkg/pca/trunk/checksums 2009-10-30 12:04:51 UTC (rev 7049) @@ -1,4 +1,4 @@ -4376789925fa9002d0567d739f717748 download/0001-prefer-opencsw-perl.diff -6f2f2376eba0a788795dd43d68ad32d1 download/COPYING -89e45905df6a36cf740a886fec2fafc9 download/pca-20090827-01 -12de68ff8f67b4bb8b095e5646402208 download/pca.conf +4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff +6f2f2376eba0a788795dd43d68ad32d1 COPYING +d915e06b37750db9e6d9806f1114a9b8 pca-20091030-01 +12de68ff8f67b4bb8b095e5646402208 pca.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 30 16:11:56 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 30 Oct 2009 15:11:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7050] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7050 http://gar.svn.sourceforge.net/gar/?rev=7050&view=rev Author: bonivart Date: 2009-10-30 15:11:29 +0000 (Fri, 30 Oct 2009) Log Message: ----------- pkgutil: update to 1.8 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-30 12:04:51 UTC (rev 7049) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-30 15:11:29 UTC (rev 7050) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8b3 +GARVERSION = 1.8 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-30 12:04:51 UTC (rev 7049) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-30 15:11:29 UTC (rev 7050) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -9641cba108ea4aad1e2608263ec48fb2 pkgutil-1.8b3.zip +f65b4c116cb03bc95c148a8488472515 pkgutil-1.8.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 00:03:26 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 22:03:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6634] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 6634 http://gar.svn.sourceforge.net/gar/?rev=6634&view=rev Author: bonivart Date: 2009-09-30 22:03:26 +0000 (Wed, 30 Sep 2009) Log Message: ----------- pkgutil: split into two packages Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-30 20:38:57 UTC (rev 6633) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-30 22:03:26 UTC (rev 6634) @@ -12,8 +12,19 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +#DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) +PACKAGES = CSWpkgutil CSWpkgutilplus + +SPKG_DESC_CSWpkgutil = $(DESCRIPTION) +SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality + +REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg + +PKGFILES_CSWpkgutilplus = .*bldcat.* +PKGFILES_CSWpkgutilplus += .*chkcat.* + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 11:52:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 09:52:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6635] csw/mgar/pkg/bdb46/trunk Message-ID: Revision: 6635 http://gar.svn.sourceforge.net/gar/?rev=6635&view=rev Author: dmichelsen Date: 2009-10-01 09:52:37 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb46: Initial commit Added Paths: ----------- csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb46/trunk/checksums csw/mgar/pkg/bdb46/trunk/files/ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 Property Changed: ---------------- csw/mgar/pkg/bdb46/trunk/ Property changes on: csw/mgar/pkg/bdb46/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/bdb46/trunk/Makefile (from rev 6627, csw/mgar/pkg/bdb47/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,88 @@ +GARNAME = db +GARVERSION = 4.6.21 +CATEGORIES = lib + +DESCRIPTION = Berkeley DB 4.6 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) + +BUILD64 = 1 +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb46 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +NO_ISAEXEC = 1 + +PACKAGES = CSWbdb46 CSWbdb46devel CSWbdb46doc + +CATALOGNAME_CSWbdb46 = berkeleydb46 +CATALOGNAME_CSWbdb46devel = berkeleydb46_devel +CATALOGNAME_CSWbdb46doc = berkeleydb46_doc + +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* + +ARCHALL_CSWbdbdoc = 1 + +SPKG_DESC_CSWbdb46 = BerkeleyDB 4.6 embedded database libraries and utilities +SPKG_DESC_CSWbdb46devel = BerkeleyDB 4.6 development support +SPKG_DESC_CSWbdb46doc = BerkeleyDB 4.6 documentation + +REQUIRED_PKGS_CSWbdb46devel = CSWbdb46 + +LICENSE = LICENSE + +PKGFILES_CSWbdb46doc = /opt/csw/share/doc/.* + +PKGFILES_CSWbdb46devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/jdk1.6.0_07/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/bdb46/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb46/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb46/trunk/checksums 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,5 @@ +718082e7e35fc48478a2334b0bc4cd11 download/db-4.6.21.tar.gz +4878872edfc53c6ecb871b1062a4bdaf download/patch.4.6.21.1 +55074e53d3acae2dcbeae8322f96e522 download/patch.4.6.21.2 +7a6e11b54712caf752f9c4a52babe60c download/patch.4.6.21.3 +ae7d3d587355fe85b512ef09b9a77d19 download/patch.4.6.21.4 Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.1 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,90 @@ +*** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 +--- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 +*************** +*** 639,644 **** +--- 639,647 ---- + */ + #define MP_TRUNC_RECOVER 0x01 + ++ /* Private flags to DB_MPOOLFILE->close. */ ++ #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ ++ + #if defined(__cplusplus) + } + #endif +*** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 888,894 **** + * when we try to flush them. + */ + deleted = 0; +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +--- 888,895 ---- + * when we try to flush them. + */ + deleted = 0; +! if (!LF_ISSET(DB_MPOOL_NOLOCK)) +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +*************** +*** 909,921 **** + } + } + if (mfp->block_cnt == 0) { + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +--- 910,928 ---- + } + } + if (mfp->block_cnt == 0) { ++ /* ++ * We should never discard this mp file if our caller ++ * is holding the lock on it. See comment in ++ * __memp_sync_file. ++ */ ++ DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +*** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 +--- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 755,761 **** + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; +--- 755,762 ---- + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && +! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; + Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.2 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,27 @@ +*** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 +*************** +*** 249,256 **** + mtx_base = htab[0].mtx_hash; + } + + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, +--- 249,262 ---- + mtx_base = htab[0].mtx_hash; + } + ++ /* ++ * We preallocated all of the mutexes in a block, so for regions after ++ * the first, we skip mutexes in use in earlier regions. Each region ++ * has the same number of buckets and there are two mutexes per hash ++ * bucket (the bucket mutex and the I/O mutex). ++ */ + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets * 2; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.3 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,74 @@ +*** sequence/sequence.c +--- sequence/sequence.c +*************** +*** 196,202 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +--- 196,206 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 252,257 **** +--- 256,266 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 304,310 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 313,324 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(dbenv) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 713,718 **** +--- 727,738 ---- + + MUTEX_LOCK(dbenv, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(dbenv, "Sequence overflow"); + ret = EINVAL; Added: csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 =================================================================== --- csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 (rev 0) +++ csw/mgar/pkg/bdb46/trunk/files/patch.4.6.21.4 2009-10-01 09:52:37 UTC (rev 6635) @@ -0,0 +1,1414 @@ +*** dbinc/repmgr.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc/repmgr.h 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,41 **** +--- 36,55 ---- + #endif + + /* ++ * The (arbitrary) maximum number of outgoing messages we're willing to hold, on ++ * a queue per connection, waiting for TCP buffer space to become available in ++ * the kernel. Rather than exceeding this limit, we simply discard additional ++ * messages (since this is always allowed by the replication protocol). ++ * As a special dispensation, if a message is destined for a specific remote ++ * site (i.e., it's not a broadcast), then we first try blocking the sending ++ * thread, waiting for space to become available (though we only wait a limited ++ * time). This is so as to be able to handle the immediate flood of (a ++ * potentially large number of) outgoing messages that replication generates, in ++ * a tight loop, when handling PAGE_REQ, LOG_REQ and ALL_REQ requests. ++ */ ++ #define OUT_QUEUE_LIMIT 10 ++ ++ /* + * The system value is available from sysconf(_SC_HOST_NAME_MAX). + * Historically, the maximum host name was 256. + */ +*************** +*** 47,52 **** +--- 61,71 ---- + #define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20) + typedef char SITE_STRING_BUFFER[MAX_SITE_LOC_STRING+1]; + ++ /* Default timeout values, in seconds. */ ++ #define DB_REPMGR_DEFAULT_ACK_TIMEOUT (1 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_CONNECTION_RETRY (30 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_ELECTION_RETRY (10 * US_PER_SEC) ++ + struct __repmgr_connection; + typedef struct __repmgr_connection REPMGR_CONNECTION; + struct __repmgr_queue; typedef struct __repmgr_queue REPMGR_QUEUE; +*************** +*** 171,178 **** + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONNECTING 0x01 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x02 /* socket close pending */ + u_int32_t flags; + + /* +--- 190,198 ---- + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONGESTED 0x01 /* msg thread wait has exceeded timeout */ +! #define CONN_CONNECTING 0x02 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x04 /* socket close pending */ + u_int32_t flags; + + /* +*************** +*** 180,189 **** + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; + + /* + * Input: while we're reading a message, we keep track of what phase +--- 200,215 ---- + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. In some cases, if the queue +! * gets too long we wait until it's drained, and then append to it. +! * This condition variable's associated mutex is the normal per-repmgr +! * db_rep->mutex, because that mutex is always held anyway whenever the +! * output queue is consulted. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; ++ cond_var_t drained; ++ int blockers; /* ref count of msg threads waiting on us */ + + /* + * Input: while we're reading a message, we keep track of what phase +*** dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 1420,1425 **** +--- 1420,1428 ---- + #define __repmgr_wake_waiting_senders __repmgr_wake_waiting_senders at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_await_ack __repmgr_await_ack at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_compute_wait_deadline __repmgr_compute_wait_deadline at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_await_drain __repmgr_await_drain at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_alloc_cond __repmgr_alloc_cond at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_free_cond __repmgr_free_cond at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_init_sync __repmgr_init_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_close_sync __repmgr_close_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_net_init __repmgr_net_init at DB_VERSION_UNIQUE_NAME@ +*** dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 21,30 **** + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *, int)); +! void __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +--- 21,30 ---- + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *, int)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *)); +! int __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +*************** +*** 39,44 **** +--- 39,47 ---- + int __repmgr_wake_waiting_senders __P((DB_ENV *)); + int __repmgr_await_ack __P((DB_ENV *, const DB_LSN *)); + void __repmgr_compute_wait_deadline __P((DB_ENV*, struct timespec *, db_timeout_t)); ++ int __repmgr_await_drain __P((DB_ENV *, REPMGR_CONNECTION *, db_timeout_t)); ++ int __repmgr_alloc_cond __P((cond_var_t *)); ++ int __repmgr_free_cond __P((cond_var_t *)); + int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + int __repmgr_close_sync __P((DB_ENV *)); + int __repmgr_net_init __P((DB_ENV *, DB_REP *)); +*** repmgr/repmgr_method.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_method.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 196,204 **** + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = 1 * US_PER_SEC; /* 1 second */ +! db_rep->connection_retry_wait = 30 * US_PER_SEC; /* 30 seconds */ +! db_rep->election_retry_wait = 10 * US_PER_SEC; /* 10 seconds */ + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +--- 196,204 ---- + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = DB_REPMGR_DEFAULT_ACK_TIMEOUT; +! db_rep->connection_retry_wait = DB_REPMGR_DEFAULT_CONNECTION_RETRY; +! db_rep->election_retry_wait = DB_REPMGR_DEFAULT_ELECTION_RETRY; + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +*************** +*** 238,243 **** +--- 238,244 ---- + DB_ENV *dbenv; + { + DB_REP *db_rep; ++ REPMGR_CONNECTION *conn; + int ret; + + db_rep = dbenv->rep_handle; +*************** +*** 254,259 **** +--- 255,266 ---- + + if ((ret = __repmgr_signal(&db_rep->queue_nonempty)) != 0) + goto unlock; ++ ++ TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (conn->blockers > 0 && ++ ((ret = __repmgr_signal(&conn->drained)) != 0)) ++ goto unlock; ++ } + UNLOCK_MUTEX(db_rep->mutex); + + return (__repmgr_wake_main_thread(dbenv)); +*** repmgr/repmgr_msg.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_msg.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 183,192 **** + + /* + * Acknowledges a message. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + ack_message(dbenv, generation, lsn) +--- 183,188 ---- +*************** +*** 227,235 **** + rec2.size = 0; + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn, FALSE); + } + + UNLOCK_MUTEX(db_rep->mutex); +--- 223,236 ---- + rec2.size = 0; + + conn = site->ref.conn; ++ /* ++ * It's hard to imagine anyone would care about a lost ack if ++ * the path to the master is so congested as to need blocking; ++ * so pass "blockable" argument as FALSE. ++ */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2, FALSE)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn); + } + + UNLOCK_MUTEX(db_rep->mutex); +*** repmgr/repmgr_net.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_net.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 63,69 **** + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +--- 63,69 ---- + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, int)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +*************** +*** 73,85 **** + * __repmgr_send -- + * The send function for DB_ENV->rep_set_transport. + * +- * !!! +- * This is only ever called as the replication transport call-back, which means +- * it's either on one of our message processing threads or an application +- * thread. It mustn't be called from the select() thread, because we might call +- * __repmgr_bust_connection(..., FALSE) here, and that's not allowed in the +- * select() thread. +- * + * PUBLIC: int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, + * PUBLIC: const DB_LSN *, int, u_int32_t)); + */ +--- 73,78 ---- +*************** +*** 126,134 **** + } + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn, FALSE)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +--- 119,128 ---- + } + + conn = site->ref.conn; ++ /* Pass the "blockable" argument as TRUE. */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec, TRUE)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +*************** +*** 222,228 **** + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING)) + return (NULL); + return (site); + } +--- 216,222 ---- + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING|CONN_DEFUNCT)) + return (NULL); + return (site); + } +*************** +*** 235,244 **** + * + * !!! + * Caller must hold dbenv->mutex. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + __repmgr_send_broadcast(dbenv, control, rec, nsitesp, npeersp) +--- 229,234 ---- +*************** +*** 268,281 **** + !IS_VALID_EID(conn->eid)) + continue; + +! if ((ret = __repmgr_send_internal(dbenv, conn, &msg)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection( +! dbenv, conn, FALSE)) != 0) + return (ret); + } else + return (ret); +--- 258,277 ---- + !IS_VALID_EID(conn->eid)) + continue; + +! /* +! * Broadcast messages are either application threads committing +! * transactions, or replication status message that we can +! * afford to lose. So don't allow blocking for them (pass +! * "blockable" argument as FALSE). +! */ +! if ((ret = __repmgr_send_internal(dbenv, +! conn, &msg, FALSE)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) + return (ret); + } else + return (ret); +*************** +*** 301,339 **** + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, we simply drop +! * this message, and still return 0 even in this case. + */ + static int +! __repmgr_send_internal(dbenv, conn, msg) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; + { +! #define OUT_QUEUE_LIMIT 10 /* arbitrary, for now */ + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; + int ret; + size_t nw; + size_t total_written; + + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +--- 297,355 ---- + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *, int)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; ++ int blockable; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg, blockable)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, what shall we +! * do? If the caller doesn't mind blocking, we'll wait (a limited amount of +! * time) for the queue to drain. Otherwise we'll simply drop the message. This +! * is always allowed by the replication protocol. But in the case of a +! * multi-message response to a request like PAGE_REQ, LOG_REQ or ALL_REQ we +! * almost always get a flood of messages that instantly fills our queue, so +! * blocking improves performance (by avoiding the need for the client to +! * re-request). +! * +! * How long shall we wait? We could of course create a new timeout +! * configuration type, so that the application could set it directly. But that +! * would start to overwhelm the user with too many choices to think about. We +! * already have an ACK timeout, which is the user's estimate of how long it +! * should take to send a message to the client, have it be processed, and return +! * a message back to us. We multiply that by the queue size, because that's how +! * many messages have to be swallowed up by the client before we're able to +! * start sending again (at least to a rough approximation). + */ + static int +! __repmgr_send_internal(dbenv, conn, msg, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; ++ int blockable; + { +! DB_REP *db_rep; + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; ++ db_timeout_t drain_to; + int ret; + size_t nw; + size_t total_written; + ++ db_rep = dbenv->rep_handle; ++ + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +*************** +*** 344,358 **** + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (0); + } + } + + /* + * Send as much data to the site as we can, without blocking. Keep +--- 360,393 ---- + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); ++ if (conn->out_queue_length >= OUT_QUEUE_LIMIT && ++ blockable && !F_ISSET(conn, CONN_CONGESTED)) { ++ RPRINT(dbenv, (dbenv, ++ "block msg thread, await queue space")); ++ ++ if ((drain_to = db_rep->ack_timeout) == 0) ++ drain_to = DB_REPMGR_DEFAULT_ACK_TIMEOUT; ++ conn->blockers++; ++ ret = __repmgr_await_drain(dbenv, ++ conn, drain_to * OUT_QUEUE_LIMIT); ++ conn->blockers--; ++ if (db_rep->finished) ++ return (DB_TIMEOUT); ++ if (ret != 0) ++ return (ret); ++ if (STAILQ_EMPTY(&conn->outbound_queue)) ++ goto empty; ++ } + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (blockable ? DB_TIMEOUT : 0); + } + } ++ empty: + + /* + * Send as much data to the site as we can, without blocking. Keep +*************** +*** 498,521 **** + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. +! * +! * If the 'do_close' flag is true, we do the whole job; the clean-up includes +! * removing the struct from the list and freeing all its memory, so upon return +! * the caller must not refer to it any further. Otherwise, we merely mark the +! * connection for clean-up later by the main thread. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *, int)); + * + * !!! + * Caller holds mutex. + */ + int +! __repmgr_bust_connection(dbenv, conn, do_close) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +- int do_close; + { + DB_REP *db_rep; + int connecting, ret, eid; +--- 533,553 ---- + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. For now, just mark it as unusable; it will +! * be fully cleaned up in the top-level select thread, as soon as possible. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *)); + * + * !!! + * Caller holds mutex. ++ * ++ * Must be idempotent + */ + int +! __repmgr_bust_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + { + DB_REP *db_rep; + int connecting, ret, eid; +*************** +*** 526,537 **** + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! if (do_close) +! __repmgr_cleanup_connection(dbenv, conn); +! else { +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; +! } + + /* + * When we first accepted the incoming connection, we set conn->eid to +--- 558,566 ---- + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; + + /* + * When we first accepted the incoming connection, we set conn->eid to +*************** +*** 557,563 **** + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else if (!do_close) { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +--- 586,592 ---- + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +*************** +*** 568,577 **** + } + + /* +! * PUBLIC: void __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); + */ +! void + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +--- 597,610 ---- + } + + /* +! * PUBLIC: int __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); ++ * ++ * !!! ++ * Idempotent. This can be called repeatedly as blocking message threads (of ++ * which there could be multiples) wake up in case of error on the connection. + */ +! int + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 580,596 **** + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; + + db_rep = dbenv->rep_handle; + +! TAILQ_REMOVE(&db_rep->connections, conn, entries); + if (conn->fd != INVALID_SOCKET) { +! (void)closesocket(conn->fd); + #ifdef DB_WIN32 +! (void)WSACloseEvent(conn->event_object); + #endif + } + + /* + * Deallocate any input and output buffers we may have. + */ +--- 613,643 ---- + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; ++ int ret; + + db_rep = dbenv->rep_handle; + +! DB_ASSERT(dbenv, F_ISSET(conn, CONN_DEFUNCT) || db_rep->finished); +! + if (conn->fd != INVALID_SOCKET) { +! ret = closesocket(conn->fd); +! conn->fd = INVALID_SOCKET; +! if (ret == SOCKET_ERROR) { +! ret = net_errno; +! __db_err(dbenv, ret, "closing socket"); +! } + #ifdef DB_WIN32 +! if (!WSACloseEvent(conn->event_object) && ret != 0) +! ret = net_errno; + #endif ++ if (ret != 0) ++ return (ret); + } + ++ if (conn->blockers > 0) ++ return (__repmgr_signal(&conn->drained)); ++ ++ TAILQ_REMOVE(&db_rep->connections, conn, entries); + /* + * Deallocate any input and output buffers we may have. + */ +*************** +*** 614,620 **** +--- 661,669 ---- + __os_free(dbenv, out); + } + ++ ret = __repmgr_free_cond(&conn->drained); + __os_free(dbenv, conn); ++ return (ret); + } + + static int +*************** +*** 1063,1069 **** + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! __repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +--- 1112,1118 ---- + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! (void)__repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +*** repmgr/repmgr_posix.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_posix.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 21,26 **** +--- 21,28 ---- + size_t __repmgr_guesstimated_max = (128 * 1024); + #endif + ++ static int __repmgr_conn_work __P((DB_ENV *, ++ REPMGR_CONNECTION *, fd_set *, fd_set *, int)); + static int finish_connecting __P((DB_ENV *, REPMGR_CONNECTION *)); + + /* +*************** +*** 189,194 **** +--- 191,284 ---- + } + + /* ++ * PUBLIC: int __repmgr_await_drain __P((DB_ENV *, ++ * PUBLIC: REPMGR_CONNECTION *, db_timeout_t)); ++ * ++ * Waits for space to become available on the connection's output queue. ++ * Various ways we can exit: ++ * ++ * 1. queue becomes non-full ++ * 2. exceed time limit ++ * 3. connection becomes defunct (due to error in another thread) ++ * 4. repmgr is shutting down ++ * 5. any unexpected system resource failure ++ * ++ * In cases #3 and #5 we return an error code. Caller is responsible for ++ * distinguishing the remaining cases if desired. ++ * ++ * !!! ++ * Caller must hold repmgr->mutex. ++ */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ struct timespec deadline; ++ int ret; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __repmgr_compute_wait_deadline(dbenv, &deadline, timeout); ++ ++ ret = 0; ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ ret = pthread_cond_timedwait(&conn->drained, ++ &db_rep->mutex, &deadline); ++ switch (ret) { ++ case 0: ++ if (db_rep->finished) ++ goto out; /* #4. */ ++ /* ++ * Another thread could have stumbled into an error on ++ * the socket while we were waiting. ++ */ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ ret = DB_REP_UNAVAIL; /* #3. */ ++ goto out; ++ } ++ break; ++ case ETIMEDOUT: ++ F_SET(conn, CONN_CONGESTED); ++ ret = 0; ++ goto out; /* #2. */ ++ default: ++ goto out; /* #5. */ ++ } ++ } ++ /* #1. */ ++ ++ out: ++ return (ret); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_alloc_cond __P((cond_var_t *)); ++ * ++ * Initialize a condition variable (in allocated space). ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_init(c, NULL)); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_free_cond __P((cond_var_t *)); ++ * ++ * Clean up a previously initialized condition variable. ++ */ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_destroy(c)); ++ } ++ ++ /* + * PUBLIC: int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + * + * Allocate/initialize all data necessary for thread synchronization. This +*************** +*** 443,449 **** + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd, nready; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +--- 533,539 ---- + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +*************** +*** 477,482 **** +--- 567,575 ---- + * each one. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING)) { + FD_SET((u_int)conn->fd, &reads); + FD_SET((u_int)conn->fd, &writes); +*************** +*** 533,616 **** + return (ret); + } + } +- nready = ret; +- + LOCK_MUTEX(db_rep->mutex); + +- /* +- * The first priority thing we must do is to clean up any +- * pending defunct connections. Otherwise, if they have any +- * lingering pending input, we get very confused if we try to +- * process it. +- * +- * The TAILQ_FOREACH macro would be suitable here, except that +- * it doesn't allow unlinking the current element, which is +- * needed for cleanup_connection. +- */ +- for (conn = TAILQ_FIRST(&db_rep->connections); +- conn != NULL; +- conn = next) { +- next = TAILQ_NEXT(conn, entries); +- if (F_ISSET(conn, CONN_DEFUNCT)) +- __repmgr_cleanup_connection(dbenv, conn); +- } +- + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; +- if (nready == 0) +- continue; + + /* +! * Traverse the linked list. (Again, like TAILQ_FOREACH, except +! * that we need the ability to unlink an element along the way.) + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_CONNECTING)) { +! if (FD_ISSET((u_int)conn->fd, &reads) || +! FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = finish_connecting(dbenv, +! conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection( +! dbenv, conn, TRUE)) != 0) +! goto out; +! } else if (ret != 0) +! goto out; +! } +! continue; +! } +! +! /* +! * Here, the site is connected, and the FD_SET's are +! * valid. +! */ +! if (FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = __repmgr_write_some( +! dbenv, conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } +! +! if (!flow_control && +! FD_ISSET((u_int)conn->fd, &reads)) { +! if ((ret = __repmgr_read_from_site(dbenv, conn)) +! == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } + } + + /* +--- 626,650 ---- + return (ret); + } + } + LOCK_MUTEX(db_rep->mutex); + + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; + + /* +! * Examine each connection, to see what work needs to be done. +! * +! * The TAILQ_FOREACH macro would be suitable here, except that +! * it doesn't allow unlinking the current element, which is +! * needed for cleanup_connection. + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if ((ret = __repmgr_conn_work(dbenv, +! conn, &reads, &writes, flow_control)) != 0) +! goto out; + } + + /* +*************** +*** 637,642 **** +--- 671,719 ---- + } + + static int ++ __repmgr_conn_work(dbenv, conn, reads, writes, flow_control) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ fd_set *reads, *writes; ++ int flow_control; ++ { ++ int ret; ++ u_int fd; ++ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ /* ++ * Deferred clean-up, from an error that happened in another ++ * thread, while we were sleeping in select(). ++ */ ++ return (__repmgr_cleanup_connection(dbenv, conn)); ++ } ++ ++ ret = 0; ++ fd = (u_int)conn->fd; ++ ++ if (F_ISSET(conn, CONN_CONNECTING)) { ++ if (FD_ISSET(fd, reads) || FD_ISSET(fd, writes)) ++ ret = finish_connecting(dbenv, conn); ++ } else { ++ /* ++ * Here, the site is connected, and the FD_SET's are valid. ++ */ ++ if (FD_ISSET(fd, writes)) ++ ret = __repmgr_write_some(dbenv, conn); ++ ++ if (ret == 0 && !flow_control && FD_ISSET(fd, reads)) ++ ret = __repmgr_read_from_site(dbenv, conn); ++ } ++ ++ if (ret == DB_REP_UNAVAIL) { ++ if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) ++ return (ret); ++ ret = __repmgr_cleanup_connection(dbenv, conn); ++ } ++ return (ret); ++ } ++ ++ static int + finish_connecting(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 657,662 **** +--- 734,740 ---- + goto err_rpt; + } + ++ DB_ASSERT(dbenv, F_ISSET(conn, CONN_CONNECTING)); + F_CLR(conn, CONN_CONNECTING); + return (__repmgr_send_handshake(dbenv, conn)); + +*************** +*** 671,690 **** + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) + return (DB_REP_UNAVAIL); + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 749,773 ---- + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) { +! STAT(db_rep->region->mstat.st_connect_fail++); + return (DB_REP_UNAVAIL); ++ } + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. (Note that we don't have to worry about message threads +! * blocking on a full output queue: that can't happen when we're only +! * just connecting.) + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +*** repmgr/repmgr_sel.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_sel.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,45 **** + + /* + * PUBLIC: int __repmgr_accept __P((DB_ENV *)); +- * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). + */ + int + __repmgr_accept(dbenv) +--- 36,41 ---- +*************** +*** 133,139 **** + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + default: + return (ret); + } +--- 129,135 ---- + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn)); + default: + return (ret); + } +*************** +*** 254,263 **** + * starting with the "current" element of its address list and trying as many + * addresses as necessary until the list is exhausted. + * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- * + * PUBLIC: int __repmgr_connect_site __P((DB_ENV *, u_int eid)); + */ + int +--- 250,255 ---- +*************** +*** 332,338 **** + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con, TRUE)); + default: + return (ret); + } +--- 324,330 ---- + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con)); + default: + return (ret); + } +*************** +*** 437,443 **** + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! return (__repmgr_send_one(dbenv, conn, REPMGR_HANDSHAKE, &cntrl, &rec)); + } + + /* +--- 429,443 ---- + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! /* +! * It would of course be disastrous to block the select() thread, so +! * pass the "blockable" argument as FALSE. Fortunately blocking should +! * never be necessary here, because the hand-shake is always the first +! * thing we send. Which is a good thing, because it would be almost as +! * disastrous if we allowed ourselves to drop a handshake. +! */ +! return (__repmgr_send_one(dbenv, +! conn, REPMGR_HANDSHAKE, &cntrl, &rec, FALSE)); + } + + /* +*************** +*** 854,859 **** +--- 854,872 ---- + conn->out_queue_length--; + if (--msg->ref_count <= 0) + __os_free(dbenv, msg); ++ ++ /* ++ * We've achieved enough movement to free up at least ++ * one space in the outgoing queue. Wake any message ++ * threads that may be waiting for space. Clear the ++ * CONGESTED status so that when the queue reaches the ++ * high-water mark again, the filling thread will be ++ * allowed to try waiting again. ++ */ ++ F_CLR(conn, CONN_CONGESTED); ++ if (conn->blockers > 0 && ++ (ret = __repmgr_signal(&conn->drained)) != 0) ++ return (ret); + } + } + +*** repmgr/repmgr_util.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_util.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 103,108 **** +--- 103,113 ---- + db_rep = dbenv->rep_handle; + if ((ret = __os_malloc(dbenv, sizeof(REPMGR_CONNECTION), &c)) != 0) + return (ret); ++ if ((ret = __repmgr_alloc_cond(&c->drained)) != 0) { ++ __os_free(dbenv, c); ++ return (ret); ++ } ++ c->blockers = 0; + + c->fd = s; + c->flags = flags; +*** repmgr/repmgr_windows.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_windows.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 11,16 **** +--- 11,19 ---- + #define __INCLUDE_NETWORKING 1 + #include "db_int.h" + ++ /* Convert time-out from microseconds to milliseconds, rounding up. */ ++ #define DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t) (((t) + (US_PER_MS - 1)) / US_PER_MS) ++ + typedef struct __ack_waiter { + HANDLE event; + const DB_LSN *lsnp; +*************** +*** 120,136 **** + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret; +! DWORD timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + +- /* convert time-out from microseconds to milliseconds, rounding up */ + timeout = db_rep->ack_timeout > 0 ? +! ((db_rep->ack_timeout + (US_PER_MS - 1)) / US_PER_MS) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +--- 123,137 ---- + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret, timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + + timeout = db_rep->ack_timeout > 0 ? +! DB_TIMEOUT_TO_WINDOWS_TIMEOUT(db_rep->ack_timeout) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +*************** +*** 211,216 **** +--- 212,296 ---- + db_rep->waiters->first_free = slot; + } + ++ /* (See requirements described in repmgr_posix.c.) */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ db_timespec deadline, delta, now; ++ db_timeout_t t; ++ DWORD duration, ret; ++ int round_up; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __os_gettime(dbenv, &deadline); ++ DB_TIMEOUT_TO_TIMESPEC(timeout, &delta); ++ timespecadd(&deadline, &delta); ++ ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ if (!ResetEvent(conn->drained)) ++ return (GetLastError()); ++ ++ /* How long until the deadline? */ ++ __os_gettime(dbenv, &now); ++ if (timespeccmp(&now, &deadline, >=)) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } ++ delta = deadline; ++ timespecsub(&delta, &now); ++ round_up = TRUE; ++ DB_TIMESPEC_TO_TIMEOUT(t, &delta, round_up); ++ duration = DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t); ++ ++ ret = SignalObjectAndWait(db_rep->mutex, ++ conn->drained, duration, FALSE); ++ LOCK_MUTEX(db_rep->mutex); ++ if (ret == WAIT_FAILED) ++ return (GetLastError()); ++ else if (ret == WAIT_TIMEOUT) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } else ++ DB_ASSERT(dbenv, ret == WAIT_OBJECT_0); ++ ++ if (db_rep->finished) ++ return (0); ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ return (DB_REP_UNAVAIL); ++ } ++ return (0); ++ } ++ ++ /* ++ * Creates a manual reset event, which is usually our best choice when we may ++ * have multiple threads waiting on a single event. ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ HANDLE event; ++ ++ if ((event = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) ++ return (GetLastError()); ++ *c = event; ++ return (0); ++ } ++ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ if (CloseHandle(*c)) ++ return (0); ++ return (GetLastError()); ++ } ++ + /* + * Make resource allocation an all-or-nothing affair, outside of this and the + * close_sync function. db_rep->waiters should be non-NULL iff all of these +*************** +*** 488,493 **** +--- 568,576 ---- + * don't hurt anything flow-control-wise. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING) || + !STAILQ_EMPTY(&conn->outbound_queue) || + (!flow_control || !IS_VALID_EID(conn->eid))) { +*************** +*** 534,541 **** + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT)) +! __repmgr_cleanup_connection(dbenv, conn); + } + + /* +--- 617,626 ---- + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT) && +! (ret = __repmgr_cleanup_connection(dbenv, +! conn)) != 0) +! goto unlock; + } + + /* +*************** +*** 587,597 **** + return (ret); + } + +- /* +- * !!! +- * Only ever called on the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- */ + static int + handle_completion(dbenv, conn) + DB_ENV *dbenv; +--- 672,677 ---- +*************** +*** 651,660 **** + } + } + +! return (0); +! +! err: if (ret == DB_REP_UNAVAIL) +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + return (ret); + } + +--- 731,742 ---- + } + } + +! err: +! if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) +! return (ret); +! ret = __repmgr_cleanup_connection(dbenv, conn); +! } + return (ret); + } + +*************** +*** 708,714 **** + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 790,797 ---- + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 1 12:31:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 01 Oct 2009 10:31:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6636] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6636 http://gar.svn.sourceforge.net/gar/?rev=6636&view=rev Author: wahwah Date: 2009-10-01 10:31:33 +0000 (Thu, 01 Oct 2009) Log Message: ----------- cups: A better SAMPLECONF regex. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-01 09:52:37 UTC (rev 6635) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-01 10:31:33 UTC (rev 6636) @@ -140,7 +140,7 @@ SPKG_DESC_CSWcupsdev = CUPS header files # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html -SAMPLECONF = $(sysconfdir)/cups/cupsd.conf.CSW +SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 13:39:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 11:39:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6637] csw/mgar/pkg Message-ID: Revision: 6637 http://gar.svn.sourceforge.net/gar/?rev=6637&view=rev Author: dmichelsen Date: 2009-10-01 11:39:07 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb45: Fix package names Added Paths: ----------- csw/mgar/pkg/bdb45/ csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb45/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/bdb45/trunk/ Property changes on: csw/mgar/pkg/bdb45/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/bdb45/trunk/Makefile (from rev 6628, csw/mgar/pkg/bdb47/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-01 11:39:07 UTC (rev 6637) @@ -0,0 +1,88 @@ +GARNAME = db +GARVERSION = 4.5.20 +CATEGORIES = lib + +DESCRIPTION = Berkeley DB 4.5 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) + +BUILD64 = 1 +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb45 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +NO_ISAEXEC = 1 + +PACKAGES = CSWbdb45 CSWbdb45devel CSWbdb45doc + +CATALOGNAME_CSWbdb45 = berkeleydb45 +CATALOGNAME_CSWbdb45devel = berkeleydb45_devel +CATALOGNAME_CSWbdb45doc = berkeleydb45_doc + +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* + +ARCHALL_CSWbdbdoc = 1 + +SPKG_DESC_CSWbdb45 = BerkeleyDB 4.5 embedded database libraries and utilities +SPKG_DESC_CSWbdb45devel = BerkeleyDB 4.5 development support +SPKG_DESC_CSWbdb45doc = BerkeleyDB 4.5 documentation + +REQUIRED_PKGS_CSWbdb45devel = CSWbdb45 + +LICENSE = LICENSE + +PKGFILES_CSWbdb45doc = /opt/csw/share/doc/.* + +PKGFILES_CSWbdb45devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/jdk1.6.0_07/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 13:40:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 11:40:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6638] csw/mgar/pkg/bdb45/trunk Message-ID: Revision: 6638 http://gar.svn.sourceforge.net/gar/?rev=6638&view=rev Author: dmichelsen Date: 2009-10-01 11:40:12 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb45: Add missing files Added Paths: ----------- csw/mgar/pkg/bdb45/trunk/checksums csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 Added: csw/mgar/pkg/bdb45/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb45/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb45/trunk/checksums 2009-10-01 11:40:12 UTC (rev 6638) @@ -0,0 +1,3 @@ +b0f1c777708cb8e9d37fb47e7ed3312d download/db-4.5.20.tar.gz +a571e239b9041d7990df287cbc59ad6f download/patch.4.5.20.1 +b7a7086a067ba116f5a8464362c9a9a7 download/patch.4.5.20.2 Added: csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 =================================================================== --- csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 (rev 0) +++ csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.1 2009-10-01 11:40:12 UTC (rev 6638) @@ -0,0 +1,37 @@ +*** sequence/sequence.c.orig 27 Sep 2006 14:56:17 -0000 12.39 +--- sequence/sequence.c 26 Oct 2006 07:36:05 -0000 +*************** +*** 228,233 **** +--- 228,236 ---- + seq->seq_data.ulen = seq->seq_data.size = sizeof(seq->seq_record); + seq->seq_rp = &seq->seq_record; + ++ if ((ret = __dbt_usercopy(dbenv, keyp)) != 0) ++ goto err; ++ + memset(&seq->seq_key, 0, sizeof(DBT)); + if ((ret = __os_malloc(dbenv, keyp->size, &seq->seq_key.data)) != 0) + goto err; +*************** +*** 365,370 **** +--- 368,374 ---- + ret = t_ret; + + ENV_LEAVE(dbenv, ip); ++ __dbt_userfree(dbenv, keyp, NULL, NULL); + return (ret); + } + +*************** +*** 764,769 **** +--- 768,777 ---- + DBT *key; + { + SEQ_ILLEGAL_BEFORE_OPEN(seq, "DB_SEQUENCE->get_key"); ++ ++ if (F_ISSET(key, DB_DBT_USERCOPY)) ++ return (__db_retcopy(seq->seq_dbp->dbenv, key, ++ seq->seq_key.data, seq->seq_key.size, NULL, 0)); + + key->data = seq->seq_key.data; + key->size = key->ulen = seq->seq_key.size; Added: csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 =================================================================== --- csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 (rev 0) +++ csw/mgar/pkg/bdb45/trunk/files/patch.4.5.20.2 2009-10-01 11:40:12 UTC (rev 6638) @@ -0,0 +1,66 @@ +*** rep/rep_method.c.orig Fri Oct 20 08:34:06 2006 +--- rep/rep_method.c Fri Oct 27 12:09:04 2006 +*************** +*** 526,535 **** + * will allow the client to either perform recovery or + * simply join in. + */ +! if (announce) + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0); +! else + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0); + } +--- 526,537 ---- + * will allow the client to either perform recovery or + * simply join in. + */ +! if (announce) { +! if ((ret = __dbt_usercopy(dbenv, dbt)) != 0) +! goto err; + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0); +! } else + (void)__rep_send_message(dbenv, + DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0); + } +*************** +*** 553,558 **** +--- 555,561 ---- + } + if (pending_event != DB_EVENT_NO_SUCH_EVENT) + DB_EVENT(dbenv, pending_event, NULL); ++ __dbt_userfree(dbenv, dbt, NULL, NULL); + return (ret); + } + +*** rep/rep_record.c.orig Fri Oct 20 08:34:06 2006 +--- rep/rep_record.c Mon Nov 13 10:46:29 2006 +*************** +*** 163,168 **** +--- 163,176 ---- + return (EINVAL); + } + ++ if ((ret = __dbt_usercopy(dbenv, control)) != 0 || ++ (ret = __dbt_usercopy(dbenv, rec)) != 0) { ++ __dbt_userfree(dbenv, control, rec, NULL); ++ __db_errx(dbenv, ++ "DB_ENV->rep_process_message: error retrieving DBT contents"); ++ return ret; ++ } ++ + ret = 0; + db_rep = dbenv->rep_handle; + rep = db_rep->region; +*************** +*** 621,626 **** +--- 629,635 ---- + *ret_lsnp = rp->lsn; + ret = DB_REP_NOTPERM; + } ++ __dbt_userfree(dbenv, control, rec, NULL); + return (ret); + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 14:59:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 12:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6639] csw/mgar/pkg/bdb46/trunk/Makefile Message-ID: Revision: 6639 http://gar.svn.sourceforge.net/gar/?rev=6639&view=rev Author: dmichelsen Date: 2009-10-01 12:59:27 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb46: Fix ARCHALL for docs Modified Paths: -------------- csw/mgar/pkg/bdb46/trunk/Makefile Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-01 11:40:12 UTC (rev 6638) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-01 12:59:27 UTC (rev 6639) @@ -61,7 +61,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb46doc = 1 SPKG_DESC_CSWbdb46 = BerkeleyDB 4.6 embedded database libraries and utilities SPKG_DESC_CSWbdb46devel = BerkeleyDB 4.6 development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:04:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6640] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6640 http://gar.svn.sourceforge.net/gar/?rev=6640&view=rev Author: dmichelsen Date: 2009-10-01 13:04:23 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb47: Fix ARCHALL for docs Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 12:59:27 UTC (rev 6639) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 13:04:23 UTC (rev 6640) @@ -61,7 +61,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb47doc = 1 SPKG_DESC_CSWbdb47 = BerkeleyDB 4.7 embedded database libraries and utilities SPKG_DESC_CSWbdb47devel = BerkeleyDB 4.7 development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:05:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:05:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6641] csw/mgar/pkg/bdb45/trunk/Makefile Message-ID: Revision: 6641 http://gar.svn.sourceforge.net/gar/?rev=6641&view=rev Author: dmichelsen Date: 2009-10-01 13:05:12 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb45: Fix ARCHALL for docs Modified Paths: -------------- csw/mgar/pkg/bdb45/trunk/Makefile Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-01 13:04:23 UTC (rev 6640) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-01 13:05:12 UTC (rev 6641) @@ -61,7 +61,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb45doc = 1 SPKG_DESC_CSWbdb45 = BerkeleyDB 4.5 embedded database libraries and utilities SPKG_DESC_CSWbdb45devel = BerkeleyDB 4.5 development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 15:08:36 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:08:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6642] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 6642 http://gar.svn.sourceforge.net/gar/?rev=6642&view=rev Author: bonivart Date: 2009-10-01 13:08:36 +0000 (Thu, 01 Oct 2009) Log Message: ----------- geoip: update to 1.4.6, initial commit Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 13:05:12 UTC (rev 6641) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 13:08:36 UTC (rev 6642) @@ -15,34 +15,44 @@ REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip CATALOGNAME_CSWgeoip = geoip CATALOGNAME_CSWgeoipdevel = geoip_devel +SPKG_DESC_CSWgeoip = $(DESCRIPTION) +SPKG_DESC_CSWgeoipdevel = GeoIP C API development support +PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GCC4 +TEST_TARGET = check + +# Do not exclude static libs (needed for devel package) +MERGE_EXCLUDE_STATICLIBS = + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk -pre-configure-modulated: - @echo " ==> Pre-configure for $(GARNAME) (custom)" - @( cd $(WORKSRC) ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ; \ - cd apps ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ; \ - cd ../libGeoIP ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ; \ - cd ../test ; \ - sed 's/-Wall//' Makefile.am > tmp.sed ; \ - mv tmp.sed Makefile.am ; \ - sed 's/-Wall//' Makefile.in > tmp.sed ; \ - mv tmp.sed Makefile.in ) - @$(MAKECOOKIE) +#pre-configure-modulated: +# @echo " ==> Pre-configure for $(GARNAME) (custom)" +# @( cd $(WORKSRC) ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ; \ +# cd apps ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ; \ +# cd ../libGeoIP ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ; \ +# cd ../test ; \ +# sed 's/-Wall//' Makefile.am > tmp.sed ; \ +# mv tmp.sed Makefile.am ; \ +# sed 's/-Wall//' Makefile.in > tmp.sed ; \ +# mv tmp.sed Makefile.in ) +# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:10:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6643] csw/mgar/pkg/bdb47/trunk Message-ID: Revision: 6643 http://gar.svn.sourceforge.net/gar/?rev=6643&view=rev Author: dmichelsen Date: 2009-10-01 13:10:42 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb47: Fix patches Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb47/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 Removed Paths: ------------- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 4.6.21 +GARVERSION = 4.7.25 CATEGORIES = lib -DESCRIPTION = Berkeley DB 4.6 +DESCRIPTION = Berkeley DB 4.7 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,7 +30,7 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb46 +prefix = $(BUILD_PREFIX)/bdb47 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct Modified: csw/mgar/pkg/bdb47/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb47/trunk/checksums 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/checksums 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,5 +1,5 @@ -718082e7e35fc48478a2334b0bc4cd11 download/db-4.6.21.tar.gz -4878872edfc53c6ecb871b1062a4bdaf download/patch.4.6.21.1 -55074e53d3acae2dcbeae8322f96e522 download/patch.4.6.21.2 -7a6e11b54712caf752f9c4a52babe60c download/patch.4.6.21.3 -ae7d3d587355fe85b512ef09b9a77d19 download/patch.4.6.21.4 +ec2b87e833779681a0c3a814aa71359e download/db-4.7.25.tar.gz +5fdf101259e5164dea1c8c86214fde38 download/patch.4.7.25.1 +bd410a11c71fee52fddb6aa2d8d4f80c download/patch.4.7.25.2 +6fcd69f64f5b34bfe8f0a63cc2e402c1 download/patch.4.7.25.3 +c71830a1303cd34595ca655257196eec download/patch.4.7.25.4 Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,90 +0,0 @@ -*** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 ---- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 -*************** -*** 639,644 **** ---- 639,647 ---- - */ - #define MP_TRUNC_RECOVER 0x01 - -+ /* Private flags to DB_MPOOLFILE->close. */ -+ #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ -+ - #if defined(__cplusplus) - } - #endif -*** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 ---- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 -*************** -*** 888,894 **** - * when we try to flush them. - */ - deleted = 0; -! MUTEX_LOCK(dbenv, mfp->mutex); - if (F_ISSET(dbmfp, MP_MULTIVERSION)) - --mfp->multiversion; - if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { ---- 888,895 ---- - * when we try to flush them. - */ - deleted = 0; -! if (!LF_ISSET(DB_MPOOL_NOLOCK)) -! MUTEX_LOCK(dbenv, mfp->mutex); - if (F_ISSET(dbmfp, MP_MULTIVERSION)) - --mfp->multiversion; - if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { -*************** -*** 909,921 **** - } - } - if (mfp->block_cnt == 0) { - if ((t_ret = - __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) - ret = t_ret; - deleted = 1; - } - } -! if (!deleted) - MUTEX_UNLOCK(dbenv, mfp->mutex); - - done: /* Discard the DB_MPOOLFILE structure. */ ---- 910,928 ---- - } - } - if (mfp->block_cnt == 0) { -+ /* -+ * We should never discard this mp file if our caller -+ * is holding the lock on it. See comment in -+ * __memp_sync_file. -+ */ -+ DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); - if ((t_ret = - __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) - ret = t_ret; - deleted = 1; - } - } -! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) - MUTEX_UNLOCK(dbenv, mfp->mutex); - - done: /* Discard the DB_MPOOLFILE structure. */ -*** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 ---- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 -*************** -*** 755,761 **** - * This is important since we are called with the hash bucket - * locked. The mfp will get freed via the cleanup pass. - */ -! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) - ret = t_ret; - - --mfp->mpf_cnt; ---- 755,762 ---- - * This is important since we are called with the hash bucket - * locked. The mfp will get freed via the cleanup pass. - */ -! if (dbmfp != NULL && -! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) - ret = t_ret; - - --mfp->mpf_cnt; - Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,27 +0,0 @@ -*** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 ---- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 -*************** -*** 249,256 **** - mtx_base = htab[0].mtx_hash; - } - - if (mtx_base != MUTEX_INVALID) -! mtx_base += reginfo_off * htab_buckets; - - /* Allocate hash table space and initialize it. */ - if ((ret = __env_alloc(infop, ---- 249,262 ---- - mtx_base = htab[0].mtx_hash; - } - -+ /* -+ * We preallocated all of the mutexes in a block, so for regions after -+ * the first, we skip mutexes in use in earlier regions. Each region -+ * has the same number of buckets and there are two mutexes per hash -+ * bucket (the bucket mutex and the I/O mutex). -+ */ - if (mtx_base != MUTEX_INVALID) -! mtx_base += reginfo_off * htab_buckets * 2; - - /* Allocate hash table space and initialize it. */ - if ((ret = __env_alloc(infop, Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,74 +0,0 @@ -*** sequence/sequence.c ---- sequence/sequence.c -*************** -*** 196,202 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); - goto err; - } ---- 196,206 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 252,257 **** ---- 256,266 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(dbenv) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 304,310 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (__db_isbigendian()) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 313,324 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(dbenv) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (__db_isbigendian()) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 713,718 **** ---- 727,738 ---- - - MUTEX_LOCK(dbenv, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(dbenv) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(dbenv, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(dbenv, "Sequence overflow"); - ret = EINVAL; Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 2009-10-01 13:08:36 UTC (rev 6642) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 2009-10-01 13:10:42 UTC (rev 6643) @@ -1,1414 +0,0 @@ -*** dbinc/repmgr.h 2007-10-31 10:23:52.000000000 -0700 ---- dbinc/repmgr.h 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 36,41 **** ---- 36,55 ---- - #endif - - /* -+ * The (arbitrary) maximum number of outgoing messages we're willing to hold, on -+ * a queue per connection, waiting for TCP buffer space to become available in -+ * the kernel. Rather than exceeding this limit, we simply discard additional -+ * messages (since this is always allowed by the replication protocol). -+ * As a special dispensation, if a message is destined for a specific remote -+ * site (i.e., it's not a broadcast), then we first try blocking the sending -+ * thread, waiting for space to become available (though we only wait a limited -+ * time). This is so as to be able to handle the immediate flood of (a -+ * potentially large number of) outgoing messages that replication generates, in -+ * a tight loop, when handling PAGE_REQ, LOG_REQ and ALL_REQ requests. -+ */ -+ #define OUT_QUEUE_LIMIT 10 -+ -+ /* - * The system value is available from sysconf(_SC_HOST_NAME_MAX). - * Historically, the maximum host name was 256. - */ -*************** -*** 47,52 **** ---- 61,71 ---- - #define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20) - typedef char SITE_STRING_BUFFER[MAX_SITE_LOC_STRING+1]; - -+ /* Default timeout values, in seconds. */ -+ #define DB_REPMGR_DEFAULT_ACK_TIMEOUT (1 * US_PER_SEC) -+ #define DB_REPMGR_DEFAULT_CONNECTION_RETRY (30 * US_PER_SEC) -+ #define DB_REPMGR_DEFAULT_ELECTION_RETRY (10 * US_PER_SEC) -+ - struct __repmgr_connection; - typedef struct __repmgr_connection REPMGR_CONNECTION; - struct __repmgr_queue; typedef struct __repmgr_queue REPMGR_QUEUE; -*************** -*** 171,178 **** - #ifdef DB_WIN32 - WSAEVENT event_object; - #endif -! #define CONN_CONNECTING 0x01 /* nonblocking connect in progress */ -! #define CONN_DEFUNCT 0x02 /* socket close pending */ - u_int32_t flags; - - /* ---- 190,198 ---- - #ifdef DB_WIN32 - WSAEVENT event_object; - #endif -! #define CONN_CONGESTED 0x01 /* msg thread wait has exceeded timeout */ -! #define CONN_CONNECTING 0x02 /* nonblocking connect in progress */ -! #define CONN_DEFUNCT 0x04 /* socket close pending */ - u_int32_t flags; - - /* -*************** -*** 180,189 **** - * send() function's thread. But if TCP doesn't have enough network - * buffer space for us when we first try it, we instead allocate some - * memory, and copy the message, and then send it as space becomes -! * available in our main select() thread. - */ - OUT_Q_HEADER outbound_queue; - int out_queue_length; - - /* - * Input: while we're reading a message, we keep track of what phase ---- 200,215 ---- - * send() function's thread. But if TCP doesn't have enough network - * buffer space for us when we first try it, we instead allocate some - * memory, and copy the message, and then send it as space becomes -! * available in our main select() thread. In some cases, if the queue -! * gets too long we wait until it's drained, and then append to it. -! * This condition variable's associated mutex is the normal per-repmgr -! * db_rep->mutex, because that mutex is always held anyway whenever the -! * output queue is consulted. - */ - OUT_Q_HEADER outbound_queue; - int out_queue_length; -+ cond_var_t drained; -+ int blockers; /* ref count of msg threads waiting on us */ - - /* - * Input: while we're reading a message, we keep track of what phase -*** dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 ---- dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 -*************** -*** 1420,1425 **** ---- 1420,1428 ---- - #define __repmgr_wake_waiting_senders __repmgr_wake_waiting_senders at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_await_ack __repmgr_await_ack at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_compute_wait_deadline __repmgr_compute_wait_deadline at DB_VERSION_UNIQUE_NAME@ -+ #define __repmgr_await_drain __repmgr_await_drain at DB_VERSION_UNIQUE_NAME@ -+ #define __repmgr_alloc_cond __repmgr_alloc_cond at DB_VERSION_UNIQUE_NAME@ -+ #define __repmgr_free_cond __repmgr_free_cond at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_init_sync __repmgr_init_sync at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_close_sync __repmgr_close_sync at DB_VERSION_UNIQUE_NAME@ - #define __repmgr_net_init __repmgr_net_init at DB_VERSION_UNIQUE_NAME@ -*** dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 ---- dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 -*************** -*** 21,30 **** - int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); - void __repmgr_stash_generation __P((DB_ENV *)); - int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); -! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *)); - int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); -! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *, int)); -! void __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); - int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); - int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); - int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); ---- 21,30 ---- - int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); - void __repmgr_stash_generation __P((DB_ENV *)); - int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); -! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *, int)); - int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); -! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *)); -! int __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); - int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); - int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); - int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); -*************** -*** 39,44 **** ---- 39,47 ---- - int __repmgr_wake_waiting_senders __P((DB_ENV *)); - int __repmgr_await_ack __P((DB_ENV *, const DB_LSN *)); - void __repmgr_compute_wait_deadline __P((DB_ENV*, struct timespec *, db_timeout_t)); -+ int __repmgr_await_drain __P((DB_ENV *, REPMGR_CONNECTION *, db_timeout_t)); -+ int __repmgr_alloc_cond __P((cond_var_t *)); -+ int __repmgr_free_cond __P((cond_var_t *)); - int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); - int __repmgr_close_sync __P((DB_ENV *)); - int __repmgr_net_init __P((DB_ENV *, DB_REP *)); -*** repmgr/repmgr_method.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_method.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 196,204 **** - int ret; - - /* Set some default values. */ -! db_rep->ack_timeout = 1 * US_PER_SEC; /* 1 second */ -! db_rep->connection_retry_wait = 30 * US_PER_SEC; /* 30 seconds */ -! db_rep->election_retry_wait = 10 * US_PER_SEC; /* 10 seconds */ - db_rep->config_nsites = 0; - db_rep->peer = DB_EID_INVALID; - db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; ---- 196,204 ---- - int ret; - - /* Set some default values. */ -! db_rep->ack_timeout = DB_REPMGR_DEFAULT_ACK_TIMEOUT; -! db_rep->connection_retry_wait = DB_REPMGR_DEFAULT_CONNECTION_RETRY; -! db_rep->election_retry_wait = DB_REPMGR_DEFAULT_ELECTION_RETRY; - db_rep->config_nsites = 0; - db_rep->peer = DB_EID_INVALID; - db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; -*************** -*** 238,243 **** ---- 238,244 ---- - DB_ENV *dbenv; - { - DB_REP *db_rep; -+ REPMGR_CONNECTION *conn; - int ret; - - db_rep = dbenv->rep_handle; -*************** -*** 254,259 **** ---- 255,266 ---- - - if ((ret = __repmgr_signal(&db_rep->queue_nonempty)) != 0) - goto unlock; -+ -+ TAILQ_FOREACH(conn, &db_rep->connections, entries) { -+ if (conn->blockers > 0 && -+ ((ret = __repmgr_signal(&conn->drained)) != 0)) -+ goto unlock; -+ } - UNLOCK_MUTEX(db_rep->mutex); - - return (__repmgr_wake_main_thread(dbenv)); -*** repmgr/repmgr_msg.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_msg.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 183,192 **** - - /* - * Acknowledges a message. -- * -- * !!! -- * Note that this cannot be called from the select() thread, in case we call -- * __repmgr_bust_connection(..., FALSE). - */ - static int - ack_message(dbenv, generation, lsn) ---- 183,188 ---- -*************** -*** 227,235 **** - rec2.size = 0; - - conn = site->ref.conn; - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, -! &control2, &rec2)) == DB_REP_UNAVAIL) -! ret = __repmgr_bust_connection(dbenv, conn, FALSE); - } - - UNLOCK_MUTEX(db_rep->mutex); ---- 223,236 ---- - rec2.size = 0; - - conn = site->ref.conn; -+ /* -+ * It's hard to imagine anyone would care about a lost ack if -+ * the path to the master is so congested as to need blocking; -+ * so pass "blockable" argument as FALSE. -+ */ - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, -! &control2, &rec2, FALSE)) == DB_REP_UNAVAIL) -! ret = __repmgr_bust_connection(dbenv, conn); - } - - UNLOCK_MUTEX(db_rep->mutex); -*** repmgr/repmgr_net.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_net.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 63,69 **** - static void setup_sending_msg - __P((struct sending_msg *, u_int, const DBT *, const DBT *)); - static int __repmgr_send_internal -! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *)); - static int enqueue_msg - __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); - static int flatten __P((DB_ENV *, struct sending_msg *)); ---- 63,69 ---- - static void setup_sending_msg - __P((struct sending_msg *, u_int, const DBT *, const DBT *)); - static int __repmgr_send_internal -! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, int)); - static int enqueue_msg - __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); - static int flatten __P((DB_ENV *, struct sending_msg *)); -*************** -*** 73,85 **** - * __repmgr_send -- - * The send function for DB_ENV->rep_set_transport. - * -- * !!! -- * This is only ever called as the replication transport call-back, which means -- * it's either on one of our message processing threads or an application -- * thread. It mustn't be called from the select() thread, because we might call -- * __repmgr_bust_connection(..., FALSE) here, and that's not allowed in the -- * select() thread. -- * - * PUBLIC: int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, - * PUBLIC: const DB_LSN *, int, u_int32_t)); - */ ---- 73,78 ---- -*************** -*** 126,134 **** - } - - conn = site->ref.conn; - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, -! control, rec)) == DB_REP_UNAVAIL && -! (t_ret = __repmgr_bust_connection(dbenv, conn, FALSE)) != 0) - ret = t_ret; - if (ret != 0) - goto out; ---- 119,128 ---- - } - - conn = site->ref.conn; -+ /* Pass the "blockable" argument as TRUE. */ - if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, -! control, rec, TRUE)) == DB_REP_UNAVAIL && -! (t_ret = __repmgr_bust_connection(dbenv, conn)) != 0) - ret = t_ret; - if (ret != 0) - goto out; -*************** -*** 222,228 **** - if (site->state != SITE_CONNECTED) - return (NULL); - -! if (F_ISSET(site->ref.conn, CONN_CONNECTING)) - return (NULL); - return (site); - } ---- 216,222 ---- - if (site->state != SITE_CONNECTED) - return (NULL); - -! if (F_ISSET(site->ref.conn, CONN_CONNECTING|CONN_DEFUNCT)) - return (NULL); - return (site); - } -*************** -*** 235,244 **** - * - * !!! - * Caller must hold dbenv->mutex. -- * -- * !!! -- * Note that this cannot be called from the select() thread, in case we call -- * __repmgr_bust_connection(..., FALSE). - */ - static int - __repmgr_send_broadcast(dbenv, control, rec, nsitesp, npeersp) ---- 229,234 ---- -*************** -*** 268,281 **** - !IS_VALID_EID(conn->eid)) - continue; - -! if ((ret = __repmgr_send_internal(dbenv, conn, &msg)) == 0) { - site = SITE_FROM_EID(conn->eid); - nsites++; - if (site->priority > 0) - npeers++; - } else if (ret == DB_REP_UNAVAIL) { -! if ((ret = __repmgr_bust_connection( -! dbenv, conn, FALSE)) != 0) - return (ret); - } else - return (ret); ---- 258,277 ---- - !IS_VALID_EID(conn->eid)) - continue; - -! /* -! * Broadcast messages are either application threads committing -! * transactions, or replication status message that we can -! * afford to lose. So don't allow blocking for them (pass -! * "blockable" argument as FALSE). -! */ -! if ((ret = __repmgr_send_internal(dbenv, -! conn, &msg, FALSE)) == 0) { - site = SITE_FROM_EID(conn->eid); - nsites++; - if (site->priority > 0) - npeers++; - } else if (ret == DB_REP_UNAVAIL) { -! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) - return (ret); - } else - return (ret); -*************** -*** 301,339 **** - * intersperse writes that are part of two single messages. - * - * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, -! * PUBLIC: u_int, const DBT *, const DBT *)); - */ - int -! __repmgr_send_one(dbenv, conn, msg_type, control, rec) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - u_int msg_type; - const DBT *control, *rec; - { - struct sending_msg msg; - - setup_sending_msg(&msg, msg_type, control, rec); -! return (__repmgr_send_internal(dbenv, conn, &msg)); - } - - /* - * Attempts a "best effort" to send a message on the given site. If there is an -! * excessive backlog of message already queued on the connection, we simply drop -! * this message, and still return 0 even in this case. - */ - static int -! __repmgr_send_internal(dbenv, conn, msg) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - struct sending_msg *msg; - { -! #define OUT_QUEUE_LIMIT 10 /* arbitrary, for now */ - REPMGR_IOVECS iovecs; - SITE_STRING_BUFFER buffer; - int ret; - size_t nw; - size_t total_written; - - DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); - if (!STAILQ_EMPTY(&conn->outbound_queue)) { - /* ---- 297,355 ---- - * intersperse writes that are part of two single messages. - * - * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, -! * PUBLIC: u_int, const DBT *, const DBT *, int)); - */ - int -! __repmgr_send_one(dbenv, conn, msg_type, control, rec, blockable) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - u_int msg_type; - const DBT *control, *rec; -+ int blockable; - { - struct sending_msg msg; - - setup_sending_msg(&msg, msg_type, control, rec); -! return (__repmgr_send_internal(dbenv, conn, &msg, blockable)); - } - - /* - * Attempts a "best effort" to send a message on the given site. If there is an -! * excessive backlog of message already queued on the connection, what shall we -! * do? If the caller doesn't mind blocking, we'll wait (a limited amount of -! * time) for the queue to drain. Otherwise we'll simply drop the message. This -! * is always allowed by the replication protocol. But in the case of a -! * multi-message response to a request like PAGE_REQ, LOG_REQ or ALL_REQ we -! * almost always get a flood of messages that instantly fills our queue, so -! * blocking improves performance (by avoiding the need for the client to -! * re-request). -! * -! * How long shall we wait? We could of course create a new timeout -! * configuration type, so that the application could set it directly. But that -! * would start to overwhelm the user with too many choices to think about. We -! * already have an ACK timeout, which is the user's estimate of how long it -! * should take to send a message to the client, have it be processed, and return -! * a message back to us. We multiply that by the queue size, because that's how -! * many messages have to be swallowed up by the client before we're able to -! * start sending again (at least to a rough approximation). - */ - static int -! __repmgr_send_internal(dbenv, conn, msg, blockable) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - struct sending_msg *msg; -+ int blockable; - { -! DB_REP *db_rep; - REPMGR_IOVECS iovecs; - SITE_STRING_BUFFER buffer; -+ db_timeout_t drain_to; - int ret; - size_t nw; - size_t total_written; - -+ db_rep = dbenv->rep_handle; -+ - DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); - if (!STAILQ_EMPTY(&conn->outbound_queue)) { - /* -*************** -*** 344,358 **** - RPRINT(dbenv, (dbenv, "msg to %s to be queued", - __repmgr_format_eid_loc(dbenv->rep_handle, - conn->eid, buffer))); - if (conn->out_queue_length < OUT_QUEUE_LIMIT) - return (enqueue_msg(dbenv, conn, msg, 0)); - else { - RPRINT(dbenv, (dbenv, "queue limit exceeded")); - STAT(dbenv->rep_handle-> - region->mstat.st_msgs_dropped++); -! return (0); - } - } - - /* - * Send as much data to the site as we can, without blocking. Keep ---- 360,393 ---- - RPRINT(dbenv, (dbenv, "msg to %s to be queued", - __repmgr_format_eid_loc(dbenv->rep_handle, - conn->eid, buffer))); -+ if (conn->out_queue_length >= OUT_QUEUE_LIMIT && -+ blockable && !F_ISSET(conn, CONN_CONGESTED)) { -+ RPRINT(dbenv, (dbenv, -+ "block msg thread, await queue space")); -+ -+ if ((drain_to = db_rep->ack_timeout) == 0) -+ drain_to = DB_REPMGR_DEFAULT_ACK_TIMEOUT; -+ conn->blockers++; -+ ret = __repmgr_await_drain(dbenv, -+ conn, drain_to * OUT_QUEUE_LIMIT); -+ conn->blockers--; -+ if (db_rep->finished) -+ return (DB_TIMEOUT); -+ if (ret != 0) -+ return (ret); -+ if (STAILQ_EMPTY(&conn->outbound_queue)) -+ goto empty; -+ } - if (conn->out_queue_length < OUT_QUEUE_LIMIT) - return (enqueue_msg(dbenv, conn, msg, 0)); - else { - RPRINT(dbenv, (dbenv, "queue limit exceeded")); - STAT(dbenv->rep_handle-> - region->mstat.st_msgs_dropped++); -! return (blockable ? DB_TIMEOUT : 0); - } - } -+ empty: - - /* - * Send as much data to the site as we can, without blocking. Keep -*************** -*** 498,521 **** - - /* - * Abandons a connection, to recover from an error. Upon entry the conn struct -! * must be on the connections list. -! * -! * If the 'do_close' flag is true, we do the whole job; the clean-up includes -! * removing the struct from the list and freeing all its memory, so upon return -! * the caller must not refer to it any further. Otherwise, we merely mark the -! * connection for clean-up later by the main thread. - * - * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, -! * PUBLIC: REPMGR_CONNECTION *, int)); - * - * !!! - * Caller holds mutex. - */ - int -! __repmgr_bust_connection(dbenv, conn, do_close) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; -- int do_close; - { - DB_REP *db_rep; - int connecting, ret, eid; ---- 533,553 ---- - - /* - * Abandons a connection, to recover from an error. Upon entry the conn struct -! * must be on the connections list. For now, just mark it as unusable; it will -! * be fully cleaned up in the top-level select thread, as soon as possible. - * - * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, -! * PUBLIC: REPMGR_CONNECTION *)); - * - * !!! - * Caller holds mutex. -+ * -+ * Must be idempotent - */ - int -! __repmgr_bust_connection(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; - { - DB_REP *db_rep; - int connecting, ret, eid; -*************** -*** 526,537 **** - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); - eid = conn->eid; - connecting = F_ISSET(conn, CONN_CONNECTING); -! if (do_close) -! __repmgr_cleanup_connection(dbenv, conn); -! else { -! F_SET(conn, CONN_DEFUNCT); -! conn->eid = -1; -! } - - /* - * When we first accepted the incoming connection, we set conn->eid to ---- 558,566 ---- - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); - eid = conn->eid; - connecting = F_ISSET(conn, CONN_CONNECTING); -! -! F_SET(conn, CONN_DEFUNCT); -! conn->eid = -1; - - /* - * When we first accepted the incoming connection, we set conn->eid to -*************** -*** 557,563 **** - dbenv, ELECT_FAILURE_ELECTION)) != 0) - return (ret); - } -! } else if (!do_close) { - /* - * One way or another, make sure the main thread is poked, so - * that we do the deferred clean-up. ---- 586,592 ---- - dbenv, ELECT_FAILURE_ELECTION)) != 0) - return (ret); - } -! } else { - /* - * One way or another, make sure the main thread is poked, so - * that we do the deferred clean-up. -*************** -*** 568,577 **** - } - - /* -! * PUBLIC: void __repmgr_cleanup_connection - * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); - */ -! void - __repmgr_cleanup_connection(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; ---- 597,610 ---- - } - - /* -! * PUBLIC: int __repmgr_cleanup_connection - * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); -+ * -+ * !!! -+ * Idempotent. This can be called repeatedly as blocking message threads (of -+ * which there could be multiples) wake up in case of error on the connection. - */ -! int - __repmgr_cleanup_connection(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; -*************** -*** 580,596 **** - QUEUED_OUTPUT *out; - REPMGR_FLAT *msg; - DBT *dbt; - - db_rep = dbenv->rep_handle; - -! TAILQ_REMOVE(&db_rep->connections, conn, entries); - if (conn->fd != INVALID_SOCKET) { -! (void)closesocket(conn->fd); - #ifdef DB_WIN32 -! (void)WSACloseEvent(conn->event_object); - #endif - } - - /* - * Deallocate any input and output buffers we may have. - */ ---- 613,643 ---- - QUEUED_OUTPUT *out; - REPMGR_FLAT *msg; - DBT *dbt; -+ int ret; - - db_rep = dbenv->rep_handle; - -! DB_ASSERT(dbenv, F_ISSET(conn, CONN_DEFUNCT) || db_rep->finished); -! - if (conn->fd != INVALID_SOCKET) { -! ret = closesocket(conn->fd); -! conn->fd = INVALID_SOCKET; -! if (ret == SOCKET_ERROR) { -! ret = net_errno; -! __db_err(dbenv, ret, "closing socket"); -! } - #ifdef DB_WIN32 -! if (!WSACloseEvent(conn->event_object) && ret != 0) -! ret = net_errno; - #endif -+ if (ret != 0) -+ return (ret); - } - -+ if (conn->blockers > 0) -+ return (__repmgr_signal(&conn->drained)); -+ -+ TAILQ_REMOVE(&db_rep->connections, conn, entries); - /* - * Deallocate any input and output buffers we may have. - */ -*************** -*** 614,620 **** ---- 661,669 ---- - __os_free(dbenv, out); - } - -+ ret = __repmgr_free_cond(&conn->drained); - __os_free(dbenv, conn); -+ return (ret); - } - - static int -*************** -*** 1063,1069 **** - - while (!TAILQ_EMPTY(&db_rep->connections)) { - conn = TAILQ_FIRST(&db_rep->connections); -! __repmgr_cleanup_connection(dbenv, conn); - } - - for (i = 0; i < db_rep->site_cnt; i++) { ---- 1112,1118 ---- - - while (!TAILQ_EMPTY(&db_rep->connections)) { - conn = TAILQ_FIRST(&db_rep->connections); -! (void)__repmgr_cleanup_connection(dbenv, conn); - } - - for (i = 0; i < db_rep->site_cnt; i++) { -*** repmgr/repmgr_posix.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_posix.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 21,26 **** ---- 21,28 ---- - size_t __repmgr_guesstimated_max = (128 * 1024); - #endif - -+ static int __repmgr_conn_work __P((DB_ENV *, -+ REPMGR_CONNECTION *, fd_set *, fd_set *, int)); - static int finish_connecting __P((DB_ENV *, REPMGR_CONNECTION *)); - - /* -*************** -*** 189,194 **** ---- 191,284 ---- - } - - /* -+ * PUBLIC: int __repmgr_await_drain __P((DB_ENV *, -+ * PUBLIC: REPMGR_CONNECTION *, db_timeout_t)); -+ * -+ * Waits for space to become available on the connection's output queue. -+ * Various ways we can exit: -+ * -+ * 1. queue becomes non-full -+ * 2. exceed time limit -+ * 3. connection becomes defunct (due to error in another thread) -+ * 4. repmgr is shutting down -+ * 5. any unexpected system resource failure -+ * -+ * In cases #3 and #5 we return an error code. Caller is responsible for -+ * distinguishing the remaining cases if desired. -+ * -+ * !!! -+ * Caller must hold repmgr->mutex. -+ */ -+ int -+ __repmgr_await_drain(dbenv, conn, timeout) -+ DB_ENV *dbenv; -+ REPMGR_CONNECTION *conn; -+ db_timeout_t timeout; -+ { -+ DB_REP *db_rep; -+ struct timespec deadline; -+ int ret; -+ -+ db_rep = dbenv->rep_handle; -+ -+ __repmgr_compute_wait_deadline(dbenv, &deadline, timeout); -+ -+ ret = 0; -+ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { -+ ret = pthread_cond_timedwait(&conn->drained, -+ &db_rep->mutex, &deadline); -+ switch (ret) { -+ case 0: -+ if (db_rep->finished) -+ goto out; /* #4. */ -+ /* -+ * Another thread could have stumbled into an error on -+ * the socket while we were waiting. -+ */ -+ if (F_ISSET(conn, CONN_DEFUNCT)) { -+ ret = DB_REP_UNAVAIL; /* #3. */ -+ goto out; -+ } -+ break; -+ case ETIMEDOUT: -+ F_SET(conn, CONN_CONGESTED); -+ ret = 0; -+ goto out; /* #2. */ -+ default: -+ goto out; /* #5. */ -+ } -+ } -+ /* #1. */ -+ -+ out: -+ return (ret); -+ } -+ -+ /* -+ * PUBLIC: int __repmgr_alloc_cond __P((cond_var_t *)); -+ * -+ * Initialize a condition variable (in allocated space). -+ */ -+ int -+ __repmgr_alloc_cond(c) -+ cond_var_t *c; -+ { -+ return (pthread_cond_init(c, NULL)); -+ } -+ -+ /* -+ * PUBLIC: int __repmgr_free_cond __P((cond_var_t *)); -+ * -+ * Clean up a previously initialized condition variable. -+ */ -+ int -+ __repmgr_free_cond(c) -+ cond_var_t *c; -+ { -+ return (pthread_cond_destroy(c)); -+ } -+ -+ /* - * PUBLIC: int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); - * - * Allocate/initialize all data necessary for thread synchronization. This -*************** -*** 443,449 **** - REPMGR_RETRY *retry; - db_timespec timeout; - fd_set reads, writes; -! int ret, flow_control, maxfd, nready; - u_int8_t buf[10]; /* arbitrary size */ - - flow_control = FALSE; ---- 533,539 ---- - REPMGR_RETRY *retry; - db_timespec timeout; - fd_set reads, writes; -! int ret, flow_control, maxfd; - u_int8_t buf[10]; /* arbitrary size */ - - flow_control = FALSE; -*************** -*** 477,482 **** ---- 567,575 ---- - * each one. - */ - TAILQ_FOREACH(conn, &db_rep->connections, entries) { -+ if (F_ISSET(conn, CONN_DEFUNCT)) -+ continue; -+ - if (F_ISSET(conn, CONN_CONNECTING)) { - FD_SET((u_int)conn->fd, &reads); - FD_SET((u_int)conn->fd, &writes); -*************** -*** 533,616 **** - return (ret); - } - } -- nready = ret; -- - LOCK_MUTEX(db_rep->mutex); - -- /* -- * The first priority thing we must do is to clean up any -- * pending defunct connections. Otherwise, if they have any -- * lingering pending input, we get very confused if we try to -- * process it. -- * -- * The TAILQ_FOREACH macro would be suitable here, except that -- * it doesn't allow unlinking the current element, which is -- * needed for cleanup_connection. -- */ -- for (conn = TAILQ_FIRST(&db_rep->connections); -- conn != NULL; -- conn = next) { -- next = TAILQ_NEXT(conn, entries); -- if (F_ISSET(conn, CONN_DEFUNCT)) -- __repmgr_cleanup_connection(dbenv, conn); -- } -- - if ((ret = __repmgr_retry_connections(dbenv)) != 0) - goto out; -- if (nready == 0) -- continue; - - /* -! * Traverse the linked list. (Again, like TAILQ_FOREACH, except -! * that we need the ability to unlink an element along the way.) - */ - for (conn = TAILQ_FIRST(&db_rep->connections); - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if (F_ISSET(conn, CONN_CONNECTING)) { -! if (FD_ISSET((u_int)conn->fd, &reads) || -! FD_ISSET((u_int)conn->fd, &writes)) { -! if ((ret = finish_connecting(dbenv, -! conn)) == DB_REP_UNAVAIL) { -! if ((ret = -! __repmgr_bust_connection( -! dbenv, conn, TRUE)) != 0) -! goto out; -! } else if (ret != 0) -! goto out; -! } -! continue; -! } -! -! /* -! * Here, the site is connected, and the FD_SET's are -! * valid. -! */ -! if (FD_ISSET((u_int)conn->fd, &writes)) { -! if ((ret = __repmgr_write_some( -! dbenv, conn)) == DB_REP_UNAVAIL) { -! if ((ret = -! __repmgr_bust_connection(dbenv, -! conn, TRUE)) != 0) -! goto out; -! continue; -! } else if (ret != 0) -! goto out; -! } -! -! if (!flow_control && -! FD_ISSET((u_int)conn->fd, &reads)) { -! if ((ret = __repmgr_read_from_site(dbenv, conn)) -! == DB_REP_UNAVAIL) { -! if ((ret = -! __repmgr_bust_connection(dbenv, -! conn, TRUE)) != 0) -! goto out; -! continue; -! } else if (ret != 0) -! goto out; -! } - } - - /* ---- 626,650 ---- - return (ret); - } - } - LOCK_MUTEX(db_rep->mutex); - - if ((ret = __repmgr_retry_connections(dbenv)) != 0) - goto out; - - /* -! * Examine each connection, to see what work needs to be done. -! * -! * The TAILQ_FOREACH macro would be suitable here, except that -! * it doesn't allow unlinking the current element, which is -! * needed for cleanup_connection. - */ - for (conn = TAILQ_FIRST(&db_rep->connections); - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if ((ret = __repmgr_conn_work(dbenv, -! conn, &reads, &writes, flow_control)) != 0) -! goto out; - } - - /* -*************** -*** 637,642 **** ---- 671,719 ---- - } - - static int -+ __repmgr_conn_work(dbenv, conn, reads, writes, flow_control) -+ DB_ENV *dbenv; -+ REPMGR_CONNECTION *conn; -+ fd_set *reads, *writes; -+ int flow_control; -+ { -+ int ret; -+ u_int fd; -+ -+ if (F_ISSET(conn, CONN_DEFUNCT)) { -+ /* -+ * Deferred clean-up, from an error that happened in another -+ * thread, while we were sleeping in select(). -+ */ -+ return (__repmgr_cleanup_connection(dbenv, conn)); -+ } -+ -+ ret = 0; -+ fd = (u_int)conn->fd; -+ -+ if (F_ISSET(conn, CONN_CONNECTING)) { -+ if (FD_ISSET(fd, reads) || FD_ISSET(fd, writes)) -+ ret = finish_connecting(dbenv, conn); -+ } else { -+ /* -+ * Here, the site is connected, and the FD_SET's are valid. -+ */ -+ if (FD_ISSET(fd, writes)) -+ ret = __repmgr_write_some(dbenv, conn); -+ -+ if (ret == 0 && !flow_control && FD_ISSET(fd, reads)) -+ ret = __repmgr_read_from_site(dbenv, conn); -+ } -+ -+ if (ret == DB_REP_UNAVAIL) { -+ if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) -+ return (ret); -+ ret = __repmgr_cleanup_connection(dbenv, conn); -+ } -+ return (ret); -+ } -+ -+ static int - finish_connecting(dbenv, conn) - DB_ENV *dbenv; - REPMGR_CONNECTION *conn; -*************** -*** 657,662 **** ---- 734,740 ---- - goto err_rpt; - } - -+ DB_ASSERT(dbenv, F_ISSET(conn, CONN_CONNECTING)); - F_CLR(conn, CONN_CONNECTING); - return (__repmgr_send_handshake(dbenv, conn)); - -*************** -*** 671,690 **** - "connecting to %s", __repmgr_format_site_loc(site, buffer)); - - /* If we've exhausted the list of possible addresses, give up. */ -! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) - return (DB_REP_UNAVAIL); - - /* - * This is just like a little mini-"bust_connection", except that we - * don't reschedule for later, 'cuz we're just about to try again right -! * now. - * - * !!! - * Which means this must only be called on the select() thread, since - * only there are we allowed to actually close a connection. - */ - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! __repmgr_cleanup_connection(dbenv, conn); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); ---- 749,773 ---- - "connecting to %s", __repmgr_format_site_loc(site, buffer)); - - /* If we've exhausted the list of possible addresses, give up. */ -! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) { -! STAT(db_rep->region->mstat.st_connect_fail++); - return (DB_REP_UNAVAIL); -+ } - - /* - * This is just like a little mini-"bust_connection", except that we - * don't reschedule for later, 'cuz we're just about to try again right -! * now. (Note that we don't have to worry about message threads -! * blocking on a full output queue: that can't happen when we're only -! * just connecting.) - * - * !!! - * Which means this must only be called on the select() thread, since - * only there are we allowed to actually close a connection. - */ - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) -! return (ret); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); -*** repmgr/repmgr_sel.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_sel.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 36,45 **** - - /* - * PUBLIC: int __repmgr_accept __P((DB_ENV *)); -- * -- * !!! -- * Only ever called in the select() thread, since we may call -- * __repmgr_bust_connection(..., TRUE). - */ - int - __repmgr_accept(dbenv) ---- 36,41 ---- -*************** -*** 133,139 **** - case 0: - return (0); - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, conn, TRUE)); - default: - return (ret); - } ---- 129,135 ---- - case 0: - return (0); - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, conn)); - default: - return (ret); - } -*************** -*** 254,263 **** - * starting with the "current" element of its address list and trying as many - * addresses as necessary until the list is exhausted. - * -- * !!! -- * Only ever called in the select() thread, since we may call -- * __repmgr_bust_connection(..., TRUE). -- * - * PUBLIC: int __repmgr_connect_site __P((DB_ENV *, u_int eid)); - */ - int ---- 250,255 ---- -*************** -*** 332,338 **** - case 0: - break; - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, con, TRUE)); - default: - return (ret); - } ---- 324,330 ---- - case 0: - break; - case DB_REP_UNAVAIL: -! return (__repmgr_bust_connection(dbenv, con)); - default: - return (ret); - } -*************** -*** 437,443 **** - - DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); - -! return (__repmgr_send_one(dbenv, conn, REPMGR_HANDSHAKE, &cntrl, &rec)); - } - - /* ---- 429,443 ---- - - DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); - -! /* -! * It would of course be disastrous to block the select() thread, so -! * pass the "blockable" argument as FALSE. Fortunately blocking should -! * never be necessary here, because the hand-shake is always the first -! * thing we send. Which is a good thing, because it would be almost as -! * disastrous if we allowed ourselves to drop a handshake. -! */ -! return (__repmgr_send_one(dbenv, -! conn, REPMGR_HANDSHAKE, &cntrl, &rec, FALSE)); - } - - /* -*************** -*** 854,859 **** ---- 854,872 ---- - conn->out_queue_length--; - if (--msg->ref_count <= 0) - __os_free(dbenv, msg); -+ -+ /* -+ * We've achieved enough movement to free up at least -+ * one space in the outgoing queue. Wake any message -+ * threads that may be waiting for space. Clear the -+ * CONGESTED status so that when the queue reaches the -+ * high-water mark again, the filling thread will be -+ * allowed to try waiting again. -+ */ -+ F_CLR(conn, CONN_CONGESTED); -+ if (conn->blockers > 0 && -+ (ret = __repmgr_signal(&conn->drained)) != 0) -+ return (ret); - } - } - -*** repmgr/repmgr_util.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_util.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 103,108 **** ---- 103,113 ---- - db_rep = dbenv->rep_handle; - if ((ret = __os_malloc(dbenv, sizeof(REPMGR_CONNECTION), &c)) != 0) - return (ret); -+ if ((ret = __repmgr_alloc_cond(&c->drained)) != 0) { -+ __os_free(dbenv, c); -+ return (ret); -+ } -+ c->blockers = 0; - - c->fd = s; - c->flags = flags; -*** repmgr/repmgr_windows.c 2007-10-31 10:23:52.000000000 -0700 ---- repmgr/repmgr_windows.c 2007-10-31 10:23:53.000000000 -0700 -*************** -*** 11,16 **** ---- 11,19 ---- - #define __INCLUDE_NETWORKING 1 - #include "db_int.h" - -+ /* Convert time-out from microseconds to milliseconds, rounding up. */ -+ #define DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t) (((t) + (US_PER_MS - 1)) / US_PER_MS) -+ - typedef struct __ack_waiter { - HANDLE event; - const DB_LSN *lsnp; -*************** -*** 120,136 **** - { - DB_REP *db_rep; - ACK_WAITER *me; -! DWORD ret; -! DWORD timeout; - - db_rep = dbenv->rep_handle; - - if ((ret = allocate_wait_slot(dbenv, &me)) != 0) - goto err; - -- /* convert time-out from microseconds to milliseconds, rounding up */ - timeout = db_rep->ack_timeout > 0 ? -! ((db_rep->ack_timeout + (US_PER_MS - 1)) / US_PER_MS) : INFINITE; - me->lsnp = lsnp; - if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, - FALSE)) == WAIT_FAILED) { ---- 123,137 ---- - { - DB_REP *db_rep; - ACK_WAITER *me; -! DWORD ret, timeout; - - db_rep = dbenv->rep_handle; - - if ((ret = allocate_wait_slot(dbenv, &me)) != 0) - goto err; - - timeout = db_rep->ack_timeout > 0 ? -! DB_TIMEOUT_TO_WINDOWS_TIMEOUT(db_rep->ack_timeout) : INFINITE; - me->lsnp = lsnp; - if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, - FALSE)) == WAIT_FAILED) { -*************** -*** 211,216 **** ---- 212,296 ---- - db_rep->waiters->first_free = slot; - } - -+ /* (See requirements described in repmgr_posix.c.) */ -+ int -+ __repmgr_await_drain(dbenv, conn, timeout) -+ DB_ENV *dbenv; -+ REPMGR_CONNECTION *conn; -+ db_timeout_t timeout; -+ { -+ DB_REP *db_rep; -+ db_timespec deadline, delta, now; -+ db_timeout_t t; -+ DWORD duration, ret; -+ int round_up; -+ -+ db_rep = dbenv->rep_handle; -+ -+ __os_gettime(dbenv, &deadline); -+ DB_TIMEOUT_TO_TIMESPEC(timeout, &delta); -+ timespecadd(&deadline, &delta); -+ -+ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { -+ if (!ResetEvent(conn->drained)) -+ return (GetLastError()); -+ -+ /* How long until the deadline? */ -+ __os_gettime(dbenv, &now); -+ if (timespeccmp(&now, &deadline, >=)) { -+ F_SET(conn, CONN_CONGESTED); -+ return (0); -+ } -+ delta = deadline; -+ timespecsub(&delta, &now); -+ round_up = TRUE; -+ DB_TIMESPEC_TO_TIMEOUT(t, &delta, round_up); -+ duration = DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t); -+ -+ ret = SignalObjectAndWait(db_rep->mutex, -+ conn->drained, duration, FALSE); -+ LOCK_MUTEX(db_rep->mutex); -+ if (ret == WAIT_FAILED) -+ return (GetLastError()); -+ else if (ret == WAIT_TIMEOUT) { -+ F_SET(conn, CONN_CONGESTED); -+ return (0); -+ } else -+ DB_ASSERT(dbenv, ret == WAIT_OBJECT_0); -+ -+ if (db_rep->finished) -+ return (0); -+ if (F_ISSET(conn, CONN_DEFUNCT)) -+ return (DB_REP_UNAVAIL); -+ } -+ return (0); -+ } -+ -+ /* -+ * Creates a manual reset event, which is usually our best choice when we may -+ * have multiple threads waiting on a single event. -+ */ -+ int -+ __repmgr_alloc_cond(c) -+ cond_var_t *c; -+ { -+ HANDLE event; -+ -+ if ((event = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) -+ return (GetLastError()); -+ *c = event; -+ return (0); -+ } -+ -+ int -+ __repmgr_free_cond(c) -+ cond_var_t *c; -+ { -+ if (CloseHandle(*c)) -+ return (0); -+ return (GetLastError()); -+ } -+ - /* - * Make resource allocation an all-or-nothing affair, outside of this and the - * close_sync function. db_rep->waiters should be non-NULL iff all of these -*************** -*** 488,493 **** ---- 568,576 ---- - * don't hurt anything flow-control-wise. - */ - TAILQ_FOREACH(conn, &db_rep->connections, entries) { -+ if (F_ISSET(conn, CONN_DEFUNCT)) -+ continue; -+ - if (F_ISSET(conn, CONN_CONNECTING) || - !STAILQ_EMPTY(&conn->outbound_queue) || - (!flow_control || !IS_VALID_EID(conn->eid))) { -*************** -*** 534,541 **** - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if (F_ISSET(conn, CONN_DEFUNCT)) -! __repmgr_cleanup_connection(dbenv, conn); - } - - /* ---- 617,626 ---- - conn != NULL; - conn = next) { - next = TAILQ_NEXT(conn, entries); -! if (F_ISSET(conn, CONN_DEFUNCT) && -! (ret = __repmgr_cleanup_connection(dbenv, -! conn)) != 0) -! goto unlock; - } - - /* -*************** -*** 587,597 **** - return (ret); - } - -- /* -- * !!! -- * Only ever called on the select() thread, since we may call -- * __repmgr_bust_connection(..., TRUE). -- */ - static int - handle_completion(dbenv, conn) - DB_ENV *dbenv; ---- 672,677 ---- -*************** -*** 651,660 **** - } - } - -! return (0); -! -! err: if (ret == DB_REP_UNAVAIL) -! return (__repmgr_bust_connection(dbenv, conn, TRUE)); - return (ret); - } - ---- 731,742 ---- - } - } - -! err: -! if (ret == DB_REP_UNAVAIL) { -! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) -! return (ret); -! ret = __repmgr_cleanup_connection(dbenv, conn); -! } - return (ret); - } - -*************** -*** 708,714 **** - } - - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! __repmgr_cleanup_connection(dbenv, conn); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); ---- 790,797 ---- - } - - DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); -! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) -! return (ret); - ret = __repmgr_connect_site(dbenv, eid); - DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); - return (ret); Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,75 @@ +*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 +--- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 +*************** +*** 187,193 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +--- 187,197 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 244,249 **** +--- 248,258 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 296,302 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 305,316 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(env) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(env, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 707,712 **** +--- 721,733 ---- + + MUTEX_LOCK(env, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(env, "Sequence overflow"); + ret = EINVAL; Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,71 @@ +Index: lock/lock.c +=================================================================== +RCS file: /a/CVSROOT/db/lock/lock.c,v +retrieving revision 12.61 +diff -c -r12.61 lock.c +*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 +--- lock/lock.c 19 Aug 2008 17:28:24 -0000 +*************** +*** 1278,1287 **** + SH_TAILQ_REMOVE( + <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); + if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { +! LOCK_REGION_LOCK(env); + __env_alloc_free(<->reginfo, + SH_DBT_PTR(&sh_obj->lockobj)); +! LOCK_REGION_UNLOCK(env); + } + SH_TAILQ_INSERT_HEAD( + &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); +--- 1278,1289 ---- + SH_TAILQ_REMOVE( + <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); + if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { +! if (region->part_t_size != 1) +! LOCK_REGION_LOCK(env); + __env_alloc_free(<->reginfo, + SH_DBT_PTR(&sh_obj->lockobj)); +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + } + SH_TAILQ_INSERT_HEAD( + &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); +*************** +*** 1470,1484 **** + if (obj->size <= sizeof(sh_obj->objdata)) + p = sh_obj->objdata; + else { +! LOCK_REGION_LOCK(env); + if ((ret = + __env_alloc(<->reginfo, obj->size, &p)) != 0) { + __db_errx(env, + "No space for lock object storage"); +! LOCK_REGION_UNLOCK(env); + goto err; + } +! LOCK_REGION_UNLOCK(env); + } + + memcpy(p, obj->data, obj->size); +--- 1472,1492 ---- + if (obj->size <= sizeof(sh_obj->objdata)) + p = sh_obj->objdata; + else { +! /* +! * If we have only one partition, the region is locked. +! */ +! if (region->part_t_size != 1) +! LOCK_REGION_LOCK(env); + if ((ret = + __env_alloc(<->reginfo, obj->size, &p)) != 0) { + __db_errx(env, + "No space for lock object storage"); +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + goto err; + } +! if (region->part_t_size != 1) +! LOCK_REGION_UNLOCK(env); + } + + memcpy(p, obj->data, obj->size); Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,314 @@ +*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 +--- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 +*************** +*** 121,127 **** + DB_LOCKTAB *lt; + db_timespec now; + locker_info *idmap; +! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; + u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; + u_int32_t lock_max, txn_max; + int ret, status; +--- 121,127 ---- + DB_LOCKTAB *lt; + db_timespec now; + locker_info *idmap; +! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; + u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; + u_int32_t lock_max, txn_max; + int ret, status; +*************** +*** 133,139 **** + if (IS_REP_CLIENT(env)) + atype = DB_LOCK_MINWRITE; + +! free_me = NULL; + + lt = env->lk_handle; + if (rejectp != NULL) +--- 133,140 ---- + if (IS_REP_CLIENT(env)) + atype = DB_LOCK_MINWRITE; + +! copymap = tmpmap = NULL; +! deadlist = NULL; + + lt = env->lk_handle; + if (rejectp != NULL) +*************** +*** 179,189 **** + memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); + + if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) +! goto err1; + + /* Find a deadlock. */ + if ((ret = +! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) + return (ret); + + /* +--- 180,190 ---- + memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); + + if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) +! goto err; + + /* Find a deadlock. */ + if ((ret = +! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) + return (ret); + + /* +*************** +*** 204,211 **** + txn_max = TXN_MAXIMUM; + + killid = BAD_KILLID; +! free_me = deadp; +! for (; *deadp != NULL; deadp++) { + if (rejectp != NULL) + ++*rejectp; + killid = (u_int32_t)(*deadp - bitmap) / nalloc; +--- 205,211 ---- + txn_max = TXN_MAXIMUM; + + killid = BAD_KILLID; +! for (deadp = deadlist; *deadp != NULL; deadp++) { + if (rejectp != NULL) + ++*rejectp; + killid = (u_int32_t)(*deadp - bitmap) / nalloc; +*************** +*** 342,352 **** + __db_msg(env, + "Aborting locker %lx", (u_long)idmap[killid].id); + } +! __os_free(env, tmpmap); +! err1: __os_free(env, copymap); +! +! err: if (free_me != NULL) +! __os_free(env, free_me); + __os_free(env, bitmap); + __os_free(env, idmap); + +--- 342,353 ---- + __db_msg(env, + "Aborting locker %lx", (u_long)idmap[killid].id); + } +! err: if(copymap != NULL) +! __os_free(env, copymap); +! if (deadlist != NULL) +! __os_free(env, deadlist); +! if(tmpmap != NULL) +! __os_free(env, tmpmap); + __os_free(env, bitmap); + __os_free(env, idmap); + +*************** +*** 360,365 **** +--- 361,377 ---- + + #define DD_INVALID_ID ((u_int32_t) -1) + ++ /* ++ * __dd_build -- ++ * Build the lock dependency bit maps. ++ * Notes on syncronization: ++ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have ++ * a single partition. ++ * LOCK_LOCKERS is held while we are walking the lockers list and ++ * to single thread the use of lockerp->dd_id. ++ * LOCK_DD protects the DD list of objects. ++ */ ++ + static int + __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) + ENV *env; +*************** +*** 393,398 **** +--- 405,411 ---- + * In particular we do not build the conflict array and our caller + * needs to expect this. + */ ++ LOCK_SYSTEM_LOCK(lt, region); + if (atype == DB_LOCK_EXPIRE) { + skip: LOCK_DD(env, region); + op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); +*************** +*** 430,446 **** + OBJECT_UNLOCK(lt, region, indx); + } + UNLOCK_DD(env, region); + goto done; + } + + /* +! * We'll check how many lockers there are, add a few more in for +! * good measure and then allocate all the structures. Then we'll +! * verify that we have enough room when we go back in and get the +! * mutex the second time. + */ +! retry: count = region->stat.st_nlockers; + if (count == 0) { + *nlockers = 0; + return (0); + } +--- 443,460 ---- + OBJECT_UNLOCK(lt, region, indx); + } + UNLOCK_DD(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + goto done; + } + + /* +! * Allocate after locking the region +! * to make sure the structures are large enough. + */ +! LOCK_LOCKERS(env, region); +! count = region->stat.st_nlockers; + if (count == 0) { ++ UNLOCK_LOCKERS(env, region); + *nlockers = 0; + return (0); + } +*************** +*** 448,497 **** + if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) + __db_msg(env, "%lu lockers", (u_long)count); + +- count += 20; + nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; + +! /* +! * Allocate enough space for a count by count bitmap matrix. +! * +! * XXX +! * We can probably save the malloc's between iterations just +! * reallocing if necessary because count grew by too much. +! */ + if ((ret = __os_calloc(env, (size_t)count, +! sizeof(u_int32_t) * nentries, &bitmap)) != 0) + return (ret); + + if ((ret = __os_calloc(env, + sizeof(u_int32_t), nentries, &tmpmap)) != 0) { + __os_free(env, bitmap); + return (ret); + } + + if ((ret = __os_calloc(env, + (size_t)count, sizeof(locker_info), &id_array)) != 0) { + __os_free(env, bitmap); + __os_free(env, tmpmap); + return (ret); + } + + /* +- * Now go back in and actually fill in the matrix. +- */ +- if (region->stat.st_nlockers > count) { +- __os_free(env, bitmap); +- __os_free(env, tmpmap); +- __os_free(env, id_array); +- goto retry; +- } +- +- /* + * First we go through and assign each locker a deadlock detector id. + */ + id = 0; +- LOCK_LOCKERS(env, region); + SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { + if (lip->master_locker == INVALID_ROFF) { + lip->dd_id = id++; + id_array[lip->dd_id].id = lip->id; + switch (atype) { +--- 462,498 ---- + if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) + __db_msg(env, "%lu lockers", (u_long)count); + + nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; + +! /* Allocate enough space for a count by count bitmap matrix. */ + if ((ret = __os_calloc(env, (size_t)count, +! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { +! UNLOCK_LOCKERS(env, region); + return (ret); ++ } + + if ((ret = __os_calloc(env, + sizeof(u_int32_t), nentries, &tmpmap)) != 0) { ++ UNLOCK_LOCKERS(env, region); + __os_free(env, bitmap); + return (ret); + } + + if ((ret = __os_calloc(env, + (size_t)count, sizeof(locker_info), &id_array)) != 0) { ++ UNLOCK_LOCKERS(env, region); + __os_free(env, bitmap); + __os_free(env, tmpmap); + return (ret); + } + + /* + * First we go through and assign each locker a deadlock detector id. + */ + id = 0; + SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { + if (lip->master_locker == INVALID_ROFF) { ++ DB_ASSERT(env, id < count); + lip->dd_id = id++; + id_array[lip->dd_id].id = lip->id; + switch (atype) { +*************** +*** 510,516 **** + lip->dd_id = DD_INVALID_ID; + + } +- UNLOCK_LOCKERS(env, region); + + /* + * We only need consider objects that have waiters, so we use +--- 511,516 ---- +*************** +*** 669,675 **** + * status after building the bit maps so that we will not detect + * a blocked transaction without noting that it is already aborting. + */ +- LOCK_LOCKERS(env, region); + for (id = 0; id < count; id++) { + if (!id_array[id].valid) + continue; +--- 669,674 ---- +*************** +*** 738,743 **** +--- 737,743 ---- + id_array[id].in_abort = 1; + } + UNLOCK_LOCKERS(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + + /* + * Now we can release everything except the bitmap matrix that we +*************** +*** 839,844 **** +--- 839,845 ---- + ret = 0; + + /* We must lock so this locker cannot go away while we abort it. */ ++ LOCK_SYSTEM_LOCK(lt, region); + LOCK_LOCKERS(env, region); + + /* +*************** +*** 895,900 **** +--- 896,902 ---- + done: OBJECT_UNLOCK(lt, region, info->last_ndx); + err: + out: UNLOCK_LOCKERS(env, region); ++ LOCK_SYSTEM_UNLOCK(lt, region); + return (ret); + } + Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 2009-10-01 13:10:42 UTC (rev 6643) @@ -0,0 +1,183 @@ +*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 +--- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 374,379 **** +--- 374,380 ---- + #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) + #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) + #define IS_VALID_EID(e) ((e) >= 0) ++ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) + #define SELF_EID INT_MAX + + #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ +*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 +--- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 +*************** +*** 33,39 **** + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); + + /* + * __rep_elect -- +--- 33,39 ---- + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); + + /* + * __rep_elect -- +*************** +*** 55,61 **** + ENV *env; + LOG *lp; + REP *rep; +! int done, eid, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +--- 55,61 ---- + ENV *env; + LOG *lp; + REP *rep; +! int done, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +*************** +*** 181,188 **** + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, &eid, +! 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +--- 181,187 ---- + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +*************** +*** 286,296 **** + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +--- 285,295 ---- + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (!IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +*************** +*** 398,412 **** + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! if (eid != DB_EID_INVALID) +! goto edone; +! ret = DB_REP_UNAVAIL; +! break; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +--- 397,408 ---- + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! goto edone; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +*************** +*** 1050,1062 **** + ENV *env; + REP *rep; + { +- /* +- * We often come through here twice, sometimes even more. We mustn't +- * let the redundant calls affect stats counting. But rep_elect relies +- * on this first part for setting eidp. +- */ +- rep->master_id = rep->eid; +- + if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { + /* We've been through here already; avoid double counting. */ + return; +--- 1046,1051 ---- +*************** +*** 1093,1102 **** + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, eidp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int *eidp, full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +--- 1082,1091 ---- + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +*************** +*** 1174,1180 **** + F_CLR(rep, REP_F_EGENUPDATE); + ret = DB_REP_EGENCHG; + } else if (phase_over) { +- *eidp = rep->master_id; + done = 1; + ret = 0; + } +--- 1163,1168 ---- +*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 +--- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 100,105 **** +--- 100,107 ---- + control, rec, &nsites_sent, &npeers_sent)) != 0) + goto out; + } else { ++ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); ++ + /* + * If this is a request that can be sent anywhere, then see if + * we can send it to our peer (to save load on the master), but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 15:16:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 13:16:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6644] csw/mgar/pkg Message-ID: Revision: 6644 http://gar.svn.sourceforge.net/gar/?rev=6644&view=rev Author: dmichelsen Date: 2009-10-01 13:16:29 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb33: Initial commit Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb33/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb33/ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool Removed Paths: ------------- csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,5 +1,5 @@ GARNAME = db -GARVERSION = 4.2.52 +GARVERSION = 3.3.11 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -16,7 +16,7 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc +PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -27,13 +27,13 @@ PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) BUILD64 = 1 CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb42 +prefix = $(BUILD_PREFIX)/bdb33 docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -50,38 +50,38 @@ CONFIGURE_ARGS += --with-tcl=$(libdir) endif -FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb33/lib # bdb tests are *very* time consuming TEST_SCRIPTS = NO_ISAEXEC = 1 -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc +PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc -CATALOGNAME_CSWbdb42 = berkeleydb42 -CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel -CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc +CATALOGNAME_CSWbdb33 = berkeleydb33 +CATALOGNAME_CSWbdb33-devel = berkeleydb33_devel +CATALOGNAME_CSWbdb33-doc = berkeleydb33_doc -ARCHALL_CSWbdb42-doc = 1 +ARCHALL_CSWbdb33-doc = 1 -SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities -SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support -SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation +SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities +SPKG_DESC_CSWbdb33-devel = BerkeleyDB 3.3 development support +SPKG_DESC_CSWbdb33-doc = BerkeleyDB 3.3 documentation -REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42 -INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc +REQUIRED_PKGS_CSWbdb33-devel = CSWbdb33 +INCOMPATIBLE_PKGS_CSWbdb33-doc = CSWbdb33doc LICENSE = LICENSE # Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" +#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" +#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" -#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb42-doc = $(prefix)/docs/.* +#PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb33-doc = $(prefix)/docs/.* -PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/bdb33/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb42/trunk/checksums 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,7 +1,4 @@ -8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz -1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff -3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff -0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff -9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff -99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff -d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff +b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz +a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1 +fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2 +d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool Added: csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 (rev 0) +++ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 2009-10-01 13:16:29 UTC (rev 6644) @@ -0,0 +1,96 @@ +*** db185/db185.c 2001/04/10 20:43:53 11.18 +--- db185/db185.c 2001/07/30 14:12:47 +*************** +*** 40,47 **** +--- 40,52 ---- + + /* + * EXTERN: #define dbopen __db185_open ++ * EXTERN: #ifdef _DB185_INT_H_ + * EXTERN: DB185 *__db185_open + * EXTERN: __P((const char *, int, int, DBTYPE, const void *)); ++ * EXTERN: #else ++ * EXTERN: DB *__db185_open ++ * EXTERN: __P((const char *, int, int, DBTYPE, const void *)); ++ * EXTERN: #endif + */ + DB185 * + __db185_open(file, oflags, mode, type, openinfo) +*** db185/db185_int.in 2001/04/10 20:43:54 11.9 +--- db185/db185_int.in 2001/07/30 14:12:47 +*************** +*** 39,46 **** + * $Id: patch.3.3.11.1,v 1.1 2003/01/10 13:43:30 mao Exp $ + */ + +! #ifndef _DB_185_H_ +! #define _DB_185_H_ + + /* Routine flags. */ + #define R_CURSOR 1 /* del, put, seq */ +--- 39,46 ---- + * $Id: patch.3.3.11.1,v 1.1 2003/01/10 13:43:30 mao Exp $ + */ + +! #ifndef _DB185_INT_H_ +! #define _DB185_INT_H_ + + /* Routine flags. */ + #define R_CURSOR 1 /* del, put, seq */ +*** include_auto/db185_ext.in 2001/04/10 20:44:20 1.1 +--- include_auto/db185_ext.in 2001/07/30 14:12:48 +*************** +*** 3,11 **** + extern "C" { + #endif + #define dbopen __db185_open + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); + #if defined(__cplusplus) + } + #endif + +! #endif /* !_DB_185_H_ */ +--- 3,15 ---- + extern "C" { + #endif + #define dbopen __db185_open ++ #ifdef _DB185_INT_H_ + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #else ++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #endif + #if defined(__cplusplus) + } + #endif + +! #endif /* _DB_185_H_ or _DB185_INT_H_ */ +*** include_auto/db185_uext.in 2001/04/10 20:44:20 1.1 +--- include_auto/db185_uext.in 2001/07/30 14:12:48 +*************** +*** 3,12 **** + extern "C" { + #endif + #define dbopen __db185_open at DB_VERSION_UNIQUE_NAME@ + #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@ + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); + #if defined(__cplusplus) + } + #endif + +! #endif /* !_DB_185_H_ */ +--- 3,17 ---- + extern "C" { + #endif + #define dbopen __db185_open at DB_VERSION_UNIQUE_NAME@ ++ #ifdef _DB185_INT_H_ + #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@ + DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #else ++ #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@ ++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *)); ++ #endif + #if defined(__cplusplus) + } + #endif + +! #endif /* _DB_185_H_ or _DB185_INT_H_ */ Added: csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 (rev 0) +++ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 2009-10-01 13:16:29 UTC (rev 6644) @@ -0,0 +1,15 @@ +*** build_vxworks/db.h.orig Mon Jul 30 09:49:54 2001 +--- build_vxworks/db.h Wed Dec 31 19:00:00 1969 +*************** +*** 32,37 **** +--- 32,41 ---- + extern "C" { + #endif + ++ #ifndef HAVE_VXWORKS ++ #define HAVE_VXWORKS 1 ++ #endif ++ + /* + * XXX + * Handle function prototypes and the keyword "const". This steps on name Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,36 +0,0 @@ -*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 ---- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 -*************** -*** 440,446 **** - c_mp->stat.st_pages--; - alloc_bhp = NULL; - R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); -- MUTEX_LOCK(dbenv, &hp->hash_mutex); - - /* - * We can't use the page we found in the pool if DB_MPOOL_NEW ---- 440,445 ---- -*************** -*** 455,460 **** ---- 454,462 ---- - b_incr = 0; - goto alloc; - } -+ -+ /* We can use the page -- get the bucket lock. */ -+ MUTEX_LOCK(dbenv, &hp->hash_mutex); - break; - case SECOND_MISS: - /* -*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 ---- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 -*************** -*** 285,290 **** ---- 285,291 ---- - bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) - if (bhp->priority != UINT32_T_MAX && - bhp->priority > MPOOL_BASE_DECREMENT) -+ bhp->priority -= MPOOL_BASE_DECREMENT; - MUTEX_UNLOCK(dbenv, &hp->hash_mutex); - } - } Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,45 +0,0 @@ -*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 ---- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 -*************** -*** 2216,2226 **** - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, obj->data, obj->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN(obj->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ ---- 2216,2227 ---- - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, \ -! (obj)->data, (obj)->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN((obj)->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ -*************** -*** 2339,2345 **** - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, obj); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; ---- 2340,2346 ---- - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, &obj[i]); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,247 +0,0 @@ ---- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 -+++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 -@@ -61,7 +61,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -94,7 +94,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - ---- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 -+++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 -@@ -57,7 +57,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -84,7 +84,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) { - dbenv.cleanup(); - } ---- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 -+++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 -@@ -14,15 +14,15 @@ - db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); - } - -- static Object initDbEnvRef0(DbEnv self, Object handle) { -+ static long initDbEnvRef0(DbEnv self, Object handle) { - return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); - } - -- static Object initDbRef0(Db self, Object handle) { -+ static long initDbRef0(Db self, Object handle) { - return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); - } - -- static void deleteRef0(Object ref) { -+ static void deleteRef0(long ref) { - db_javaJNI.deleteRef0(ref); - } - ---- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 -+++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 -@@ -45,9 +45,9 @@ - static native final void initialize(); - - public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; -- final static native Object initDbEnvRef0(long jarg1, Object jarg2); -- final static native Object initDbRef0(long jarg1, Object jarg2); -- final static native void deleteRef0(Object jarg1); -+ final static native long initDbEnvRef0(long jarg1, Object jarg2); -+ final static native long initDbRef0(long jarg1, Object jarg2); -+ final static native void deleteRef0(long jarg1); - final static native long getDbEnv0(long jarg1); - public final static native long new_Db(long jarg1, int jarg2) throws DbException; - public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; ---- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 -+++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 -@@ -53,7 +53,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -76,7 +76,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - public synchronized void close(int flags) throws DbException { -@@ -220,7 +220,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -245,7 +245,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) - dbenv.cleanup(); - dbenv = null; -@@ -503,46 +503,42 @@ - } - %} - --%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); --%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); --%native(deleteRef0) void deleteRef0(jobject ref); -+%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); -+%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); -+%native(deleteRef0) void deleteRef0(jlong ref); - %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); - - %{ --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -554,7 +550,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL ---- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 -+++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 -@@ -1192,40 +1192,36 @@ - } - - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -1237,7 +1233,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,36 +0,0 @@ -*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 ---- btree/bt_rec.c Tue Mar 22 09:42:11 2005 -*************** -*** 222,228 **** - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); ---- 222,228 ---- - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); -*************** -*** 294,300 **** - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; ---- 294,300 ---- - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 ---- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 -*************** -*** 553,560 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } ---- 553,563 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } Copied: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff) =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool (rev 0) +++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 13:16:29 UTC (rev 6644) @@ -0,0 +1,22 @@ +diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh +--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 ++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 +@@ -1298,7 +1298,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1309,9 +1309,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff 2009-10-01 13:16:29 UTC (rev 6644) @@ -1,22 +0,0 @@ -diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh ---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 -+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 -@@ -1298,7 +1298,7 @@ - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-xarch=*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1309,9 +1309,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 16:19:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 14:19:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6645] csw/mgar/pkg/bdb33/trunk Message-ID: Revision: 6645 http://gar.svn.sourceforge.net/gar/?rev=6645&view=rev Author: dmichelsen Date: 2009-10-01 14:19:31 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bdb33: Fix installation Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb33/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 13:16:29 UTC (rev 6644) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 14:19:31 UTC (rev 6645) @@ -29,7 +29,7 @@ PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) -BUILD64 = 1 +#BUILD64 = 1 CONFIGURE_SCRIPTS = dist @@ -74,6 +74,8 @@ LICENSE = LICENSE +INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir + # Leave the docs where they are for now #EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" #EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" Modified: csw/mgar/pkg/bdb33/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 13:16:29 UTC (rev 6644) +++ csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 14:19:31 UTC (rev 6645) @@ -1,4 +1,3 @@ b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1 fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2 -d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool =================================================================== --- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 13:16:29 UTC (rev 6644) +++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 14:19:31 UTC (rev 6645) @@ -1,22 +0,0 @@ -diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh ---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 -+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 -@@ -1298,7 +1298,7 @@ - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-xarch=*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1309,9 +1309,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 18:55:35 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 16:55:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6646] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6646 http://gar.svn.sourceforge.net/gar/?rev=6646&view=rev Author: bonivart Date: 2009-10-01 16:55:33 +0000 (Thu, 01 Oct 2009) Log Message: ----------- pkgutil: split work Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-01 14:19:31 UTC (rev 6645) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-01 16:55:33 UTC (rev 6646) @@ -12,15 +12,15 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -#DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) -DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) +DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +#DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) PACKAGES = CSWpkgutil CSWpkgutilplus SPKG_DESC_CSWpkgutil = $(DESCRIPTION) SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality -REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg +REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg CSWpkgutil PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* @@ -46,6 +46,7 @@ @ginstall -d $(DESTDIR)$(sysconfdir) @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)plus @ginstall -d $(DESTDIR)$(mandir)/man1 # @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @@ -57,6 +58,7 @@ @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ # @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-01 14:19:31 UTC (rev 6645) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-01 16:55:33 UTC (rev 6646) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc download/CSWpkgutil.gspec e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove -4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype +951b11e347d6f3f49cc8617ecab4ad62 download/CSWpkgutil.prototype 11c02a77d18f1fc11f23679b1b06efa8 download/pkgutil-1.7.zip Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-10-01 14:19:31 UTC (rev 6645) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-10-01 16:55:33 UTC (rev 6646) @@ -7,8 +7,6 @@ d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin -f none /opt/csw/bin/bldcat 755 root bin -f none /opt/csw/bin/chkcat 755 root bin d none /opt/csw/etc 0755 root bin f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin @@ -22,8 +20,6 @@ d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin f none /opt/csw/share/man/man1/pkgutil.1 644 root bin -f none /opt/csw/share/man/man1/bldcat.1 644 root bin -f none /opt/csw/share/man/man1/chkcat.1 644 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin f none /var/opt/csw/pkgutil/admin.CSW 644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 20:34:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 18:34:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6647] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6647 http://gar.svn.sourceforge.net/gar/?rev=6647&view=rev Author: dmichelsen Date: 2009-10-01 18:34:10 +0000 (Thu, 01 Oct 2009) Log Message: ----------- cswutils: Adjust binary name Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-01 16:55:33 UTC (rev 6646) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-01 18:34:10 UTC (rev 6647) @@ -66,5 +66,5 @@ $(DESTDIR)$(libdir)/opencsw/compare_pkgs.py @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/opencsw/opencsw_lib.py - @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/csw-pkg-diff + @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 21:24:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 19:24:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6648] csw/mgar/pkg/libpcap/trunk/Makefile Message-ID: Revision: 6648 http://gar.svn.sourceforge.net/gar/?rev=6648&view=rev Author: dmichelsen Date: 2009-10-01 19:24:43 +0000 (Thu, 01 Oct 2009) Log Message: ----------- libpcap: Remove specias ISAs and add link to generic shared lib Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 18:34:10 UTC (rev 6647) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 19:24:43 UTC (rev 6648) @@ -29,8 +29,8 @@ BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis -EXTRA_BUILD_ISAS_i386 = pentium pentium_pro+mmx +EXTRA_BUILD_ISAS_sparc = sparcv8plus +EXTRA_BUILD_ISAS_i386 = pentium TEST_TARGET = check @@ -51,10 +51,12 @@ TEST_SCRIPTS = MERGE_DIRS_isa-sparcv8plus = $(libdir) -MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) MERGE_DIRS_isa-pentium = $(libdir) -MERGE_DIRS_isa-pentium_pro+mmx = $(libdir) PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) include gar/category.mk + +post-install-modulated: + ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 21:25:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 19:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6649] csw/mgar/pkg/libpcap/trunk/Makefile Message-ID: Revision: 6649 http://gar.svn.sourceforge.net/gar/?rev=6649&view=rev Author: dmichelsen Date: 2009-10-01 19:25:35 +0000 (Thu, 01 Oct 2009) Log Message: ----------- libpcap: Add dependency Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 19:24:43 UTC (rev 6648) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-10-01 19:25:35 UTC (rev 6649) @@ -55,6 +55,8 @@ PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) +REQUIRED_PKGS_CSWlibpcapdevel = CSWlibpcap + include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 1 21:37:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Oct 2009 19:37:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6650] csw/mgar/pkg/tcpdump/trunk/Makefile Message-ID: Revision: 6650 http://gar.svn.sourceforge.net/gar/?rev=6650&view=rev Author: dmichelsen Date: 2009-10-01 19:37:14 +0000 (Thu, 01 Oct 2009) Log Message: ----------- tcpdump: Skip versioned tcpdump binary Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2009-10-01 19:25:35 UTC (rev 6649) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2009-10-01 19:37:14 UTC (rev 6650) @@ -19,15 +19,12 @@ SPKG_SOURCEURL = http://www.tcpdump.org/ -# Shared libraries patch -#PATCHFILES = solib.diff - # No test target for libpcap TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 -#INSTALL_OVERRIDE_DIRS = prefix exec_prefix includedir libdir mandir +EXTRA_MERGE_EXCLUDE_FILES = $(sbindir)/tcpdump\..* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 22:58:58 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 20:58:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6651] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 6651 http://gar.svn.sourceforge.net/gar/?rev=6651&view=rev Author: bonivart Date: 2009-10-01 20:58:55 +0000 (Thu, 01 Oct 2009) Log Message: ----------- geolitedb: update db Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2009-10-01 19:37:14 UTC (rev 6650) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2009-10-01 20:58:55 UTC (rev 6651) @@ -1,5 +1,5 @@ GARNAME = geolitedb -GARVERSION = 090422 +GARVERSION = 091001 CATEGORIES = net DESCRIPTION = geolite country database Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2009-10-01 19:37:14 UTC (rev 6650) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2009-10-01 20:58:55 UTC (rev 6651) @@ -1,2 +1,2 @@ -cd8d7820bebbb6f274fa426c12485f9e download/GeoIP.dat.gz ed834df1fb6cb5056f5310b98fc71811 download/COPYING +a8430b5dc9dee5ff81ac3ff1745097c6 download/GeoIP.dat.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 1 23:26:22 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Oct 2009 21:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6652] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 6652 http://gar.svn.sourceforge.net/gar/?rev=6652&view=rev Author: bonivart Date: 2009-10-01 21:26:22 +0000 (Thu, 01 Oct 2009) Log Message: ----------- geoip: update to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 20:58:55 UTC (rev 6651) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2009-10-01 21:26:22 UTC (rev 6652) @@ -11,48 +11,27 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWgeoip CSWgeoipdevel -REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib +REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip CATALOGNAME_CSWgeoip = geoip CATALOGNAME_CSWgeoipdevel = geoip_devel SPKG_DESC_CSWgeoip = $(DESCRIPTION) SPKG_DESC_CSWgeoipdevel = GeoIP C API development support -PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz GARCOMPILER = GCC4 TEST_TARGET = check +PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) + +EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$ + # Do not exclude static libs (needed for devel package) MERGE_EXCLUDE_STATICLIBS = CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw include gar/category.mk - -#pre-configure-modulated: -# @echo " ==> Pre-configure for $(GARNAME) (custom)" -# @( cd $(WORKSRC) ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ; \ -# cd apps ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ; \ -# cd ../libGeoIP ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ; \ -# cd ../test ; \ -# sed 's/-Wall//' Makefile.am > tmp.sed ; \ -# mv tmp.sed Makefile.am ; \ -# sed 's/-Wall//' Makefile.in > tmp.sed ; \ -# mv tmp.sed Makefile.in ) -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 10:30:21 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 08:30:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6653] csw/mgar/pkg Message-ID: Revision: 6653 http://gar.svn.sourceforge.net/gar/?rev=6653&view=rev Author: bonivart Date: 2009-10-02 08:30:19 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: initial commit Added Paths: ----------- csw/mgar/pkg/nicstat/ csw/mgar/pkg/nicstat/branches/ csw/mgar/pkg/nicstat/tags/ csw/mgar/pkg/nicstat/trunk/ csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums csw/mgar/pkg/nicstat/trunk/files/ Property changes on: csw/mgar/pkg/nicstat/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 08:30:19 UTC (rev 6653) @@ -0,0 +1,42 @@ +GARNAME = nicstat +GARVERSION = 1.20 +CATEGORIES = net + +DESCRIPTION = Network monitoring tool +define BLURB + Network monitoring tool +endef + +MASTER_SITES = http://blogs.sun.com/roller/resources/timc/nicstat/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://blogs.sun.com/timc/entry/nicstat_the_solaris_and_linux + +LICENSE = LICENSE.txt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +WORKSRC = $(WORKDIR) + +include gar/category.mk + +build-custom: + @echo " ==> Build $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + cp Makefile.Solaris Makefile ; \ + gmake ) + @$(MAKECOOKIE) + +install-custom: + @echo " ==> Install $(GARNAME) (custom)" + ( cd $(WORKSRC) ; \ + gmake BASEDIR=$(DESTDIR)/opt/csw install ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums (rev 0) +++ csw/mgar/pkg/nicstat/trunk/checksums 2009-10-02 08:30:19 UTC (rev 6653) @@ -0,0 +1 @@ +9cf3090944d01d6ad3c7cc9762207fea download/nicstat-1.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 10:42:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 08:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6654] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6654 http://gar.svn.sourceforge.net/gar/?rev=6654&view=rev Author: dmichelsen Date: 2009-10-02 08:42:18 +0000 (Fri, 02 Oct 2009) Log Message: ----------- cswutils: Relocate lib to /opt/csw/lib/python/opencsw Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 08:30:19 UTC (rev 6653) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 08:42:18 UTC (rev 6654) @@ -61,10 +61,10 @@ @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ - @ginstall -d $(DESTDIR)$(libdir)/opencsw + @ginstall -d $(DESTDIR)$(libdir)/python/opencsw @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/opencsw/compare_pkgs.py + $(DESTDIR)$(libdir)/python/opencsw/compare_pkgs.py @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/opencsw/opencsw_lib.py - @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg + $(DESTDIR)$(libdir)/python/opencsw/opencsw_lib.py + @ln -s ../lib/python/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 11:18:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:18:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6655] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6655 http://gar.svn.sourceforge.net/gar/?rev=6655&view=rev Author: bonivart Date: 2009-10-02 09:18:41 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: some fixes Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 08:42:18 UTC (rev 6654) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 09:18:41 UTC (rev 6655) @@ -26,17 +26,24 @@ WORKSRC = $(WORKDIR) +ifeq ($(shell uname -p), sparc) + MYARCH = -xarch=v8 +else + MYARCH = +endif + include gar/category.mk build-custom: @echo " ==> Build $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ - cp Makefile.Solaris Makefile ; \ + sed "s/CFLAGS =/CFLAGS = $(MYARCH) /" Makefile.Solaris > Makefile ; \ gmake ) @$(MAKECOOKIE) install-custom: @echo " ==> Install $(GARNAME) (custom)" - ( cd $(WORKSRC) ; \ + @( cd $(WORKSRC) ; \ gmake BASEDIR=$(DESTDIR)/opt/csw install ) + @cp $(WORKSRC)/enicstat $(DESTDIR)$(bindir) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:27:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:27:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6656] csw/mgar/pkg/bdb3/trunk Message-ID: Revision: 6656 http://gar.svn.sourceforge.net/gar/?rev=6656&view=rev Author: dmichelsen Date: 2009-10-02 09:27:59 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb3: Make package stub to CSWbdb33 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile csw/mgar/pkg/bdb3/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/bdb3/trunk/files/ Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:18:41 UTC (rev 6655) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:27:59 UTC (rev 6656) @@ -2,7 +2,7 @@ GARVERSION = 3.3.11 CATEGORIES = lib -DESCRIPTION = BerkeleyDB 3 +DESCRIPTION = Stub package as contents moved to CSWbdb33 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -13,40 +13,20 @@ (MSVC 4, 5 and 6). endef -MASTER_SITES = http://download.oracle.com/berkeley-db/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -# See http://www.sleepycat.com/update/4.1.25/patch.4.1.25.html -PATCHFILES = patch.$(GARVERSION).1 patch.$(GARVERSION).2 -PATCHDIRLEVEL = 0 - -LICENSE = LICENSE - PACKAGES = CSWbdb3 CATALOGNAME = berkeleydb3 -CONFIGURE_SCRIPTS = $(WORKSRC)/dist/configure -BUILD_SCRIPTS = $(WORKSRC)/dist/Makefile -INSTALL_SCRIPTS = $(WORKSRC)/dist/Makefile +REQUIRED_PKGS = CSWbdb33 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + TEST_SCRIPTS = -#NODIRPATHS = --prefix -CONFIGURE_ARGS = --prefix $(prefix) $(DIRPATHS) -CONFIGURE_ARGS += --enable-compat185 -CONFIGURE_ARGS += --enable-rpc -CONFIGURE_ARGS += --enable-cxx -CONFIGURE_ARGS += --enable-java -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) - -# The Makefile is too dumb for DESTDIR -INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir docdir - -# Include only the library and nothing else -EXTRA_PAX_ARGS = -s ",^\.\($(libdir)/libdb-3.3.so\)$$,\1," -s ",\..*,," - include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/bdb3/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb3/trunk/checksums 2009-10-02 09:18:41 UTC (rev 6655) +++ csw/mgar/pkg/bdb3/trunk/checksums 2009-10-02 09:27:59 UTC (rev 6656) @@ -1,3 +0,0 @@ -b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz -a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1 -fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:28:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:28:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6657] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 6657 http://gar.svn.sourceforge.net/gar/?rev=6657&view=rev Author: dmichelsen Date: 2009-10-02 09:28:43 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb3: Make stub ARCHALL=1 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:27:59 UTC (rev 6656) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-02 09:28:43 UTC (rev 6657) @@ -16,6 +16,7 @@ PACKAGES = CSWbdb3 CATALOGNAME = berkeleydb3 +ARCHALL = 1 REQUIRED_PKGS = CSWbdb33 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:33:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:33:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6658] csw/mgar/pkg/bdb4 Message-ID: Revision: 6658 http://gar.svn.sourceforge.net/gar/?rev=6658&view=rev Author: dmichelsen Date: 2009-10-02 09:33:12 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb4: Make package a stub to CSWbdb42 Added Paths: ----------- csw/mgar/pkg/bdb4/tags/legacy-4.1.25/ csw/mgar/pkg/bdb4/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bdb4/trunk/Makefile csw/mgar/pkg/bdb4/trunk/legacy/ Deleted: csw/mgar/pkg/bdb4/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile 2009-10-02 09:28:43 UTC (rev 6657) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2009-10-02 09:33:12 UTC (rev 6658) @@ -1,88 +0,0 @@ -GARNAME = db -GARVERSION = 4.2.52 -CATEGORIES = lib - -DESCRIPTION = This is a stub to BerkeleyDB 4.7 libraries from CSWbdb -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - - -REQUIRED_PKGS = CSWbdb - -PACKAGES = CSWbdb4 -CATALOGNAME = berkeleydb4 - -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom-$(GARCH) custom-all -TEST_SCRIPTS = - -ENABLE_CHECK = 0 - -include gar/category.mk - -install-custom-sparc: - ginstall -d $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 - ginstall -d $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s . sparcv8 - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s sparcv9 64 - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.2_g.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_load db_load - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb4/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_verify db_verify - -install-custom-i386: - ginstall -d $(DESTDIR)$(prefix)/bdb4/lib - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s . i386 - -install-custom-all: - ginstall -d $(DESTDIR)$(prefix)/bdb4/lib - ginstall -d $(DESTDIR)$(prefix)/bdb4/bin - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s . 32 - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb-4.so libdb-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.2.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.2_g.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb4/lib && gln -s $(libdir)/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_load db_load - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb4/bin && gln -s $(bindir)/db_verify db_verify Copied: csw/mgar/pkg/bdb4/trunk/Makefile (from rev 6657, csw/mgar/pkg/bdb3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2009-10-02 09:33:12 UTC (rev 6658) @@ -0,0 +1,33 @@ +GARNAME = db +GARVERSION = 4.2.52 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb42 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb4 +CATALOGNAME = berkeleydb4 + +ARCHALL = 1 +REQUIRED_PKGS = CSWbdb42 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(prefix) + ln -s bdb42 $(DESTDIR)$(prefix)/bdb4 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 11:37:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 09:37:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6659] csw/mgar/pkg/bdb/trunk Message-ID: Revision: 6659 http://gar.svn.sourceforge.net/gar/?rev=6659&view=rev Author: dmichelsen Date: 2009-10-02 09:37:43 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb: Make package a stub to CSWbdb47 Added Paths: ----------- csw/mgar/pkg/bdb/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bdb/trunk/Makefile Deleted: csw/mgar/pkg/bdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2009-10-02 09:33:12 UTC (rev 6658) +++ csw/mgar/pkg/bdb/trunk/Makefile 2009-10-02 09:37:43 UTC (rev 6659) @@ -1,90 +0,0 @@ -GARNAME = db -GARVERSION = 4.7.25 -CATEGORIES = lib - -DESCRIPTION = Berkeley DB 4.7 -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -MASTER_SITES = http://download.oracle.com/berkeley-db/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix - -PATCHDIR = $(WORKSRC)/.. -PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) - -BUILD64 = 1 -CONFIGURE_SCRIPTS = dist - -#prefix = $(BUILD_PREFIX)/bdb47 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-compat185 -CONFIGURE_ARGS += --enable-o_direct -CONFIGURE_ARGS += --enable-rpc -CONFIGURE_ARGS += --enable-cxx -CONFIGURE_ARGS += --enable-java - -# Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif - -# bdb tests are *very* time consuming -TEST_SCRIPTS = - -NO_ISAEXEC = 1 - -PACKAGES = CSWbdb CSWbdbdevel CSWbdbdoc - -CATALOGNAME_CSWbdb = berkeleydb -CATALOGNAME_CSWbdbdevel = berkeleydb_devel -CATALOGNAME_CSWbdbdoc = berkeleydb_doc - -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - -ARCHALL_CSWbdbdoc = 1 - -SPKG_DESC_CSWbdb = BerkeleyDB 4.7 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.7 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.7 documentation - -REQUIRED_PKGS_CSWbdbdevel = CSWbdb - -LICENSE = LICENSE - -PKGFILES_CSWbdbdoc = $(PKGFILES_DOC) - -PKGFILES_CSWbdbdevel = $(PKGFILES_DEVEL) - -include gar/category.mk - -LIBS += -lnsl -export LIBS - -PATH := /usr/jdk1.6.0_07/bin:$(PATH) -export PATH - -configure-dist: - @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/bdb/trunk/Makefile (from rev 6657, csw/mgar/pkg/bdb3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb/trunk/Makefile 2009-10-02 09:37:43 UTC (rev 6659) @@ -0,0 +1,34 @@ +GARNAME = db +GARVERSION = 4.7.25 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb47 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb +CATALOGNAME = berkeleydb + +REQUIRED_PKGS = CSWbdb47 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb47/lib/libdb-4.7.so $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) + ln -s ../../bdb47/lib/$(ISA_DEFAULT64)/libdb-4.7.so $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 12:44:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 10:44:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6660] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6660 http://gar.svn.sourceforge.net/gar/?rev=6660&view=rev Author: bonivart Date: 2009-10-02 10:44:37 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: more fixes Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 09:37:43 UTC (rev 6659) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 10:44:37 UTC (rev 6660) @@ -43,7 +43,10 @@ install-custom: @echo " ==> Install $(GARNAME) (custom)" - @( cd $(WORKSRC) ; \ - gmake BASEDIR=$(DESTDIR)/opt/csw install ) + @ginstall -d $(DESTDIR)$(bindir) + @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) @cp $(WORKSRC)/enicstat $(DESTDIR)$(bindir) + @chmod 755 $(DESTDIR)$(bindir)/?nicstat + @ginstall -d $(DESTDIR)$(mandir)/man1 + @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 13:00:33 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 11:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6661] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6661 http://gar.svn.sourceforge.net/gar/?rev=6661&view=rev Author: bonivart Date: 2009-10-02 11:00:27 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: remove enicstat Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 10:44:37 UTC (rev 6660) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 11:00:27 UTC (rev 6661) @@ -45,7 +45,6 @@ @echo " ==> Install $(GARNAME) (custom)" @ginstall -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) - @cp $(WORKSRC)/enicstat $(DESTDIR)$(bindir) @chmod 755 $(DESTDIR)$(bindir)/?nicstat @ginstall -d $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 2 13:04:44 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 02 Oct 2009 11:04:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6662] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 6662 http://gar.svn.sourceforge.net/gar/?rev=6662&view=rev Author: bonivart Date: 2009-10-02 11:04:40 +0000 (Fri, 02 Oct 2009) Log Message: ----------- nicstat: one more fix Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 11:00:27 UTC (rev 6661) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-02 11:04:40 UTC (rev 6662) @@ -45,7 +45,6 @@ @echo " ==> Install $(GARNAME) (custom)" @ginstall -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) - @chmod 755 $(DESTDIR)$(bindir)/?nicstat @ginstall -d $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 2 14:00:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Oct 2009 12:00:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6663] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6663 http://gar.svn.sourceforge.net/gar/?rev=6663&view=rev Author: wahwah Date: 2009-10-02 12:00:32 +0000 (Fri, 02 Oct 2009) Log Message: ----------- puppet: support for pkgutil Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 11:04:40 UTC (rev 6662) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 12:00:32 UTC (rev 6663) @@ -52,6 +52,9 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet +PATCHFILES = 0001-pkgutil-provider.patch +PATCHFILES += 0002-pkgutil-specific-command-line-opts.patch + include gar/category.mk install-puppet: Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 11:04:40 UTC (rev 6662) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 12:00:32 UTC (rev 6663) @@ -1,4 +1,6 @@ -7331526709cf8cbce59421157068c184 download/cswpuppetd -066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd +cbf89ddcce76bfbce3b92aa4599f4e4c download/0001-pkgutil-provider.patch +4bf70f19b9a69bf00590d0e639f4e344 download/0002-pkgutil-specific-command-line-opts.patch +71174fc47265e5c81a0e32366563e5e4 download/cswpuppetd +fd5e49b7d2b7d288d5beb224d0cfa855 download/cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup 288d46dee00acad64d0f3ecc6d8ba6fa download/puppet-0.24.8.tgz Added: csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch 2009-10-02 12:00:32 UTC (rev 6663) @@ -0,0 +1,131 @@ +From e1c96e313d15f21857a2dd098534de374e8f765d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 2 Oct 2009 11:46:59 +0100 +Subject: [PATCH 1/2] pkgutil provider + +--- + lib/puppet/provider/package/pkgutil.rb | 112 ++++++++++++++++++++++++++++++++ + 1 files changed, 112 insertions(+), 0 deletions(-) + create mode 100755 lib/puppet/provider/package/pkgutil.rb + +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +new file mode 100755 +index 0000000..9242cb1 +--- /dev/null ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -0,0 +1,112 @@ ++# Packaging using Blastwave's pkgutil program. ++Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do ++ desc "Package management using ``pkgutil`` command on Solaris." ++ pkgutil = "pkgutil" ++ if FileTest.executable?("/opt/csw/bin/pkgutil") ++ pkgutil = "/opt/csw/bin/pkgutil" ++ end ++ ++ confine :operatingsystem => :solaris ++ ++ commands :pkgutil => pkgutil ++ ++ # This is so stupid, but then, so is blastwave. ++ ENV["PAGER"] = "/usr/bin/cat" ++ ++ def self.extended(mod) ++ unless command(:pkgutil) != "pkgutil" ++ raise Puppet::Error, ++ "The pkgutil command is missing; blastwave packaging unavailable" ++ end ++ end ++ ++ def self.instances(hash = {}) ++ blastlist(hash).collect do |bhash| ++ bhash.delete(:avail) ++ new(bhash) ++ end ++ end ++ ++ # Turn our blastwave listing into a bunch of hashes. ++ def self.blastlist(hash) ++ command = ["-c"] ++ ++ if hash[:justme] ++ command << hash[:justme] ++ end ++ ++ output = pkgutil command ++ ++ list = output.split("\n").collect do |line| ++ next if line =~ /^#/ ++ next if line =~ /^WARNING/ ++ next if line =~ /localrev\s+remoterev/ ++ ++ blastsplit(line) ++ end.reject { |h| h.nil? } ++ ++ if hash[:justme] ++ return list[0] ++ else ++ list.reject! { |h| ++ h[:ensure] == :absent ++ } ++ return list ++ end ++ ++ end ++ ++ # Split the different lines into hashes. ++ def self.blastsplit(line) ++ if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/ ++ hash = {} ++ hash[:name] = $1 ++ hash[:ensure] = if $2 == "[Not installed]" ++ :absent ++ else ++ $2 ++ end ++ hash[:avail] = $5 ++ ++ if hash[:avail] == "SAME" ++ hash[:avail] = hash[:ensure] ++ end ++ ++ # Use the name method, so it works with subclasses. ++ hash[:provider] = self.name ++ ++ return hash ++ else ++ Puppet.warning "Cannot match %s" % line ++ return nil ++ end ++ end ++ ++ def install ++ pkgutil "-y", :install, @resource[:name] ++ end ++ ++ # Retrieve the version from the current package file. ++ def latest ++ hash = self.class.blastlist(:justme => @resource[:name]) ++ hash[:avail] ++ end ++ ++ def query ++ if hash = self.class.blastlist(:justme => @resource[:name]) ++ hash ++ else ++ {:ensure => :absent} ++ end ++ end ++ ++ # Remove the old package, and install the new one ++ def update ++ pkgutil "-y", :upgrade, @resource[:name] ++ end ++ ++ def uninstall ++ pkgutil "-y", :remove, @resource[:name] ++ end ++end ++ +-- +1.6.3.2 + Added: csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch 2009-10-02 12:00:32 UTC (rev 6663) @@ -0,0 +1,39 @@ +From ff82126b6566776f7b988a84c00c7552edde9db1 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 2 Oct 2009 12:27:44 +0100 +Subject: [PATCH 2/2] pkgutil-specific command line opts + +--- + lib/puppet/provider/package/pkgutil.rb | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +index 9242cb1..8d8551b 100755 +--- a/lib/puppet/provider/package/pkgutil.rb ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + end + + def install +- pkgutil "-y", :install, @resource[:name] ++ pkgutil "-y", "--install", @resource[:name] + end + + # Retrieve the version from the current package file. +@@ -102,11 +102,11 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + + # Remove the old package, and install the new one + def update +- pkgutil "-y", :upgrade, @resource[:name] ++ pkgutil "-y", "--upgrade", @resource[:name] + end + + def uninstall +- pkgutil "-y", :remove, @resource[:name] ++ pkgutil "-y", "--remove", @resource[:name] + end + end + +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 2 14:09:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Oct 2009 12:09:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6664] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6664 http://gar.svn.sourceforge.net/gar/?rev=6664&view=rev Author: wahwah Date: 2009-10-02 12:09:39 +0000 (Fri, 02 Oct 2009) Log Message: ----------- puppet: Using one patch instead of two for pkgutil support Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-10-02 12:09:39 UTC (rev 6664) @@ -52,8 +52,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -PATCHFILES = 0001-pkgutil-provider.patch -PATCHFILES += 0002-pkgutil-specific-command-line-opts.patch +PATCHFILES = 0001-pkgutil-support.patch include gar/category.mk Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-10-02 12:09:39 UTC (rev 6664) @@ -1,5 +1,4 @@ -cbf89ddcce76bfbce3b92aa4599f4e4c download/0001-pkgutil-provider.patch -4bf70f19b9a69bf00590d0e639f4e344 download/0002-pkgutil-specific-command-line-opts.patch +abaa404420106f9f28e9e1218b4e365b download/0001-pkgutil-support.patch 71174fc47265e5c81a0e32366563e5e4 download/cswpuppetd fd5e49b7d2b7d288d5beb224d0cfa855 download/cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup Deleted: csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-provider.patch 2009-10-02 12:09:39 UTC (rev 6664) @@ -1,131 +0,0 @@ -From e1c96e313d15f21857a2dd098534de374e8f765d Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Fri, 2 Oct 2009 11:46:59 +0100 -Subject: [PATCH 1/2] pkgutil provider - ---- - lib/puppet/provider/package/pkgutil.rb | 112 ++++++++++++++++++++++++++++++++ - 1 files changed, 112 insertions(+), 0 deletions(-) - create mode 100755 lib/puppet/provider/package/pkgutil.rb - -diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb -new file mode 100755 -index 0000000..9242cb1 ---- /dev/null -+++ b/lib/puppet/provider/package/pkgutil.rb -@@ -0,0 +1,112 @@ -+# Packaging using Blastwave's pkgutil program. -+Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do -+ desc "Package management using ``pkgutil`` command on Solaris." -+ pkgutil = "pkgutil" -+ if FileTest.executable?("/opt/csw/bin/pkgutil") -+ pkgutil = "/opt/csw/bin/pkgutil" -+ end -+ -+ confine :operatingsystem => :solaris -+ -+ commands :pkgutil => pkgutil -+ -+ # This is so stupid, but then, so is blastwave. -+ ENV["PAGER"] = "/usr/bin/cat" -+ -+ def self.extended(mod) -+ unless command(:pkgutil) != "pkgutil" -+ raise Puppet::Error, -+ "The pkgutil command is missing; blastwave packaging unavailable" -+ end -+ end -+ -+ def self.instances(hash = {}) -+ blastlist(hash).collect do |bhash| -+ bhash.delete(:avail) -+ new(bhash) -+ end -+ end -+ -+ # Turn our blastwave listing into a bunch of hashes. -+ def self.blastlist(hash) -+ command = ["-c"] -+ -+ if hash[:justme] -+ command << hash[:justme] -+ end -+ -+ output = pkgutil command -+ -+ list = output.split("\n").collect do |line| -+ next if line =~ /^#/ -+ next if line =~ /^WARNING/ -+ next if line =~ /localrev\s+remoterev/ -+ -+ blastsplit(line) -+ end.reject { |h| h.nil? } -+ -+ if hash[:justme] -+ return list[0] -+ else -+ list.reject! { |h| -+ h[:ensure] == :absent -+ } -+ return list -+ end -+ -+ end -+ -+ # Split the different lines into hashes. -+ def self.blastsplit(line) -+ if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/ -+ hash = {} -+ hash[:name] = $1 -+ hash[:ensure] = if $2 == "[Not installed]" -+ :absent -+ else -+ $2 -+ end -+ hash[:avail] = $5 -+ -+ if hash[:avail] == "SAME" -+ hash[:avail] = hash[:ensure] -+ end -+ -+ # Use the name method, so it works with subclasses. -+ hash[:provider] = self.name -+ -+ return hash -+ else -+ Puppet.warning "Cannot match %s" % line -+ return nil -+ end -+ end -+ -+ def install -+ pkgutil "-y", :install, @resource[:name] -+ end -+ -+ # Retrieve the version from the current package file. -+ def latest -+ hash = self.class.blastlist(:justme => @resource[:name]) -+ hash[:avail] -+ end -+ -+ def query -+ if hash = self.class.blastlist(:justme => @resource[:name]) -+ hash -+ else -+ {:ensure => :absent} -+ end -+ end -+ -+ # Remove the old package, and install the new one -+ def update -+ pkgutil "-y", :upgrade, @resource[:name] -+ end -+ -+ def uninstall -+ pkgutil "-y", :remove, @resource[:name] -+ end -+end -+ --- -1.6.3.2 - Deleted: csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch 2009-10-02 12:00:32 UTC (rev 6663) +++ csw/mgar/pkg/puppet/trunk/files/0002-pkgutil-specific-command-line-opts.patch 2009-10-02 12:09:39 UTC (rev 6664) @@ -1,39 +0,0 @@ -From ff82126b6566776f7b988a84c00c7552edde9db1 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Fri, 2 Oct 2009 12:27:44 +0100 -Subject: [PATCH 2/2] pkgutil-specific command line opts - ---- - lib/puppet/provider/package/pkgutil.rb | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb -index 9242cb1..8d8551b 100755 ---- a/lib/puppet/provider/package/pkgutil.rb -+++ b/lib/puppet/provider/package/pkgutil.rb -@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d - end - - def install -- pkgutil "-y", :install, @resource[:name] -+ pkgutil "-y", "--install", @resource[:name] - end - - # Retrieve the version from the current package file. -@@ -102,11 +102,11 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d - - # Remove the old package, and install the new one - def update -- pkgutil "-y", :upgrade, @resource[:name] -+ pkgutil "-y", "--upgrade", @resource[:name] - end - - def uninstall -- pkgutil "-y", :remove, @resource[:name] -+ pkgutil "-y", "--remove", @resource[:name] - end - end - --- -1.6.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 2 14:10:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Oct 2009 12:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6665] csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support .patch Message-ID: Revision: 6665 http://gar.svn.sourceforge.net/gar/?rev=6665&view=rev Author: wahwah Date: 2009-10-02 12:10:14 +0000 (Fri, 02 Oct 2009) Log Message: ----------- puppet: Adding the pkgutil support patch Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch Added: csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0001-pkgutil-support.patch 2009-10-02 12:10:14 UTC (rev 6665) @@ -0,0 +1,130 @@ +From a910ce5c5ea0b626fc6676254d8fc00bd0b7325a Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 2 Oct 2009 13:08:19 +0100 +Subject: [PATCH] pkgutil support + +--- + lib/puppet/provider/package/pkgutil.rb | 111 ++++++++++++++++++++++++++++++++ + 1 files changed, 111 insertions(+), 0 deletions(-) + create mode 100755 lib/puppet/provider/package/pkgutil.rb + +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +new file mode 100755 +index 0000000..cde7482 +--- /dev/null ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -0,0 +1,111 @@ ++# Packaging using pkgutil from http://pkgutil.wikidot.com/ ++Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do ++ desc "Package management using ``pkgutil`` command on Solaris." ++ pkgutil = "pkgutil" ++ if FileTest.executable?("/opt/csw/bin/pkgutil") ++ pkgutil = "/opt/csw/bin/pkgutil" ++ end ++ ++ confine :operatingsystem => :solaris ++ ++ commands :pkgutil => pkgutil ++ ++ # This is so stupid, but then, so is Solaris. ++ ENV["PAGER"] = "/usr/bin/cat" ++ ++ def self.extended(mod) ++ unless command(:pkgutil) != "pkgutil" ++ raise Puppet::Error, ++ "The pkgutil command is missing; pkgutil packaging unavailable" ++ end ++ end ++ ++ def self.instances(hash = {}) ++ blastlist(hash).collect do |bhash| ++ bhash.delete(:avail) ++ new(bhash) ++ end ++ end ++ ++ # Turn our pkgutil listing into a bunch of hashes. ++ def self.blastlist(hash) ++ command = ["-c"] ++ ++ if hash[:justme] ++ command << hash[:justme] ++ end ++ ++ output = pkgutil command ++ ++ list = output.split("\n").collect do |line| ++ next if line =~ /^#/ ++ next if line =~ /^WARNING/ ++ next if line =~ /localrev\s+remoterev/ ++ ++ blastsplit(line) ++ end.reject { |h| h.nil? } ++ ++ if hash[:justme] ++ return list[0] ++ else ++ list.reject! { |h| ++ h[:ensure] == :absent ++ } ++ return list ++ end ++ ++ end ++ ++ # Split the different lines into hashes. ++ def self.blastsplit(line) ++ if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/ ++ hash = {} ++ hash[:name] = $1 ++ hash[:ensure] = if $2 == "[Not installed]" ++ :absent ++ else ++ $2 ++ end ++ hash[:avail] = $5 ++ ++ if hash[:avail] == "SAME" ++ hash[:avail] = hash[:ensure] ++ end ++ ++ # Use the name method, so it works with subclasses. ++ hash[:provider] = self.name ++ ++ return hash ++ else ++ Puppet.warning "Cannot match %s" % line ++ return nil ++ end ++ end ++ ++ def install ++ pkgutil "-y", "--install", @resource[:name] ++ end ++ ++ # Retrieve the version from the current package file. ++ def latest ++ hash = self.class.blastlist(:justme => @resource[:name]) ++ hash[:avail] ++ end ++ ++ def query ++ if hash = self.class.blastlist(:justme => @resource[:name]) ++ hash ++ else ++ {:ensure => :absent} ++ end ++ end ++ ++ # Remove the old package, and install the new one ++ def update ++ pkgutil "-y", "--upgrade", @resource[:name] ++ end ++ ++ def uninstall ++ pkgutil "-y", "--remove", @resource[:name] ++ end ++end +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:31:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:31:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6666] csw/mgar/pkg/bdb33/trunk/Makefile Message-ID: Revision: 6666 http://gar.svn.sourceforge.net/gar/?rev=6666&view=rev Author: dmichelsen Date: 2009-10-02 15:31:58 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb33: Relocate docs and add revision Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 12:10:14 UTC (rev 6665) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:31:58 UTC (rev 6666) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 3.3.11 +RELEASE = p2 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -76,12 +77,11 @@ INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir -# Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p" +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb33),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -#PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb33-doc = $(prefix)/docs/.* +PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL) @@ -101,3 +101,6 @@ gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:34:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:34:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6667] csw/mgar/pkg/bdb42/trunk/Makefile Message-ID: Revision: 6667 http://gar.svn.sourceforge.net/gar/?rev=6667&view=rev Author: dmichelsen Date: 2009-10-02 15:34:51 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb42: Relocate docs and add revision Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/Makefile Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 15:31:58 UTC (rev 6666) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 15:34:51 UTC (rev 6667) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 4.2.52 +RELEASE = p5 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -30,6 +31,7 @@ PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -55,8 +57,6 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc CATALOGNAME_CSWbdb42 = berkeleydb42 @@ -74,12 +74,11 @@ LICENSE = LICENSE -# Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb42),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb42-doc = $(prefix)/docs/.* +PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) @@ -99,3 +98,6 @@ gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:38:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:38:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6668] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6668 http://gar.svn.sourceforge.net/gar/?rev=6668&view=rev Author: dmichelsen Date: 2009-10-02 15:38:00 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb43: Relocate docs and add revision Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 15:34:51 UTC (rev 6667) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 15:38:00 UTC (rev 6668) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 4.3.29 +RELEASE = p1 CATEGORIES = lib DESCRIPTION = BerkeleyDB 4.3 libraries and utilities @@ -70,8 +71,11 @@ # bdb tests are time consuming TEST_SCRIPTS = -PKGFILES_CSWbdb43-doc = $(prefix)/docs/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb43-doc = $(PKGFILES_DOC) PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +90,5 @@ ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 17:46:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 15:46:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6669] csw/mgar/pkg/bdb33/trunk/Makefile Message-ID: Revision: 6669 http://gar.svn.sourceforge.net/gar/?rev=6669&view=rev Author: dmichelsen Date: 2009-10-02 15:46:53 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb33: Reorder Makefile Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:38:00 UTC (rev 6668) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) @@ -1,6 +1,5 @@ GARNAME = db GARVERSION = 3.3.11 -RELEASE = p2 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -17,20 +16,18 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) #BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -56,22 +53,22 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +PACKAGES = CSWbdb33 CSWbdb33devel CSWbdb33doc -PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc +CATALOGNAME_CSWbdb33 = berkeleydb33 +CATALOGNAME_CSWbdb33devel = berkeleydb33_devel +CATALOGNAME_CSWbdb33doc = berkeleydb33_doc -CATALOGNAME_CSWbdb33 = berkeleydb33 -CATALOGNAME_CSWbdb33-devel = berkeleydb33_devel -CATALOGNAME_CSWbdb33-doc = berkeleydb33_doc +ARCHALL_CSWbdb33doc = 1 -ARCHALL_CSWbdb33-doc = 1 +SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities +SPKG_DESC_CSWbdb33devel = BerkeleyDB 3.3 development support +SPKG_DESC_CSWbdb33doc = BerkeleyDB 3.3 documentation -SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities -SPKG_DESC_CSWbdb33-devel = BerkeleyDB 3.3 development support -SPKG_DESC_CSWbdb33-doc = BerkeleyDB 3.3 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb33-devel = CSWbdb33 -INCOMPATIBLE_PKGS_CSWbdb33-doc = CSWbdb33doc +REQUIRED_PKGS_CSWbdb33devel = CSWbdb33 +INCOMPATIBLE_PKGS_CSWbdb33doc = CSWbdb33doc LICENSE = LICENSE @@ -81,10 +78,9 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb33doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb33devel = $(PKGFILES_DEVEL) -PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 18:09:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 16:09:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6670] csw/mgar/pkg Message-ID: Revision: 6670 http://gar.svn.sourceforge.net/gar/?rev=6670&view=rev Author: dmichelsen Date: 2009-10-02 16:09:10 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb*: Homogenize Makefiles Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb48/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool Removed Paths: ------------- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -68,7 +68,6 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html REQUIRED_PKGS_CSWbdb33devel = CSWbdb33 -INCOMPATIBLE_PKGS_CSWbdb33doc = CSWbdb33doc LICENSE = LICENSE Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,6 +1,5 @@ GARNAME = db GARVERSION = 4.2.52 -RELEASE = p5 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -17,18 +16,15 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 NO_ISAEXEC = 1 @@ -57,31 +53,31 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc +PACKAGES = CSWbdb42 CSWbdb42devel CSWbdb42doc -CATALOGNAME_CSWbdb42 = berkeleydb42 -CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel -CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc +CATALOGNAME_CSWbdb42 = berkeleydb42 +CATALOGNAME_CSWbdb42devel = berkeleydb42_devel +CATALOGNAME_CSWbdb42doc = berkeleydb42_doc -ARCHALL_CSWbdb42-doc = 1 +ARCHALL_CSWbdb42doc = 1 -SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities -SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support -SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation +SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities +SPKG_DESC_CSWbdb42devel = BerkeleyDB 4.2 development support +SPKG_DESC_CSWbdb42doc = BerkeleyDB 4.2 documentation -REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42 -INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html +REQUIRED_PKGS_CSWbdb42devel = CSWbdb42 + LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb42),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb42doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb42devel = $(PKGFILES_DEVEL) -PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,36 @@ +*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 +--- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 +*************** +*** 440,446 **** + c_mp->stat.st_pages--; + alloc_bhp = NULL; + R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); +- MUTEX_LOCK(dbenv, &hp->hash_mutex); + + /* + * We can't use the page we found in the pool if DB_MPOOL_NEW +--- 440,445 ---- +*************** +*** 455,460 **** +--- 454,462 ---- + b_incr = 0; + goto alloc; + } ++ ++ /* We can use the page -- get the bucket lock. */ ++ MUTEX_LOCK(dbenv, &hp->hash_mutex); + break; + case SECOND_MISS: + /* +*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 +--- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 +*************** +*** 285,290 **** +--- 285,291 ---- + bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) + if (bhp->priority != UINT32_T_MAX && + bhp->priority > MPOOL_BASE_DECREMENT) ++ bhp->priority -= MPOOL_BASE_DECREMENT; + MUTEX_UNLOCK(dbenv, &hp->hash_mutex); + } + } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,36 +0,0 @@ -*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 ---- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 -*************** -*** 440,446 **** - c_mp->stat.st_pages--; - alloc_bhp = NULL; - R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); -- MUTEX_LOCK(dbenv, &hp->hash_mutex); - - /* - * We can't use the page we found in the pool if DB_MPOOL_NEW ---- 440,445 ---- -*************** -*** 455,460 **** ---- 454,462 ---- - b_incr = 0; - goto alloc; - } -+ -+ /* We can use the page -- get the bucket lock. */ -+ MUTEX_LOCK(dbenv, &hp->hash_mutex); - break; - case SECOND_MISS: - /* -*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 ---- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 -*************** -*** 285,290 **** ---- 285,291 ---- - bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) - if (bhp->priority != UINT32_T_MAX && - bhp->priority > MPOOL_BASE_DECREMENT) -+ bhp->priority -= MPOOL_BASE_DECREMENT; - MUTEX_UNLOCK(dbenv, &hp->hash_mutex); - } - } Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,45 @@ +*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 +--- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 +*************** +*** 2216,2226 **** + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, obj->data, obj->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN(obj->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +--- 2216,2227 ---- + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, \ +! (obj)->data, (obj)->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN((obj)->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +*************** +*** 2339,2345 **** + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, obj); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; +--- 2340,2346 ---- + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, &obj[i]); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,45 +0,0 @@ -*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 ---- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 -*************** -*** 2216,2226 **** - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, obj->data, obj->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN(obj->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ ---- 2216,2227 ---- - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, \ -! (obj)->data, (obj)->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN((obj)->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ -*************** -*** 2339,2345 **** - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, obj); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; ---- 2340,2346 ---- - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, &obj[i]); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,247 @@ +--- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 ++++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 +@@ -61,7 +61,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -94,7 +94,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + +--- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 ++++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 +@@ -57,7 +57,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -84,7 +84,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) { + dbenv.cleanup(); + } +--- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 ++++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 +@@ -14,15 +14,15 @@ + db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); + } + +- static Object initDbEnvRef0(DbEnv self, Object handle) { ++ static long initDbEnvRef0(DbEnv self, Object handle) { + return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); + } + +- static Object initDbRef0(Db self, Object handle) { ++ static long initDbRef0(Db self, Object handle) { + return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); + } + +- static void deleteRef0(Object ref) { ++ static void deleteRef0(long ref) { + db_javaJNI.deleteRef0(ref); + } + +--- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 ++++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 +@@ -45,9 +45,9 @@ + static native final void initialize(); + + public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; +- final static native Object initDbEnvRef0(long jarg1, Object jarg2); +- final static native Object initDbRef0(long jarg1, Object jarg2); +- final static native void deleteRef0(Object jarg1); ++ final static native long initDbEnvRef0(long jarg1, Object jarg2); ++ final static native long initDbRef0(long jarg1, Object jarg2); ++ final static native void deleteRef0(long jarg1); + final static native long getDbEnv0(long jarg1); + public final static native long new_Db(long jarg1, int jarg2) throws DbException; + public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; +--- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 ++++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 +@@ -53,7 +53,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -76,7 +76,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + public synchronized void close(int flags) throws DbException { +@@ -220,7 +220,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -245,7 +245,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) + dbenv.cleanup(); + dbenv = null; +@@ -503,46 +503,42 @@ + } + %} + +-%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); +-%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); +-%native(deleteRef0) void deleteRef0(jobject ref); ++%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); ++%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); ++%native(deleteRef0) void deleteRef0(jlong ref); + %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); + + %{ +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -554,7 +550,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL +--- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 ++++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 +@@ -1192,40 +1192,36 @@ + } + + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -1237,7 +1233,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,247 +0,0 @@ ---- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 -+++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 -@@ -61,7 +61,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -94,7 +94,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - ---- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 -+++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 -@@ -57,7 +57,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -84,7 +84,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) { - dbenv.cleanup(); - } ---- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 -+++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 -@@ -14,15 +14,15 @@ - db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); - } - -- static Object initDbEnvRef0(DbEnv self, Object handle) { -+ static long initDbEnvRef0(DbEnv self, Object handle) { - return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); - } - -- static Object initDbRef0(Db self, Object handle) { -+ static long initDbRef0(Db self, Object handle) { - return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); - } - -- static void deleteRef0(Object ref) { -+ static void deleteRef0(long ref) { - db_javaJNI.deleteRef0(ref); - } - ---- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 -+++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 -@@ -45,9 +45,9 @@ - static native final void initialize(); - - public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; -- final static native Object initDbEnvRef0(long jarg1, Object jarg2); -- final static native Object initDbRef0(long jarg1, Object jarg2); -- final static native void deleteRef0(Object jarg1); -+ final static native long initDbEnvRef0(long jarg1, Object jarg2); -+ final static native long initDbRef0(long jarg1, Object jarg2); -+ final static native void deleteRef0(long jarg1); - final static native long getDbEnv0(long jarg1); - public final static native long new_Db(long jarg1, int jarg2) throws DbException; - public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; ---- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 -+++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 -@@ -53,7 +53,7 @@ - // Internally, the JNI layer creates a global reference to each DbEnv, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object dbenv_ref; -+ private long dbenv_ref; - private DbAppDispatch app_dispatch_handler; - private DbEnvFeedbackHandler env_feedback_handler; - private DbErrorHandler error_handler; -@@ -76,7 +76,7 @@ - void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(dbenv_ref); -- dbenv_ref = null; -+ dbenv_ref = 0L; - } - - public synchronized void close(int flags) throws DbException { -@@ -220,7 +220,7 @@ - // Internally, the JNI layer creates a global reference to each Db, - // which can potentially be different to this. We keep a copy here so - // we can clean up after destructors. -- private Object db_ref; -+ private long db_ref; - private DbEnv dbenv; - private boolean private_dbenv; - private DbAppendRecno append_recno_handler; -@@ -245,7 +245,7 @@ - private void cleanup() { - swigCPtr = 0; - db_java.deleteRef0(db_ref); -- db_ref = null; -+ db_ref = 0L; - if (private_dbenv) - dbenv.cleanup(); - dbenv = null; -@@ -503,46 +503,42 @@ - } - %} - --%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); --%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); --%native(deleteRef0) void deleteRef0(jobject ref); -+%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); -+%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); -+%native(deleteRef0) void deleteRef0(jlong ref); - %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); - - %{ --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -554,7 +550,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL ---- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 -+++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 -@@ -1192,40 +1192,36 @@ - } - - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB_ENV *self = *(DB_ENV **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); - self->set_errpfx(self, (const char*)self); -- return (jobject)DB_ENV_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); -+ return (ret); - } - --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( -+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { - DB *self = *(DB **)&jarg1; -+ jlong ret; - COMPQUIET(jcls, NULL); - - DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); -- return (jobject)DB_INTERNAL(self); -+ *(jobject *)&ret = (jobject)DB_INTERNAL(self); -+ return (ret); - } - - JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( -- JNIEnv *jenv, jclass jcls, jobject jref) { -- COMPQUIET(jcls, NULL); -- -- if (jref != NULL) -- (*jenv)->DeleteGlobalRef(jenv, jref); --} -- --JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( - JNIEnv *jenv, jclass jcls, jlong jarg1) { -- DB *self = *(DB **)&jarg1; -+ jobject jref = *(jobject *)&jarg1; - COMPQUIET(jcls, NULL); -- COMPQUIET(jenv, NULL); - -- return (jobject)DB_INTERNAL(self); -+ if (jref != 0L) -+ (*jenv)->DeleteGlobalRef(jenv, jref); - } - - JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( -@@ -1237,7 +1233,7 @@ - COMPQUIET(jcls, NULL); - - *(DB_ENV **)&env_cptr = self->dbenv; -- return env_cptr; -+ return (env_cptr); - } - - JNIEXPORT jboolean JNICALL Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,36 @@ +*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 +--- btree/bt_rec.c Tue Mar 22 09:42:11 2005 +*************** +*** 222,228 **** + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +--- 222,228 ---- + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +*************** +*** 294,300 **** + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; +--- 294,300 ---- + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,36 +0,0 @@ -*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 ---- btree/bt_rec.c Tue Mar 22 09:42:11 2005 -*************** -*** 222,228 **** - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); ---- 222,228 ---- - * previous-page pointer updated to our new page. The next - * page must exist because we're redoing the operation. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - ret = __db_pgerr(file_dbp, argp->npgno, ret); -*************** -*** 294,300 **** - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; ---- 294,300 ---- - * possible that the next-page never existed, we ignore it as - * if there's nothing to undo. - */ -! if (!rootsplit && argp->npgno != PGNO_INVALID) { - if ((ret = - __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { - np = NULL; Copied: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,24 @@ +*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 +--- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 +*************** +*** 553,560 **** + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } +--- 553,563 ---- + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != +! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); +! } + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 ---- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 -*************** -*** 553,560 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } ---- 553,563 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } Copied: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff) =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,22 @@ +diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh +--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 ++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 +@@ -1298,7 +1298,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1309,9 +1309,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,22 +0,0 @@ -diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh ---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 -+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 -@@ -1298,7 +1298,7 @@ - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-xarch=*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1309,9 +1309,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,6 +1,5 @@ GARNAME = db GARVERSION = 4.3.29 -RELEASE = p1 CATEGORIES = lib DESCRIPTION = BerkeleyDB 4.3 libraries and utilities @@ -20,32 +19,13 @@ PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix -PACKAGES = CSWbdb43 CSWbdb43-devel CSWbdb43-doc - -CATALOGNAME_CSWbdb43 = berkeleydb43 -CATALOGNAME_CSWbdb43-devel = berkeleydb43_devel -CATALOGNAME_CSWbdb43-doc = berkeleydb43_doc - -SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 -SPKG_DESC_CSWbdb43-devel = BerkeleyDB 4.3 development support -SPKG_DESC_CSWbdb43-doc = BerkeleyDB 4.3 documentation - -SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html - -REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 - -INCOMPATIBLE_PKGS_CSWbdb43-doc = CSWbdb43doc - -LICENSE = LICENSE - -ARCHALL_CSWbdb43-doc = 1 - BUILD64 = 1 NO_ISAEXEC = 1 @@ -71,12 +51,30 @@ # bdb tests are time consuming TEST_SCRIPTS = +PACKAGES = CSWbdb43 CSWbdb43devel CSWbdb43doc + +CATALOGNAME_CSWbdb43 = berkeleydb43 +CATALOGNAME_CSWbdb43devel = berkeleydb43_devel +CATALOGNAME_CSWbdb43doc = berkeleydb43_doc + +ARCHALL_CSWbdb43doc = 1 + +SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 +SPKG_DESC_CSWbdb43devel = BerkeleyDB 4.3 development support +SPKG_DESC_CSWbdb43doc = BerkeleyDB 4.3 documentation + +SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html + +REQUIRED_PKGS_CSWbdb43devel = CSWbdb43 + +LICENSE = LICENSE + EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb43-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb43doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -90,5 +88,10 @@ ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -16,20 +16,18 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 -PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -55,34 +53,31 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +PACKAGES = CSWbdb44 CSWbdb44devel CSWbdb44doc -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc +CATALOGNAME_CSWbdb44 = berkeleydb44 +CATALOGNAME_CSWbdb44devel = berkeleydb44_devel +CATALOGNAME_CSWbdb44doc = berkeleydb44_doc -CATALOGNAME_CSWbdb44 = berkeleydb44 -CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel -CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc +ARCHALL_CSWbdb44doc = 1 -ARCHALL_CSWbdb44-doc = 1 +SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities +SPKG_DESC_CSWbdb44devel = BerkeleyDB 4.4 development support +SPKG_DESC_CSWbdb44doc = BerkeleyDB 4.4 documentation -SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities -SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support -SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 -INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc +REQUIRED_PKGS_CSWbdb44devel = CSWbdb44 LICENSE = LICENSE -# Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb44),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb44-doc = $(prefix)/docs/.* +PKGFILES_CSWbdb44doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL) -PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl @@ -99,3 +94,6 @@ gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,27 @@ +*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 +--- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 +*************** +*** 411,416 **** +--- 411,422 ---- + DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) + goto err; + #endif ++ ++ mpf = array->mpfarray[offset].mpf; ++ /* This extent my already be marked for delete and closed. */ ++ if (mpf == NULL) ++ goto err; ++ + /* + * The log must be flushed before the file is deleted. We depend on + * the log record of the last delete to recreate the file if we crash. +*************** +*** 418,424 **** + if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) + goto err; + +- mpf = array->mpfarray[offset].mpf; + (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); + /* Someone could be real slow, let them close it down. */ + if (array->mpfarray[offset].pinref != 0) +--- 424,429 ---- Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,27 +0,0 @@ -*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 ---- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 -*************** -*** 411,416 **** ---- 411,422 ---- - DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) - goto err; - #endif -+ -+ mpf = array->mpfarray[offset].mpf; -+ /* This extent my already be marked for delete and closed. */ -+ if (mpf == NULL) -+ goto err; -+ - /* - * The log must be flushed before the file is deleted. We depend on - * the log record of the last delete to recreate the file if we crash. -*************** -*** 418,424 **** - if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) - goto err; - -- mpf = array->mpfarray[offset].mpf; - (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); - /* Someone could be real slow, let them close it down. */ - if (array->mpfarray[offset].pinref != 0) ---- 424,429 ---- Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,29 @@ +*** txn/txn.c.orig Tue Nov 1 06:50:03 2005 +--- txn/txn.c Tue Jan 31 15:05:13 2006 +*************** +*** 1049,1060 **** +--- 1049,1062 ---- + return (ret); + memcpy(txn->name, name, len); + ++ TXN_SYSTEM_LOCK(dbenv); + if (td->name != INVALID_ROFF) { + __db_shalloc_free( + &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); + td->name = INVALID_ROFF; + } + if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { ++ TXN_SYSTEM_UNLOCK(dbenv); + __db_err(dbenv, + "Unable to allocate memory for transaction name"); + +*************** +*** 1063,1068 **** +--- 1065,1071 ---- + + return (ret); + } ++ TXN_SYSTEM_UNLOCK(dbenv); + td->name = R_OFFSET(&mgr->reginfo, p); + memcpy(p, name, len); + Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,29 +0,0 @@ -*** txn/txn.c.orig Tue Nov 1 06:50:03 2005 ---- txn/txn.c Tue Jan 31 15:05:13 2006 -*************** -*** 1049,1060 **** ---- 1049,1062 ---- - return (ret); - memcpy(txn->name, name, len); - -+ TXN_SYSTEM_LOCK(dbenv); - if (td->name != INVALID_ROFF) { - __db_shalloc_free( - &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); - td->name = INVALID_ROFF; - } - if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { -+ TXN_SYSTEM_UNLOCK(dbenv); - __db_err(dbenv, - "Unable to allocate memory for transaction name"); - -*************** -*** 1063,1068 **** ---- 1065,1071 ---- - - return (ret); - } -+ TXN_SYSTEM_UNLOCK(dbenv); - td->name = R_OFFSET(&mgr->reginfo, p); - memcpy(p, name, len); - Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,49 @@ +*** db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 +--- db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 +*************** +*** 579,589 **** + flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { + if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) + return (ret); +! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) + return (ret); + +! switch (ret = +! opd->c_am_get(opd, key, data, flags, NULL)) { + case 0: + goto done; + case DB_NOTFOUND: +--- 579,590 ---- + flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { + if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) + return (ret); +! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) +! opd = cp->opd; +! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) + return (ret); + +! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { + case 0: + goto done; + case DB_NOTFOUND: +*************** +*** 596,607 **** +--- 597,614 ---- + if ((ret = __db_c_close(opd)) != 0) + goto err; + opd = NULL; ++ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) ++ cp->opd = NULL; + break; + } + goto err; + default: + goto err; + } ++ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { ++ if ((ret = __db_c_close(cp->opd)) != 0) ++ goto err; ++ cp->opd = NULL; + } + + /* Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,49 +0,0 @@ -*** db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 ---- db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 -*************** -*** 579,589 **** - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = -! opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: ---- 579,590 ---- - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -! opd = cp->opd; -! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: -*************** -*** 596,607 **** ---- 597,614 ---- - if ((ret = __db_c_close(opd)) != 0) - goto err; - opd = NULL; -+ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -+ cp->opd = NULL; - break; - } - goto err; - default: - goto err; - } -+ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { -+ if ((ret = __db_c_close(cp->opd)) != 0) -+ goto err; -+ cp->opd = NULL; - } - - /* Copied: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,24 @@ +*** mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 +--- mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 +*************** +*** 587,594 **** + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_MAX; +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); + hp->hash_priority = + SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; + } +--- 587,597 ---- + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_MAX; +! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != +! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); +! } + hp->hash_priority = + SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; + } Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 ---- mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 -*************** -*** 587,594 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } ---- 587,597 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } Deleted: csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff 2009-10-02 16:09:10 UTC (rev 6670) @@ -1,13 +0,0 @@ -diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh ---- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 -+++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 -@@ -1552,9 +1552,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Copied: csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff) =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool (rev 0) +++ csw/mgar/pkg/bdb44/trunk/files/patch.64bit-libtool 2009-10-02 16:09:10 UTC (rev 6670) @@ -0,0 +1,13 @@ +diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh +--- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 ++++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 +@@ -1552,9 +1552,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,18 +19,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb45 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -45,34 +48,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb45 CSWbdb45devel CSWbdb45doc CATALOGNAME_CSWbdb45 = berkeleydb45 CATALOGNAME_CSWbdb45devel = berkeleydb45_devel CATALOGNAME_CSWbdb45doc = berkeleydb45_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb45doc = 1 SPKG_DESC_CSWbdb45 = BerkeleyDB 4.5 embedded database libraries and utilities SPKG_DESC_CSWbdb45devel = BerkeleyDB 4.5 development support SPKG_DESC_CSWbdb45doc = BerkeleyDB 4.5 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb45devel = CSWbdb45 LICENSE = LICENSE -PKGFILES_CSWbdb45doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb45doc = $(PKGFILES_DOC) PKGFILES_CSWbdb45devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +84,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,18 +19,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb46 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -45,34 +48,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb46 CSWbdb46devel CSWbdb46doc CATALOGNAME_CSWbdb46 = berkeleydb46 CATALOGNAME_CSWbdb46devel = berkeleydb46_devel CATALOGNAME_CSWbdb46doc = berkeleydb46_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb46doc = 1 SPKG_DESC_CSWbdb46 = BerkeleyDB 4.6 embedded database libraries and utilities SPKG_DESC_CSWbdb46devel = BerkeleyDB 4.6 development support SPKG_DESC_CSWbdb46doc = BerkeleyDB 4.6 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb46devel = CSWbdb46 LICENSE = LICENSE -PKGFILES_CSWbdb46doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb46doc = $(PKGFILES_DOC) PKGFILES_CSWbdb46devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +84,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,8 +19,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. @@ -28,9 +26,13 @@ PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb47 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -45,34 +47,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb47 CSWbdb47devel CSWbdb47doc CATALOGNAME_CSWbdb47 = berkeleydb47 CATALOGNAME_CSWbdb47devel = berkeleydb47_devel CATALOGNAME_CSWbdb47doc = berkeleydb47_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb47doc = 1 SPKG_DESC_CSWbdb47 = BerkeleyDB 4.7 embedded database libraries and utilities SPKG_DESC_CSWbdb47devel = BerkeleyDB 4.7 development support SPKG_DESC_CSWbdb47doc = BerkeleyDB 4.7 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb47devel = CSWbdb47 LICENSE = LICENSE -PKGFILES_CSWbdb47doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -86,3 +83,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-02 15:46:53 UTC (rev 6669) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) @@ -19,18 +19,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb48 +docdir = $(BUILD_PREFIX)/share/doc + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -46,34 +49,29 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 - PACKAGES = CSWbdb48 CSWbdb48devel CSWbdb48doc CATALOGNAME_CSWbdb48 = berkeleydb48 CATALOGNAME_CSWbdb48devel = berkeleydb48_devel CATALOGNAME_CSWbdb48doc = berkeleydb48_doc -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* - -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* - ARCHALL_CSWbdb48doc = 1 SPKG_DESC_CSWbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities SPKG_DESC_CSWbdb48devel = BerkeleyDB 4.8 development support SPKG_DESC_CSWbdb48doc = BerkeleyDB 4.8 documentation +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + REQUIRED_PKGS_CSWbdb48devel = CSWbdb48 LICENSE = LICENSE -PKGFILES_CSWbdb48doc = /opt/csw/share/doc/.* +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +PKGFILES_CSWbdb48doc = $(PKGFILES_DOC) PKGFILES_CSWbdb48devel = $(PKGFILES_DEVEL) include gar/category.mk @@ -87,3 +85,11 @@ configure-dist: @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 18:21:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 16:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6671] csw/mgar/pkg Message-ID: Revision: 6671 http://gar.svn.sourceforge.net/gar/?rev=6671&view=rev Author: dmichelsen Date: 2009-10-02 16:21:09 +0000 (Fri, 02 Oct 2009) Log Message: ----------- bdb*: Further homogenizations Modified Paths: -------------- csw/mgar/pkg/bdb33/trunk/Makefile csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile Modified: csw/mgar/pkg/bdb33/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct CONFIGURE_ARGS += --enable-rpc @@ -43,10 +42,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb33/lib Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct CONFIGURE_ARGS += --enable-rpc @@ -43,10 +42,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 16:09:10 UTC (rev 6670) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) @@ -35,7 +35,6 @@ docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct CONFIGURE_ARGS += --enable-rpc @@ -43,10 +42,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb44/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 18:23:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 16:23:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6672] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6672 http://gar.svn.sourceforge.net/gar/?rev=6672&view=rev Author: dmichelsen Date: 2009-10-02 16:22:59 +0000 (Fri, 02 Oct 2009) Log Message: ----------- cswutils: Change Python path from opencsw to csw Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 16:21:09 UTC (rev 6671) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-02 16:22:59 UTC (rev 6672) @@ -61,10 +61,10 @@ @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ - @ginstall -d $(DESTDIR)$(libdir)/python/opencsw + @ginstall -d $(DESTDIR)$(libdir)/python/csw @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/opencsw/compare_pkgs.py + $(DESTDIR)$(libdir)/python/csw/compare_pkgs.py @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/opencsw/opencsw_lib.py - @ln -s ../lib/python/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg + $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py + @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 21:59:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 19:59:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6673] csw/mgar/pkg/libpopt/trunk Message-ID: Revision: 6673 http://gar.svn.sourceforge.net/gar/?rev=6673&view=rev Author: dmichelsen Date: 2009-10-02 19:59:54 +0000 (Fri, 02 Oct 2009) Log Message: ----------- libpopt: Update version to 1.15, some tests failing, upstream notified Modified Paths: -------------- csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libpopt/trunk/checksums Modified: csw/mgar/pkg/libpopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-02 16:22:59 UTC (rev 6672) +++ csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-02 19:59:54 UTC (rev 6673) @@ -1,5 +1,5 @@ GARNAME = popt -GARVERSION = 1.14 +GARVERSION = 1.15 CATEGORIES = lib DESCRIPTION = Popt is a C library for parsing command line parameters Modified: csw/mgar/pkg/libpopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libpopt/trunk/checksums 2009-10-02 16:22:59 UTC (rev 6672) +++ csw/mgar/pkg/libpopt/trunk/checksums 2009-10-02 19:59:54 UTC (rev 6673) @@ -1 +1 @@ -4f90a07316eb825604dd10ae4f9f3f04 download/popt-1.14.tar.gz +c61ef795fa450eb692602a661ec8d7f1 download/popt-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 2 23:05:18 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:05:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6674] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6674 http://gar.svn.sourceforge.net/gar/?rev=6674&view=rev Author: skayser Date: 2009-10-02 21:05:18 +0000 (Fri, 02 Oct 2009) Log Message: ----------- sudosh2: update TODOs, add SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-10-02 19:59:54 UTC (rev 6673) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-10-02 21:05:18 UTC (rev 6674) @@ -1,5 +1,7 @@ # TODO/Issues # - Submit 001- (DESTDIR) and 002- (man page) patches upstream +# - clearenvironment is not documented in sudosh.conf(5), others? +# - add /opt/csw/bin/sudosh to /etc/shells in postinstall GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps @@ -21,6 +23,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SPKG_SOURCEURL = http://sudosh2.sf.net sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 23:35:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6675] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6675 http://gar.svn.sourceforge.net/gar/?rev=6675&view=rev Author: dmichelsen Date: 2009-10-02 21:35:11 +0000 (Fri, 02 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Major upgrade for PLATFORM support Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.lib.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -11,16 +11,29 @@ # Pick up user information -include $(HOME)/.garrc +-include /etc/opt/csw/garrc -include /opt/csw/etc/garrc -MODULATION ?= global-$(GARCH) +THISHOST := $(shell uname -n) + +# On these platforms packages are built. +# They will include binaries for all ISAs that are specified for the platform. +PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 + +# This is the platform we are currently building. It is either set when +# invoked from "gmake platforms" or when you build a package on a host +# that is suitable for the platform. +# If there are no platform hosts defined the feature is disabled. +PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P))) + +MODULATION ?= global FILEDIR ?= files -DOWNLOADDIR ?= download -PARTIALDIR ?= $(DOWNLOADDIR)/partial -WORKROOTDIR ?= work +WORKROOTDIR ?= $(if $(PLATFORM),work/$(PLATFORM),work) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) -COOKIEROOTDIR ?= cookies +DOWNLOADDIR ?= $(WORKROOTDIR)/download +PARTIALDIR ?= $(DOWNLOADDIR)/partial +COOKIEROOTDIR ?= $(WORKROOTDIR)/cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) WORKSRC ?= $(WORKDIR)/$(DISTNAME) @@ -135,7 +148,7 @@ DESTROOT ?= $(HOME) # This is the directory from where the package is build from -PKGROOT ?= $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH)) +PKGROOT ?= $(abspath $(WORKROOTDIR)/pkgroot) # Each ISA has a separate installation directory inside the # working directory for that package. The files are copied @@ -274,8 +287,6 @@ # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler $(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I)))) -THISHOST := $(shell uname -n) - # BUILDHOST_isa-$ISA is the name of the host where the compilation should take place # It defaults to the corresponding BUILD_(sparc|i386)-(32|64) # An empty string means "stay on the current host" Modified: csw/mgar/gar/v2-pbuild/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -139,10 +139,12 @@ # check a given file's checksum against $(CHECKSUM_FILE) and # error out if it mentions the file without an "OK". +# The removal of the download prefix is for legacy checksums. For newstyle +# checksums without path this is not necessary. checksum-%: $(CHECKSUM_FILE) @echo " ==> Running checksum on $*" - @if gegrep -- '/$*$$' $(CHECKSUM_FILE); then \ - if LC_ALL="C" LANG="C" gmd5sum -c $(CHECKSUM_FILE) 2>&1 | \ + @if gegrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ echo '(!!!) $* failed checksum test!' 1>&2; \ false; \ Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -165,8 +165,8 @@ echo THISHOST="$$(THISHOST)" echo "Building modulation on host '$$(BUILDHOST)'" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - ssh $$(BUILDHOST) "gmake -C $$(CURDIR) MODULATION=$(2) $(3) merge-modulated",\ - gmake MODULATION=$(2) $(3) merge-modulated\ + ssh $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule @@ -294,12 +294,15 @@ checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum @$(DONADA) +checksum-global: + @$(MAKE) -s ISA=global checksum + @$(MAKECOOKIE) + # The next rule handles the dependency from the modulated context to # the contextless checksumming. The rule is called when the cookie # to the global checksum is requested. If the global checksum has not run, # then run it. Otherwise it is silently accepted. -checksum-modulated: $(COOKIEDIR) - @$(MAKE) -s ISA=global checksum +checksum-modulated: $(if $(test ! -e $(COOKIEDIR)/build-global/checksum),checksum-global) @$(DONADA) # returns true if checksum has completed successfully, false @@ -308,11 +311,11 @@ @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) # makesum - Generate distinfo (only do this for your own ports!). -MAKESUM_TARGETS = $(addprefix $(DOWNLOADDIR)/,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) +MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) -makesum: fetch $(MAKESUM_TARGETS) +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) @if test "x$(MAKESUM_TARGETS)" != "x "; then \ - gmd5sum $(MAKESUM_TARGETS) > $(CHECKSUM_FILE) ; \ + (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ cat $(CHECKSUM_FILE) ; \ fi @@ -618,6 +621,25 @@ _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS) +define killprocandparent +cpids() { \ + P=$1 \ + PPIDS=$P \ + PP=`ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $P { print \\$1 }\"` \ + while [ -n "$PP" ]; do \ + PQ=$PP \ + PP= \ + for q in $PQ; do \ + PPIDS="$PPIDS $q" \ + PP=$PP\ `ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $q { print \\$1 }\"` \ + done \ + done \ + \ + echo $PPIDS \ +} +endef + + # The basic merge merges the compiles for all ISAs on the current architecture merge: checksum pre-merge merge-do merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) @@ -626,7 +648,7 @@ merge-sequential: $(foreach M,$(MODULATIONS),merge-$M) -merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid +merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid merge-parallel: merge-watch $(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\ $(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait @@ -643,7 +665,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) @@ -709,7 +731,7 @@ # cookie, but that would be lame and unportable). clean: $(addprefix clean-,$(MODULATIONS)) - @rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) + rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) clean-modulated: $(call _pmod,Cleaning ) @@ -742,7 +764,7 @@ spotless: imageclean @echo " ==> Removing $(DESTDIR)" - @-rm -rf $(DESTDIR) + @-rm -rf work # Print package dependencies PKGDEP_LIST = $(filter-out $(BUILDDEPS),$(DEPEND_LIST)) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:05:18 UTC (rev 6674) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:35:11 UTC (rev 6675) @@ -533,12 +533,11 @@ # On a normal packaging workflow this is not used. prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) -# On these platforms packages are built. -# They will include binaries for all ISAs that are specified for the platform. -PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 - +# Verify that the host on we are currently packaging is one of the platform +# hosts. If there are no platform hosts defined the test is skipped. validateplatform: - $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ + $(if $(strip $(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\ + $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ $(warning ***)\ $(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\ $(foreach P,$(PACKAGING_PLATFORMS),\ @@ -546,13 +545,14 @@ )\ $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ $(warning ***)\ - ) + )) + @$(MAKECOOKIE) # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -package: validateplatform extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package - $(DONADA) +package: validateplatform checksum merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package + @$(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(if $(filter %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @@ -606,13 +606,26 @@ $(foreach P,$(PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) package;,\ - ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) package";\ + $(MAKE) PLATFORM=$P package;,\ + ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ ),\ $(error *** No host has been defined for platform $P)\ )\ ) +# Print relecant informations about the platform +platformenv: + @$(foreach P,$(PACKAGING_PLATFORMS),\ + echo "* Platform '$P'";\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + echo " - Package built on this host";,\ + echo " - Package built on host '$(PACKAGING_HOST_$P)'";\ + ),\ + echo "Package can not be built for this platform as there is no host defined";\ + )\ + ) + # dependb - update the dependency database # dependb: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 2 23:42:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:42:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6676] csw/mgar/pkg Message-ID: Revision: 6676 http://gar.svn.sourceforge.net/gar/?rev=6676&view=rev Author: skayser Date: 2009-10-02 21:42:03 +0000 (Fri, 02 Oct 2009) Log Message: ----------- pylxml: initial commit Added Paths: ----------- csw/mgar/pkg/pylxml/ csw/mgar/pkg/pylxml/branches/ csw/mgar/pkg/pylxml/tags/ csw/mgar/pkg/pylxml/trunk/ csw/mgar/pkg/pylxml/trunk/Makefile csw/mgar/pkg/pylxml/trunk/checksums csw/mgar/pkg/pylxml/trunk/files/ csw/mgar/pkg/pylxml/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/pylxml/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pylxml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pylxml/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pylxml/trunk/Makefile 2009-10-02 21:42:03 UTC (rev 6676) @@ -0,0 +1,37 @@ +# TODO +# - Move this to a pymodules/ subdirectory with the rest of the +# python modules (similar to the cpan directory). +GARNAME = pylxml +GARVERSION = 2.2.2 +CATEGORIES = python + +DESCRIPTION = Pythonic binding for the libxml2 and libxslt libraries +define BLURB + lxml is a Pythonic binding for the libxml2 and libxslt libraries. It is + unique in that it combines the speed and feature completeness of these + libraries with the simplicity of a native Python API, mostly compatible + but superior to the well-known ElementTree API. +endef + +SPKG_SOURCEURL = http://codespeak.net/lxml/ +MASTER_SITES = http://pypi.python.org/packages/source/l/lxml/ +DISTNAME = lxml-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +UFILES_REGEX = lxml-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWpylxml +CATALOGNAME = py_lxml + +REQUIRED_PKGS = CSWlibxml2 CSWlibxslt CSWzlib + +EXTRA_PAX_ARGS = '-s,CHANGES.txt,changelog,p' + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: DOCS=CHANGES.txt CREDITS.txt IDEAS.txt +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pylxml/trunk/checksums =================================================================== --- csw/mgar/pkg/pylxml/trunk/checksums (rev 0) +++ csw/mgar/pkg/pylxml/trunk/checksums 2009-10-02 21:42:03 UTC (rev 6676) @@ -0,0 +1 @@ +2f2fcb6aae51b5b417a3c0a6b256ec56 download/lxml-2.2.2.tar.gz Added: csw/mgar/pkg/pylxml/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pylxml/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pylxml/trunk/files/changelog.CSW 2009-10-02 21:42:03 UTC (rev 6676) @@ -0,0 +1,5 @@ +py_lxml (2.2.2,REV=2009.10.02) + + * Initial release. + + -- Sebastian Kayser Fri, 2 Oct 2009 23:31:04 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 2 23:47:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Oct 2009 21:47:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6677] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6677 http://gar.svn.sourceforge.net/gar/?rev=6677&view=rev Author: dmichelsen Date: 2009-10-02 21:47:51 +0000 (Fri, 02 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Use specific SSH instead of the first one in the path Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:42:03 UTC (rev 6676) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:47:51 UTC (rev 6677) @@ -52,6 +52,7 @@ PARALLELMODULATIONS ?= MULTITAIL ?= /opt/csw/bin/multitail TTY ?= /usr/bin/tty +SSH ?= /usr/bin/ssh # Outbound proxies http_proxy ?= Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:42:03 UTC (rev 6676) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-02 21:47:51 UTC (rev 6677) @@ -165,7 +165,7 @@ echo THISHOST="$$(THISHOST)" echo "Building modulation on host '$$(BUILDHOST)'" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - ssh $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:42:03 UTC (rev 6676) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-02 21:47:51 UTC (rev 6677) @@ -607,7 +607,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P package;,\ - ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ + $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ ),\ $(error *** No host has been defined for platform $P)\ )\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:27:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6678] csw/mgar/gar/v2-pbuild/gar.conf.mk Message-ID: Revision: 6678 http://gar.svn.sourceforge.net/gar/?rev=6678&view=rev Author: dmichelsen Date: 2009-10-03 08:27:25 +0000 (Sat, 03 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Use generic SSH Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-02 21:47:51 UTC (rev 6677) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-03 08:27:25 UTC (rev 6678) @@ -52,8 +52,12 @@ PARALLELMODULATIONS ?= MULTITAIL ?= /opt/csw/bin/multitail TTY ?= /usr/bin/tty -SSH ?= /usr/bin/ssh +# For platform hopping +# Use whatever SSH is found in the path. That is /opt/csw/bin/ssh for Solaris 8 and +# /usr/bin/ssh for Solaris 9+ and +SSH ?= ssh + # Outbound proxies http_proxy ?= ftp_proxy ?= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:47:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:47:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6679] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6679 http://gar.svn.sourceforge.net/gar/?rev=6679&view=rev Author: dmichelsen Date: 2009-10-03 08:47:27 +0000 (Sat, 03 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Merge in mGAR v2 r4932-6677 Modified Paths: -------------- csw/mgar/gar/v2-pbuild/bin/checkpkg csw/mgar/gar/v2-pbuild/bin/cswproto csw/mgar/gar/v2-pbuild/bin/depmaker csw/mgar/gar/v2-pbuild/bin/gitproxy csw/mgar/gar/v2-pbuild/bin/mkpackage csw/mgar/gar/v2-pbuild/categories/cpan/category.mk csw/mgar/gar/v2-pbuild/categories/x11/category.mk csw/mgar/gar/v2-pbuild/categories/xfce/category.mk csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.lib.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/v2-pbuild/categories/python/ csw/mgar/gar/v2-pbuild/categories/python/category.mk csw/mgar/gar/v2-pbuild/general-help Removed Paths: ------------- csw/mgar/gar/v2-pbuild/categories/python/category.mk Property Changed: ---------------- csw/mgar/gar/v2-pbuild/ Property changes on: csw/mgar/gar/v2-pbuild ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-pbuild/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,8 +1,8 @@ #!/bin/ksh -p -# checkpkg 1.46a (diff to 1.46: modified errmsg -> warnmsg on two places) +# checkpkg 1.50 (diff to 1.46a: check multiple package files) # This script examines a package that has been put together -# for submittal to the CSW archive +# for submittal to the CSW archive at opencsw.org # # It examines it for compliance with the packaging standards at # http://www.opencsw.org/standards/ @@ -29,10 +29,15 @@ rm -rf $EXTRACTDIR fi if [[ "$TMPARCHIVE" != "" ]] ; then - rm $TMPARCHIVE + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE fi } +cleanupset(){ + if [ "`echo $SETINF*`" != "$SETINF*" ]; then + rm $SETINF* + fi +} warnmsg(){ print WARNING: $* >/dev/fd/2 if [[ "$quit_on_warn" != "" ]] ; then @@ -45,6 +50,7 @@ errmsg(){ print ERROR: $* >/dev/fd/2 cleanup + cleanupset exit 1 } @@ -58,6 +64,12 @@ shift fi +# a unique filename for the list of package deps and libs we see in a 'set' +SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETLIBS=$SETINF.libs +SETDEPS=$SETINF.deps + + for f in "$@" do @@ -123,7 +135,6 @@ TMPFILE=$EXTRACTDIR/pkginfo - dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo) if [[ $? -ne 0 ]] ; then print ERROR: could not extract $f @@ -217,6 +228,13 @@ print ERROR: VERSION field not allowed to have '"-"' in it exit 1 ;; + *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) + : + ;; + *) + print ERROR: no REV=YYYY.MM.DD field in VERSION + exit 1 + ;; esac case $pkgarch in @@ -377,17 +395,19 @@ # man ld.so.1 for more info on this hack export LD_NOAUXFLTR=1 - listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/tmplist + listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist # have to do this for ldd to work. arrg. - if [ -s "$EXTRACTDIR/tmplist" ] ; then - chmod 0755 `cat $EXTRACTDIR/tmplist` + if [ -s "$EXTRACTDIR/elflist" ] ; then + chmod 0755 `cat $EXTRACTDIR/elflist` - #cat $EXTRACTDIR/tmplist| xargs ldd 2>/dev/null |fgrep '.so' | + #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/tmplist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + + print libraries used are: cat $EXTRACTDIR/liblist print "cross-referencing with depend file (May take a while)" @@ -399,6 +419,10 @@ #If these dont exist, it is Bad. touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs +# store things that look like shared objects from the package map for +# delayed library validation. +grep "\.so" $EXTRACTDIR/$pkgname/pkgmap >> $SETLIBS + if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then print print "Examining 'depend' file" @@ -416,11 +440,26 @@ exit 1 fi +#to retain a record of all packages currently being examined from $@ +echo $pkgname >> $SETDEPS + nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | sort >$EXTRACTDIR/deppkgs for dep in `cat $EXTRACTDIR/deppkgs` do - pkginfo $dep || warnmsg invalid package $dep specified + pkginfo $dep + if [[ $? -ne 0 ]]; then + #if we've already looked at the package named $dep, + #it'll be in the file. + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep + if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set + echo "Can't validate dependence on $dep. Storing for delayed validation." + #store for validation at the end. + echo "$dep $pkgname" >> $SETDEPS.missing + else + echo "Found $dep as part of the package set being evaluated." + fi + fi done egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | @@ -433,13 +472,20 @@ if [[ $? -eq 0 ]] ; then echo $lib provided by package itself continue + else + grep "[/=]$lib[ =]" $SETLIBS + if [[ $? -eq 0 ]]; then + echo "$lib provided by package set being evaluated." + continue + fi fi libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | sed 's/^.* \([^ ]*\)$/\1/' |sort -u` if [[ -z "$libpkg" ]] ; then - warnmsg cannot find package for $lib + echo "$lib $pkgname" >> $SETLIBS.missing + print Cannot find package providing $lib. Storing for delayed validation. else print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs fi @@ -458,19 +504,53 @@ if [[ "$basedir" != "" ]] ; then - print - print "Checking relocation ability..." - xargs strings <$EXTRACTDIR/tmplist | grep /opt/csw - if [[ $? -eq 0 ]] ; then - errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + print + if [[ -f $EXTRACTDIR/elflist ]] ; then + print "Checking relocation ability..." + xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + if [[ $? -eq 0 ]] ; then + errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + else + print trivial check passed + fi else - print trivial check passed + echo No relocation check done for non-binary relocatable package. fi fi + cleanup - print "" done + +if [ -s $SETDEPS.missing ]; then + print "Doing late evaluations of package dependencies." + while read mdep; do + dep=`echo $mdep | nawk '{print $1}'` + pkg=`echo $mdep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q $dep $SETDEPS + if [ $? -ne 0 ]; then + errmsg "Couldn't validate $dep as a dependency in package $pkg" + else + print "Validated $dep as a dependency for $pkg." + fi + done < $SETDEPS.missing +fi + +if [ -s $SETLIBS.missing ]; then + print "Doing late evaluations of package library dependencies." + while read ldep; do + lib=`echo $ldep | nawk '{print $1}'` + pkg=`echo $ldep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + if [ $? -ne 0 ]; then + errmsg "Couldn't find a package providing $lib" + else + print "A package in the set being evaluated provides $lib" + fi + done < $SETLIBS.missing +fi + +cleanupset Modified: csw/mgar/gar/v2-pbuild/bin/cswproto =================================================================== --- csw/mgar/gar/v2-pbuild/bin/cswproto 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/cswproto 2009-10-03 08:47:27 UTC (rev 6679) @@ -112,6 +112,8 @@ open F, $common || die "Couldn't open $common"; while () { chomp; next if /^\s*$/ or /^#/; + s/\+/\\+/g; + s/\-/\\-/g; my @c = split( m!/! ); my @pc = map { join( '/', @c[0..$_] ) } 1..$#c; $alldirs{$_} = 1 foreach (@pc); Modified: csw/mgar/gar/v2-pbuild/bin/depmaker =================================================================== --- csw/mgar/gar/v2-pbuild/bin/depmaker 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/depmaker 2009-10-03 08:47:27 UTC (rev 6679) @@ -27,12 +27,14 @@ my $do_script = 1; my $be_quiet = 0; my (@nodep, $rootdir); +my $text_files = 0; GetOptions( 'script!' => \$do_script, 'quiet|q' => \$be_quiet, 'root=s' => \$rootdir, 'nodep=s' => \@nodep, 'help|h' => \&usage, + 'text|t' => \$text_files, 'version|V' => sub { print STDERR "$self v$VERSION\n"; exit 2; @@ -43,7 +45,7 @@ my $nodep = join "|", @nodep; sub usage { - print STDERR "Usage: $self [--no/script] [--nodep ] [--root ] < path_list > depend\n"; + print STDERR "Usage: $self [--text] [--no/script] [--nodep ] [--root ] < path_list > depend\n"; exit 1; } @@ -111,6 +113,9 @@ $depfiles{$lib}++ if $lib; } } + elsif ($text_files and $ftype =~ /text/) { + $depfiles{$filesrc}++; + } } exit 0 unless scalar keys %depfiles; Modified: csw/mgar/gar/v2-pbuild/bin/gitproxy =================================================================== --- csw/mgar/gar/v2-pbuild/bin/gitproxy 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/gitproxy 2009-10-03 08:47:27 UTC (rev 6679) @@ -5,7 +5,7 @@ REMHOST=$1 REMPORT=$2 - set - $(echo "${http_proxy}" | sed 's/http//i' | tr -d '/' | tr ':' ' ') + set - $(echo "${http_proxy}" | gsed 's/http//i' | tr -d '/' | tr ':' ' ') PROXYHOST=$1 PROXYPORT=$2 Modified: csw/mgar/gar/v2-pbuild/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-pbuild/bin/mkpackage 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/bin/mkpackage 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,4 +1,4 @@ -#!/bin/env perl -w +#!/opt/csw/bin/perl -w # # $Id$ # Modified: csw/mgar/gar/v2-pbuild/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-pbuild/categories/cpan/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/cpan/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -62,7 +62,7 @@ INSTALL_ENV += PERL5LIB=$(PERL5LIB) # Configure a target using Makefile.PL -PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor +PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS) configure-%/Makefile.PL: @echo " ==> Running Makefile.PL in $*" @( cd $* ; \ @@ -70,7 +70,7 @@ $(CONFIGURE_ARGS) $(PERL_CONFIGURE_ARGS) ) @$(MAKECOOKIE) -PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor +PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor $(EXTRA_PERLBUILD_CONFIGURE_ARGS) configure-%/Build.PL: @echo " ==> Running Build.PL in $*" @( cd $* ; \ Deleted: csw/mgar/gar/v2-pbuild/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/python/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,21 +0,0 @@ -# Add a dependency to CSWpython -_EXTRA_GAR_PKGS += CSWpython - -# Exclude egg-info files (only needed for easy_install) -_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* - -# Activate cswpycompile support to exclude .pyc and .pyo files from -# the package and compile them on installation. File exclusion is -# handled by gar.mk and cswclassutils integration by gar.pkg.mk -PYCOMPILE = 1 - -# Haven't seen a python module with a configure phase so far -CONFIGURE_SCRIPTS ?= - -# gar.lib.mk contains implicit targets for setup.py -BUILD_SCRIPTS ?= $(WORKSRC)/setup.py -INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py -INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix) -TEST_SCRIPTS ?= $(WORKSRC)/setup.py - -include gar/gar.mk Copied: csw/mgar/gar/v2-pbuild/categories/python/category.mk (from rev 6678, csw/mgar/gar/v2/categories/python/category.mk) =================================================================== --- csw/mgar/gar/v2-pbuild/categories/python/category.mk (rev 0) +++ csw/mgar/gar/v2-pbuild/categories/python/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -0,0 +1,21 @@ +# Add a dependency to CSWpython +_EXTRA_GAR_PKGS += CSWpython + +# Exclude egg-info files (only needed for easy_install) +_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* + +# Activate cswpycompile support to exclude .pyc and .pyo files from +# the package and compile them on installation. File exclusion is +# handled by gar.mk and cswclassutils integration by gar.pkg.mk +PYCOMPILE = 1 + +# Haven't seen a python module with a configure phase so far +CONFIGURE_SCRIPTS ?= + +# gar.lib.mk contains implicit targets for setup.py +BUILD_SCRIPTS ?= $(WORKSRC)/setup.py +INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py +INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix) +TEST_SCRIPTS ?= $(WORKSRC)/setup.py + +include gar/gar.mk Modified: csw/mgar/gar/v2-pbuild/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2-pbuild/categories/x11/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/x11/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,5 +1,6 @@ # X11 X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags Modified: csw/mgar/gar/v2-pbuild/categories/xfce/category.mk =================================================================== --- csw/mgar/gar/v2-pbuild/categories/xfce/category.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/categories/xfce/category.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -1,6 +1,6 @@ # XFCE XFCE_ROOT = http://www.us.xfce.org -XFCE_VERSION ?= 4.4.1 +XFCE_VERSION ?= 4.6.1 XFCE_MIRROR = $(XFCE_ROOT)/archive/xfce-$(XFCE_VERSION)/src/ MASTER_SITES ?= $(XFCE_MIRROR) @@ -8,8 +8,6 @@ PKGDIST ?= $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(PKGDIST) -include gar/gar.mk - # Compiler options # Compiler options CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION @@ -18,13 +16,22 @@ LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib # pkg-config options -PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/lib/pkgconfig +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig # Configure common options CONFIGURE_ARGS = $(DIRPATHS) -# CONFIGURE_ARGS += --prefix=/opt/csw CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --enable-final CONFIGURE_ARGS += --enable-xinerama CONFIGURE_ARGS += --enable-dbus -# CONFIGURE_ARGS += --mandir=/opt/csw/share/man + +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + +include gar/gar.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -45,6 +45,8 @@ MANIFEST_FILE ?= manifest LOGDIR ?= log +ELISP_DIRS ?= $(datadir)/emacs/site-lisp $(EXTRA_ELISP_DIRS) + GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master @@ -400,9 +402,11 @@ # REQUESTED_ISAS contains all ISAs that should be built # NEEDED_ISAS contains all ISAs that must be build for this architecture to make the package # BUILD_ISAS contains all ISAs that can be built on the current kernel +# It is guaranteed that all BUILD_ISAS come first in NEEDED_ISAS # Set 'BUILD64 = 1' to build 64 bit versions automatically REQUESTED_ISAS ?= $(strip $(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)) -NEEDED_ISAS ?= $(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)) +NEEDED_ISAS ?= $(strip $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ + $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)))) BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS)) # Subdirectories for specialized binaries and libraries @@ -519,7 +523,7 @@ OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS) $(EXTRA_OPTFLAGS)) GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) -GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) +GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR)) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) @@ -542,9 +546,10 @@ # # Gnome +GNOME_PROJ ?= $(GARNAME) GNOME_ROOT = http://ftp.gnome.org/pub/GNOME/sources GNOME_SUBV = $(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}') -GNOME_MIRROR = $(GNOME_ROOT)/$(GARNAME)/$(GNOME_SUBV)/ +GNOME_MIRROR = $(GNOME_ROOT)/$(GNOME_PROJ)/$(GNOME_SUBV)/ # SourceForge SF_PROJ ?= $(GARNAME) Modified: csw/mgar/gar/v2-pbuild/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.lib.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -68,7 +68,7 @@ # to update the code. # we possibly proxy the git:// references depending on GIT_USE_PROXY git-http//%: - @$git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ git remote add origin http://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) @@ -583,17 +583,17 @@ # just run make install and hope for the best. install-%/Makefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/makefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/GNUmakefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install @$(MAKECOOKIE) # Ruby makefiles @@ -732,6 +732,19 @@ gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ gxargs -r gzip --force +compile-elisp: + @(for d in $(ELISP_DIRS); do \ + echo " ===> Compiling .el files in $$d"; \ + cd $(PKGROOT)/$$d; \ + for f in `find . -name "*el"`; do \ + bf=`basename $$f`; \ + bd=`dirname $$f`; \ + cd $$bd; \ + emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ + cd $(PKGROOT)/$$d; \ + done; \ + done) + include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) # Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -515,7 +515,10 @@ @$(call _pmod,Reset install state) @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) + @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip + @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) + @rm -f $(COOKIEROOTDIR)/global/install-$(MODULATION) # merge in all isas to the package directory after installation @@ -544,9 +547,9 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= +MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) endif @@ -560,7 +563,7 @@ ) ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F"; then echo $$F; fi; \ + if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) ifneq ($(ISAEXEC_FILES),) @@ -581,11 +584,18 @@ # This can be defined in category.mk MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY) +# Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) +# during the merge phase. +_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py +MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) + MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la MERGE_EXCLUDE_BACKUPFILES ?= .*\~ MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) +# Exclude all other .pc-files apart from the default 32- and 64 bit versions +MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc) +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE) # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) @@ -599,7 +609,7 @@ # Exclude by replacing files with the empty string _INC_EXT_RULE = $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') # Replace files by itself terminating on first match -_INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)\$,\1,") +_INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)$$,\1,") # These are used during merge phase to determine the base installation directory MERGEBASE_$(bindir) ?= $(bindir_install) @@ -619,7 +629,7 @@ # has not, so we use this one for appending. -_PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS) +_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS) define killprocandparent cpids() { \ @@ -641,12 +651,12 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) -merge-sequential: $(foreach M,$(MODULATIONS),merge-$M) +merge-sequential: $(addprefix merge-,$(MODULATIONS)) merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid merge-parallel: merge-watch @@ -718,7 +728,7 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src - @rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge + @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:27:25 UTC (rev 6678) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:47:27 UTC (rev 6679) @@ -127,13 +127,22 @@ # 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED # 4. There is a svn binary and everything was committed -> r +ifndef SPKG_PACKAGER + $(warning Please set SPKG_PACKAGER in your .garrc file to your name) + SPKG_PACKAGER = Unknown +endif + +ifndef SPKG_EMAIL + $(warning Please set SPKG_EMAIL in your .garrc file to your email address) + SPKG_EMAIL = Unknown +endif + + SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES)) -SPKG_PACKAGER ?= Unknown SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) -SPKG_EMAIL ?= Unknown SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none @@ -141,7 +150,7 @@ SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) -SPKG_EXPORT ?= $(WORKDIR) +SPKG_EXPORT ?= $(HOME)/staging/build-$(shell date '+%d.%b.%Y') SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) @@ -152,17 +161,24 @@ # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES += $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf)) -SPKG_CLASSES += $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) -SPKG_CLASSES += $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ - $(foreach FILE,$(SAMPLECONF),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(INITMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ print join(" ", at F),"\n";' _EXTRA_GAR_PKGS += CSWcswclassutils +# Make sure the configuration files always have a .CSW suffix and rename the +# configuration files to this if necessary during merge. +_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") endif PKGGET_DESTDIR ?= @@ -211,7 +227,7 @@ # between the prefix and the suffix. # usage: $(call isadirs,,) # expands to // // ... -isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2)) +isadirs = $(foreach ISA,$(ISALIST),$(1)/$(subst +,\+,$(subst -,\-,$(ISA)))/$(2)) # This is a helper function just like isadirs, but also contains the # prefix and suffix without an ISA subdirectories inserted. @@ -441,6 +457,14 @@ $(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) endef +# Make sure every producable package contains specific descriptions. +# We explicitly ignore NOPACKAGE here to disallow circumventing the check. +$(foreach P,$(SPKG_SPECS),\ + $(foreach Q,$(filter-out $P,$(SPKG_SPECS)),\ + $(if $(shell if test "$(SPKG_DESC_$P)" = "$(SPKG_DESC_$Q)"; then echo ERROR; fi),\ + $(error The package descriptions for $P and $Q are identical, please make sure all package descriptions are unique by setting SPKG_DESC_ for each package) \ +))) + .PRECIOUS: $(WORKDIR)/%.pkginfo $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ @@ -552,10 +576,15 @@ # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. package: validateplatform checksum merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package + @echo + @echo "The following packages have been built:" + @echo + @$(foreach SPEC,$(_PKG_SPECS),echo $(SPEC);echo " $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz";) + @echo @$(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files -package-%: $(WORKDIR)/%.gspec $(if $(filter %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend +package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ Copied: csw/mgar/gar/v2-pbuild/general-help (from rev 6678, csw/mgar/gar/v2/general-help) =================================================================== --- csw/mgar/gar/v2-pbuild/general-help (rev 0) +++ csw/mgar/gar/v2-pbuild/general-help 2009-10-03 08:47:27 UTC (rev 6679) @@ -0,0 +1,4 @@ +Please go here for more detailed documentation: + + http://sourceforge.net/apps/trac/gar/wiki/GarRepository + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:52:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6680] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6680 http://gar.svn.sourceforge.net/gar/?rev=6680&view=rev Author: dmichelsen Date: 2009-10-03 08:52:20 +0000 (Sat, 03 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Activate checkpkg to check interdependencies Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:47:27 UTC (rev 6679) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-03 08:52:20 UTC (rev 6680) @@ -607,7 +607,7 @@ pkgcheck-%: @echo " ==> Checking compliance: $*" - @( LC_ALL=C checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 + @( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:52:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:52:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6681] csw/mgar/pkg/bdb42/trunk/checksums Message-ID: Revision: 6681 http://gar.svn.sourceforge.net/gar/?rev=6681&view=rev Author: dmichelsen Date: 2009-10-03 08:52:51 +0000 (Sat, 03 Oct 2009) Log Message: ----------- bdb42: Update checksum Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/checksums Modified: csw/mgar/pkg/bdb42/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb42/trunk/checksums 2009-10-03 08:52:20 UTC (rev 6680) +++ csw/mgar/pkg/bdb42/trunk/checksums 2009-10-03 08:52:51 UTC (rev 6681) @@ -1,7 +1,7 @@ -8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz -1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff -3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff -0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff -9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff -99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff -d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff +8b5cff6eb83972afdd8e0b821703c33c db-4.2.52.tar.gz +1227f5f9ff43d48b5b1759e113a1c2d7 patch.4.2.52.1 +3da7efd8d29919a9113e2f6f5166f5b7 patch.4.2.52.2 +0bf9ebbe852652bed433e522928d40ec patch.4.2.52.3 +9cfeff4dce0c11372c0b04b134f8faef patch.4.2.52.4 +99836f962361da8936219cc193edc7ed patch.4.2.52.5 +d49545b2691c511276b73bb6c3ec64c3 patch.64bit-libtool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 3 10:53:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 03 Oct 2009 08:53:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6682] csw/mgar/pkg/bdb44/trunk/checksums Message-ID: Revision: 6682 http://gar.svn.sourceforge.net/gar/?rev=6682&view=rev Author: dmichelsen Date: 2009-10-03 08:53:21 +0000 (Sat, 03 Oct 2009) Log Message: ----------- bdb44: Update checksum Modified Paths: -------------- csw/mgar/pkg/bdb44/trunk/checksums Modified: csw/mgar/pkg/bdb44/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb44/trunk/checksums 2009-10-03 08:52:51 UTC (rev 6681) +++ csw/mgar/pkg/bdb44/trunk/checksums 2009-10-03 08:53:21 UTC (rev 6682) @@ -1,6 +1,6 @@ -d84dff288a19186b136b0daf7067ade3 download/db-4.4.20.tar.gz -66584d621355df055b6e05b4a02e9c3e download/patch.4.4.20.1.diff -85df93a0867f6cace3501671cdeb6ed1 download/patch.4.4.20.2.diff -88ee91889ebf5498b22b2e7bed945d41 download/patch.4.4.20.3.diff -c2ef7b3e59460c35950fab5f2faa3fc0 download/patch.4.4.20.4.diff -099621e0dad419188acd42c588242131 download/patch.4.4.20.5.diff +d84dff288a19186b136b0daf7067ade3 db-4.4.20.tar.gz +66584d621355df055b6e05b4a02e9c3e patch.4.4.20.1 +85df93a0867f6cace3501671cdeb6ed1 patch.4.4.20.2 +88ee91889ebf5498b22b2e7bed945d41 patch.4.4.20.3 +c2ef7b3e59460c35950fab5f2faa3fc0 patch.4.4.20.4 +099621e0dad419188acd42c588242131 patch.64bit-libtool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:26:53 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:26:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6683] csw/mgar/pkg Message-ID: Revision: 6683 http://gar.svn.sourceforge.net/gar/?rev=6683&view=rev Author: skayser Date: 2009-10-03 14:26:41 +0000 (Sat, 03 Oct 2009) Log Message: ----------- pysoappy: initial commit Added Paths: ----------- csw/mgar/pkg/pysoappy/ csw/mgar/pkg/pysoappy/branches/ csw/mgar/pkg/pysoappy/tags/ csw/mgar/pkg/pysoappy/trunk/ csw/mgar/pkg/pysoappy/trunk/Makefile csw/mgar/pkg/pysoappy/trunk/checksums csw/mgar/pkg/pysoappy/trunk/files/ csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/pysoappy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pysoappy/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysoappy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/Makefile 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,46 @@ +# TODO +# - Move this to a pymodules/ subdirectory with the rest of the +# python modules (similar to the cpan directory). +GARNAME = pysoappy +GARVERSION = 0.11.4 +CATEGORIES = python + +DESCRIPTION = SOAP library for python +define BLURB + This package contains the SOAPpy Python module, which implements a high- + level interface to Simple Object Access Protocol (SOAP) functions from + Python. It includes functionality for acting as a SOAP server, client, + or proxy, and includes both building and parsing functions. It has been + tested against a wide array of other SOAP clients and servers, and is a + very robust and well-rounded implementation of the SOAP protocol. + + SOAPpy is not actively supported by upstream anymore - please do not + consider to use it in new projects! All functions were merged into ZSI +endef + +SPKG_SOURCEURL = http://pywebsvcs.sourceforge.net/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = pywebsvcs +DISTNAME = SOAPpy-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +ARCHALL = 1 +PACKAGES = CSWpysoappy +CATALOGNAME = py_soappy +REQUIRED_PKGS = CSWpyfpconst CSWpyxml + +# import __future__ statements need to occur first within a file +# SyntaxError: from __future__ imports must occur at the beginning of the file +PATCHFILES = 001-place-import-future-first.patch + +# No tests available +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(WORKSRC)/docs/* $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pysoappy/trunk/checksums =================================================================== --- csw/mgar/pkg/pysoappy/trunk/checksums (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/checksums 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,2 @@ +fd1ea22ebacd98900074e8add1cf39fe download/001-place-import-future-first.patch +69a384d9a61b36325a97d81165668b39 download/SOAPpy-0.11.4.tar.gz Added: csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch =================================================================== --- csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/files/001-place-import-future-first.patch 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,72 @@ +diff --git a/SOAPpy/Client.py b/SOAPpy/Client.py +index 15542b0..922e098 100644 +--- a/SOAPpy/Client.py ++++ b/SOAPpy/Client.py +@@ -39,12 +39,11 @@ + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import urllib + from types import * +diff --git a/SOAPpy/GSIServer.py b/SOAPpy/GSIServer.py +index 3c723e7..0c0876a 100644 +--- a/SOAPpy/GSIServer.py ++++ b/SOAPpy/GSIServer.py +@@ -42,12 +42,11 @@ GSIServer - Contributed by Ivan R. Judson + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: GSIServer.py,v 1.4 2004/02/04 03:21:02 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import re + import socket +diff --git a/SOAPpy/Server.py b/SOAPpy/Server.py +index d6efce2..1419790 100644 +--- a/SOAPpy/Server.py ++++ b/SOAPpy/Server.py +@@ -39,12 +39,11 @@ + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: Server.py,v 1.19 2004/04/27 15:23:46 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import re + import socket +diff --git a/SOAPpy/Types.py b/SOAPpy/Types.py +index cc8bc7b..f907dcf 100644 +--- a/SOAPpy/Types.py ++++ b/SOAPpy/Types.py +@@ -32,12 +32,11 @@ + # + ################################################################################ + """ ++from __future__ import nested_scopes + + ident = '$Id: Types.py,v 1.16 2004/04/14 03:42:50 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + import UserList + import base64 + import cgi Added: csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW 2009-10-03 14:26:41 UTC (rev 6683) @@ -0,0 +1,5 @@ +pysoappy (0.11.4,REV=2009.10.03) + + * Initial release. + + -- Sebastian Kayser Sat, 3 Oct 2009 16:17:22 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:34:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:34:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6684] csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW Message-ID: Revision: 6684 http://gar.svn.sourceforge.net/gar/?rev=6684&view=rev Author: skayser Date: 2009-10-03 14:34:10 +0000 (Sat, 03 Oct 2009) Log Message: ----------- pysoappy: fix changelog.CSW Modified Paths: -------------- csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW 2009-10-03 14:26:41 UTC (rev 6683) +++ csw/mgar/pkg/pysoappy/trunk/files/changelog.CSW 2009-10-03 14:34:10 UTC (rev 6684) @@ -1,4 +1,4 @@ -pysoappy (0.11.4,REV=2009.10.03) +py_soappy (0.11.4,REV=2009.10.03) * Initial release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:36:59 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6685] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 6685 http://gar.svn.sourceforge.net/gar/?rev=6685&view=rev Author: skayser Date: 2009-10-03 14:36:59 +0000 (Sat, 03 Oct 2009) Log Message: ----------- supybot: add REQUIRED_PKGS, description / SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:34:10 UTC (rev 6684) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:36:59 UTC (rev 6685) @@ -1,17 +1,23 @@ -# TODO -# - Check whether additional dependencies are needed GARNAME = supybot GARVERSION = 0.83.4.1 CATEGORIES = python DESCRIPTION = Robust, user-friendly, and extensible IRC bot -define BLURB + Supybot is a robust (it doesn't crash), user friendly (it's easy to + configure) and programmer friendly (plugins are *extremely* easy to + write) Python IRC bot. It aims to be an adequate replacement for most + existing IRC bots. It includes a very flexible and powerful ACL system + for controlling access to commands, as well as more than 50 builtin + plugins providing around 400 actual commands. endef +SPKG_SOURCEURL = http://sourceforge.net/projects/supybot/ MASTER_SITES = $(SF_MIRRORS) DISTNAME = Supybot-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +REQUIRED_PKGS = CSWpysqlite CSWtwisted + EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:38:31 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:38:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6686] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 6686 http://gar.svn.sourceforge.net/gar/?rev=6686&view=rev Author: skayser Date: 2009-10-03 14:38:31 +0000 (Sat, 03 Oct 2009) Log Message: ----------- supybot: fix BLURB Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:36:59 UTC (rev 6685) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:38:31 UTC (rev 6686) @@ -3,6 +3,7 @@ CATEGORIES = python DESCRIPTION = Robust, user-friendly, and extensible IRC bot +define BLURB Supybot is a robust (it doesn't crash), user friendly (it's easy to configure) and programmer friendly (plugins are *extremely* easy to write) Python IRC bot. It aims to be an adequate replacement for most This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Oct 3 16:41:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 14:41:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6687] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 6687 http://gar.svn.sourceforge.net/gar/?rev=6687&view=rev Author: skayser Date: 2009-10-03 14:41:10 +0000 (Sat, 03 Oct 2009) Log Message: ----------- supybot: ARCHALL=1 Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:38:31 UTC (rev 6686) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-10-03 14:41:10 UTC (rev 6687) @@ -17,6 +17,7 @@ DISTNAME = Supybot-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +ARCHALL = 1 REQUIRED_PKGS = CSWpysqlite CSWtwisted EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Oct 3 17:15:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 03 Oct 2009 15:15:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6688] csw/mgar/pkg/cpan/Net-IP/trunk Message-ID: Revision: 6688 http://gar.svn.sourceforge.net/gar/?rev=6688&view=rev Author: bonivart Date: 2009-10-03 15:15:40 +0000 (Sat, 03 Oct 2009) Log Message: ----------- pm_netip: update build recipe Modified Paths: -------------- csw/mgar/pkg/cpan/Net-IP/trunk/Makefile csw/mgar/pkg/cpan/Net-IP/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec Modified: csw/mgar/pkg/cpan/Net-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/Makefile 2009-10-03 14:41:10 UTC (rev 6687) +++ csw/mgar/pkg/cpan/Net-IP/trunk/Makefile 2009-10-03 15:15:40 UTC (rev 6688) @@ -9,8 +9,9 @@ IPv6 addresses. endef -DISTFILES += $(call admfiles,CSWpmnetip,) +PACKAGES = CSWpmnetip +CATALOGNAME = pm_netip -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/checksums 2009-10-03 14:41:10 UTC (rev 6687) +++ csw/mgar/pkg/cpan/Net-IP/trunk/checksums 2009-10-03 15:15:40 UTC (rev 6688) @@ -1,2 +1 @@ -bdd199eae1946802858cc08707e71f24 download/CSWpmnetip.gspec a49c0b02a9b793ff60191cdafc0c202e download/Net-IP-1.25.tar.gz Deleted: csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec 2009-10-03 14:41:10 UTC (rev 6687) +++ csw/mgar/pkg/cpan/Net-IP/trunk/files/CSWpmnetip.gspec 2009-10-03 15:15:40 UTC (rev 6688) @@ -1,44 +0,0 @@ -%var bitname pm_netip -%var pkgname CSWpmnetip -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -Copyright (c) 1999-2000 by RIPE-NCC. All rights reserved. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. - -You should have received a copy of the Perl license along with -Perl; see the file README in Perl distribution. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -You should have received a copy of the Artistic License -along with Perl; see the file Artistic. - - NO WARRANTY - -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Oct 3 17:32:13 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 03 Oct 2009 15:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6689] csw/mgar/pkg/phpsysinfo/trunk/Makefile Message-ID: Revision: 6689 http://gar.svn.sourceforge.net/gar/?rev=6689&view=rev Author: bonivart Date: 2009-10-03 15:32:13 +0000 (Sat, 03 Oct 2009) Log Message: ----------- phpsysinfo: update recipe Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2009-10-03 15:15:40 UTC (rev 6688) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2009-10-03 15:32:13 UTC (rev 6689) @@ -2,9 +2,9 @@ GARVERSION = 2.5.4 CATEGORIES = utils -DESCRIPTION = displays information about the host being accessed +DESCRIPTION = Displays information about the host being accessed define BLURB - displays information about the host being accessed + Displays information about the host being accessed endef SF_PROJ = $(GARNAME) @@ -16,13 +16,13 @@ SPKG_DESC = $(DESCRIPTION) SPKG_SOURCEURL = http://phpsysinfo.sourceforge.net -REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 CSWcswclassutils +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 -SPKG_CLASSES_CSWphpsysinfo = none cswcpsampleconf - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +ARCHALL = 1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -30,9 +30,7 @@ WORKSRC = $(WORKDIR)/$(GARNAME) -PROTOTYPE_FILTER = awk ' \ -$$$$3 ~ /\/config.php.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -{ print }' +SAMPLECONF = .*config.php include gar/category.mk @@ -43,7 +41,7 @@ @ginstall -d $(DESTDIR)$(prefix)/share/www @cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www/phpsysinfo @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo ; \ - mv config.php.new config.php.CSW ; \ + mv config.php.new config.php ; \ mv COPYING $(DESTDIR)$(docdir)/$(GARNAME)/license ) @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo/includes/os ; \ gpatch < ../../../../../../../../../$(FILEDIR)/CSWphpsysinfo.class.SunOS.inc.php.p ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 3 19:17:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 03 Oct 2009 17:17:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6690] csw/mgar/pkg/x11 Message-ID: Revision: 6690 http://gar.svn.sourceforge.net/gar/?rev=6690&view=rev Author: wbonnet Date: 2009-10-03 17:17:41 +0000 (Sat, 03 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_bigreqsproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_bigreqsproto/ Removed Paths: ------------- csw/mgar/pkg/x11/bigreqsproto/ Modified: csw/mgar/pkg/x11/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile 2009-10-03 15:15:40 UTC (rev 6688) +++ csw/mgar/pkg/x11/x11_bigreqsproto/trunk/Makefile 2009-10-03 17:17:41 UTC (rev 6690) @@ -1,6 +1,8 @@ -GARNAME = bigreqsproto +PROTONAME = bigreqsproto +CATEGORIES = x11 +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) GARVERSION = 1.1.0 -CATEGORIES = x11 DESCRIPTION = Prototype headers for BigReqs extension to X11 define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11applewmproto +CATALOGNAME_CSWx11applewmproto = x11_applewmproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 3 20:55:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Oct 2009 18:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6691] csw/mgar/pkg/git/trunk Message-ID: Revision: 6691 http://gar.svn.sourceforge.net/gar/?rev=6691&view=rev Author: bdwalton Date: 2009-10-03 18:55:23 +0000 (Sat, 03 Oct 2009) Log Message: ----------- correct git registration in /etc/services postinstall Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-03 17:17:41 UTC (rev 6690) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-03 18:55:23 UTC (rev 6691) @@ -1 +1 @@ -6c2d8cf8dcdfc844ea32bc381f6a3bfd download/CSWgit.postinstall +b2f8cba4fea2abc0cab666bb8a523a1a download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-03 17:17:41 UTC (rev 6690) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-03 18:55:23 UTC (rev 6691) @@ -9,9 +9,9 @@ cp -p "$GC_OLD" "$GC_NEW" fi -/usr/xpg4/bin/grep -q CSWgit /etc/services +/usr/xpg4/bin/grep -q CSWgit /etc/inet/services if [ $? -ne 0 ]; then - echo <>/etc/services + cat <>/etc/inet/services git 9418/tcp # CSWgit: git transfer service git 9418/udp # CSWgit: git transfer service EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 3 22:28:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 03 Oct 2009 20:28:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6692] csw/mgar/pkg/x11 Message-ID: Revision: 6692 http://gar.svn.sourceforge.net/gar/?rev=6692&view=rev Author: wbonnet Date: 2009-10-03 20:28:43 +0000 (Sat, 03 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_compositeproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_compositeproto/ Removed Paths: ------------- csw/mgar/pkg/x11/compositeproto/ Modified: csw/mgar/pkg/x11/x11_compositeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/trunk/Makefile 2009-10-03 18:55:23 UTC (rev 6691) +++ csw/mgar/pkg/x11/x11_compositeproto/trunk/Makefile 2009-10-03 20:28:43 UTC (rev 6692) @@ -1,6 +1,8 @@ -GARNAME = compositeproto GARVERSION = 0.4 CATEGORIES = x11 +PROTONAME = compositeproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Composite protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Oct 4 00:09:49 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Oct 2009 22:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6693] csw/mgar/pkg Message-ID: Revision: 6693 http://gar.svn.sourceforge.net/gar/?rev=6693&view=rev Author: skayser Date: 2009-10-03 22:09:49 +0000 (Sat, 03 Oct 2009) Log Message: ----------- tmpreaper: initial commit Added Paths: ----------- csw/mgar/pkg/tmpreaper/ csw/mgar/pkg/tmpreaper/branches/ csw/mgar/pkg/tmpreaper/tags/ csw/mgar/pkg/tmpreaper/trunk/ csw/mgar/pkg/tmpreaper/trunk/Makefile csw/mgar/pkg/tmpreaper/trunk/checksums csw/mgar/pkg/tmpreaper/trunk/files/ csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch csw/mgar/pkg/tmpreaper/trunk/files/README.CSW csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/tmpreaper/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tmpreaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/Makefile 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,42 @@ +GARNAME = tmpreaper +GARVERSION = 1.6.13 +CATEGORIES = apps + +DESCRIPTION = Cleans up files in directories based on their age +define BLURB + This package provides a program that can be used to clean out + temporary-file directories. It recursively searches the directory, + refusing to chdir() across symlinks, and removes files that haven't been + accessed in a user-specified amount of time. You can specify a set of + files to protect from deletion with a shell pattern. It will not remove + files owned by the process EUID that have the `w' bit clear, unless you + ask it to, much like `rm -f'. `tmpreaper' will not remove symlinks, + sockets, fifos, or special files unless given a command line option + enabling it to. +endef + +SPKG_SOURCEURL = http://packages.debian.org/sid/tmpreaper +MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/t/tmpreaper/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = + +# getcwd() returns char*, fix return value comparison +PATCHFILES = 0001-fix-getcwd-comparison.patch +# Studio 11 does not know about statement expressions +PATCHFILES += 0002-provide-statement-expression-workaround.patch + +# Force zone-friendly dirs, while they have not yet become standard in GAR +sysconfdir=/etc/opt/csw +localstatedir=/var/opt/csw + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(FILEDIR)/README.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/tmpreaper/trunk/checksums =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/checksums (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/checksums 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,3 @@ +2ef1fd86b2350b7e8d95c587aa752eba download/0001-fix-getcwd-comparison.patch +64c57bd076a6bace6fa108ff750c7d53 download/0002-provide-statement-expression-workaround.patch +f5799a7f142f9fa49586ae3da2bba222 download/tmpreaper_1.6.13.tar.gz Added: csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/0001-fix-getcwd-comparison.patch 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,13 @@ +diff --git a/tmpreaper.c b/tmpreaper.c +index a6d172c..111c647 100644 +--- a/tmpreaper.c ++++ b/tmpreaper.c +@@ -356,7 +356,7 @@ cleanupDirectory (const char * dirname , + int l; + /* the admin will want to know where the problem lies */ + #ifdef NO_get_current_dir_name +- if (getcwd(path, PATH_MAX) < 0) ++ if (getcwd(path, PATH_MAX) == NULL) + /* too long even for PATH_MAX, show something anyway */ + #else + if ((path = get_current_dir_name()) < 0) Added: csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/0002-provide-statement-expression-workaround.patch 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,26 @@ +diff --git a/tmpreaper.c b/tmpreaper.c +index 111c647..0a7005f 100644 +--- a/tmpreaper.c ++++ b/tmpreaper.c +@@ -688,12 +688,21 @@ main (int argc, + * Utilize GNU C dynamic array allocation and statement expressions to + * allocate an array to hold the --protect argument strings. + */ ++#ifdef __GNUC__ + char *protect_argv[ ({ int i; + int count = 0; + for (i = 1; i < argc; i++) + if (! strncmp (argv[i], "--protect", 9)) + count++; + ++count; }) ]; ++#else ++ int pi; ++ int pcount = 0; ++ for (pi = 1; pi < argc; pi++) ++ if (! strncmp (argv[pi], "--protect", 9)) pcount++; ++ ++pcount; ++ char *protect_argv[pcount]; ++#endif + + char **p = protect_argv; + Added: csw/mgar/pkg/tmpreaper/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/README.CSW 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,12 @@ +To get started, create a crontab entry such as the following: + +0 4 * * * /opt/csw/bin/tmpreaper --mtime-dir --symlinks 7d --protect '/tmp/.X*-{lock,unix,unix/*}' /tmp + + This will run every day at 04:00 AM, cleaning the /tmp directory of files + not accessed withing 7 days, including symlinks. Empty directories not + modified in the last 7 days will also be removed. The --protect option + causes tmpreaper to skip files with matching names. You can supply more + than one --protect option, and you can supply more than one directory + to be cleaned. + Feel free to adjust as you wish; see the manpage for options. You can use + the --test option to only show what would be done. Added: csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW 2009-10-03 22:09:49 UTC (rev 6693) @@ -0,0 +1,6 @@ +tmpreaper (1.6.13,REV=2009.10.03) + + * Adopted and updated to 1.6.13 + * Added README.CSW with crontab example. + + -- Sebastian Kayser Sat, 3 Oct 2009 23:49:33 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 4 02:10:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 04 Oct 2009 00:10:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6694] csw/mgar/pkg/git/trunk Message-ID: Revision: 6694 http://gar.svn.sourceforge.net/gar/?rev=6694&view=rev Author: bdwalton Date: 2009-10-04 00:09:53 +0000 (Sun, 04 Oct 2009) Log Message: ----------- git: add a 'sign post' file after conditionally copying global gitconfig Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-03 22:09:49 UTC (rev 6693) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-04 00:09:53 UTC (rev 6694) @@ -1 +1 @@ -b2f8cba4fea2abc0cab666bb8a523a1a download/CSWgit.postinstall +5284f7f910e954f4fe2dcab32b750929 download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-03 22:09:49 UTC (rev 6693) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-04 00:09:53 UTC (rev 6694) @@ -7,6 +7,14 @@ if [ -f "$GC_OLD" -a ! -f "$GC_NEW" ]; then echo "Copying /opt/csw/etc/gitconfig to /etc/opt/csw/gitconfig" cp -p "$GC_OLD" "$GC_NEW" + cat < "$GC_OLD.THIS_LOCATION_IS_DEPRECATED" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. +Please make sure your configuration have been moved to /etc/opt/csw +and remove the old one from this location. + +EOF fi /usr/xpg4/bin/grep -q CSWgit /etc/inet/services This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 4 02:22:11 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 04 Oct 2009 00:22:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6695] csw/mgar/pkg/git/trunk Message-ID: Revision: 6695 http://gar.svn.sourceforge.net/gar/?rev=6695&view=rev Author: bdwalton Date: 2009-10-04 00:22:11 +0000 (Sun, 04 Oct 2009) Log Message: ----------- git: correct grammar in etc migration sign post file. Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-04 00:09:53 UTC (rev 6694) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-04 00:22:11 UTC (rev 6695) @@ -1 +1 @@ -5284f7f910e954f4fe2dcab32b750929 download/CSWgit.postinstall +0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-04 00:09:53 UTC (rev 6694) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-04 00:22:11 UTC (rev 6695) @@ -11,8 +11,8 @@ This location (/opt/csw/etc) is deprecated. Configuration files are currently being placed in /etc/opt/csw. -Please make sure your configuration have been moved to /etc/opt/csw -and remove the old one from this location. +Please make sure your configuration (gitconfig) was properly moved to +/etc/opt/csw and then remove the old one from this location. EOF fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 4 13:34:19 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 04 Oct 2009 11:34:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6696] csw/mgar/pkg Message-ID: Revision: 6696 http://gar.svn.sourceforge.net/gar/?rev=6696&view=rev Author: bonivart Date: 2009-10-04 11:34:11 +0000 (Sun, 04 Oct 2009) Log Message: ----------- cvsproxy: initial commit, lacks pre/post scripts Added Paths: ----------- csw/mgar/pkg/cvsproxy/ csw/mgar/pkg/cvsproxy/branches/ csw/mgar/pkg/cvsproxy/tags/ csw/mgar/pkg/cvsproxy/trunk/ csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/checksums csw/mgar/pkg/cvsproxy/trunk/files/ Property changes on: csw/mgar/pkg/cvsproxy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-10-04 11:34:11 UTC (rev 6696) @@ -0,0 +1,28 @@ +GARNAME = cvsproxy +GARVERSION = 1.0.1 +CATEGORIES = utils + +DESCRIPTION = Provides a CVS proxy +define BLURB + Provides a CVS proxy +endef + +MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-install-modulated: + @echo "==> Post-install fixes" + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/cvsproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/checksums (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/checksums 2009-10-04 11:34:11 UTC (rev 6696) @@ -0,0 +1 @@ +ceff47a655085497f5712e2da160c607 download/cvsproxy-1.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 4 15:50:05 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 04 Oct 2009 13:50:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6697] csw/mgar/pkg/cvsproxy/trunk Message-ID: Revision: 6697 http://gar.svn.sourceforge.net/gar/?rev=6697&view=rev Author: bonivart Date: 2009-10-04 13:50:05 +0000 (Sun, 04 Oct 2009) Log Message: ----------- cvsproxy: added pre/post scripts, some re-layout Modified Paths: -------------- csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl Modified: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-10-04 11:34:11 UTC (rev 6696) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-10-04 13:50:05 UTC (rev 6697) @@ -9,7 +9,12 @@ MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWcvsproxy.postinstall +DISTFILES += CSWcvsproxy.preremove +REQUIRED_PKGS = CSWtcpwrap +SPKG_SOURCEURL = http://www.sra.co.jp/people/m-kasahr/cvsproxy + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -25,4 +30,8 @@ @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + @mv $(DESTDIR)/opt/csw/libexec/cvsproxy $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp + @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @cp $(FILEDIR)/editconf.pl $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @mv $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp $(DESTDIR)/opt/csw/libexec/$(GARNAME)/cvsproxy @$(MAKECOOKIE) Modified: csw/mgar/pkg/cvsproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/checksums 2009-10-04 11:34:11 UTC (rev 6696) +++ csw/mgar/pkg/cvsproxy/trunk/checksums 2009-10-04 13:50:05 UTC (rev 6697) @@ -1 +1,3 @@ +5095049b846e80cbe0745d85929af2d9 download/CSWcvsproxy.postinstall +3ce92c760a74f36d40acc02eb5e8e275 download/CSWcvsproxy.preremove ceff47a655085497f5712e2da160c607 download/cvsproxy-1.0.1.tar.gz Added: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall 2009-10-04 13:50:05 UTC (rev 6697) @@ -0,0 +1,30 @@ +#!/bin/sh + +# Mostly copied from CSWfam + +set -e + +if [ "$PKG_ROOT_DIR" = "" ]; then + PKG_ROOT_DIR=/; +fi + +CSWROOT=$PKG_ROOT_DIR/opt/csw +EDITCONF=$CSWROOT/libexec/cvsproxy/editconf.pl + + +echo "Adding cvsproxy to /etc/services" +"$EDITCONF" "$PKG_ROOT_DIR/etc/services" add '^cvsproxy\b' \ + "cvsproxy 2401/tcp # Transparent CVS proxy" \ + "cvsproxy 2401/udp # Transparent CVS proxy" + +echo "Adding cvsproxy to inetd.conf" +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add 'Transparent CVS proxy' \ + "# Transparent CVS proxy" +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add '^cvsproxy\b' \ + "cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy" + + +echo "Restarting inetd..." +pkill -HUP inetd + +exit 0 Added: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove 2009-10-04 13:50:05 UTC (rev 6697) @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +if [ "$PKG_ROOT_DIR" = "" ]; then + PKG_ROOT_DIR=/; +fi + +EDITCONF="$PKG_ROOT_DIR/opt/csw/libexec/cvsproxy/editconf.pl" + +echo "Removing cvsproxy from /etc/services" +"$EDITCONF" "$PKG_ROOT_DIR/etc/services" remove '^cvsproxy' + +echo "Removing cvsproxy from inetd.conf" +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove '^cvsproxy' +"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove 'Transparent CVS proxy' + +echo "Restarting inetd..." +pkill -HUP inetd + +exit 0 Added: csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl 2009-10-04 13:50:05 UTC (rev 6697) @@ -0,0 +1,440 @@ +#!/usr/bin/perl -w + +use strict; + +# $Id: editconf.perl,v 1.1 2000/05/19 22:44:34 rusty Exp $ +# +# This edits configuration files during software install/uninstall. +# Run with --help or see the text of the usage subroutine below for +# more information. +# +# Examples: +# +# Add fam to /etc/inetd.conf during install: +# editconf inetd.conf add '\bfam\b' \ +# "# fam, the File Alteration Monitor" \ +# "sgi_fam/1-2 stream rpc/tcp wait root /usr/local/bin/fam fam" +# +# Remove fam from /etc/inetd.conf during uninstall: +# editconf inetd.conf remove '\bfam\b' +# +# Add /usr/sysadm/lib to /etc/ld.so.conf# +# editconf ld.so.conf add '\bsysadm\b' /usr/sysadm/lib +# +# Add sysadmd to /usr/local/etc/tcpmux.conf: +# editconf tcpmux.conf add '\bsysadm\b' \ +# "# sysadmd, for system administration applications" \ +# "sgi_sysadm root /usr/sysadm/bin/sysadmd sysadmd" +# +# The main goal of this script is to "do no harm." We don't +# modify any files if it looks like we're going to mess with +# lines which have been edited by the user. The only time we +# change a file is when we're confident that we're adding new +# lines, or messing with lines which we ourselves added or +# removed during a previous invocation of the script. +# +# Well... that's not entirely true; the "remove" operation comments +# out any line that matches the given regexp. But it makes a backup! +# +# USING EDITCONF WITH AUTOMAKE AND RPM +# +# This prepends DESTDIR to the files it operates on (unless you pass +# it a file starting with \.{0,2}/, so it can be used during an +# automake "make install" into a non-root directory (as you would do +# while building an RPM package). Note that the file it attempts to +# operate on probably won't be present, though, so you'll probably +# need to ignore errors during the make install: +# +# make-install-hook: +# -$(EDITCONF) ld.so.conf add '\bsysadm\b' /usr/sysadm/lib +# +# This will probably fail when DESTDIR is set, as ld.so.conf probably +# doesn't exist under DESTDIR; the only reason to have this line in the +# Makefile.am is so that a normal "make install" will update the +# configuration files. +# +# In order to have your configuration files updated during the install/ +# uninstall of an rpm package, you'll need to add something like this +# to your spec file: +# +# # this is %preun rather than %postun because we want to use our +# # script before it gets uninstalled. +# %preun +# perl /usr/local/lib/fam/editconf.perl ld.so.conf remove '\bsysadm\b' +# +# +sub usage { + my($msg) = @_; + $msg && ($msg ne "help") && print STDERR "$msg\n\n"; + print STDERR <<"EOF"; +Usage: + $0 [options] file \"add\" regexp lines... + $0 [options] file \"remove\" regexp [comment] + $0 --help + +Options: + -n No-exec (don't change any files) + -v Verbose + -s Silent + -- End argument processing (in case your new config file lines + start with -) +EOF + + if($msg eq "help") { + print STDERR <<"EOF"; + +This edits configuration files. Given a file name, it looks +in a list of directories (see below) for the file. (If the file +name starts with "/" or ".", the path list is not searched.) +Once the file is found, the given regular expression is searched +for in the file to determine whether the option or service we're +adding/removing already exists. + +If we're adding new lines to the file, there are four possible +outcomes: + + - If the regexp isn't found in the file, we figure our lines + haven't been added before, and we add them. + + - If the regexp is found in the file, and indeed the exact lines + we were going to add are already there, we're happy, and we + don't change the file. + + - If the regexp is found in the file, and the lines we were going + to add are present but commented out, we uncomment them. + + - If the regexp is found in the file, but in lines which are + different than the lines we were going to add, we figure the + option or service we were going to add has already been configured + differently; in this case, we make our changes in a new copy + of the file and print a warning message saying that someone + should compare the two files. (We don't change the + configuration of the system in this case.) + +If we're removing lines from the file, there are two possible +outcomes: + + - If the regexp isn't found in the file, we're happy, and we + don't change the file. + + - If the regexp is found in the file, we make a backup of the + file, and comment out the lines containing the regexp in the + original file. + +EOF + print STDERR "Configuration file paths:\n"; + foreach (@::paths) { print STDERR " $_\n"; } + } + + exit 1; +} + + +# See if DESTDIR is set, to have us operate on files not in / +my $DESTDIR = $ENV{'DESTDIR'} ? $ENV{'DESTDIR'} : ""; + +# This is the list of places we'll look for the configuration file +# if we weren't given an absolute path. +@::paths = ("$DESTDIR/etc", "$DESTDIR/usr/etc", "$DESTDIR/usr/local/etc"); + +my $comment = '#'; +my $verbose = &splicegrep('^-v$', \@ARGV, '^--$'); +my $noexec = &splicegrep('^-n$', \@ARGV, '^--$'); +my $silent = &splicegrep('^-s$', \@ARGV, '^--$'); +&splicegrep('^--?h', \@ARGV, '^--$') && &usage("help"); +&splicegrep('^-', \@ARGV, '^--$') && &usage(); +&splicegrep('^--$', \@ARGV); + +my $file; # the name of the file passed on the command line +my $regexp; # the pattern passed on the command line +my $op; # the operation being performed (add|remove) + +($file = shift) || &usage("The config file name is required!"); +(($op = shift) && ($op =~ /^(add|remove)$/)) || &usage("\"add\" or \"remove\" is required!"); +($regexp = shift) || &usage("The regexp to search for is required!"); +my @lines = @ARGV; + + +# +# Does the file name start with /, ./, or ../? +# +if ($file =~ m#^\.{0,2}/#) { + # Danger! Not applying $DESTDIR to $path here! + &shaketh_thy_booty($op, $file, $regexp, @lines); + exit 0; +} +# +# No, so we'll search for the file name in the list of paths. +# +$verbose && $DESTDIR && print "Using DESTDIR \"$DESTDIR\"\n"; +my($p, $path); +foreach $p (@::paths) { + $path = "$p/$file"; + $verbose && print STDERR "Looking for $path...\n"; + if (-f $path) { + &shaketh_thy_booty($op, $path, $regexp, @lines); + exit 0; + } +} +die("Couldn't find $file in " . join(" ", @::paths) . "\n"); + + +# +# Once we know what file we're attacking, this does the actual work. +# +sub shaketh_thy_booty { # or is it "thine"? + my($op, $path, $regexp, @lines) = @_; + $noexec || -w $path || die("I don't have write permission on $path!\n"); + # Might as well snort it into memory. Hopefully it's a small file, ha ha. + open(CFG, "<$path") || die("Couldn't open $path for input!\n"); + my @wholefile = ; + close(CFG); + + my $matched = 0; + if (!grep /$regexp/, @wholefile) { + if ($op eq 'add') { + # It doesn't contain our regexp, so append our lines and + # exit happily. + if ($noexec) { + print "I would have added the following lines to $path:\n"; + foreach (@lines) { print "$_\n"; } + } else { + open(CFG, ">>$path") || die("Couldn't open $path for append!\n"); + $silent || print "Added the following lines to $path:\n"; + foreach (@lines) { + $silent || print "$_\n"; + print CFG "$_\n"; + } + $silent || print "(end of lines added to $path)\n"; + } + exit 0; + } elsif ($op eq 'remove') { + # It doesn't contain our regexp, so we don't need to remove it, + # so we're happy. + exit 0; + } else { die("bad op \"$op\""); } + } + + if ($op eq "remove") { + # Since we're still here, and we're removing this entry, comment out + # all lines matching our regexp. + if ($noexec) { + print "I would have commented out the following lines in $path:\n"; + grep { + /$regexp/ && print; + } @wholefile; + } else { + my $tmpnm = &tmpnam("$path.$$"); + my $comment_re = quotemeta $comment; + my @commented_out; + open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); + foreach (@wholefile) { + # We care if it matches, and isn't already commented out. + if ((/$regexp/) && (!/^$comment_re/)) { + push @commented_out, $_; + print CFG $comment; + } + print CFG; + } + if ($#commented_out == -1) { + # We didn't actually need to comment anything out! + # Apparently all the lines that matched our regexp were + # already commented out. + $verbose && print "All the lines matching our regexp were ", + "already commented out, so we're not doing ", + "anything!\n"; + unlink $tmpnm; + exit 0; + } +# $silent || print "Commented out the following lines in $path:\n"; +# $silent || grep { print; } @commented_out; +# $silent || print "(end of lines commented out in $path)\n"; + my $bak = &tmpnam("$path.O"); + rename($path, $bak) || die("Couldn't rename $path to $bak!\n"); + rename($tmpnm, $path) || die("Couldn't rename $tmpnm to $path!\n"); + $silent || print "Original file saved as $bak\n"; + } + exit 0; + } + + # just a sanity check... + ($op eq "add") || die("bad op \"\$op\""); + + # We're still here, so we found our regexp, which suggests that the + # entry we're adding might already be in the file. Do our new lines + # match existing lines exactly? + $verbose && print "The file contains our regular expression, so let's see ", + "if it has our lines...\n"; + $matched = 1; + my $re; + foreach (@lines) { + $re = quotemeta $_; + $verbose && print " Looking for \"$re\"\n"; + if (! grep /^$re$/, @wholefile) { + $verbose && print " Didn't find it!\n"; + $matched = 0; + last; + } + } + if ($matched) { + # The lines we would have added are already in the file, so + # we can all go home early. + $verbose && print "$path already contains the lines we would have ", + "added.\n"; + exit 0; + } + + # All right, we're still here, so let's see if the lines we would have + # added are in the file, but commented out. This is slightly complicated + # by the possibility that lines we're adding start with comments; if so, + # we don't want to require that they be preceded by another comment + # character. + $verbose && print "Let's see if it has our lines, but commented out...\n"; + $re = quotemeta $comment; + my @linesre = @lines; + grep { + # If it starts with a comment, require make an additional starting + # comment optional. (the ($re.*)? as opposed to $re.*) + $_ = (/^$re/) ? "^($re.*)?" . quotemeta $_ : "^$re.*" . quotemeta $_; + } @linesre; + $matched = 1; + foreach $re (@linesre) { + # This loop through @linesre isn't done in the grep above because + # we want that to iterate through every element, while this loop + # can bail as soon as it fails to find a line it's looking for. + $verbose && print " Looking for \"$re\"\n"; + # If you change this next line, make sure you make the same changes + # in the substitution below. + if (! grep /$re$/, @wholefile) { + $verbose && print " Didn't find it!\n"; + $matched = 0; + last; + } + } + if ($matched) { + # The lines we would have added are already in the file, but + # commented out. Let's uncomment them into a temp file, and then + # replace the existing file with the temp file. + if ($noexec) { + print "I would have uncommented the following lines in $path:\n"; + foreach (@lines) { print "$_\n"; } + exit 0; + } + # This is crude. For every line in the file, if it matches the + # commented-out version of any of the lines we're adding, replace + # it with the corresponding non-commented-out line. + my $idx; + foreach (@wholefile) { + foreach $idx (0..$#lines) { + s/$linesre[$idx]$/$lines[$idx]/ && last; + } + } + # isn't there a perl tmpnam? this open/die is stupid. + my $tmpnm = &tmpnam("$path.$$"); + open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); + print CFG @wholefile; + close(CFG) || die("Couldn't close $tmpnm after writing!\n"); + rename($tmpnm, $path) || die("Couldn't replace $path with $tmpnm " . + "after writing!\n"); + exit 0; + } + + # We're still here, so it looks like our configuration lines are in the + # file, but they're different than what we would have added. Nuts! + # Comment out everything matching our regexp and append our new lines, + # but do it into a new file so that we don't stomp any existing + # configuration. + my $tmpnm = &tmpnam("$path.N"); + if ($noexec) { + print "I would have copied $path to $tmpnm and commented out the following lines in $tmpnm:\n"; + grep { + /$regexp/ && print; + } @wholefile; + print "...and added the following lines to $tmpnm:\n"; + foreach (@lines) { print "$_\n"; } + exit 0; + } + grep { + /$regexp/ && ($_ = ($comment . $_)); + } @wholefile; + # Now append our new stuff + foreach (@lines) { + push @wholefile, "$_\n"; + } + open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); + print CFG @wholefile; + close(CFG) || die("Couldn't close $tmpnm after writing!\n"); + # Just for fun, if $path.N already existed, let's see if it's the + # same as what we just wrote. + &diff($tmpnm, "$path.N", \@wholefile) || ($tmpnm = "$path.N"); + + print STDERR <<"EOF"; + +********************************************************************** +Configuration changes to $file have not been made +automatically because there appears to be a conflict between the +file's current contents and the lines which would have been added. + +Original file: $path +New file: $tmpnm + +Please compare these two files and update the original file as needed. +********************************************************************** + +EOF + exit 0; +} + + +# Returns the array of elements matching the given re in the given array, +# and removes those elements from the array. If $bre is set, we only +# search through the array until an element matching $bre is encountered. +sub splicegrep { + my($re, $a, $bre) = @_; + my @ta = (); + my @ra = (); + my $skip = 0; + $a || ($a = \@ARGV); + # sub-optimal but our argv should be short + grep { + $bre && /$bre/ && ($skip = 1); + ((!$skip) && /$re/) ? push @ra, $_ : push @ta, $_; + } @{$a}; + @{$a} = @ta; + return @ra; +} + + +# This is kind of stupid. +sub tmpnam { + my($base) = @_; + my $hope = $base; + my $count = 0; + while(-e $hope) { + $hope = "$base$count"; + ++$count; + } + return $hope; +} + + +# Returns 0 if we know the two files are the same, 1 if we're not sure. +sub diff { + my($fn1, $fn2, $fc1) = @_; + ($fn1 eq $fn2) && return 0; # same file name! + my $sz1 = (stat $fn1)[7]; # size $sstuff[7]; # size + my $sz2 = (stat $fn2)[7]; # size $sstuff[7]; # size + $sz1 && ($sz1 != $sz2) && return 1; # different sizes; they're different + # Nuts, they're the same size, so we have to compare them. + open(FH2, "<$fn2") || return 1; + my @snort2 = ; + close(FH2); + # Same number of lines? + ($#snort2 == $#{$fc1}) || return 1; + my $i = $#snort2; + while ($i >= 0) { + ($snort2[$i] eq $fc1->[$i]) || return 1; + --$i; + } + return 0; +} Property changes on: csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 4 23:27:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 04 Oct 2009 21:27:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6698] csw/mgar/pkg/libtheora/trunk Message-ID: Revision: 6698 http://gar.svn.sourceforge.net/gar/?rev=6698&view=rev Author: dmichelsen Date: 2009-10-04 21:27:22 +0000 (Sun, 04 Oct 2009) Log Message: ----------- libtheora: Update to 1.1.1 Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile csw/mgar/pkg/libtheora/trunk/checksums Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 13:50:05 UTC (rev 6697) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:27:22 UTC (rev 6698) @@ -1,5 +1,5 @@ GARNAME = libtheora -GARVERSION = 1.0 +GARVERSION = 1.1.1 CATEGORIES = lib DESCRIPTION = Theora video codec support library Modified: csw/mgar/pkg/libtheora/trunk/checksums =================================================================== --- csw/mgar/pkg/libtheora/trunk/checksums 2009-10-04 13:50:05 UTC (rev 6697) +++ csw/mgar/pkg/libtheora/trunk/checksums 2009-10-04 21:27:22 UTC (rev 6698) @@ -1 +1 @@ -c963937053f45a7878954bed37ceb182 download/libtheora-1.0.tar.bz2 +292ab65cedd5021d6b7ddd117e07cd8e download/libtheora-1.1.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 4 23:31:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 04 Oct 2009 21:31:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6699] csw/mgar/pkg/libtheora/trunk/Makefile Message-ID: Revision: 6699 http://gar.svn.sourceforge.net/gar/?rev=6699&view=rev Author: dmichelsen Date: 2009-10-04 21:31:28 +0000 (Sun, 04 Oct 2009) Log Message: ----------- libtheora: Relocate documentation to standard location Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:27:22 UTC (rev 6698) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:31:28 UTC (rev 6699) @@ -32,4 +32,6 @@ TEST_TARGET = check +EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(GARNAME)-$(GARVERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),' + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 09:52:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 07:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6700] csw/mgar/pkg/libtheora/trunk/Makefile Message-ID: Revision: 6700 http://gar.svn.sourceforge.net/gar/?rev=6700&view=rev Author: dmichelsen Date: 2009-10-05 07:52:59 +0000 (Mon, 05 Oct 2009) Log Message: ----------- libtheora: Adjust upstream watch Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-04 21:31:28 UTC (rev 6699) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2009-10-05 07:52:59 UTC (rev 6700) @@ -22,7 +22,7 @@ CATALOGNAME = libtheora # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 10:12:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 08:12:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6701] csw/mgar/pkg/x11/libxpm/trunk/Makefile Message-ID: Revision: 6701 http://gar.svn.sourceforge.net/gar/?rev=6701&view=rev Author: dmichelsen Date: 2009-10-05 08:12:53 +0000 (Mon, 05 Oct 2009) Log Message: ----------- x11/libxpm: Add missing link Modified Paths: -------------- csw/mgar/pkg/x11/libxpm/trunk/Makefile Modified: csw/mgar/pkg/x11/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxpm/trunk/Makefile 2009-10-05 07:52:59 UTC (rev 6700) +++ csw/mgar/pkg/x11/libxpm/trunk/Makefile 2009-10-05 08:12:53 UTC (rev 6701) @@ -45,6 +45,10 @@ include gar/category.mk +post-install-modulated: + ln -s libXpm.so.4.11.0 $(DESTDIR)$(libdir)/libXpm.so.4.11 + @$(MAKECOOKIE) + post-merge: ifeq ($(GARCH),sparc) @ginstall -d $(PKGROOT)/opt/csw/lib/sparcv8plus+vis This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 10:27:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 08:27:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6702] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6702 http://gar.svn.sourceforge.net/gar/?rev=6702&view=rev Author: dmichelsen Date: 2009-10-05 08:27:21 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: More bugfixes towards release Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.conf.mk csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-05 08:12:53 UTC (rev 6701) +++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-05 08:27:21 UTC (rev 6702) @@ -294,24 +294,6 @@ # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler $(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I)))) -# BUILDHOST_isa-$ISA is the name of the host where the compilation should take place -# It defaults to the corresponding BUILD_(sparc|i386)-(32|64) -# An empty string means "stay on the current host" -define BUILDHOST -$(strip - $(if $(filter $1,$(ISALIST_sparcv9), - $(if $(BUILDHOST_sparc-$(MEMORYMODEL_$1)), - $(if $(eq $(BUILDHOST_sparc-$(MEMORYMODEL_$1)),$(THISHOST)),,$(BUILDHOST_sparc-$(MEMORYMODEL_$1))), - ), - $(if $(filter $1,$(ISALIST_amd64), - $(if $(BUILDHOST_i386-$(MEMORYMODEL_$1)), - $(if $(eq $(BUILDHOST_i386-$(MEMORYMODEL_$1)),$(THISHOST)),,$(BUILDHOST_i386-$(MEMORYMODEL_$1))), - ), - ), - ), -) -endef - # This is the memory model of the currently compiled architecture MEMORYMODEL = $(MEMORYMODEL_$(ISA)) Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 08:12:53 UTC (rev 6701) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 08:27:21 UTC (rev 6702) @@ -158,12 +158,7 @@ ) merge-$(2): BUILDHOST=$$(call modulation2host) merge-$(2): - echo modulation: $(2) - echo vars: $(3) - echo ISA: $$(ISA) - echo BUILDHOST="$$(BUILDHOST)" - echo THISHOST="$$(THISHOST)" - echo "Building modulation on host '$$(BUILDHOST)'" + @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ @@ -663,17 +658,17 @@ $(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\ $(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait $(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)`; stty sane; fi - $(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \ + $(_DBG_MERGE)$(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \ echo "Build error in modulation $M. Please see"; \ echo " $(WORKROOTDIR)/build-$M/build.log"; \ echo "for details:"; \ echo; \ tail -100 $(WORKROOTDIR)/build-$M/build.log; \ - exit `cat $(WORKROOTDIR)/build-$M/build.ret`; \ + exit "Return code: `cat $(WORKROOTDIR)/build-$M/build.ret`"; \ fi;) merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) -merge-watch: +merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 08:12:53 UTC (rev 6701) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 08:27:21 UTC (rev 6702) @@ -561,16 +561,14 @@ # hosts. If there are no platform hosts defined the test is skipped. validateplatform: $(if $(strip $(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\ - $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ - $(warning ***)\ + $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\ + @$(MAKECOOKIE),\ $(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\ $(foreach P,$(PACKAGING_PLATFORMS),\ $(warning *** - $P $(if $(PACKAGING_HOST_$P),to be build on host '$(PACKAGING_HOST_$P)',with no suitable host available))\ )\ - $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ - $(warning ***)\ - )) - @$(MAKECOOKIE) + $(error You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ + ),@$(MAKECOOKIE)) # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific @@ -635,12 +633,12 @@ $(foreach P,$(PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P package;,\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\ + $(MAKE) PLATFORM=$P package && ,\ + $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ - ) + ) true # Print relecant informations about the platform platformenv: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 11:22:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 09:22:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6703] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 6703 http://gar.svn.sourceforge.net/gar/?rev=6703&view=rev Author: dmichelsen Date: 2009-10-05 09:22:58 +0000 (Mon, 05 Oct 2009) Log Message: ----------- libsdl: Add 64 bit and split off devel Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-05 08:27:21 UTC (rev 6702) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-05 09:22:58 UTC (rev 6703) @@ -11,13 +11,28 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibsdl) REQUIRED_PKGS = CSWiconv +SPKG_SOURCEURL = http://www.libsdl.org/ + +PACKAGES = CSWlibsdl CSWlibsdldevel + +CATALOGNAME_CSWlibsdl = libsdl +CATALOGNAME_CSWlibsdldevel = libsdl_devel + +SPKG_DESC_CSWlibsdl = Simple DirectMedia Layer library +SPKG_DESC_CSWlibsdldevel = Simple DirectMedia Layer library development files + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# needs esound in 64 bit +# make sure it binds completely against new X11 + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static +PKGFILES_CSWlibsdldevel = $(PKGFILES_DEVEL) + include gar/category.mk Deleted: csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec 2009-10-05 08:27:21 UTC (rev 6702) +++ csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.gspec 2009-10-05 09:22:58 UTC (rev 6703) @@ -1,4 +0,0 @@ -%var bitname libsdl -%var pkgname CSWlibsdl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:17:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:17:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6704] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6704 http://gar.svn.sourceforge.net/gar/?rev=6704&view=rev Author: dmichelsen Date: 2009-10-05 12:17:49 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: More fixes towards release Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 09:22:58 UTC (rev 6703) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 12:17:49 UTC (rev 6704) @@ -75,37 +75,6 @@ include $(GARDIR)/gar.conf.mk include $(GARDIR)/gar.lib.mk -#################### DIRECTORY MAKERS #################### - -# This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: - @if test -d $@; then : ; else \ - ginstall -d $@; \ - echo "ginstall -d $@"; \ - fi - -# These stubs are wildcarded, so that the port maintainer can -# define something like "pre-configure" and it won't conflict, -# while the configure target can call "pre-configure" safely even -# if the port maintainer hasn't defined it. -# -# in addition to the pre- rules, the maintainer may wish -# to set a "pre-everything" rule, which runs before the first -# actual target. -pre-%: - @true - -post-%: - @true - -# Call any arbitrary rule recursively for all dependencies -deep-%: % - @for target in "" $(DEPEND_LIST) ; do \ - test -z "$$target" && continue ; \ - $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ - done - @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) - # ========================= MODULATIONS ======================== # The default is to modulate over ISAs @@ -137,7 +106,7 @@ define _modulate_target $(1)-$(2): - @gmake MODULATION=$(2) $(3) $(1)-modulated + @$(MAKE) MODULATION=$(2) $(3) $(1)-modulated @# This is MAKECOOKIE expanded to use the name of the rule explicily as the rule has @# not been evaluated yet. XXX: Use function _MAKECOOKIE for both @mkdir -p $(COOKIEDIR)/$(dir $(1)-$(2)) && date >> $(COOKIEDIR)/$(1)-$(2) @@ -147,7 +116,7 @@ define _modulate_target_nocookie $(1)-$(2): - @gmake -s MODULATION=$(2) $(3) $(1)-modulated + @$(MAKE) -s MODULATION=$(2) $(3) $(1)-modulated @# The next line has intentionally been left blank to explicitly terminate this make rule endef @@ -161,7 +130,7 @@ @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ - gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ + $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule @@ -218,7 +187,38 @@ $(eval $(call _modulate,$(MODULATORS))) +#################### DIRECTORY MAKERS #################### +# This is to make dirs as needed by the base rules +$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + ginstall -d $@; \ + echo "ginstall -d $@"; \ + fi + +# These stubs are wildcarded, so that the port maintainer can +# define something like "pre-configure" and it won't conflict, +# while the configure target can call "pre-configure" safely even +# if the port maintainer hasn't defined it. +# +# in addition to the pre- rules, the maintainer may wish +# to set a "pre-everything" rule, which runs before the first +# actual target. +pre-%: + @true + +post-%: + @true + +# Call any arbitrary rule recursively for all dependencies +deep-%: % + @for target in "" $(DEPEND_LIST) ; do \ + test -z "$$target" && continue ; \ + $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ + done + @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) + + # ========================= MAIN RULES ========================= # The main rules are the ones that the user can specify as a # target on the "make" command-line. Currently, they are: @@ -249,7 +249,9 @@ # prerequisite - Make sure that the system is in a sane state for building the package PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) -prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite +# Force to be called in global modulation +prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite) $(DONADA) prerequisitepkg-%: @@ -289,15 +291,15 @@ checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum @$(DONADA) -checksum-global: - @$(MAKE) -s ISA=global checksum - @$(MAKECOOKIE) +checksum-global: $(if $(filter global,$(MODULATION)),checksum) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global checksum) + @$(DONADA) # The next rule handles the dependency from the modulated context to # the contextless checksumming. The rule is called when the cookie # to the global checksum is requested. If the global checksum has not run, # then run it. Otherwise it is silently accepted. -checksum-modulated: $(if $(test ! -e $(COOKIEDIR)/build-global/checksum),checksum-global) +checksum-modulated: checksum-global @$(DONADA) # returns true if checksum has completed successfully, false @@ -331,6 +333,10 @@ extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) +extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global extract) + @$(MAKECOOKIE) + extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ @@ -736,7 +742,7 @@ # cookie, but that would be lame and unportable). clean: $(addprefix clean-,$(MODULATIONS)) - rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) + @rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) clean-modulated: $(call _pmod,Cleaning ) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 09:22:58 UTC (rev 6703) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:17:49 UTC (rev 6704) @@ -573,14 +573,18 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -package: validateplatform checksum merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package + +package: _package @echo @echo "The following packages have been built:" @echo - @$(foreach SPEC,$(_PKG_SPECS),echo $(SPEC);echo " $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz";) - @echo + @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow @$(DONADA) +_pkgshow: + @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) + # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" @@ -601,7 +605,7 @@ # pkgcheck - check if the package is compliant # pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS)) - $(DONADA) + @$(DONADA) pkgcheck-%: @echo " ==> Checking compliance: $*" @@ -633,12 +637,25 @@ $(foreach P,$(PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P package && ,\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package" && \ + $(MAKE) PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ ) true + @echo + @echo "The following packages have been built during this invocation:" + @echo + @$(foreach P,$(PACKAGING_PLATFORMS),\ + echo "* Platform $P\c";\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + echo " (built on this host)";\ + $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ + echo " (built on host '$(PACKAGING_HOST_$P)')";\ + $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + )\ + ) + #@$(MAKECOOKIE) # Print relecant informations about the platform platformenv: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:25:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6705] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6705 http://gar.svn.sourceforge.net/gar/?rev=6705&view=rev Author: dmichelsen Date: 2009-10-05 12:25:35 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Cosmetic addition Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:17:49 UTC (rev 6704) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:25:35 UTC (rev 6705) @@ -580,6 +580,7 @@ @echo "The following packages have been built:" @echo @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow + @echo @$(DONADA) _pkgshow: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:36:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:36:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6706] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6706 http://gar.svn.sourceforge.net/gar/?rev=6706&view=rev Author: dmichelsen Date: 2009-10-05 12:36:43 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Added replatforms Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:25:35 UTC (rev 6705) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 12:36:43 UTC (rev 6706) @@ -656,8 +656,10 @@ $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ )\ ) - #@$(MAKECOOKIE) + @$(MAKECOOKIE) +replatforms: spotless platforms + # Print relecant informations about the platform platformenv: @$(foreach P,$(PACKAGING_PLATFORMS),\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 14:44:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 12:44:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6707] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6707 http://gar.svn.sourceforge.net/gar/?rev=6707&view=rev Author: dmichelsen Date: 2009-10-05 12:44:12 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb47: Exclude old license Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 12:36:43 UTC (rev 6706) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 12:44:12 UTC (rev 6707) @@ -69,6 +69,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:20:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6708] csw/mgar/pkg/x11/libxaw/trunk/Makefile Message-ID: Revision: 6708 http://gar.svn.sourceforge.net/gar/?rev=6708&view=rev Author: dmichelsen Date: 2009-10-05 13:20:14 +0000 (Mon, 05 Oct 2009) Log Message: ----------- x11/libxaw: Add dependency Modified Paths: -------------- csw/mgar/pkg/x11/libxaw/trunk/Makefile Modified: csw/mgar/pkg/x11/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-10-05 12:44:12 UTC (rev 6707) +++ csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-10-05 13:20:14 UTC (rev 6708) @@ -25,8 +25,8 @@ SPKG_DESC_CSWlibxaw = X Athena Widgets SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files -REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt -REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpm +REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt CSWlibxpm +REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpmdevel BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:46:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:46:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6709] csw/mgar/pkg/bdb45/trunk/Makefile Message-ID: Revision: 6709 http://gar.svn.sourceforge.net/gar/?rev=6709&view=rev Author: dmichelsen Date: 2009-10-05 13:46:16 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb45: Remove extra license directory Modified Paths: -------------- csw/mgar/pkg/bdb45/trunk/Makefile Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-05 13:20:14 UTC (rev 6708) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-05 13:46:16 UTC (rev 6709) @@ -70,6 +70,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb45doc = $(PKGFILES_DOC) PKGFILES_CSWbdb45devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:47:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6710] csw/mgar/pkg/bdb46/trunk/Makefile Message-ID: Revision: 6710 http://gar.svn.sourceforge.net/gar/?rev=6710&view=rev Author: dmichelsen Date: 2009-10-05 13:47:15 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb46: Remove extra license directory Modified Paths: -------------- csw/mgar/pkg/bdb46/trunk/Makefile Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-05 13:46:16 UTC (rev 6709) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-05 13:47:15 UTC (rev 6710) @@ -70,6 +70,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb46doc = $(PKGFILES_DOC) PKGFILES_CSWbdb46devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 15:48:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 13:48:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6711] csw/mgar/pkg/bdb48/trunk/Makefile Message-ID: Revision: 6711 http://gar.svn.sourceforge.net/gar/?rev=6711&view=rev Author: dmichelsen Date: 2009-10-05 13:48:42 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb48: Remove extra license directory Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-05 13:47:15 UTC (rev 6710) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-05 13:48:42 UTC (rev 6711) @@ -71,6 +71,10 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + PKGFILES_CSWbdb48doc = $(PKGFILES_DOC) PKGFILES_CSWbdb48devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 16:34:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 14:34:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6712] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6712 http://gar.svn.sourceforge.net/gar/?rev=6712&view=rev Author: dmichelsen Date: 2009-10-05 14:34:43 +0000 (Mon, 05 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Fix source packages on Solaris 8 Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 13:48:42 UTC (rev 6711) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 14:34:43 UTC (rev 6712) @@ -530,8 +530,10 @@ merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files - $(_DBG)(cd $(DOWNLOADDIR); pax -rH -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR)/files) - $(_DBG)(cd $(CURDIR); pax -rH -w -v Makefile checksums $(_SRCDIR)) + $(_DBG)-rm -f $(addprefix $(_SRCDIR)/files/,$(DISTFILES) $(PATCHFILES)) + $(_DBG)(cd $(DOWNLOADDIR); cp $(DISTFILES) $(PATCHFILES) $(_SRCDIR)/files) + $(_DBG)-rm -f $(addprefix $(_SRCDIR)/,Makefile checksums gar) + $(_DBG)(cd $(CURDIR); cp Makefile checksums $(_SRCDIR)) $(_DBG)ln -s ../gar/$(GARSYSTEMVERSION) $(_SRCDIR)/gar $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 5 16:46:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 05 Oct 2009 14:46:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6713] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6713 http://gar.svn.sourceforge.net/gar/?rev=6713&view=rev Author: dmichelsen Date: 2009-10-05 14:46:03 +0000 (Mon, 05 Oct 2009) Log Message: ----------- bdb47: Add release Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 14:34:43 UTC (rev 6712) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) @@ -24,6 +24,7 @@ PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 NO_ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Oct 5 21:25:17 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:25:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6714] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 6714 http://gar.svn.sourceforge.net/gar/?rev=6714&view=rev Author: rthurner Date: 2009-10-05 19:25:16 +0000 (Mon, 05 Oct 2009) Log Message: ----------- depend on python runtime as well Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-10-05 19:25:16 UTC (rev 6714) @@ -12,7 +12,7 @@ SPKG_DESC_CSWmercurial = Mercurial -REQUIRED_PKGS_CSWmercurial = CSWpython +REQUIRED_PKGS_CSWmercurial = CSWpython CSWpython-rt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 21:31:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:31:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6715] csw/mgar/pkg/x11 Message-ID: Revision: 6715 http://gar.svn.sourceforge.net/gar/?rev=6715&view=rev Author: wbonnet Date: 2009-10-05 19:31:28 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_damageproto/ Removed Paths: ------------- csw/mgar/pkg/x11/damageproto/ Modified: csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile 2009-10-05 19:31:28 UTC (rev 6715) @@ -1,6 +1,8 @@ -GARNAME = damageproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = damageproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Damage protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 21:47:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:47:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6716] csw/mgar/pkg/x11 Message-ID: Revision: 6716 http://gar.svn.sourceforge.net/gar/?rev=6716&view=rev Author: wbonnet Date: 2009-10-05 19:46:33 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_dmxproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_dmxproto/ Removed Paths: ------------- csw/mgar/pkg/x11/dmxproto/ Modified: csw/mgar/pkg/x11/x11_dmxproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_dmxproto/trunk/Makefile 2009-10-05 19:46:33 UTC (rev 6716) @@ -1,6 +1,8 @@ -GARNAME = dmxproto GARVERSION = 2.2.2 CATEGORIES = x11 +PROTONAME = dmxproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Distributed Multi-headed X protocol headers for X11 define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 21:57:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 19:57:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6717] csw/mgar/pkg/x11 Message-ID: Revision: 6717 http://gar.svn.sourceforge.net/gar/?rev=6717&view=rev Author: wbonnet Date: 2009-10-05 19:57:49 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_dri2proto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_dri2proto/ Removed Paths: ------------- csw/mgar/pkg/x11/dri2proto/ Modified: csw/mgar/pkg/x11/x11_dri2proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_dri2proto/trunk/Makefile 2009-10-05 19:57:49 UTC (rev 6717) @@ -1,6 +1,8 @@ -GARNAME = dri2proto GARVERSION = 2.1 CATEGORIES = x11 +PROTONAME = dri2proto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org DRI2 prototype headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:04:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6718] csw/mgar/pkg/x11 Message-ID: Revision: 6718 http://gar.svn.sourceforge.net/gar/?rev=6718&view=rev Author: wbonnet Date: 2009-10-05 20:04:33 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_evieextproto/ Removed Paths: ------------- csw/mgar/pkg/x11/evieextproto/ Modified: csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile 2009-10-05 20:04:33 UTC (rev 6718) @@ -1,6 +1,8 @@ -GARNAME = evieext GARVERSION = 1.1.0 CATEGORIES = x11 +PROTONAME = evieext +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org EvIE protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME)proto +CATALOGNAME_CSWx11$(PROTONAME)proto = x11_$(PROTONAME)proto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:13:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6719] csw/mgar/pkg/x11 Message-ID: Revision: 6719 http://gar.svn.sourceforge.net/gar/?rev=6719&view=rev Author: wbonnet Date: 2009-10-05 20:13:44 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_fixesproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_fixesproto/ Removed Paths: ------------- csw/mgar/pkg/x11/fixesproto/ Modified: csw/mgar/pkg/x11/x11_fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_fixesproto/trunk/Makefile 2009-10-05 20:13:44 UTC (rev 6719) @@ -1,6 +1,8 @@ -GARNAME = fixesproto GARVERSION = 4.0 CATEGORIES = x11 +PROTONAME = fixesproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X11 Fixes extension protocol specification define BLURB @@ -8,15 +10,17 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:21:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:21:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6720] csw/mgar/pkg/x11 Message-ID: Revision: 6720 http://gar.svn.sourceforge.net/gar/?rev=6720&view=rev Author: wbonnet Date: 2009-10-05 20:21:20 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_fontsproto/ Removed Paths: ------------- csw/mgar/pkg/x11/fontsproto/ Modified: csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontsproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile 2009-10-05 20:21:20 UTC (rev 6720) @@ -1,6 +1,8 @@ -GARNAME = fontsproto GARVERSION = 2.1.0 CATEGORIES = x11 +PROTONAME = fontsproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Fonts extension headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:26:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6721] csw/mgar/pkg/x11 Message-ID: Revision: 6721 http://gar.svn.sourceforge.net/gar/?rev=6721&view=rev Author: wbonnet Date: 2009-10-05 20:26:30 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_fontcacheproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_fontcacheproto/ Removed Paths: ------------- csw/mgar/pkg/x11/fontcacheproto/ Modified: csw/mgar/pkg/x11/x11_fontcacheproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_fontcacheproto/trunk/Makefile 2009-10-05 20:26:30 UTC (rev 6721) @@ -1,6 +1,8 @@ -GARNAME = fontcacheproto GARVERSION = 0.1.2 CATEGORIES = x11 +PROTONAME = fontcacheproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X11 Prototype headers for the Fontcache library define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:33:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6722] csw/mgar/pkg/x11 Message-ID: Revision: 6722 http://gar.svn.sourceforge.net/gar/?rev=6722&view=rev Author: wbonnet Date: 2009-10-05 20:33:15 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_printproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_printproto/ Removed Paths: ------------- csw/mgar/pkg/x11/printproto/ Modified: csw/mgar/pkg/x11/x11_printproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/printproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_printproto/trunk/Makefile 2009-10-05 20:33:15 UTC (rev 6722) @@ -1,6 +1,8 @@ -GARNAME = printproto GARVERSION = 1.0.4 CATEGORIES = x11 +PROTONAME = printproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Print extension headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:38:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:38:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6723] csw/mgar/pkg/x11 Message-ID: Revision: 6723 http://gar.svn.sourceforge.net/gar/?rev=6723&view=rev Author: wbonnet Date: 2009-10-05 20:38:22 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_randrproto/ Removed Paths: ------------- csw/mgar/pkg/x11/randrproto/ Modified: csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile 2009-10-05 20:38:22 UTC (rev 6723) @@ -1,6 +1,8 @@ -GARNAME = randrproto GARVERSION = 1.3.0 CATEGORIES = x11 +PROTONAME = randrproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Randr protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:43:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6724] csw/mgar/pkg/x11 Message-ID: Revision: 6724 http://gar.svn.sourceforge.net/gar/?rev=6724&view=rev Author: wbonnet Date: 2009-10-05 20:43:48 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_resourceproto/ Removed Paths: ------------- csw/mgar/pkg/x11/resourceproto/ Modified: csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/resourceproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile 2009-10-05 20:43:48 UTC (rev 6724) @@ -1,6 +1,8 @@ -GARNAME = resourceproto GARVERSION = 1.1.0 CATEGORIES = x11 +PROTONAME = resourceproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Resource protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 5 22:49:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 05 Oct 2009 20:49:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6725] csw/mgar/pkg/x11 Message-ID: Revision: 6725 http://gar.svn.sourceforge.net/gar/?rev=6725&view=rev Author: wbonnet Date: 2009-10-05 20:49:38 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_trapproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_trapproto/ Removed Paths: ------------- csw/mgar/pkg/x11/trapproto/ Modified: csw/mgar/pkg/x11/x11_trapproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_trapproto/trunk/Makefile 2009-10-05 20:49:38 UTC (rev 6725) @@ -1,6 +1,8 @@ -GARNAME = trapproto GARVERSION = 3.4.3 CATEGORIES = x11 +PROTONAME = trapproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Trap protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 6 16:31:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Oct 2009 14:31:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6726] csw/mgar/pkg/libpopt/tags/popt-1.15, REV=2009.10.06/ Message-ID: Revision: 6726 http://gar.svn.sourceforge.net/gar/?rev=6726&view=rev Author: dmichelsen Date: 2009-10-06 14:31:37 +0000 (Tue, 06 Oct 2009) Log Message: ----------- popt: Tag as release 1.15,REV=2009.10.06 Added Paths: ----------- csw/mgar/pkg/libpopt/tags/popt-1.15,REV=2009.10.06/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 6 16:32:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Oct 2009 14:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6727] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6727 http://gar.svn.sourceforge.net/gar/?rev=6727&view=rev Author: dmichelsen Date: 2009-10-06 14:32:10 +0000 (Tue, 06 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Add submitpkg target Modified Paths: -------------- csw/mgar/gar/v2-pbuild/bin/checkpkg csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-06 14:31:37 UTC (rev 6726) +++ csw/mgar/gar/v2-pbuild/bin/checkpkg 2009-10-06 14:32:10 UTC (rev 6727) @@ -543,6 +543,7 @@ print "Doing late evaluations of package library dependencies." while read ldep; do lib=`echo $ldep | nawk '{print $1}'` + [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS if [ $? -ne 0 ]; then Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-06 14:31:37 UTC (rev 6726) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-06 14:32:10 UTC (rev 6727) @@ -279,7 +279,7 @@ # The package may be generated during this build or already installed on the system. # /etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA l none SUNWcsr #perl -ane '$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){print join(" ",$$F[3..$$#F]),"\n";exit}'/dev/null | awk '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)') +#$(shell /usr/sbin/pkgchk -l -p $1 2>/dev/null | $(GAWK) '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)') # 'pkchk -l -p' doesn't work as it concatenates package names with more than 14 characters, # e. g. SUNWgnome-base-libs-develSUNWgnome-calculatorSUNWgnome-freedb-libsSUNWgnome-cd-burnerSUNWgnome-character-map define file2pkg @@ -374,7 +374,7 @@ $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ - echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \ + echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ ) \ )) >$@) @@ -675,6 +675,14 @@ )\ ) +submitpkg: submitpkg-default + +submitpkg-%: _PKGURL=$(shell svn info .. | $(GAWK) '$$1 == "URL:" { print $$2 }') +submitpkg-%: + @$(if $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),\ + $(error You have local files not in the repository. Please commit everything before submitting a package)) + $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION)$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION)$(SPKG_REVSTAMP) + # dependb - update the dependency database # dependb: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 6 16:59:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 06 Oct 2009 14:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6728] csw/mgar/pkg/urxvt/trunk Message-ID: Revision: 6728 http://gar.svn.sourceforge.net/gar/?rev=6728&view=rev Author: wahwah Date: 2009-10-06 14:59:08 +0000 (Tue, 06 Oct 2009) Log Message: ----------- urxvt: A workaround for a Solaris kernel bug: http://bugs.opensolaris.org/view_bug.do?bug_id=6268715 Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2009-10-06 14:32:10 UTC (rev 6727) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2009-10-06 14:59:08 UTC (rev 6728) @@ -20,6 +20,7 @@ MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += urxvt-wrapper # PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris8.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -33,7 +34,21 @@ GARCOMPILER = GNU -REQUIRED_PKGS_CSWurxvt = CSWfconfig CSWftype2 CSWlibxft2 CSWlibxrender CSWzlib +REQUIRED_PKGS_CSWurxvt = CSWbash +REQUIRED_PKGS_CSWurxvt += CSWfconfig +REQUIRED_PKGS_CSWurxvt += CSWftype2 +REQUIRED_PKGS_CSWurxvt += CSWlibxft2 +REQUIRED_PKGS_CSWurxvt += CSWlibxrender +REQUIRED_PKGS_CSWurxvt += CSWzlib TEST_SCRIPTS = +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)$(libexecdir) + for b in urxvt urxvtd urxvtc; do \ + mv $(DESTDIR)$(bindir)/$${b} $(DESTDIR)$(libexecdir); \ + ln -s ../libexec/urxvt-wrapper $(DESTDIR)$(bindir)/$${b}; \ + done + ginstall -m 755 $(FILEDIR)/urxvt-wrapper $(DESTDIR)$(libexecdir) + @$(MAKECOOKIE) + include gar/category.mk Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2009-10-06 14:32:10 UTC (rev 6727) +++ csw/mgar/pkg/urxvt/trunk/checksums 2009-10-06 14:59:08 UTC (rev 6728) @@ -1 +1,2 @@ 4cb9330e99fc0b0b05cebf3581557dd8 download/rxvt-unicode-9.06.tar.bz2 +d1fb3a5f721baf361574880f6cdc92be download/urxvt-wrapper Added: csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper =================================================================== --- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper (rev 0) +++ csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper 2009-10-06 14:59:08 UTC (rev 6728) @@ -0,0 +1,20 @@ +#!/opt/csw/bin/bash +# +# A workaround because of a Solaris 10 kernel bug: +# http://bugs.opensolaris.org/view_bug.do?bug_id=6268715 + +set -u + +executable=$(basename $0) +libexec="/opt/csw/libexec" +libexec_binary="${libexec}/${executable}" + +if [[ ! -r "${libexec_binary}" ]]; then + echo "Can't read ${libexec_binary}" + exit 1 +fi + +# The workaround itself: +export LIBEV_FLAGS=1 + +exec "${libexec_binary}" "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Oct 6 20:27:33 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 06 Oct 2009 18:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6729] csw/mgar/pkg/wget/trunk Message-ID: Revision: 6729 http://gar.svn.sourceforge.net/gar/?rev=6729&view=rev Author: idogan23 Date: 2009-10-06 18:27:32 +0000 (Tue, 06 Oct 2009) Log Message: ----------- wget: bump version to 1.12 Modified Paths: -------------- csw/mgar/pkg/wget/trunk/Makefile csw/mgar/pkg/wget/trunk/checksums Modified: csw/mgar/pkg/wget/trunk/Makefile =================================================================== --- csw/mgar/pkg/wget/trunk/Makefile 2009-10-06 14:59:08 UTC (rev 6728) +++ csw/mgar/pkg/wget/trunk/Makefile 2009-10-06 18:27:32 UTC (rev 6729) @@ -1,5 +1,5 @@ GARNAME = wget -GARVERSION = 1.11.4 +GARVERSION = 1.12 CATEGORIES = net DESCRIPTION = A network utility to retrieve files from the Web Modified: csw/mgar/pkg/wget/trunk/checksums =================================================================== --- csw/mgar/pkg/wget/trunk/checksums 2009-10-06 14:59:08 UTC (rev 6728) +++ csw/mgar/pkg/wget/trunk/checksums 2009-10-06 18:27:32 UTC (rev 6729) @@ -1 +1 @@ -f5076a8c2ec2b7f334cb6e3059820f9c download/wget-1.11.4.tar.bz2 +308a5476fc096a8a525d07279a6f6aa3 download/wget-1.12.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 20:44:49 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 18:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6730] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 6730 http://gar.svn.sourceforge.net/gar/?rev=6730&view=rev Author: valholla Date: 2009-10-06 18:44:49 +0000 (Tue, 06 Oct 2009) Log Message: ----------- fix required pkgs Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2009-10-06 18:27:32 UTC (rev 6729) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2009-10-06 18:44:49 UTC (rev 6730) @@ -33,8 +33,8 @@ SPKG_DESC_CSWsendmail = $(DESCRIPTION) CATALOGNAME_CSWsendmail = sendmail -REQUIRED_PKGS_CSWsendmail = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap -REQUIRED_PKGS_CSWsendmail = CSWcswclassutils +REQUIRED_PKGS_CSWsendmail = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap +REQUIRED_PKGS_CSWsendmail += CSWcswclassutils PROTOTYPE_FILTER = awk \ '$$$$2 ~/i.sol8/ { next } \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 21:42:24 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 19:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6731] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 6731 http://gar.svn.sourceforge.net/gar/?rev=6731&view=rev Author: valholla Date: 2009-10-06 19:42:24 +0000 (Tue, 06 Oct 2009) Log Message: ----------- update to latest version Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 18:44:49 UTC (rev 6730) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 19:42:24 UTC (rev 6731) @@ -1,5 +1,5 @@ GARNAME = libssh2 -GARVERSION = 1.2 +GARVERSION = 1.2.1 CATEGORIES = lib DESCRIPTION = A Library Implementing the SSH2 Protocol. Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2009-10-06 18:44:49 UTC (rev 6730) +++ csw/mgar/pkg/libssh2/trunk/checksums 2009-10-06 19:42:24 UTC (rev 6731) @@ -1 +1 @@ -751f4b5b5d8091f84cfe25fa52226cf9 download/libssh2-1.2.tar.gz +4ee0197947a3b8a4472328c346e1a0e4 download/libssh2-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:14:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6732] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: Revision: 6732 http://gar.svn.sourceforge.net/gar/?rev=6732&view=rev Author: valholla Date: 2009-10-06 20:14:12 +0000 (Tue, 06 Oct 2009) Log Message: ----------- don't test port conflict Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 19:42:24 UTC (rev 6731) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-10-06 20:14:12 UTC (rev 6732) @@ -27,6 +27,7 @@ BUILD64 = 1 NO_ISAEXEC = 1 +TEST_SCRIPTS = TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:19:29 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:19:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6733] csw/mgar/pkg/drupal/trunk/Makefile Message-ID: Revision: 6733 http://gar.svn.sourceforge.net/gar/?rev=6733&view=rev Author: valholla Date: 2009-10-06 20:19:29 +0000 (Tue, 06 Oct 2009) Log Message: ----------- update to 6.14 Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/Makefile Modified: csw/mgar/pkg/drupal/trunk/Makefile =================================================================== --- csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:14:12 UTC (rev 6732) +++ csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:19:29 UTC (rev 6733) @@ -1,5 +1,5 @@ GARNAME = drupal -GARVERSION = 6.12 +GARVERSION = 6.14 CATEGORIES = apps DESCRIPTION = An open source content management platform This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:20:32 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:20:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6734] csw/mgar/pkg/drupal/trunk/checksums Message-ID: Revision: 6734 http://gar.svn.sourceforge.net/gar/?rev=6734&view=rev Author: valholla Date: 2009-10-06 20:20:31 +0000 (Tue, 06 Oct 2009) Log Message: ----------- update to 6.14 Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/checksums Modified: csw/mgar/pkg/drupal/trunk/checksums =================================================================== --- csw/mgar/pkg/drupal/trunk/checksums 2009-10-06 20:19:29 UTC (rev 6733) +++ csw/mgar/pkg/drupal/trunk/checksums 2009-10-06 20:20:31 UTC (rev 6734) @@ -1,4 +1,4 @@ 53fd0059901ddea2bf62f920ee8a6cf6 download/README.CSW -82e2517f175320cffe20997333b3a33a download/drupal-6.12.tar.gz +014bb453a8d0adb0233c763e40d63859 download/drupal-6.14.tar.gz 26a7b490bfe0b52a9ff85880dd3aede1 download/httpd-drupal.conf.CSW 827f7d5f390a53577fc11ac17ad66651 download/uploaddir.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:48:26 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6735] csw/mgar/pkg/drupal/trunk/Makefile Message-ID: Revision: 6735 http://gar.svn.sourceforge.net/gar/?rev=6735&view=rev Author: valholla Date: 2009-10-06 20:48:26 +0000 (Tue, 06 Oct 2009) Log Message: ----------- fix location Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/Makefile Modified: csw/mgar/pkg/drupal/trunk/Makefile =================================================================== --- csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:20:31 UTC (rev 6734) +++ csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:48:26 UTC (rev 6735) @@ -40,7 +40,7 @@ REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5 -DRUPAL_INST_DIR = $(DESTDIR)$(docdir)/$(GARNAME)/$(GARVERSION) +DRUPAL_INST_DIR = $(DESTDIR)$(sharedstatedir)/$(GARNAME)/$(GARVERSION) DRUPAL_DOCFILES = CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt DRUPAL_DOCFILES += INSTALL.pgsql.txt INSTALL.txt LICENSE.txt DRUPAL_DOCFILES += MAINTAINERS.txt UPGRADE.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Oct 6 22:52:14 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 06 Oct 2009 20:52:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6736] csw/mgar/pkg/drupal/trunk/Makefile Message-ID: Revision: 6736 http://gar.svn.sourceforge.net/gar/?rev=6736&view=rev Author: valholla Date: 2009-10-06 20:52:14 +0000 (Tue, 06 Oct 2009) Log Message: ----------- fix depend Modified Paths: -------------- csw/mgar/pkg/drupal/trunk/Makefile Modified: csw/mgar/pkg/drupal/trunk/Makefile =================================================================== --- csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:48:26 UTC (rev 6735) +++ csw/mgar/pkg/drupal/trunk/Makefile 2009-10-06 20:52:14 UTC (rev 6736) @@ -37,7 +37,7 @@ INSTALL_SCRIPTS = custom TEST_SCRIPTS = -REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring +REQUIRED_PKGS_CSWdrupal = CSWapache2 CSWphp5 CSWphp5gd CSWphp5mbstring REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5 DRUPAL_INST_DIR = $(DESTDIR)$(sharedstatedir)/$(GARNAME)/$(GARVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 04:58:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 02:58:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6737] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6737 http://gar.svn.sourceforge.net/gar/?rev=6737&view=rev Author: bdwalton Date: 2009-10-07 02:58:35 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cswclassutils: make prototype dynamic; add {i,r}.cswinetd Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd Removed Paths: ------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,11 +1,10 @@ GARNAME = cswclassutils -GARVERSION = 1.18 +GARVERSION = 1.19 CATEGORIES = utils DESCRIPTION = CSW class action utilities MASTER_SITES = -DISTFILES += $(call admfiles,CSWcswclassutils,prototype) ARCHALL = 1 @@ -14,23 +13,24 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -include gar/category.mk - -WORKSRC = $(WORKDIR) SPKG_SOURCEURL = http://www.opencsw.org -CASLIST = cswcpsampleconf cswpreserveconf cswinitsmf cswusergroup cswpycompile +CASLIST = $(foreach F,$(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +PROTOTYPE_FILTER = sed -e '/^d.*\/usr/d; /scripts/{ s/bin/sys/; }' + +include gar/category.mk + install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)/usr/sadm/install/scripts - @ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest - @ginstall -d $(DESTDIR)/var/opt/csw/svc/method - @cp $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample - @cp $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @cp $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license - @$(foreach CAS,$(CASLIST),cp $(FILEDIR)/CSW$(GARNAME).i.$(CAS) $(DESTDIR)/usr/sadm/install/scripts/i.$(CAS);cp $(FILEDIR)/CSW$(GARNAME).r.$(CAS) $(DESTDIR)/usr/sadm/install/scripts/r.$(CAS);) + @ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 0755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts + @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/manifest + @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method + @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample + @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW + @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license + @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,2 +0,0 @@ -38e0bf6e204e003254ed246df2b4e1f9 download/CSWcswclassutils.gspec -854d77b21b177b15fd2aac39339a0c8c download/CSWcswclassutils.prototype Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.gspec 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,11 +0,0 @@ -%var bitname cswclassutils -%var pkgname CSWcswclassutils -%var arch all -%include url file://%{PKGLIB}/csw_vars.gspec -%pkginfo url file://%{PKGLIB}/csw/pkginfo -%include url file://%{PKGLIB}/csw_prototype.gspec -%depend -%copyright - -Please see /opt/csw/share/doc/cswclassutils/license for license information. - Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-07 02:58:35 UTC (rev 6737) @@ -0,0 +1,119 @@ +#!/bin/sh +# +# i.cswinetd - Class action script for CSW inetd support +# +# Written and maintained by Ben Walton +# +# 2009-10-02 Initial release + +# set DEBUG to any value to enable trace outpu. +DEBUG= + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# Determine if we should import the file with inetconv +case "`uname -r`" in + 5.8|5.9) useinetconv=no;; + *) useinetconv=yes;; +esac + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + inetdsvc=`cat $dest` + set -- $inetdsvc + svcname=$1 + proto=$3 + + if [ -n "$DEBUG" ]; then + echo "svcname: $svcname; proto: $proto" + fi + + case "$svcname" in + */*) isrpc=yes;; + *) isrpc=no;; + esac + + # Determine if service should be started or not + daemon=yes + if [ "$autoenable_daemons" = "no" ]; then + daemon=no + fi + eval autoenable_service="\$autoenable_$svcname" + if [ "$autoenable_service" = "no" ]; then + daemon=no + elif [ "$autoenable_service" = "yes" ]; then + daemon=yes + fi + + # we won't register with inetd if the service name isn't registered + # in the global services file. + /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/inet/services + if [ $? -eq 0 ]; then + if [ -n "$DEBUG" ]; then + echo "Installing inetd service:" + echo "$inetdsvc" + fi + + if [ "$useinetconv" = "yes" ]; then + [ -n "$DEBUG" ] && echo "For solaris 10 (or newer)" + + outdir=/var/opt/csw/svc/manifest/network + if [ "$isrpc" = "yes" ]; then + outdir=$outdir/rpc + fi + manifest=$outdir/$svcname-$proto.xml + + echo "$inetdsvc" > /tmp/$svcname.$$ + + # we use -f to force any in the specified inetd to take precedence + /usr/sbin/inetconv -f -i /tmp/$svcname.$$ -o $outdir || exit 2 + if [ "$daemon" = "yes" ]; then + /usr/sbin/inetadm -e svc:/network/$svcname/$proto:default + else + /usr/sbin/inetadm -d svc:/network/$svcname/$proto:default + fi + + /usr/sbin/installf -c cswinetd $PKGINST $manifest f 644 root bin + /usr/bin/chmod 644 $manifest + /usr/bin/chown root:bin $manifest + + rm /tmp/$svcname.$$ + else + [ -n "$DEBUG" ] && echo "For solaris 8 or 9" + + inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf + + echo "Installing '$svcname' into inetd.conf." + echo "# $PKGINST: added by i.cswinetd" >> $inetdconf + if [ "$daemon" = "yes" ]; then + + echo "$inetdsvc" >> $inetdconf + /usr/bin/pkill -HUP inetd + else + echo "#$inetdsvc" >> $inetdconf + fi + fi + + if [ "$daemon" = "yes" ]; then + echo "Inetd service '$svcname' should be enabled by default." + else + echo "Inetd service '$svcname' should be disabled by default." + fi + else + echo "Service '$svcname' not found in /etc/inet/services. Won't setup inetd for it." + exit 2 + fi +done + +exit 0 Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype 2009-10-06 20:52:14 UTC (rev 6736) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype 2009-10-07 02:58:35 UTC (rev 6737) @@ -1,24 +0,0 @@ -i pkginfo=CSWcswclassutils.pkginfo -i copyright=CSWcswclassutils.copyright -d none /etc/opt/csw 0755 root bin -d none /etc/opt/csw/init.d 0755 root bin -f none /etc/opt/csw/init.d/csw.smf.sample 0755 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/svc 0755 root bin -d none /var/opt/csw/svc/manifest 0755 root bin -d none /var/opt/csw/svc/method 0755 root bin -f none /usr/sadm/install/scripts/i.cswusergroup 0555 root sys -f none /usr/sadm/install/scripts/r.cswusergroup 0555 root sys -f none /usr/sadm/install/scripts/i.cswinitsmf 0555 root sys -f none /usr/sadm/install/scripts/r.cswinitsmf 0555 root sys -f none /usr/sadm/install/scripts/i.cswcpsampleconf 0555 root sys -f none /usr/sadm/install/scripts/r.cswcpsampleconf 0555 root sys -f none /usr/sadm/install/scripts/i.cswpreserveconf 0555 root sys -f none /usr/sadm/install/scripts/r.cswpreserveconf 0555 root sys -f none /usr/sadm/install/scripts/i.cswpycompile 0555 root sys -f none /usr/sadm/install/scripts/r.cswpycompile 0555 root sys -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/cswclassutils 0755 root bin -f none /opt/csw/share/doc/cswclassutils/README.CSW 0444 root bin -f none /opt/csw/share/doc/cswclassutils/license 0444 root bin Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd 2009-10-07 02:58:35 UTC (rev 6737) @@ -0,0 +1,49 @@ +#!/bin/sh +# +# r.cswinetd - Class action script for CSW inetd support +# +# Written and maintained by Ben Walton +# +# 2009-10-02 Initial release + +case "`uname -r`" in + 5.8|5.9) useinetconv=no;; + *) useinetconv=yes; +esac + +while read dest; do + case "$dest" in + *xml) + # we know that this won't happen for sol8/9 + fmri=`/usr/sbin/svccfg inventory $dest | grep -v default` + echo "Disabling and removing $fmri" + inetadm -d $fmri + svccfg delete $fmri + ;; + *) + if [ "$useinetconv" = "no" ]; then + # sol 8 or 9 + + inetdconf=/etc/inet/inetd.conf + inetdsvc=`cat $dest` + set -- $inetdsvc + svcname=$1 + echo "Removing $svcname service from inetd.conf" + /usr/xpg4/bin/sed -e '/# CSWgitosis/{ +$!N +/^# CSWgitosis.*\n#git.*$/d +}' $inetdconf > $inetdconf.$$ && \ + mv $inetdconf.$$ $inetdconf && \ + + chown root:sys $inetdconf && \ + chmod 444 $inetdconf + + # even if the service was disabled, this shouldn't hurt + /usr/bin/pkill -HUP inetd + fi + ;; + esac + + echo $dest + rm -f $dest +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 12:03:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 10:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6738] csw/mgar/pkg/autoproject/trunk Message-ID: Revision: 6738 http://gar.svn.sourceforge.net/gar/?rev=6738&view=rev Author: wahwah Date: 2009-10-07 10:03:07 +0000 (Wed, 07 Oct 2009) Log Message: ----------- autoproject: Added a patch to make it work on Solaris Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile csw/mgar/pkg/autoproject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2009-10-07 02:58:35 UTC (rev 6737) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-10-07 10:03:07 UTC (rev 6738) @@ -22,9 +22,14 @@ SPKG_SOURCEURL = http://packages.debian.org/unstable/devel/autoproject MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/ DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz +PATCHFILES = 0001-gawk-and-ggrep.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL = 1 -REQUIRED_PKGS = CSWautomake +REQUIRED_PKGS = CSWautomake CSWbash CSWgawk CSWggrep TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +AWK=gawk +export AWK +GREP=ggrep +export GREP include gar/category.mk Modified: csw/mgar/pkg/autoproject/trunk/checksums =================================================================== --- csw/mgar/pkg/autoproject/trunk/checksums 2009-10-07 02:58:35 UTC (rev 6737) +++ csw/mgar/pkg/autoproject/trunk/checksums 2009-10-07 10:03:07 UTC (rev 6738) @@ -1,2 +1,2 @@ -c56275967bba34ce1864b3d917e08e55 download/autoproject_0.20-5.diff.gz +acbc54ffab66fd0e7e1820f280a454f1 download/0001-gawk-and-ggrep.patch 609369fa76391d58714059313b9c831c download/autoproject_0.20.orig.tar.gz Added: csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch =================================================================== --- csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch (rev 0) +++ csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch 2009-10-07 10:03:07 UTC (rev 6738) @@ -0,0 +1,123 @@ +From e740fa7364ce0c3a4e67474df83533aae4e85595 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 7 Oct 2009 10:56:16 +0100 +Subject: [PATCH] gawk and ggrep + +--- + autoproject.in | 25 +++++++++++++------------ + 1 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/autoproject.in b/autoproject.in +index d7d1ce8..faa67cc 100755 +--- a/autoproject.in ++++ b/autoproject.in +@@ -12,7 +12,8 @@ set -e + + prefix=@prefix@ + DATADIR=@datadir@ +-AWK=awk ++AWK=gawk ++GREP=ggrep + NAME= + EMAIL= + theoptions=a:d:e:i:l:n:o:p:vVh +@@ -67,7 +68,7 @@ while + DESCRIPTION="$OPTARG"; shift $two ;; + e|-e|--email) EMAIL="$OPTARG"; shift $two ;; + i|-i|--interface) +- if echo "$STDIFS"|grep -q -- " $OPTARG "; then ++ if echo "$STDIFS"|${GREP} -q -- " $OPTARG "; then + IFACE="$OPTARG"; shift $two; + else + echo "unrecognized interface $OPTARG"; +@@ -78,13 +79,13 @@ while + if [ "$OPTARG" = "" ]; then + SKELETONS=""; + else +- if (echo $OPTARG|grep ^/ >/dev/null); then true; \ ++ if (echo $OPTARG|${GREP} ^/ >/dev/null); then true; \ + else OPTARG=`pwd`/$OPTARG; fi + SKELETONS="$OPTARG $SKELETONS"; + fi; + shift $two;; + l|-l|--language) +- if echo "$STDLANGS"|grep -F -q -- " $OPTARG "; then ++ if echo "$STDLANGS"|${GREP} -F -q -- " $OPTARG "; then + PROJECT_LANG="$PROJECT_LANG $OPTARG "; shift $two; + else + echo "unrecognized language $OPTARG"; +@@ -94,7 +95,7 @@ while + n|-n|--name) + NAME=$OPTARG; shift $two ;; + o|-o|--option) +- if echo "$STDOPTS"|grep -q -- " $OPTARG "; then ++ if echo "$STDOPTS"|${GREP} -q -- " $OPTARG "; then + OPTS="$OPTS $OPTARG"; shift $two; + else + echo "unrecognized option $OPTARG"; +@@ -102,7 +103,7 @@ while + exit 1; + fi ;; + p|-p|--parser) +- if echo "$STDPARSERS"|grep -q -- " $OPTARG "; then ++ if echo "$STDPARSERS"|${GREP} -q -- " $OPTARG "; then + PARSER="$OPTARG"; shift $two; + else + echo "unrecognized parser generator $OPTARG"; +@@ -163,7 +164,7 @@ while [ $finished != yes ]; do + else + echo "$HELP"; + fi +- else if echo "$CHOICES" | grep -q -- " $ans "; then ++ else if echo "$CHOICES" | ${GREP} -q -- " $ans "; then + finished=yes; + else echo " unrecognized choice $ans"; fi; fi + done +@@ -251,7 +252,7 @@ fi + + echo "Please indicate which of the following standard options $NAME will use:" + for op in $STDOPTS; do +- if echo " $OPTS "|grep -q -- " $op "; then ++ if echo " $OPTS "|${GREP} -q -- " $op "; then + true; + else + echo -n " $op? [yN] "; read ans; +@@ -279,7 +280,7 @@ if [ "$AUTHOR" = "" ]; then + # Give NIS a try + AUTHOR=`ypmatch $USER passwd.byname|$AWK -F: '{ print $5; }'` + fi +- if echo $AUTHOR | grep -q -- "\,"; then ++ if echo $AUTHOR | ${GREP} -q -- "\,"; then + X=`expr index "$AUTHOR" ","` + X=`expr $X - 1` || true + AUTHOR=`expr substr "$AUTHOR" 1 $X` || true +@@ -325,7 +326,7 @@ cd "$NAME" + # Create a small awk script to select the appropriate options fragments + + for op in $STDOPTS; do +- if echo " $OPTS " | grep -q -- " $op " ; then ++ if echo " $OPTS " | ${GREP} -q -- " $op " ; then + # lines like "@item --output=@var{name}" are not special + cat >>optionsub <$i + if [ -x $DIR/$i ]; then chmod +x $i; fi +- PROCESSED=`awk "BEGIN{print $PROCESSED+1}"` ++ PROCESSED=`${AWK} "BEGIN{print $PROCESSED+1}"` + fi + done + fi +@@ -402,7 +403,7 @@ fi + + # insert language-specific macros into configure.in + insert(){ +-if echo "$PROJECT_LANG"|grep -F -q -- " $1 "; then ++if echo "$PROJECT_LANG"|${GREP} -F -q -- " $1 "; then + echo "using $1 - adding $2 to configure.in" + $AWK "{print}/^AC_PROG_CC/{print \"$2\"}" \ + configure.in >tmp && mv tmp configure.in +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 12:29:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 10:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6739] csw/mgar/pkg/examples/modulations/trunk/files Message-ID: Revision: 6739 http://gar.svn.sourceforge.net/gar/?rev=6739&view=rev Author: wahwah Date: 2009-10-07 10:29:20 +0000 (Wed, 07 Oct 2009) Log Message: ----------- libexample: initial commit Added Paths: ----------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/ csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am csw/mgar/pkg/examples/modulations/trunk/files/libexample/NEWS csw/mgar/pkg/examples/modulations/trunk/files/libexample/README csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/gpl.texinfo csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.1 csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.info csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.lsm.in csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.spec.in csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.texinfo csw/mgar/pkg/examples/modulations/trunk/files/libexample/system.h Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/AUTHORS 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1 @@ +Maciej Blizinski Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/COPYING 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/ChangeLog 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,4 @@ +2009-10-07 Maciej Blizinski + + * libexample: initial version. + Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,18 @@ +bin_PROGRAMS=libexample +libexample_SOURCES=libexample.c libexample.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h + +# uncomment the following if libexample requires the math library +#libexample_LDADD=-lm + +EXTRA_DIST=libexample.lsm.in libexample.spec.in libexample.texinfo + +# if you write a self-test script named `chk', uncomment the +# following and add `chk' to the EXTRA_DIST list +#TESTS=chk + +# build and install the .info pages +info_TEXINFOS = libexample.texinfo +libexample_TEXINFOS = gpl.texinfo + +# install the man pages +man_MANS=libexample.1 Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/README =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/README (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/README 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,23 @@ + libexample - A shared library example project + + + + Copyright (C) 2009 Maciej Blizinski + + libexample is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Comments are welcome. + + - Maciej Blizinski Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,40 @@ +#serial 3 + +dnl From Jim Meyering + +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- +dnl usually in . +dnl Some systems have utime.h but don't declare the struct anywhere. + +AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, +[ + AC_CHECK_HEADERS(utime.h) + AC_REQUIRE([AC_HEADER_TIME]) + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, + [AC_TRY_COMPILE( + [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#ifdef HAVE_UTIME_H +# include +#endif + ], + [static struct utimbuf x; x.actime = x.modtime;], + fu_cv_sys_struct_utimbuf=yes, + fu_cv_sys_struct_utimbuf=no) + ]) + + if test $fu_cv_sys_struct_utimbuf = yes; then + AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, +[Define if struct utimbuf is declared -- usually in . + Some systems have utime.h but don't declare the struct anywhere. ]) + fi +]) Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,964 @@ +# generated automatically by aclocal 1.11 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +[m4_warning([this file was generated for autoconf 2.64. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 9 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 10 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 5 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 16 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 6 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([acinclude.m4]) Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,41 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT(libexample.c) +dnl Every other copy of the package version number gets its value from here +AM_INIT_AUTOMAKE(libexample, 0.1.0) + +dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) +AM_CONFIG_HEADER(config.h) + +AC_SUBST(VERSION) + +ISODATE=`date +%Y-%m-%d` +AC_SUBST(ISODATE) + +AC_CANONICAL_HOST + +dnl Checks for programs. +AC_PROG_INSTALL +AC_PROG_CC + +dnl Checks for libraries. + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h ) + + +jm_CHECK_TYPE_STRUCT_UTIMBUF +AC_HEADER_MAJOR +AC_FUNC_ALLOCA +AC_STRUCT_TM +AC_STRUCT_ST_BLOCKS +AC_FUNC_CLOSEDIR_VOID +AC_CHECK_FUNCS(mkfifo) +AC_CHECK_FUNC(mknod) + +dnl Checks for typedefs, structures, and compiler characteristics. + +dnl Checks for library functions. + +AC_OUTPUT(Makefile libexample.lsm libexample.spec) Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.c 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,1055 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper at gnu.org + before changing it! + + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 + Free Software Foundation, Inc. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include +# include +#endif /* GNU C library. */ + +#ifdef VMS +# include +# if HAVE_STRING_H - 0 +# include +# endif +#endif + +#ifndef _ +/* This is for other GNU distributions with internationalized messages. + When compiling libc, the _ macro is predefined. */ +# ifdef HAVE_LIBINTL_H +# include +# define _(msgid) gettext (msgid) +# else +# define _(msgid) (msgid) +# endif +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include +# define my_index strchr +#else + +# if HAVE_STRING_H +# include +# else +# include +# endif + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; + +static int original_argc; +static char *const *original_argv; + +/* Make sure the environment variable bash 2.0 puts in the environment + is valid for the getopt call we must make sure that the ARGV passed + to getopt is that one passed to the process. */ +static void +__attribute__ ((unused)) +store_args_and_env (int argc, char *const *argv) +{ + /* XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ + original_argc = argc; + original_argv = argv; +} +# ifdef text_set_element +text_set_element (__libc_subinit, store_args_and_env); +# endif /* text_set_element */ + +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +#if defined __STDC__ && __STDC__ +static void exchange (char **); +#endif + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#ifdef _LIBC + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +#if defined __STDC__ && __STDC__ +static const char *_getopt_initialize (int, char *const *, const char *); +#endif +static const char * +_getopt_initialize (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#ifdef _LIBC + if (posixly_correct == NULL + && argc == original_argc && argv == original_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + int print_errors = opterr; + if (optstring[0] == ':') + print_errors = 0; + + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#ifdef _LIBC +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + _("%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); + else + /* +option or -option */ + fprintf (stderr, + _("%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); + } + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (print_errors) + { + if (argv[optind][1] == '-') + /* --option */ + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); + else + /* +option or -option */ + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (print_errors) + { + if (posixly_correct) + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: illegal option -- %c\n"), + argv[0], c); + else + fprintf (stderr, _("%s: invalid option -- %c\n"), + argv[0], c); + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt.h 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,169 @@ +/* Declarations for getopt. + Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _GETOPT_H + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +# if defined __STDC__ && __STDC__ + const char *name; +# else + char *name; +# endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#if defined __STDC__ && __STDC__ +# ifdef __GNU_LIBRARY__ +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int __argc, char *const *__argv, const char *__shortopts); +# else /* not __GNU_LIBRARY__ */ +extern int getopt (); +# endif /* __GNU_LIBRARY__ */ + +# ifndef __need_getopt +extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt_internal (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only); +# endif +#else /* not __STDC__ */ +extern int getopt (); +# ifndef __need_getopt +extern int getopt_long (); +extern int getopt_long_only (); + +extern int _getopt_internal (); +# endif +#endif /* __STDC__ */ + +#ifdef __cplusplus +} +#endif + +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt + +#endif /* getopt.h */ Added: csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/getopt1.c 2009-10-07 10:29:20 UTC (rev 6739) @@ -0,0 +1,188 @@ +/* getopt_long and getopt_long_only entry points for GNU getopt. + Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "getopt.h" + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +#ifndef const +#define const +#endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +#include +#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +#define ELIDE_CODE +#endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#endif + +#ifndef NULL +#define NULL 0 +#endif + +int +getopt_long (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 1); +} + + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +#include + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + int option_index = 0; + static struct option long_options[] = + { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; + @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 12:41:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 10:41:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6740] csw/mgar/pkg/examples/modulations/trunk/files/ libexample Message-ID: Revision: 6740 http://gar.svn.sourceforge.net/gar/?rev=6740&view=rev Author: wahwah Date: 2009-10-07 10:41:12 +0000 (Wed, 07 Oct 2009) Log Message: ----------- libexample: Added one shared library Modified Paths: -------------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in Added Paths: ----------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/ csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 Removed Paths: ------------- csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c Modified: csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/Makefile.am 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,11 +1,17 @@ -bin_PROGRAMS=libexample -libexample_SOURCES=libexample.c libexample.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h +bin_PROGRAMS=binexample +binexample_SOURCES=binexample.c libexample.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h # uncomment the following if libexample requires the math library #libexample_LDADD=-lm EXTRA_DIST=libexample.lsm.in libexample.spec.in libexample.texinfo +# AUTOMAKE_OPTIONS = gnu + +lib_LTLIBRARIES = libexample.la +libexample_la_SOURCES = libexample.c +libexample_la_LDFLAGS = -version-info 0:0:0 + # if you write a self-test script named `chk', uncomment the # following and add `chk' to the EXTRA_DIST list #TESTS=chk Deleted: csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,40 +0,0 @@ -#serial 3 - -dnl From Jim Meyering - -dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- -dnl usually in . -dnl Some systems have utime.h but don't declare the struct anywhere. - -AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, -[ - AC_CHECK_HEADERS(utime.h) - AC_REQUIRE([AC_HEADER_TIME]) - AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, - [AC_TRY_COMPILE( - [ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif -#ifdef HAVE_UTIME_H -# include -#endif - ], - [static struct utimbuf x; x.actime = x.modtime;], - fu_cv_sys_struct_utimbuf=yes, - fu_cv_sys_struct_utimbuf=no) - ]) - - if test $fu_cv_sys_struct_utimbuf = yes; then - AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, -[Define if struct utimbuf is declared -- usually in . - Some systems have utime.h but don't declare the struct anywhere. ]) - fi -]) Deleted: csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/aclocal.m4 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,964 +0,0 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -[m4_warning([this file was generated for autoconf 2.64. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 10 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 16 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([acinclude.m4]) Copied: csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c (from rev 6739, csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c) =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/binexample.c 2009-10-07 10:41:12 UTC (rev 6740) @@ -0,0 +1,118 @@ +/* + libexample - A shared library example project + + Copyright (C) 2009 Maciej Blizinski + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +#include +#include +#include +*/ + +#include +#include +#include +#include "system.h" + +#define EXIT_FAILURE 1 + +/* +char *xmalloc (); +char *xrealloc (); +char *xstrdup (); +*/ + + +static void usage (int status); + +/* The name the program was run with, stripped of any leading path. */ +char *program_name; + +/* getopt_long return codes */ +enum {DUMMY_CODE=129 +}; + +/* Option flags and variables */ + + +static struct option const long_options[] = +{ + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'V'}, + {NULL, 0, NULL, 0} +}; + +static int decode_switches (int argc, char **argv); + +int +main (int argc, char **argv) +{ + int i; + + program_name = argv[0]; + + i = decode_switches (argc, argv); + + /* do the work */ + + exit (0); +} + +/* Set all the option flags according to the switches specified. + Return the index of the first non-option argument. */ + +static int +decode_switches (int argc, char **argv) +{ + int c; + + + while ((c = getopt_long (argc, argv, + "h" /* help */ + "V", /* version */ + long_options, (int *) 0)) != EOF) + { + switch (c) + { + case 'V': + printf ("libexample %s\n", VERSION); + exit (0); + + case 'h': + usage (0); + + default: + usage (EXIT_FAILURE); + } + } + + return optind; +} + + +static void +usage (int status) +{ + printf (_("%s - \ +A shared library example project\n"), program_name); + printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); + printf (_("\ +Options:\n\ + -h, --help display this help and exit\n\ + -V, --version output version information and exit\n\ +")); + exit (status); +} Modified: csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/configure.in 2009-10-07 10:41:12 UTC (rev 6740) @@ -3,6 +3,8 @@ AC_INIT(libexample.c) dnl Every other copy of the package version number gets its value from here AM_INIT_AUTOMAKE(libexample, 0.1.0) +AM_PROG_LIBTOOL +AC_CONFIG_MACRO_DIR([m4]) dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) AM_CONFIG_HEADER(config.h) Deleted: csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c 2009-10-07 10:29:20 UTC (rev 6739) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/libexample.c 2009-10-07 10:41:12 UTC (rev 6740) @@ -1,118 +0,0 @@ -/* - libexample - A shared library example project - - Copyright (C) 2009 Maciej Blizinski - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -#include -#include -#include -*/ - -#include -#include -#include -#include "system.h" - -#define EXIT_FAILURE 1 - -/* -char *xmalloc (); -char *xrealloc (); -char *xstrdup (); -*/ - - -static void usage (int status); - -/* The name the program was run with, stripped of any leading path. */ -char *program_name; - -/* getopt_long return codes */ -enum {DUMMY_CODE=129 -}; - -/* Option flags and variables */ - - -static struct option const long_options[] = -{ - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {NULL, 0, NULL, 0} -}; - -static int decode_switches (int argc, char **argv); - -int -main (int argc, char **argv) -{ - int i; - - program_name = argv[0]; - - i = decode_switches (argc, argv); - - /* do the work */ - - exit (0); -} - -/* Set all the option flags according to the switches specified. - Return the index of the first non-option argument. */ - -static int -decode_switches (int argc, char **argv) -{ - int c; - - - while ((c = getopt_long (argc, argv, - "h" /* help */ - "V", /* version */ - long_options, (int *) 0)) != EOF) - { - switch (c) - { - case 'V': - printf ("libexample %s\n", VERSION); - exit (0); - - case 'h': - usage (0); - - default: - usage (EXIT_FAILURE); - } - } - - return optind; -} - - -static void -usage (int status) -{ - printf (_("%s - \ -A shared library example project\n"), program_name); - printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); - printf (_("\ -Options:\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ -")); - exit (status); -} Copied: csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 (from rev 6739, csw/mgar/pkg/examples/modulations/trunk/files/libexample/acinclude.m4) =================================================================== --- csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 (rev 0) +++ csw/mgar/pkg/examples/modulations/trunk/files/libexample/m4/acinclude.m4 2009-10-07 10:41:12 UTC (rev 6740) @@ -0,0 +1,40 @@ +#serial 3 + +dnl From Jim Meyering + +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- +dnl usually in . +dnl Some systems have utime.h but don't declare the struct anywhere. + +AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, +[ + AC_CHECK_HEADERS(utime.h) + AC_REQUIRE([AC_HEADER_TIME]) + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, + [AC_TRY_COMPILE( + [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#ifdef HAVE_UTIME_H +# include +#endif + ], + [static struct utimbuf x; x.actime = x.modtime;], + fu_cv_sys_struct_utimbuf=yes, + fu_cv_sys_struct_utimbuf=no) + ]) + + if test $fu_cv_sys_struct_utimbuf = yes; then + AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, +[Define if struct utimbuf is declared -- usually in . + Some systems have utime.h but don't declare the struct anywhere. ]) + fi +]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 13:15:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 11:15:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6741] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 6741 http://gar.svn.sourceforge.net/gar/?rev=6741&view=rev Author: dmichelsen Date: 2009-10-07 11:15:16 +0000 (Wed, 07 Oct 2009) Log Message: ----------- diffstat: Update to 1.50 Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile csw/mgar/pkg/diffstat/trunk/checksums Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2009-10-07 10:41:12 UTC (rev 6740) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-10-07 11:15:16 UTC (rev 6741) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.49 +GARVERSION = 1.50 CATEGORIES = utils DESCRIPTION = A utility which provides statistics based on the output of diff Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2009-10-07 10:41:12 UTC (rev 6740) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-10-07 11:15:16 UTC (rev 6741) @@ -1 +1 @@ -63fa6d90f137f5d839e94aa93882db98 download/diffstat-1.49.tgz +ece8f6a380d30cf2355ebb27375350d7 diffstat-1.50.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 13:26:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 11:26:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6742] csw/mgar/pkg/esound/trunk/Makefile Message-ID: Revision: 6742 http://gar.svn.sourceforge.net/gar/?rev=6742&view=rev Author: dmichelsen Date: 2009-10-07 11:26:29 +0000 (Wed, 07 Oct 2009) Log Message: ----------- esound: Add todo Modified Paths: -------------- csw/mgar/pkg/esound/trunk/Makefile Modified: csw/mgar/pkg/esound/trunk/Makefile =================================================================== --- csw/mgar/pkg/esound/trunk/Makefile 2009-10-07 11:15:16 UTC (rev 6741) +++ csw/mgar/pkg/esound/trunk/Makefile 2009-10-07 11:26:29 UTC (rev 6742) @@ -18,6 +18,11 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# TODO on next release: +# - Move config file from /opt/csw/etc to /etc/opt/csw +# - Document the location in esd(1) +# - Skip 64 binaries + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 7 14:03:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Oct 2009 12:03:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6743] csw/mgar/pkg/cups/branches/cups-1.4/ Message-ID: Revision: 6743 http://gar.svn.sourceforge.net/gar/?rev=6743&view=rev Author: wahwah Date: 2009-10-07 12:03:06 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cups-1.4: Setting svn:externals to v2-pbuild Property Changed: ---------------- csw/mgar/pkg/cups/branches/cups-1.4/ Property changes on: csw/mgar/pkg/cups/branches/cups-1.4 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-pbuild This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 15:06:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 13:06:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6744] csw/mgar/pkg Message-ID: Revision: 6744 http://gar.svn.sourceforge.net/gar/?rev=6744&view=rev Author: dmichelsen Date: 2009-10-07 13:06:14 +0000 (Wed, 07 Oct 2009) Log Message: ----------- pakchois: Initial commit Added Paths: ----------- csw/mgar/pkg/pakchois/ csw/mgar/pkg/pakchois/branches/ csw/mgar/pkg/pakchois/tags/ csw/mgar/pkg/pakchois/trunk/ csw/mgar/pkg/pakchois/trunk/Makefile csw/mgar/pkg/pakchois/trunk/checksums csw/mgar/pkg/pakchois/trunk/files/ Property changes on: csw/mgar/pkg/pakchois/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pakchois/trunk/Makefile =================================================================== --- csw/mgar/pkg/pakchois/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pakchois/trunk/Makefile 2009-10-07 13:06:14 UTC (rev 6744) @@ -0,0 +1,26 @@ +GARNAME = pakchois +GARVERSION = 0.4 +CATEGORIES = lib + +DESCRIPTION = Just another PKCS #11 wrapper library +define BLURB + pakchois is just another PKCS #11 wrapper library. pakchois aims to provide + a thin wrapper over the PKCS#11 interface. +endef + +MASTER_SITES = http://www.manyfish.co.uk/pakchois/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.manyfish.co.uk/pakchois/ + +BUILD64 = 1 +NOISALIST = 1 +EXTRA_LINKER_FLAGS = -lintl +CONFIGURE_ARGS = $(DIRPATHS) + +REQUIRED_PKGS = CSWggettextrt + +include gar/category.mk Added: csw/mgar/pkg/pakchois/trunk/checksums =================================================================== --- csw/mgar/pkg/pakchois/trunk/checksums (rev 0) +++ csw/mgar/pkg/pakchois/trunk/checksums 2009-10-07 13:06:14 UTC (rev 6744) @@ -0,0 +1 @@ +218ad0256e514989299acdf4e86aaf3d download/pakchois-0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 16:04:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 14:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6745] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6745 http://gar.svn.sourceforge.net/gar/?rev=6745&view=rev Author: dmichelsen Date: 2009-10-07 14:04:36 +0000 (Wed, 07 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Add setonce-magic to some variables Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-07 13:06:14 UTC (rev 6744) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-07 14:04:36 UTC (rev 6745) @@ -33,6 +33,10 @@ MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') +# If you call this the value is only evaluated the first time +# Usage: $(call SETONCE,A,MyComplexVariableEvaluatedOnlyOnce) +SETONCE = $(eval $(1) ?= $(2)) + #meant to take a git url and return just the $proj.git part GITPROJ = $(lastword $(subst /, ,$(1))) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-07 13:06:14 UTC (rev 6744) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-07 14:04:36 UTC (rev 6745) @@ -157,7 +157,7 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db -SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES @@ -191,9 +191,9 @@ endif ifeq ($(SPKG_FULL_REVSTAMP),1) -SPKG_REVSTAMP ?= ,REV=$(shell date '+%Y.%m.%d.%H.%M') +$(call SETONCE,SPKG_REVSTAMP,REV=$(shell date '+%Y.%m.%d.%H.%M')) else -SPKG_REVSTAMP ?= ,REV=$(shell date '+%Y.%m.%d') +$(call SETONCE,SPKG_REVSTAMP,REV=$(shell date '+%Y.%m.%d')) endif # Where we find our mkpackage global templates @@ -470,7 +470,7 @@ $(_DBG)(echo "PKG=$*"; \ echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \ echo "ARCH=$(if $(or $(ARCHALL),$(ARCHALL_$*)),all,$(call pkgvar,GARCH,$*))"; \ - echo "VERSION=$(call pkgvar,SPKG_VERSION,$*)$(call pkgvar,SPKG_REVSTAMP,$*)"; \ + echo "VERSION=$(call pkgvar,SPKG_VERSION,$*),$(call pkgvar,SPKG_REVSTAMP,$*)"; \ echo "CATEGORY=$(call pkgvar,SPKG_CATEGORY,$*)"; \ echo "VENDOR=$(call pkgvar,SPKG_VENDOR,$*)"; \ echo "EMAIL=$(call pkgvar,SPKG_EMAIL,$*)"; \ @@ -681,7 +681,7 @@ submitpkg-%: @$(if $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),\ $(error You have local files not in the repository. Please commit everything before submitting a package)) - $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION)$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION)$(SPKG_REVSTAMP) + $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION),$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION),$(SPKG_REVSTAMP) # dependb - update the dependency database # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 17:28:59 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 15:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6746] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.r.cswinetd Message-ID: Revision: 6746 http://gar.svn.sourceforge.net/gar/?rev=6746&view=rev Author: bdwalton Date: 2009-10-07 15:28:59 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cswclassutils: make the inetd service removal generic (copy/paste error); backup inetd.conf before modifications Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd 2009-10-07 14:04:36 UTC (rev 6745) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinetd 2009-10-07 15:28:59 UTC (rev 6746) @@ -28,11 +28,12 @@ inetdsvc=`cat $dest` set -- $inetdsvc svcname=$1 - echo "Removing $svcname service from inetd.conf" - /usr/xpg4/bin/sed -e '/# CSWgitosis/{ + echo "Removing $svcname service from inetd.conf (original: $inetdconf.$PKGINST)" + cp -p $inetdconf $inetdconf.$PKGINST + /usr/xpg4/bin/sed -e "/# $PKGINST/{ $!N -/^# CSWgitosis.*\n#git.*$/d -}' $inetdconf > $inetdconf.$$ && \ +/^# $PKGINST.*\n#$svcname.*$/d +}" $inetdconf > $inetdconf.$$ && \ mv $inetdconf.$$ $inetdconf && \ chown root:sys $inetdconf && \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 18:18:42 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 16:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6747] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 6747 http://gar.svn.sourceforge.net/gar/?rev=6747&view=rev Author: bdwalton Date: 2009-10-07 16:18:42 +0000 (Wed, 07 Oct 2009) Log Message: ----------- cswclassutils: setup GAR copyright/license stuff Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-07 15:28:59 UTC (rev 6746) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-07 16:18:42 UTC (rev 6747) @@ -8,6 +8,8 @@ ARCHALL = 1 +LICENSE = license + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -31,6 +33,6 @@ @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license + @cp $(FILEDIR)/CSW$(GARNAME).copyright $(WORKSRC)/license @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 18:46:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 16:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6748] csw/mgar/pkg/gardev/trunk/files/README.csw Message-ID: Revision: 6748 http://gar.svn.sourceforge.net/gar/?rev=6748&view=rev Author: bdwalton Date: 2009-10-07 16:46:38 +0000 (Wed, 07 Oct 2009) Log Message: ----------- gardev: update the README for gar_devel Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/files/README.csw Modified: csw/mgar/pkg/gardev/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/gardev/trunk/files/README.csw 2009-10-07 16:18:42 UTC (rev 6747) +++ csw/mgar/pkg/gardev/trunk/files/README.csw 2009-10-07 16:46:38 UTC (rev 6748) @@ -1,3 +1,15 @@ This is just a dummy package that depends on all CSW packages that are required to create packages with GAR. Feel free to remove it after you've used it to install the current requirements. + +It is useful _only_ in the situation where you'd like to checkout +package build descriptions from the gar.sourceforge.net subversion +repository on a machine and roll your own packages from it. + +Currently, this package will pull everything required by GAR except +the compilers. These, you will need to get and install yourself. If +packages you're working on need GCC, you can obtain v3 or v4 packages +from OpenCSW. Sun compilers must be obtained from sun.com. + +Please see http://sourceforge.net/apps/trac/gar/wiki/GarSetup for more +help getting a working GAR development environment on your machine. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 19:04:12 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 17:04:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6749] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6749 http://gar.svn.sourceforge.net/gar/?rev=6749&view=rev Author: bdwalton Date: 2009-10-07 17:04:12 +0000 (Wed, 07 Oct 2009) Log Message: ----------- git: fix the PKGFILES for the bash completion package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-07 16:46:38 UTC (rev 6748) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-07 17:04:12 UTC (rev 6749) @@ -99,7 +99,7 @@ PKGFILES_CSWgitcvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) PKGFILES_CSWgitemacs = .*emacs.* PKGFILES_CSWgitdoc = $(docdir)/.* -PKGFILES_CSWgitcompletion = $(bashconfdir)/bash_completion.d/.* +PKGFILES_CSWgitcompletion = .*/bash_completion.d/.* PKGFILES_CSWgitdevel = $(includedir)/.* $(libdir)/.* # We define upstream file regex so we can be notifed of new upstream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 21:04:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6750] csw/mgar/pkg/pakchois/trunk/Makefile Message-ID: Revision: 6750 http://gar.svn.sourceforge.net/gar/?rev=6750&view=rev Author: dmichelsen Date: 2009-10-07 19:04:50 +0000 (Wed, 07 Oct 2009) Log Message: ----------- pakchois: Fix description Modified Paths: -------------- csw/mgar/pkg/pakchois/trunk/Makefile Modified: csw/mgar/pkg/pakchois/trunk/Makefile =================================================================== --- csw/mgar/pkg/pakchois/trunk/Makefile 2009-10-07 17:04:12 UTC (rev 6749) +++ csw/mgar/pkg/pakchois/trunk/Makefile 2009-10-07 19:04:50 UTC (rev 6750) @@ -2,10 +2,10 @@ GARVERSION = 0.4 CATEGORIES = lib -DESCRIPTION = Just another PKCS #11 wrapper library +DESCRIPTION = Just another PKCS \#11 wrapper library define BLURB - pakchois is just another PKCS #11 wrapper library. pakchois aims to provide - a thin wrapper over the PKCS#11 interface. + pakchois is just another PKCS \#11 wrapper library. pakchois aims to provide + a thin wrapper over the PKCS \#11 interface. endef MASTER_SITES = http://www.manyfish.co.uk/pakchois/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 7 21:05:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6751] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6751 http://gar.svn.sourceforge.net/gar/?rev=6751&view=rev Author: bdwalton Date: 2009-10-07 19:05:34 +0000 (Wed, 07 Oct 2009) Log Message: ----------- git: bash completion package depends on CSWbashcmplt Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-07 19:04:50 UTC (rev 6750) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-07 19:05:34 UTC (rev 6751) @@ -52,7 +52,7 @@ # We include bash here even though git itself depends on it because in theory # git could use any other POSIX compliant shell and drop the dependency... -REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash +REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash CSWbashcmplt LICENSE_CSWgit = COPYING LICENSE_CSWgitk = COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 21:13:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:13:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6752] csw/mgar/pkg Message-ID: Revision: 6752 http://gar.svn.sourceforge.net/gar/?rev=6752&view=rev Author: dmichelsen Date: 2009-10-07 19:13:03 +0000 (Wed, 07 Oct 2009) Log Message: ----------- fribidi: Initial commit Added Paths: ----------- csw/mgar/pkg/fribidi/ csw/mgar/pkg/fribidi/branches/ csw/mgar/pkg/fribidi/tags/ csw/mgar/pkg/fribidi/trunk/ csw/mgar/pkg/fribidi/trunk/Makefile csw/mgar/pkg/fribidi/trunk/checksums csw/mgar/pkg/fribidi/trunk/files/ Property changes on: csw/mgar/pkg/fribidi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fribidi/trunk/Makefile =================================================================== --- csw/mgar/pkg/fribidi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fribidi/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) @@ -0,0 +1,21 @@ +GARNAME = fribidi +GARVERSION = 0.19.2 +CATEGORIES = lib + +DESCRIPTION = An implementation of the Unicode Bidirectional Algorithm (bidi) +define BLURB +endef + +MASTER_SITES = http://fribidi.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.fribidi.org/ + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/fribidi/trunk/checksums =================================================================== --- csw/mgar/pkg/fribidi/trunk/checksums (rev 0) +++ csw/mgar/pkg/fribidi/trunk/checksums 2009-10-07 19:13:03 UTC (rev 6752) @@ -0,0 +1 @@ +626db17d2d99b43615ad9d12500f568a fribidi-0.19.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 21:28:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:28:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6753] csw/mgar/pkg/x11 Message-ID: Revision: 6753 http://gar.svn.sourceforge.net/gar/?rev=6753&view=rev Author: wbonnet Date: 2009-10-07 19:28:54 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xineramaproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xineramaproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xineramaproto/ Modified: csw/mgar/pkg/x11/x11_xineramaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xineramaproto/trunk/Makefile 2009-10-07 19:28:54 UTC (rev 6753) @@ -1,6 +1,8 @@ -GARNAME = xineramaproto GARVERSION = 1.1.2 CATEGORIES = x11 +PROTONAME = xineramaproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org Xinerama protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 21:36:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 19:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6754] csw/mgar/flatpkg/ Message-ID: Revision: 6754 http://gar.svn.sourceforge.net/gar/?rev=6754&view=rev Author: dmichelsen Date: 2009-10-07 19:36:21 +0000 (Wed, 07 Oct 2009) Log Message: ----------- GAR test Added Paths: ----------- csw/mgar/flatpkg/ Property changes on: csw/mgar/flatpkg ___________________________________________________________________ Added: svn:externals + asciidoc https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/asciidoc Algorithm-Annotate https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/cpan/Algorithm-Annotate This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 22:00:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6755] csw/mgar/pkg Message-ID: Revision: 6755 http://gar.svn.sourceforge.net/gar/?rev=6755&view=rev Author: dmichelsen Date: 2009-10-07 19:59:55 +0000 (Wed, 07 Oct 2009) Log Message: ----------- libmatio: Initial commit Added Paths: ----------- csw/mgar/pkg/libmatio/ csw/mgar/pkg/libmatio/branches/ csw/mgar/pkg/libmatio/tags/ csw/mgar/pkg/libmatio/trunk/ csw/mgar/pkg/libmatio/trunk/Makefile csw/mgar/pkg/libmatio/trunk/checksums csw/mgar/pkg/libmatio/trunk/files/ Property changes on: csw/mgar/pkg/libmatio/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmatio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmatio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmatio/trunk/Makefile 2009-10-07 19:59:55 UTC (rev 6755) @@ -0,0 +1,22 @@ +GARNAME = libmatio +GARVERSION = 1.3.3 +CATEGORIES = lib + +DESCRIPTION = An ISO C library for reading and writing Matlab MAT files +define BLURB +endef + +SF_PROJ = matio +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + +include gar/category.mk Added: csw/mgar/pkg/libmatio/trunk/checksums =================================================================== --- csw/mgar/pkg/libmatio/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmatio/trunk/checksums 2009-10-07 19:59:55 UTC (rev 6755) @@ -0,0 +1 @@ +5c12a98f391de000e88b5a1b20d74abf matio-1.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 22:07:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6756] csw/mgar/flatpkg/ Message-ID: Revision: 6756 http://gar.svn.sourceforge.net/gar/?rev=6756&view=rev Author: dmichelsen Date: 2009-10-07 20:07:06 +0000 (Wed, 07 Oct 2009) Log Message: ----------- GAR Test Removed Paths: ------------- csw/mgar/flatpkg/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 7 22:21:59 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6757] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 6757 http://gar.svn.sourceforge.net/gar/?rev=6757&view=rev Author: idogan23 Date: 2009-10-07 20:21:58 +0000 (Wed, 07 Oct 2009) Log Message: ----------- unbound: bump version to 1.3.4 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-10-07 20:07:06 UTC (rev 6756) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-10-07 20:21:58 UTC (rev 6757) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.3.3 +GARVERSION = 1.3.4 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2009-10-07 20:07:06 UTC (rev 6756) +++ csw/mgar/pkg/unbound/trunk/checksums 2009-10-07 20:21:58 UTC (rev 6757) @@ -1,4 +1,3 @@ -90405f880273db5036c2ebf2e881b998 download/CSWunbound.gspec 75867432e238f5afd48dfe5d138097e9 download/cswunbound 601effee1051487655f66790762b66fd download/cswusergroup -f6b2b2c375288dfd2a03c4a36676221e download/unbound-1.3.3.tar.gz +d1eb5efed0c36c10dbaf3f805ff3a4bd download/unbound-1.3.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:31:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:31:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6758] csw/mgar/pkg/x11 Message-ID: Revision: 6758 http://gar.svn.sourceforge.net/gar/?rev=6758&view=rev Author: wbonnet Date: 2009-10-07 20:31:05 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86vidmodeproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86vidmodeproto/ Modified: csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile 2009-10-07 20:31:05 UTC (rev 6758) @@ -1,6 +1,8 @@ -GARNAME = xf86vidmodeproto GARVERSION = 2.2.2 CATEGORIES = x11 +PROTONAME = xf86vidmodeproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86VidMode protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11xf86vidmdproto +CATALOGNAME_CSWx11xf86vidmdproto = $(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:35:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6759] csw/mgar/pkg/x11 Message-ID: Revision: 6759 http://gar.svn.sourceforge.net/gar/?rev=6759&view=rev Author: wbonnet Date: 2009-10-07 20:35:14 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_windowswmproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_windowswmproto/ Removed Paths: ------------- csw/mgar/pkg/x11/windowswmproto/ Modified: csw/mgar/pkg/x11/x11_windowswmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_windowswmproto/trunk/Makefile 2009-10-07 20:35:14 UTC (rev 6759) @@ -1,6 +1,8 @@ -GARNAME = windowswmproto GARVERSION = 1.0.3 CATEGORIES = x11 +PROTONAME = windowswmproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Windowswmproto headers for X.org define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:40:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:40:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6760] csw/mgar/pkg/x11 Message-ID: Revision: 6760 http://gar.svn.sourceforge.net/gar/?rev=6760&view=rev Author: wbonnet Date: 2009-10-07 20:40:06 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_videoproto/ Removed Paths: ------------- csw/mgar/pkg/x11/videoproto/ Modified: csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile 2009-10-07 20:40:06 UTC (rev 6760) @@ -1,20 +1,23 @@ -GARNAME = videoproto GARVERSION = 2.3.0 CATEGORIES = x11 +PROTONAME = videoproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Video extension headers define BLURB Video extension headers endef -PACKAGES = CSWxvideoproto +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:46:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6761] csw/mgar/pkg/x11 Message-ID: Revision: 6761 http://gar.svn.sourceforge.net/gar/?rev=6761&view=rev Author: wbonnet Date: 2009-10-07 20:46:18 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xcmiscproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xcmiscproto/ Modified: csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile 2009-10-07 20:46:18 UTC (rev 6761) @@ -1,6 +1,8 @@ -GARNAME = xcmiscproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = xcmiscproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XCMisc extension headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 22:53:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 20:53:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6762] csw/mgar/pkg/x11 Message-ID: Revision: 6762 http://gar.svn.sourceforge.net/gar/?rev=6762&view=rev Author: wbonnet Date: 2009-10-07 20:53:19 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86dgaproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86dgaproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86dgaproto/ Modified: csw/mgar/pkg/x11/x11_xf86dgaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86dgaproto/trunk/Makefile 2009-10-07 20:53:19 UTC (rev 6762) @@ -1,6 +1,8 @@ -GARNAME = xf86dgaproto GARVERSION = 2.0.3 CATEGORIES = x11 +PROTONAME = xf86dgaproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86DGA protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:02:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:02:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6763] csw/mgar/pkg/x11 Message-ID: Revision: 6763 http://gar.svn.sourceforge.net/gar/?rev=6763&view=rev Author: wbonnet Date: 2009-10-07 21:02:05 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86driproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86driproto/ Modified: csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86driproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile 2009-10-07 21:02:05 UTC (rev 6763) @@ -1,6 +1,8 @@ -GARNAME = xf86driproto GARVERSION = 2.1.0 CATEGORIES = x11 +PROTONAME = xf86driproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86DRI protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:03:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:03:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6764] csw/mgar/pkg/x11 Message-ID: Revision: 6764 http://gar.svn.sourceforge.net/gar/?rev=6764&view=rev Author: wbonnet Date: 2009-10-07 21:03:51 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86miscproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86miscproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86miscproto/ Modified: csw/mgar/pkg/x11/x11_xf86miscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86miscproto/trunk/Makefile 2009-10-07 21:03:51 UTC (rev 6764) @@ -1,6 +1,8 @@ -GARNAME = xf86miscproto GARVERSION = 0.9.2 CATEGORIES = x11 +PROTONAME = xf86miscproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86Misc protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:05:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:05:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6765] csw/mgar/pkg/x11 Message-ID: Revision: 6765 http://gar.svn.sourceforge.net/gar/?rev=6765&view=rev Author: wbonnet Date: 2009-10-07 21:05:54 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86rushproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86rushproto/ Modified: csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile 2009-10-07 21:05:54 UTC (rev 6765) @@ -1,6 +1,8 @@ -GARNAME = xf86rushproto GARVERSION = 1.1.2 CATEGORIES = x11 +PROTONAME = xf86rushproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86Rush protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:09:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:09:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6766] csw/mgar/pkg/x11 Message-ID: Revision: 6766 http://gar.svn.sourceforge.net/gar/?rev=6766&view=rev Author: wbonnet Date: 2009-10-07 21:09:42 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xf86bigfontproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xf86bigfontproto/ Modified: csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile 2009-10-07 21:09:42 UTC (rev 6766) @@ -1,6 +1,8 @@ -GARNAME = xf86bigfontproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = xf86bigfontproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org XF86BigFont protocol headers define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11xf86bigftproto +CATALOGNAME_CSWx11xf86bigftproto = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 23:16:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:16:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6767] csw/mgar/pkg Message-ID: Revision: 6767 http://gar.svn.sourceforge.net/gar/?rev=6767&view=rev Author: dmichelsen Date: 2009-10-07 21:16:26 +0000 (Wed, 07 Oct 2009) Log Message: ----------- wireshark: Initial commit, review X11 Added Paths: ----------- csw/mgar/pkg/wireshark/ csw/mgar/pkg/wireshark/branches/ csw/mgar/pkg/wireshark/tags/ csw/mgar/pkg/wireshark/trunk/ csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums csw/mgar/pkg/wireshark/trunk/files/ Property changes on: csw/mgar/pkg/wireshark/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile (rev 0) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-10-07 21:16:26 UTC (rev 6767) @@ -0,0 +1,34 @@ +GARNAME = wireshark +GARVERSION = 1.2.2 +CATEGORIES = apps + +DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.wireshark.org/ + +#SED = /opt/csw/bin/gsed +#EXTRA_COMMON_EXPORTS = SED + +EXTRA_INC = /opt/csw/include/gtk-2.0 +EXTRA_INC += /opt/csw/lib/gtk-2.0/include +EXTRA_INC += /opt/csw/include/glib-2.0 +EXTRA_INC += /opt/csw/lib/glib-2.0/include +EXTRA_INC += /opt/csw/include/cairo +EXTRA_INC += /opt/csw/include/pango-1.0 +EXTRA_INC += /opt/csw/include/atk-1.0 + +EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums (rev 0) +++ csw/mgar/pkg/wireshark/trunk/checksums 2009-10-07 21:16:26 UTC (rev 6767) @@ -0,0 +1 @@ +bb5c09b8cffd461ced4d3251fddb217b wireshark-1.2.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 7 23:24:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6768] csw/mgar/pkg/npadmin Message-ID: Revision: 6768 http://gar.svn.sourceforge.net/gar/?rev=6768&view=rev Author: dmichelsen Date: 2009-10-07 21:24:08 +0000 (Wed, 07 Oct 2009) Log Message: ----------- npadmin: Convert legacy build receipt Added Paths: ----------- csw/mgar/pkg/npadmin/branches/ csw/mgar/pkg/npadmin/tags/ csw/mgar/pkg/npadmin/tags/legacy/ csw/mgar/pkg/npadmin/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/npadmin/trunk/legacy/ Copied: csw/mgar/pkg/npadmin/trunk/Makefile (from rev 6625, csw/mgar/pkg/colordiff/trunk/Makefile) =================================================================== --- csw/mgar/pkg/npadmin/trunk/Makefile (rev 0) +++ csw/mgar/pkg/npadmin/trunk/Makefile 2009-10-07 21:24:08 UTC (rev 6768) @@ -0,0 +1,24 @@ +GARNAME = npadmin +GARVERSION = 0.14 +CATEGORIES = apps + +DESCRIPTION = Command line SNMP based network adminstration tool for printers +define BLURB +endef + +SF_PROJ = lpr +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://lpr.sourceforge.net/ + +ARCHALL = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + cd $(WORKSRC) && rm -f config.cache config.status This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:25:40 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6769] csw/mgar/pkg/x11 Message-ID: Revision: 6769 http://gar.svn.sourceforge.net/gar/?rev=6769&view=rev Author: wbonnet Date: 2009-10-07 21:25:40 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/x11_xextproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/x11_xextproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xextproto/ Modified: csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-07 21:25:40 UTC (rev 6769) @@ -1,5 +1,7 @@ -GARNAME = xextproto GARVERSION = 7.1.1 +PROTONAME = xextproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) CATEGORIES = x11 @@ -9,11 +11,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 Modified: csw/mgar/pkg/x11/x11_xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xextproto/trunk/checksums 2009-10-07 21:25:40 UTC (rev 6769) @@ -1 +1 @@ -fb6ccaae76db7a35e49b12aea60ca6ff download/xextproto-7.1.1.tar.bz2 +6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:29:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6770] csw/mgar/pkg/x11 Message-ID: Revision: 6770 http://gar.svn.sourceforge.net/gar/?rev=6770&view=rev Author: wbonnet Date: 2009-10-07 21:29:30 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_xproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xproto/ Modified: csw/mgar/pkg/x11/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-07 21:29:30 UTC (rev 6770) @@ -1,6 +1,8 @@ -GARNAME = xproto GARVERSION = 7.0.15 CATEGORIES = x11 +PROTONAME = xproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X protocol and ancillary headers from X.org X11 define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:41:58 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:41:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6771] csw/mgar/pkg/x11/glproto/ Message-ID: Revision: 6771 http://gar.svn.sourceforge.net/gar/?rev=6771&view=rev Author: wbonnet Date: 2009-10-07 21:41:58 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Removed Paths: ------------- csw/mgar/pkg/x11/glproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:42:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:42:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6772] csw/mgar/pkg/x11 Message-ID: Revision: 6772 http://gar.svn.sourceforge.net/gar/?rev=6772&view=rev Author: wbonnet Date: 2009-10-07 21:42:52 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/x11_glproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/x11_glproto/ Modified: csw/mgar/pkg/x11/x11_glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_glproto/trunk/Makefile 2009-10-07 21:42:52 UTC (rev 6772) @@ -1,19 +1,22 @@ -GARNAME = glproto GARVERSION = 1.4.10 CATEGORIES = x11 +PROTONAME = glproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = GL extension headers define BLURB GL extension headers endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxglproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common Modified: csw/mgar/pkg/x11/x11_glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/checksums 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_glproto/trunk/checksums 2009-10-07 21:42:52 UTC (rev 6772) @@ -1 +1 @@ -c9f8cebfba72bfab674bc0170551fb8d download/glproto-1.4.10.tar.bz2 +ac89626ed6bced045d0515217bfffd4f download/glproto-1.4.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:47:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6773] csw/mgar/pkg/x11 Message-ID: Revision: 6773 http://gar.svn.sourceforge.net/gar/?rev=6773&view=rev Author: wbonnet Date: 2009-10-07 21:47:51 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_kbproto/ Removed Paths: ------------- csw/mgar/pkg/x11/kbproto/ Modified: csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile 2009-10-07 21:47:51 UTC (rev 6773) @@ -1,5 +1,7 @@ -GARNAME = kbproto GARVERSION = 1.0.3 +PROTONAME = kbproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) CATEGORIES = x11 @@ -8,13 +10,14 @@ This provides the KB extension headers from modular X.org X11 project. endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxkbproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:55:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6774] csw/mgar/pkg/x11 Message-ID: Revision: 6774 http://gar.svn.sourceforge.net/gar/?rev=6774&view=rev Author: wbonnet Date: 2009-10-07 21:55:18 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_renderproto/ Removed Paths: ------------- csw/mgar/pkg/x11/renderproto/ Modified: csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-07 21:55:18 UTC (rev 6774) @@ -1,20 +1,22 @@ -GARNAME = renderproto GARVERSION = 0.11 - CATEGORIES = x11 +PROTONAME = renderproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Render extension headers from modular X.org define BLURB This provides the Render extension headers from modular X.org X11 project. endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxrenderproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 7 23:59:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 21:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6775] csw/mgar/pkg/x11 Message-ID: Revision: 6775 http://gar.svn.sourceforge.net/gar/?rev=6775&view=rev Author: wbonnet Date: 2009-10-07 21:59:08 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_recordproto/trunk/Makefile csw/mgar/pkg/x11/x11_recordproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/x11_recordproto/ Removed Paths: ------------- csw/mgar/pkg/x11/recordproto/ Modified: csw/mgar/pkg/x11/x11_recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_recordproto/trunk/Makefile 2009-10-07 21:59:08 UTC (rev 6775) @@ -1,19 +1,22 @@ -GARNAME = recordproto GARVERSION = 1.13.2 CATEGORIES = x11 +PROTONAME = recordproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Record extension headers define BLURB Record extension headers endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxrecordproto +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common Modified: csw/mgar/pkg/x11/x11_recordproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/recordproto/trunk/checksums 2009-10-05 14:46:03 UTC (rev 6713) +++ csw/mgar/pkg/x11/x11_recordproto/trunk/checksums 2009-10-07 21:59:08 UTC (rev 6775) @@ -1 +1 @@ -0ed4706564a34fc2aff724aa16d3ff00 download/recordproto-1.13.2.tar.bz2 +a184f8939a7ecae064857e7932a929b2 download/recordproto-1.13.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 00:04:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 22:04:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6776] csw/mgar/pkg/x11 Message-ID: Revision: 6776 http://gar.svn.sourceforge.net/gar/?rev=6776&view=rev Author: wbonnet Date: 2009-10-07 22:04:39 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_inputproto/ Removed Paths: ------------- csw/mgar/pkg/x11/inputproto/ Modified: csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-07 22:04:39 UTC (rev 6776) @@ -1,5 +1,7 @@ -GARNAME = inputproto GARVERSION = 1.5.1 +PROTONAME = inputproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) CATEGORIES = x11 @@ -7,17 +9,20 @@ define BLURB This provides the input extension headers from modular X.org X11 project endef - + MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 00:06:28 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 07 Oct 2009 22:06:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6777] csw/mgar/pkg/x11 Message-ID: Revision: 6777 http://gar.svn.sourceforge.net/gar/?rev=6777&view=rev Author: wbonnet Date: 2009-10-07 22:06:28 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Switch to new naming Modified Paths: -------------- csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_scrnsaverproto/ Removed Paths: ------------- csw/mgar/pkg/x11/scrnsaverproto/ Modified: csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile 2009-10-07 19:13:03 UTC (rev 6752) +++ csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile 2009-10-07 22:06:28 UTC (rev 6777) @@ -1,18 +1,23 @@ -GARNAME = scrnsaverproto GARVERSION = 1.2.0 CATEGORIES = x11 +PROTONAME = scrnsaverproto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = X.Org ScrnSaver protocol headers define BLURB ScrnSaver protocol headers from modular X.org endef - + MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11$(PROTONAME) +CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 11:18:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 09:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6778] csw/mgar/gar/v2-pbuild/gar.pkg.mk Message-ID: Revision: 6778 http://gar.svn.sourceforge.net/gar/?rev=6778&view=rev Author: dmichelsen Date: 2009-10-08 09:18:06 +0000 (Thu, 08 Oct 2009) Log Message: ----------- mGAR v2-pbuild: Added prototype modifiers Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-07 22:06:28 UTC (rev 6777) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-08 09:18:06 UTC (rev 6778) @@ -307,6 +307,28 @@ $(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER_$(SPEC)),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC))))) $(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER)))) +# Assemble prototype modifiers +# PROTOTYPE_MODIFIERS = mytweaks +# PROTOTYPE_FTYPE_mytweaks = e +# PROTOTYPE_CLASS_mytweaks = cswconffile +# PROTOTYPE_FILES_mytweaks = $(bindir)/.*\.conf +# PROTOTYPE_PERMS_mytweaks = 0644 +# PROTOTYPE_USER_mytweaks = somebody +# PROTOTYPE_GROUP_mytweaks = somegroup + +_PROTOTYPE_MODIFIERS = | perl -ane '\ + $(foreach M,$(PROTOTYPE_MODIFIERS),\ + $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(PROTOTYPE_FILES_$M)$$) ) {)\ + $(if $(PROTOTYPE_FTYPE_$M),$$F[0] = "$(PROTOTYPE_FTYPE_$M)";)\ + $(if $(PROTOTYPE_CLASS_$M),$$F[1] = "$(PROTOTYPE_CLASS_$M)";)\ + $(if $(PROTOTYPE_PERMS_$M),$$F[3] = "$(PROTOTYPE_PERMS_$M)";)\ + $(if $(PROTOTYPE_USER_$M),$$F[4] = "$(PROTOTYPE_USER_$M)";)\ + $(if $(PROTOTYPE_GROUP_$M),$$F[5] = "$(PROTOTYPE_GROUP_$M)";)\ + $(if $(PROTOTYPE_FILES_$M),})\ + )\ + print join(" ", at F),"\n";' + + # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype @@ -342,13 +364,13 @@ ) \ <$(PROTOTYPE); \ if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ - ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \ + ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ else \ - cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \ + cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype - $(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ + $(_DBG)cat $(WORKDIR)/$*.prototype >$@ # Dynamic depends are constructed as follows: # - Packages the currently constructed one depends on can be specified with This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 14:12:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 12:12:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6779] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6779 http://gar.svn.sourceforge.net/gar/?rev=6779&view=rev Author: dmichelsen Date: 2009-10-08 12:12:27 +0000 (Thu, 08 Oct 2009) Log Message: ----------- colordiff: Force CSW less Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 09:18:06 UTC (rev 6778) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 12:12:27 UTC (rev 6779) @@ -10,11 +10,12 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = fix-entity-nesting.patch PATCHFILES += force-csw-perl.patch +PATCHFILES += force-csw-less.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWperl +REQUIRED_PKGS = CSWperl CSWless CONFIGURE_SCRIPTS = BUILD_ARGS = doc Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/force-csw-less.patch 2009-10-08 12:12:27 UTC (rev 6779) @@ -0,0 +1,9 @@ +diff -Naur colordiff-1.0.9.orig/cdiff.sh colordiff-1.0.9.patched/cdiff.sh +--- colordiff-1.0.9.orig/cdiff.sh 2009-01-26 21:17:47.000000000 +0100 ++++ colordiff-1.0.9.patched/cdiff.sh 2009-10-08 14:11:03.128576934 +0200 +@@ -56,4 +56,4 @@ + done + else + cat +-fi) | colordiff | less -R ++fi) | /opt/csw/bin/colordiff | /opt/csw/bin/less -R This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 14:13:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 12:13:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6780] csw/mgar/pkg Message-ID: Revision: 6780 http://gar.svn.sourceforge.net/gar/?rev=6780&view=rev Author: dmichelsen Date: 2009-10-08 12:13:53 +0000 (Thu, 08 Oct 2009) Log Message: ----------- libebml: Initial commit Added Paths: ----------- csw/mgar/pkg/libebml/ csw/mgar/pkg/libebml/branches/ csw/mgar/pkg/libebml/tags/ csw/mgar/pkg/libebml/trunk/ csw/mgar/pkg/libebml/trunk/Makefile csw/mgar/pkg/libebml/trunk/checksums csw/mgar/pkg/libebml/trunk/files/ csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff Property changes on: csw/mgar/pkg/libebml/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libebml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libebml/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libebml/trunk/Makefile 2009-10-08 12:13:53 UTC (rev 6780) @@ -0,0 +1,38 @@ +GARNAME = libebml +GARVERSION = 0.7.8 +CATEGORIES = lib + +DESCRIPTION = Library for Extensible Binary Meta Language +define BLURB +endef + +MASTER_SITES = http://dl.matroska.org/downloads/libebml/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = libebml-shared-library.diff + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.matroska.org/ + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_SCRIPTS = + +# Needed for shared library +EXTRA_CFLAGS = -xcode=pic32 +EXTRA_CXXFLAGS = -xcode=pic32 + +WARNINGFLAGS = +BUILD_OVERRIDE_DIRS = CC CXX LD CFLAGS WARNINGFLAGS +BUILD_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = CC CXX LD CFLAGS WARNINGFLAGS INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall +INSTALL_OVERRIDE_DIRS = prefix libdir includedir +INSTALL_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +include gar/category.mk Added: csw/mgar/pkg/libebml/trunk/checksums =================================================================== --- csw/mgar/pkg/libebml/trunk/checksums (rev 0) +++ csw/mgar/pkg/libebml/trunk/checksums 2009-10-08 12:13:53 UTC (rev 6780) @@ -0,0 +1,2 @@ +6278109f52e4f9d2c8a8dfc0d668b587 libebml-0.7.8.tar.bz2 +da5e2aaafdcba2c1bc83dba1e8ce2721 libebml-shared-library.diff Added: csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff =================================================================== --- csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff (rev 0) +++ csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff 2009-10-08 12:13:53 UTC (rev 6780) @@ -0,0 +1,12 @@ +diff -Naur libebml-0.7.8.orig/make/linux/Makefile libebml-0.7.8.patched/make/linux/Makefile +--- libebml-0.7.8.orig/make/linux/Makefile 2006-06-02 16:32:15.000000000 +0200 ++++ libebml-0.7.8.patched/make/linux/Makefile 2009-10-08 10:49:26.151491509 +0200 +@@ -94,7 +94,7 @@ + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) ++ $(CXX) -G $(LDFLAGS) -o $(LIBRARY_SO_VER) $(objects_so) + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 14:21:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 12:21:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6781] csw/mgar/pkg/colordiff/trunk/checksums Message-ID: Revision: 6781 http://gar.svn.sourceforge.net/gar/?rev=6781&view=rev Author: dmichelsen Date: 2009-10-08 12:21:08 +0000 (Thu, 08 Oct 2009) Log Message: ----------- colordiff: Updated checksum Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/checksums Modified: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 12:13:53 UTC (rev 6780) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 12:21:08 UTC (rev 6781) @@ -1,3 +1,4 @@ -31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz -d202632e9ec507e53445232a930c9c6f download/fix-entity-nesting.patch -b37c28fccba12407d69a9d856d81a396 download/force-csw-perl.patch +31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz +d202632e9ec507e53445232a930c9c6f fix-entity-nesting.patch +94bb55618657dd39b3d4d1b8b321eac3 force-csw-less.patch +b37c28fccba12407d69a9d856d81a396 force-csw-perl.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 15:25:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 13:25:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6782] csw/mgar/pkg Message-ID: Revision: 6782 http://gar.svn.sourceforge.net/gar/?rev=6782&view=rev Author: dmichelsen Date: 2009-10-08 13:25:51 +0000 (Thu, 08 Oct 2009) Log Message: ----------- libmatroska: Initial commit Added Paths: ----------- csw/mgar/pkg/libmatroska/ csw/mgar/pkg/libmatroska/branches/ csw/mgar/pkg/libmatroska/tags/ csw/mgar/pkg/libmatroska/trunk/ csw/mgar/pkg/libmatroska/trunk/Makefile csw/mgar/pkg/libmatroska/trunk/checksums csw/mgar/pkg/libmatroska/trunk/files/ csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff Property changes on: csw/mgar/pkg/libmatroska/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/libmatroska/trunk/Makefile (from rev 6780, csw/mgar/pkg/libebml/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libmatroska/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmatroska/trunk/Makefile 2009-10-08 13:25:51 UTC (rev 6782) @@ -0,0 +1,41 @@ +GARNAME = libmatroska +GARVERSION = 0.8.1 +CATEGORIES = lib + +DESCRIPTION = A C++ libary to parse Matroska files (.mkv and .mka) +define BLURB +endef + +MASTER_SITES = http://dl.matroska.org/downloads/libmatroska/libmatroska-0.8.1.tar.bz2 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = libmatroska-shared-library.diff + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.matroska.org/ + +REQUIRED_PKGS = CSWlibebml +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_SCRIPTS = + +# Needed for shared library +EXTRA_CFLAGS = -xcode=pic32 +EXTRA_CXXFLAGS = -xcode=pic32 + +WARNINGFLAGS = +BUILD_OVERRIDE_DIRS = CC CXX LD CFLAGS WARNINGFLAGS +BUILD_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = CC CXX LD CFLAGS WARNINGFLAGS INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall +INSTALL_OVERRIDE_DIRS = prefix libdir includedir +INSTALL_SCRIPTS = $(WORKSRC)/make/linux/Makefile + +include gar/category.mk Added: csw/mgar/pkg/libmatroska/trunk/checksums =================================================================== --- csw/mgar/pkg/libmatroska/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmatroska/trunk/checksums 2009-10-08 13:25:51 UTC (rev 6782) @@ -0,0 +1,2 @@ +20cf624ace0c58a54c7752eebfbc0b19 libmatroska-0.8.1.tar.bz2 +154440024a5596dc63e4ec24ded01f24 libmatroska-shared-library.diff Copied: csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff (from rev 6780, csw/mgar/pkg/libebml/trunk/files/libebml-shared-library.diff) =================================================================== --- csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff (rev 0) +++ csw/mgar/pkg/libmatroska/trunk/files/libmatroska-shared-library.diff 2009-10-08 13:25:51 UTC (rev 6782) @@ -0,0 +1,12 @@ +diff -Naur libmatroska-0.8.1.orig/make/linux/Makefile libmatroska-0.8.1.patched/make/linux/Makefile +--- libmatroska-0.8.1.orig/make/linux/Makefile 2006-06-02 16:32:52.000000000 +0200 ++++ libmatroska-0.8.1.patched/make/linux/Makefile 2009-10-08 14:19:53.080322384 +0200 +@@ -102,7 +102,7 @@ + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml ++ $(CXX) -G $(LDFLAGS) -o $(LIBRARY_SO_VER) $(objects_so) -lebml + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 15:26:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 13:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6783] csw/mgar/pkg/libebml/trunk/Makefile Message-ID: Revision: 6783 http://gar.svn.sourceforge.net/gar/?rev=6783&view=rev Author: dmichelsen Date: 2009-10-08 13:26:04 +0000 (Thu, 08 Oct 2009) Log Message: ----------- libebml: Relocate includes to ebml/ Modified Paths: -------------- csw/mgar/pkg/libebml/trunk/Makefile Modified: csw/mgar/pkg/libebml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libebml/trunk/Makefile 2009-10-08 13:25:51 UTC (rev 6782) +++ csw/mgar/pkg/libebml/trunk/Makefile 2009-10-08 13:26:04 UTC (rev 6783) @@ -33,6 +33,7 @@ INSTALL_OVERRIDE_VARS = CC CXX LD CFLAGS WARNINGFLAGS INSTALL INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall INSTALL_OVERRIDE_DIRS = prefix libdir includedir +includedir = $(prefix)/include/ebml INSTALL_SCRIPTS = $(WORKSRC)/make/linux/Makefile include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 15:27:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 13:27:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6784] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6784 http://gar.svn.sourceforge.net/gar/?rev=6784&view=rev Author: dmichelsen Date: 2009-10-08 13:27:06 +0000 (Thu, 08 Oct 2009) Log Message: ----------- colordiff: Force usage of GNU diff Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 13:26:04 UTC (rev 6783) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-10-08 13:27:06 UTC (rev 6784) @@ -11,11 +11,12 @@ PATCHFILES = fix-entity-nesting.patch PATCHFILES += force-csw-perl.patch PATCHFILES += force-csw-less.patch +PATCHFILES += force-csw-gdiff.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWperl CSWless +REQUIRED_PKGS = CSWdiffutils CSWperl CSWless CONFIGURE_SCRIPTS = BUILD_ARGS = doc Modified: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 13:26:04 UTC (rev 6783) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-10-08 13:27:06 UTC (rev 6784) @@ -1,4 +1,5 @@ 31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz d202632e9ec507e53445232a930c9c6f fix-entity-nesting.patch +4e078d43dfd8032c95699190c3bf9f16 force-csw-gdiff.patch 94bb55618657dd39b3d4d1b8b321eac3 force-csw-less.patch b37c28fccba12407d69a9d856d81a396 force-csw-perl.patch Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch 2009-10-08 13:27:06 UTC (rev 6784) @@ -0,0 +1,12 @@ +diff -Naur colordiff-1.0.9.orig/colordiff.pl colordiff-1.0.9.patched/colordiff.pl +--- colordiff-1.0.9.orig/colordiff.pl 2009-01-28 21:12:10.000000000 +0100 ++++ colordiff-1.0.9.patched/colordiff.pl 2009-10-08 14:26:51.806222906 +0200 +@@ -178,7 +178,7 @@ + my $exitcode = 0; + if ((defined $ARGV[0]) || (-t STDIN)) { + # More reliable way of pulling in arguments +- my $pid = open2(\*INPUTSTREAM, undef, "diff", @ARGV); ++ my $pid = open2(\*INPUTSTREAM, undef, "/opt/csw/bin/gdiff", @ARGV); + @inputstream = ; + close INPUTSTREAM; + waitpid $pid, 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 8 16:54:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 08 Oct 2009 14:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6785] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 6785 http://gar.svn.sourceforge.net/gar/?rev=6785&view=rev Author: bonivart Date: 2009-10-08 14:54:10 +0000 (Thu, 08 Oct 2009) Log Message: ----------- perl: update to use new bdb47 package Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-10-08 13:27:06 UTC (rev 6784) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-10-08 14:54:10 UTC (rev 6785) @@ -19,8 +19,10 @@ PACKAGES = CSWperl CSWperldoc ARCHALL_CSWperldoc = 1 -REQUIRED_PKGS_CSWperl = CSWbdb CSWgdbm +REQUIRED_PKGS_CSWperl = CSWbdb47 CSWgdbm REQUIRED_PKGS_CSWperldoc = CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +SPKG_DESC_CSWperldoc = Perl documentation LICENSE = Copying @@ -56,7 +58,7 @@ DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) # Dependencies -LIBDEPS += lib/bdb47 +#LIBDEPS += bdb48/lib LIBDEPS += lib/gdbm # Custom configure @@ -106,8 +108,8 @@ CONFIGURE_ARGS += -Dlibsdirs=" /usr/lib /opt/csw/lib" CONFIGURE_ARGS += -Dsed=$(bindir)/gsed -#EXTRA_LIB += $(prefix)/bdb44/lib -#EXTRA_INC += $(prefix)/bdb44/include +EXTRA_LIB += $(prefix)/bdb47/lib +EXTRA_INC += $(prefix)/bdb47/include #EXTRA_LDFLAGS = -lperl EXTRA_LDFLAGS = -L/opt/csw/lib/libperl.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 8 17:22:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Oct 2009 15:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6786] csw/mgar/pkg/fping/trunk Message-ID: Revision: 6786 http://gar.svn.sourceforge.net/gar/?rev=6786&view=rev Author: dmichelsen Date: 2009-10-08 15:22:50 +0000 (Thu, 08 Oct 2009) Log Message: ----------- fping: Add patch Modified Paths: -------------- csw/mgar/pkg/fping/trunk/Makefile csw/mgar/pkg/fping/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch Modified: csw/mgar/pkg/fping/trunk/Makefile =================================================================== --- csw/mgar/pkg/fping/trunk/Makefile 2009-10-08 14:54:10 UTC (rev 6785) +++ csw/mgar/pkg/fping/trunk/Makefile 2009-10-08 15:22:50 UTC (rev 6786) @@ -20,7 +20,8 @@ MASTER_SITES = http://fping.sourceforge.net/download/ MASTER_SITES += http://oss.oetiker.ch/smokeping/pub/ DISTFILES = $(GARNAME).tar.gz -PATCHFILES = fping-2.4b2_to-sequence-fix.patch +#PATCHFILES = fping-2.4b2_to-sequence-fix.patch +PATCHFILES += fping-ipv6.patch # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/fping/trunk/checksums =================================================================== --- csw/mgar/pkg/fping/trunk/checksums 2009-10-08 14:54:10 UTC (rev 6785) +++ csw/mgar/pkg/fping/trunk/checksums 2009-10-08 15:22:50 UTC (rev 6786) @@ -1,2 +1,2 @@ -ee105906fc48b78f72866e121a7c179e download/fping-2.4b2_to-sequence-fix.patch +c5e9dc057bda53ed36af08ee9fb84938 download/fping-ipv6.patch d5e8be59e307cef76bc479e1684df705 download/fping.tar.gz Added: csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch =================================================================== --- csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch (rev 0) +++ csw/mgar/pkg/fping/trunk/files/fping-2.4b2_to-sequence-fix.patch 2009-10-08 15:22:50 UTC (rev 6786) @@ -0,0 +1,82 @@ +Only in fping-2.4b2_to.patch: Makefile +Only in fping-2.4b2_to.patch: config.h +Only in fping-2.4b2_to.patch: config.log +Only in fping-2.4b2_to.patch: config.status +Only in fping-2.4b2_to.patch: fping +diff -u fping-2.4b2_to/fping.c fping-2.4b2_to.patch/fping.c +--- fping-2.4b2_to/fping.c 2001-07-20 19:10:26.000000000 +0200 ++++ fping-2.4b2_to.patch/fping.c 2008-08-18 22:14:38.000000000 +0200 +@@ -1440,7 +1440,7 @@ + icp->icmp_type = ICMP_ECHO; + icp->icmp_code = 0; + icp->icmp_cksum = 0; +- icp->icmp_seq = h->i; ++ icp->icmp_seq = h->i + (h->num_sent) * num_hosts; + icp->icmp_id = ident; + + pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR ); +@@ -1527,6 +1527,7 @@ + int n, avg; + HOST_ENTRY *h; + long this_reply; ++ long id; + int this_count; + struct timeval sent_time; + +@@ -1568,6 +1569,7 @@ + }/* IF */ + + icp = ( struct icmp* )( buffer + hlen ); ++ id = icp->icmp_seq % num_hosts; + if( icp->icmp_type != ICMP_ECHOREPLY ) + { + /* handle some problem */ +@@ -1583,10 +1585,10 @@ + + num_pingreceived++; + +- if( icp->icmp_seq >= ( n_short )num_hosts ) ++ if( id >= ( n_short )num_hosts ) + return( 1 ); /* packet received, don't worry about it anymore */ + +- n = icp->icmp_seq; ++ n = id; + h = table[n]; + + /* received ping is cool, so process it */ +@@ -1726,6 +1728,7 @@ + { + struct icmp *sent_icmp; + struct ip *sent_ip; ++ long id = sent_icmp->icmp_seq % num_hosts; + u_char *c; + HOST_ENTRY *h; + +@@ -1737,10 +1740,10 @@ + + if( ( sent_icmp->icmp_type == ICMP_ECHO ) && + ( sent_icmp->icmp_id == ident ) && +- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) ++ ( id < ( n_short )num_hosts ) ) + { + /* this is a response to a ping we sent */ +- h = table[sent_icmp->icmp_seq]; ++ h = table[id]; + + if( p->icmp_code > ICMP_UNREACH_MAXTYPE ) + { +@@ -1771,10 +1774,10 @@ + sent_icmp = ( struct icmp* )( c + 28 ); + if( ( sent_icmp->icmp_type = ICMP_ECHO ) && + ( sent_icmp->icmp_id = ident ) && +- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) ++ ( id < ( n_short )num_hosts ) ) + { + /* this is a response to a ping we sent */ +- h = table[sent_icmp->icmp_seq]; ++ h = table[id]; + fprintf( stderr, "%s from %s for ICMP Echo sent to %s", + icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host ); + +Only in fping-2.4b2_to.patch: fping.o +Only in fping-2.4b2_to.patch: stamp-h Added: csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch =================================================================== --- csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch (rev 0) +++ csw/mgar/pkg/fping/trunk/files/fping-ipv6.patch 2009-10-08 15:22:50 UTC (rev 6786) @@ -0,0 +1,952 @@ +diff -Naur fping-2.4b2/ChangeLog fping-2.4b2_to-ipv6/ChangeLog +--- fping-2.4b2/ChangeLog Thu Mar 15 03:09:39 2001 ++++ fping-2.4b2_to-ipv6/ChangeLog Mon Jan 21 02:15:04 2002 +@@ -1,12 +1,23 @@ +-Tue Mar 14 18:37:50 2001 +-Jason Ewasiuk (ZeroHype Technologies Inc.) ++Wed Jan 16 2002 ++Jeroen Massar ++- Revision v2.4b2-to-IPv6 ++ - Added IPv6 support. ++ - Added -I option for selecting source IPv4/IPv6 address. ++ - Makefile.in now generates a Makefile which will build both ++ fping (IPv4) and fping6 (IPv6). Thus it makes an fping (IPv4 only) ++ and an fping6 (IPv6 only). ++ - num_unreachable was counted twice when a sendto() generated errors. ++ - See http://unfix.org/projects/ipv6/ ++ ++Tue Mar 14 2001 ++Jason Ewasiuk + - Revision v2.4b1 + - added -g option for generating IPs from a start to an end value + - two available options, generate IPs from start IP to end IP + or from a passed netmask, such as 192.168.1.0/24 + +-Thu Feb 15 14:35:00 2001 +-Jason Ewasiuk (ZeroHype Technologies Inc.) ++Thu Feb 15 2001 ++Jason Ewasiuk + - Revision v2.3b1 + - formatting changes to code layout (fping.c) + NOTE: Best viewed with a tab stop of 4 +diff -Naur fping-2.4b2/Makefile.am fping-2.4b2_to-ipv6/Makefile.am +--- fping-2.4b2/Makefile.am Thu Mar 15 03:07:52 2001 ++++ fping-2.4b2_to-ipv6/Makefile.am Wed Jan 16 01:52:18 2002 +@@ -1,5 +1,5 @@ +- + sbin_PROGRAMS = fping + fping_SOURCES = fping.c options.h linux.h + man_MANS = fping.8 + AUTOMAKE_OPTIONS=foreign ++EXTRA_DIST = $(man_MANS) +diff -Naur fping-2.4b2/README fping-2.4b2_to-ipv6/README +--- fping-2.4b2/README Wed Apr 25 20:29:10 2001 ++++ fping-2.4b2_to-ipv6/README Mon Jan 21 02:02:12 2002 +@@ -1,9 +1,9 @@ + fping README + ------------ + +-Current maintainer and cool feature adder: ++Current maintainer: + +-ZeroHype Technologies Inc. (noc at zerohype.com) http://www.zerohype.com ++David Papp - david at remote.net + + + fping website: http://www.fping.com +@@ -11,6 +11,7 @@ + + Original author: Roland Schemers (schemers at stanford.edu) + Previous maintainer: RL "Bob" Morgan (morgan at stanford.edu) ++IPv6 Support: Jeroen Massar (jeroen at unfix.org / jeroen at ipng.nl) + + + Suggestions and patches: +diff -Naur fping-2.4b2/acconfig.h fping-2.4b2_to-ipv6/acconfig.h +--- fping-2.4b2/acconfig.h Thu Mar 15 03:07:52 2001 ++++ fping-2.4b2_to-ipv6/acconfig.h Sat Nov 3 16:23:40 2001 +@@ -1,4 +1,18 @@ ++#ifndef CONFIG_H ++#define CONFIG_H ++ ++ at TOP@ + + /* VERSION (from configure.in) */ + #undef VERSION + ++ ++ at BOTTOM@ ++ ++/* some OSes do not define this ... lets take a wild guess */ ++ ++#ifndef INADDR_NONE ++# define INADDR_NONE 0xffffffffU ++#endif ++ ++#endif /* CONFIG_H */ +diff -Naur fping-2.4b2/aclocal.m4 fping-2.4b2_to-ipv6/aclocal.m4 +--- fping-2.4b2/aclocal.m4 Thu Jan 1 01:00:00 1970 ++++ fping-2.4b2_to-ipv6/aclocal.m4 Wed Jan 16 01:48:55 2002 +@@ -0,0 +1,127 @@ ++dnl aclocal.m4 generated automatically by aclocal 1.4 ++ ++dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl This program is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++dnl PARTICULAR PURPOSE. ++ ++# Do all the work for Automake. This macro actually does too much -- ++# some checks are only needed if your package does certain things. ++# But this isn't really a big deal. ++ ++# serial 1 ++ ++dnl Usage: ++dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ++ ++AC_DEFUN(AM_INIT_AUTOMAKE, ++[AC_REQUIRE([AC_PROG_INSTALL]) ++PACKAGE=[$1] ++AC_SUBST(PACKAGE) ++VERSION=[$2] ++AC_SUBST(VERSION) ++dnl test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++fi ++ifelse([$3],, ++AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) ++AC_REQUIRE([AM_SANITY_CHECK]) ++AC_REQUIRE([AC_ARG_PROGRAM]) ++dnl FIXME This is truly gross. ++missing_dir=`cd $ac_aux_dir && pwd` ++AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) ++AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) ++AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) ++AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) ++AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) ++AC_REQUIRE([AC_PROG_MAKE_SET])]) ++ ++# ++# Check to make sure that the build environment is sane. ++# ++ ++AC_DEFUN(AM_SANITY_CHECK, ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftestfile ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` ++ if test "[$]*" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftestfile` ++ fi ++ if test "[$]*" != "X $srcdir/configure conftestfile" \ ++ && test "[$]*" != "X conftestfile $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "[$]2" = conftestfile ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++rm -f conftest* ++AC_MSG_RESULT(yes)]) ++ ++dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) ++dnl The program must properly implement --version. ++AC_DEFUN(AM_MISSING_PROG, ++[AC_MSG_CHECKING(for working $2) ++# Run test in a subshell; some versions of sh will print an error if ++# an executable is not found, even if stderr is redirected. ++# Redirect stdin to placate older versions of autoconf. Sigh. ++if ($2 --version) < /dev/null > /dev/null 2>&1; then ++ $1=$2 ++ AC_MSG_RESULT(found) ++else ++ $1="$3/missing $2" ++ AC_MSG_RESULT(missing) ++fi ++AC_SUBST($1)]) ++ ++# Like AC_CONFIG_HEADER, but automatically create stamp file. ++ ++AC_DEFUN(AM_CONFIG_HEADER, ++[AC_PREREQ([2.12]) ++AC_CONFIG_HEADER([$1]) ++dnl When config.status generates a header, we must update the stamp-h file. ++dnl This file resides in the same directory as the config header ++dnl that is generated. We must strip everything past the first ":", ++dnl and everything past the last "/". ++AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl ++ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, ++<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, ++<>; do ++ case " <<$>>CONFIG_HEADERS " in ++ *" <<$>>am_file "*<<)>> ++ echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx ++ ;; ++ esac ++ am_indx=`expr "<<$>>am_indx" + 1` ++done<<>>dnl>>) ++changequote([,]))]) ++ +diff -Naur fping-2.4b2/config.h.in fping-2.4b2_to-ipv6/config.h.in +--- fping-2.4b2/config.h.in Thu Mar 15 03:07:52 2001 ++++ fping-2.4b2_to-ipv6/config.h.in Wed Jan 16 01:49:45 2002 +@@ -1,4 +1,7 @@ + /* config.h.in. Generated automatically from configure.in by autoheader. */ ++#ifndef CONFIG_H ++#define CONFIG_H ++ + + /* VERSION (from configure.in) */ + #undef VERSION +@@ -20,3 +23,18 @@ + + /* Define if you have the socket library (-lsocket). */ + #undef HAVE_LIBSOCKET ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Version number of package */ ++#undef VERSION ++ ++ ++/* some OSes do not define this ... lets take a wild guess */ ++ ++#ifndef INADDR_NONE ++# define INADDR_NONE 0xffffffffU ++#endif ++ ++#endif /* CONFIG_H */ +diff -Naur fping-2.4b2/configure.in fping-2.4b2_to-ipv6/configure.in +--- fping-2.4b2/configure.in Thu Nov 7 21:11:57 2002 ++++ fping-2.4b2_to-ipv6/configure.in Wed Jan 16 01:48:02 2002 +@@ -1,18 +1,26 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(fping.c) +-AM_INIT_AUTOMAKE(fping,fping) ++AM_INIT_AUTOMAKE(fping, 2.4b2_to_ipv6) ++ + AM_CONFIG_HEADER(config.h) ++#VERSION=2.4b2 ++#PACKAGE=fping ++AC_SUBST(PACKAGE) ++AC_SUBST(VERSION) ++AC_DEFINE_UNQUOTED(VERSION,"$VERSION") + + dnl Checks for programs. + +-AC_ARG_PROGRAM + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL + + dnl Checks for libraries. + +-AC_CHECK_FUNC(gethostbyname, [] AC_CHECK_LIB(nsl, gethostbyname)) ++AC_CHECK_FUNC(gethostbyname) ++if test $ac_cv_func_gethostbyname = no; then ++ AC_CHECK_LIB(nsl, gethostbyname) ++fi + AC_CHECK_FUNC(connect) + if test $ac_cv_func_connect = no; then + AC_CHECK_LIB(socket, connect) +@@ -21,4 +29,4 @@ + dnl Checks for header files. + AC_CHECK_HEADERS(unistd.h sys/file.h stdlib.h sys/select.h) + +-AC_OUTPUT([Makefile]) ++AC_OUTPUT(Makefile) +diff -Naur fping-2.4b2/fping.8 fping-2.4b2_to-ipv6/fping.8 +--- fping-2.4b2/fping.8 Thu Mar 15 03:10:45 2001 ++++ fping-2.4b2_to-ipv6/fping.8 Mon Jan 21 02:05:48 2002 +@@ -192,7 +192,7 @@ + .nf + Roland J. Schemers III, Stanford University, concept and versions 1.x + RL "Bob" Morgan, Stanford University, versions 2.x +-ZeroHype Technologies Inc. (http://www.zerohype.com), versions 2.3x and up, ++David Papp, versions 2.3x and up, + fping website: http://www.fping.com + .ni + .SH DIAGNOSTICS +diff -Naur fping-2.4b2/fping.c fping-2.4b2_to-ipv6/fping.c +--- fping-2.4b2/fping.c Fri Jul 20 19:10:26 2001 ++++ fping-2.4b2_to-ipv6/fping.c Mon Jan 21 02:06:30 2002 +@@ -17,12 +17,13 @@ + * + * Current maintainers of fping: + * +- * ZeroHype Technologies Inc. (http://www.zerohype.com) +- * Suggestions and patches, please email noc at zerohype.com ++ * David Papp ++ * Suggestions and patches, please email david at remote.net + * + * + * +- * Original author: Roland Schemers ++ * Original author: Roland Schemers ++ * IPv6 Support: Jeroen Massar + * + * + * +@@ -41,6 +42,7 @@ + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ ++#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */ + + #ifndef _NO_PROTO + #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \ +@@ -65,13 +67,16 @@ + + /*** autoconf includes ***/ + +-#include + + #include + #include + #include + #include + ++#include ++ ++#include "config.h" ++ + #ifdef HAVE_UNISTD_H + #include + #endif /* HAVE_UNISTD_H */ +@@ -91,8 +96,10 @@ + #include + #endif /* HAVE_SYS_FILE_H */ + ++#ifdef IPV6 ++#include ++#endif + #include +-#include + + /* Linux has bizarre ip.h and ip_icmp.h */ + #if defined( __linux__ ) +@@ -126,8 +133,8 @@ + + /*** Constants ***/ + +-#define REV_DATE "2001/01/25 11:25:04" +-#define EMAIL "noc at zerohype.com" ++#define REV_DATE "2002/01/16 00:33:42" ++#define EMAIL "david at remote.net" + + /*** Ping packet defines ***/ + +@@ -215,6 +222,13 @@ + }; + + #define ICMP_UNREACH_MAXTYPE 15 ++#ifndef IPV6 ++#define FPING_SOCKADDR struct sockaddr_in ++#define FPING_ICMPHDR struct icmp ++#else ++#define FPING_SOCKADDR struct sockaddr_in6 ++#define FPING_ICMPHDR struct icmp6_hdr ++#endif + + /* entry used to keep track of each host we are pinging */ + +@@ -225,7 +239,7 @@ + char *name; /* name as given by user */ + char *host; /* text description of host */ + char *pad; /* pad to align print names */ +- struct sockaddr_in saddr; /* internet address */ ++ FPING_SOCKADDR saddr; /* internet address */ + int timeout; /* time to wait for response */ + u_char running; /* unset when through sending */ + u_char waiting; /* waiting for response */ +@@ -335,7 +349,11 @@ + #else + + void add_name( char *name ); ++#ifndef IPV6 + void add_addr( char *name, char *host, struct in_addr ipaddr ); ++#else ++void add_addr( char *name, char *host, FPING_SOCKADDR *ipaddr ); ++#endif + char *na_cat( char *name, struct in_addr ipaddr ); + char *cpystr( char *string ); + void crash_and_burn( char *message ); +@@ -343,7 +361,7 @@ + char *get_host_by_address( struct in_addr in ); + int in_cksum( u_short *p, int n ); + void u_sleep( int u_sec ); +-int recvfrom_wto ( int s, char *buf, int len, struct sockaddr *saddr, int timo ); ++int recvfrom_wto ( int s, char *buf, int len, FPING_SOCKADDR *saddr, int timo ); + void remove_job( HOST_ENTRY *h ); + void send_ping( int s, HOST_ENTRY *h ); + long timeval_diff( struct timeval *a, struct timeval *b ); +@@ -353,7 +371,7 @@ + void print_per_system_splits( void ); + void print_global_stats( void ); + void finish(); +-int handle_random_icmp( struct icmp *p, int psize, struct sockaddr_in *addr ); ++int handle_random_icmp( FPING_ICMPHDR *p, int psize, FPING_SOCKADDR *addr ); + char *sprint_tm( int t ); + + #endif /* _NO_PROTO */ +@@ -382,12 +400,14 @@ + #endif /* _NO_PROTO */ + { + int c, i, n; ++#ifdef IPV6 ++ int opton = 1; ++#endif + u_int lt, ht; + int advance; + struct protoent *proto; + char *buf; + uid_t uid; +- + /* check if we are root */ + + if( geteuid() ) +@@ -400,15 +420,62 @@ + }/* IF */ + + /* confirm that ICMP is available on this machine */ ++#ifndef IPV6 + if( ( proto = getprotobyname( "icmp" ) ) == NULL ) ++#else ++ if( ( proto = getprotobyname( "ipv6-icmp" ) ) == NULL ) ++#endif + crash_and_burn( "icmp: unknown protocol" ); + + /* create raw socket for ICMP calls (ping) */ ++#ifndef IPV6 + s = socket( AF_INET, SOCK_RAW, proto->p_proto ); ++#else ++ s = socket( AF_INET6, SOCK_RAW, proto->p_proto ); ++#endif + + if( s < 0 ) + errno_crash_and_burn( "can't create raw socket" ); + ++#ifdef IPV6 ++ /* ++ * let the kerel pass extension headers of incoming packets, ++ * for privileged socket options ++ */ ++#ifdef IPV6_RECVHOPOPTS ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVHOPOPTS)"); ++#else /* old adv. API */ ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_HOPOPTS)"); ++#endif ++#ifdef IPV6_RECVDSTOPTS ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVDSTOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVDSTOPTS)"); ++#else /* old adv. API */ ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_DSTOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_DSTOPTS)"); ++#endif ++#ifdef IPV6_RECVRTHDRDSTOPTS ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVRTHDRDSTOPTS, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVRTHDRDSTOPTS)"); ++#endif ++#ifdef IPV6_RECVRTHDR ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVRTHDR, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RECVRTHDR)"); ++#else /* old adv. API */ ++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RTHDR, &opton, ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RTHDR)"); ++#endif ++#endif ++ + if( ( uid = getuid() ) ) + { + seteuid( getuid() ); +@@ -1425,7 +1492,7 @@ + #endif /* _NO_PROTO */ + { + char *buffer; +- struct icmp *icp; ++ FPING_ICMPHDR *icp; + PING_DATA *pdp; + int n; + +@@ -1434,9 +1501,10 @@ + crash_and_burn( "can't malloc ping packet" ); + + memset( buffer, 0, ping_pkt_size * sizeof( char ) ); +- icp = ( struct icmp* )buffer; ++ icp = ( FPING_ICMPHDR* )buffer; + + gettimeofday( &h->last_send_time, &tz ); ++#ifndef IPV6 + icp->icmp_type = ICMP_ECHO; + icp->icmp_code = 0; + icp->icmp_cksum = 0; +@@ -1448,14 +1516,25 @@ + pdp->ping_count = h->num_sent; + + icp->icmp_cksum = in_cksum( ( u_short* )icp, ping_pkt_size ); ++#else ++ icp->icmp6_type = ICMP6_ECHO_REQUEST; ++ icp->icmp6_code = 0; ++ icp->icmp6_seq = h->i; ++ icp->icmp6_id = ident; ++ ++ pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR ); ++ pdp->ping_ts = h->last_send_time; ++ pdp->ping_count = h->num_sent; + ++ icp->icmp6_cksum = 0; // The IPv6 stack calculates the checksum for us... ++#endif + #if defined(DEBUG) || defined(_DEBUG) + if( trace_flag ) + printf( "sending [%d] to %s\n", h->num_sent, h->host ); + #endif /* DEBUG || _DEBUG */ + + n = sendto( s, buffer, ping_pkt_size, 0, +- ( struct sockaddr* )&h->saddr, sizeof( struct sockaddr_in ) ); ++ ( struct sockaddr* )&h->saddr, sizeof( FPING_SOCKADDR ) ); + + if( n < 0 || n != ping_pkt_size ) + { +@@ -1520,18 +1599,17 @@ + { + int result; + static char buffer[4096]; +- struct sockaddr_in response_addr; ++ FPING_SOCKADDR response_addr; + struct ip *ip; +- int hlen; +- struct icmp *icp; ++ int hlen = 0; ++ FPING_ICMPHDR *icp; + int n, avg; + HOST_ENTRY *h; + long this_reply; + int this_count; + struct timeval sent_time; + +- result = recvfrom_wto( s, buffer, 4096, +- ( struct sockaddr* )&response_addr, select_time ); ++ result = recvfrom_wto( s, buffer, sizeof(buffer), &response_addr, select_time ); + + if( result < 0 ) + return 0; /* timeout */ +@@ -1546,7 +1624,7 @@ + #endif /* DEBUG || _DEBUG */ + + ip = ( struct ip* )buffer; +- ++#ifndef IPV6 + #if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) + /* The alpha headers are decidedly broken. + * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and +@@ -1556,37 +1634,59 @@ + #else + hlen = ip->ip_hl << 2; + #endif /* defined(__alpha__) && __STDC__ */ +- + if( result < hlen + ICMP_MINLEN ) ++#else ++ if( result < sizeof(FPING_ICMPHDR) ) ++#endif + { + if( verbose_flag ) ++ { ++#ifndef IPV6 + printf( "received packet too short for ICMP (%d bytes from %s)\n", result, + inet_ntoa( response_addr.sin_addr ) ); +- ++#else ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ printf( "received packet too short for ICMP (%d bytes from %s)\n", result, buf); ++#endif ++ } + return( 1 ); /* too short */ +- + }/* IF */ + +- icp = ( struct icmp* )( buffer + hlen ); ++ icp = ( FPING_ICMPHDR* )( buffer + hlen ); ++#ifndef IPV6 + if( icp->icmp_type != ICMP_ECHOREPLY ) ++#else ++ if( icp->icmp6_type != ICMP6_ECHO_REPLY ) ++#endif + { + /* handle some problem */ + if( handle_random_icmp( icp, result, &response_addr ) ) + num_othericmprcvd++; +- + return 1; +- + }/* IF */ + ++#ifndef IPV6 + if( icp->icmp_id != ident ) ++#else ++ if( icp->icmp6_id != ident ) ++#endif + return 1; /* packet received, but not the one we are looking for! */ + + num_pingreceived++; + ++#ifndef IPV6 + if( icp->icmp_seq >= ( n_short )num_hosts ) ++#else ++ if( icp->icmp6_seq >= ( n_short )num_hosts ) ++#endif + return( 1 ); /* packet received, don't worry about it anymore */ + ++#ifndef IPV6 + n = icp->icmp_seq; ++#else ++ n = icp->icmp6_seq; ++#endif + h = table[n]; + + /* received ping is cool, so process it */ +@@ -1595,9 +1695,14 @@ + h->timeout = timeout; + h->num_recv++; + h->num_recv_i++; +- ++ ++#ifndef IPV6 + memcpy( &sent_time, icp->icmp_data + offsetof( PING_DATA, ping_ts ), sizeof( sent_time ) ); + memcpy( &this_count, icp->icmp_data, sizeof( this_count ) ); ++#else ++ memcpy( &sent_time, ((char *)icp->icmp6_data32)+4+offsetof(PING_DATA, ping_ts), sizeof( sent_time ) ); ++ memcpy( &this_count, ((char *)icp->icmp6_data32)+4, sizeof( this_count ) ); ++#endif + + #if defined( DEBUG ) || defined( _DEBUG ) + if( trace_flag ) +@@ -1627,10 +1732,18 @@ + { + fprintf( stderr, "%s : duplicate for [%d], %d bytes, %s ms", + h->host, this_count, result, sprint_tm( this_reply ) ); +- ++#ifndef IPV6 + if( response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr ) + fprintf( stderr, " [<- %s]", inet_ntoa( response_addr.sin_addr ) ); +- ++#else ++ if(memcmp(&response_addr.sin6_addr, &h->saddr.sin6_addr, sizeof(response_addr.sin6_addr))) ++ { ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ ++ fprintf( stderr, " [<- %s]", buf); ++ } ++#endif + fprintf( stderr, "\n" ); + + }/* IF */ +@@ -1660,10 +1773,17 @@ + + if( elapsed_flag ) + printf( " (%s ms)", sprint_tm( this_reply ) ); +- ++#ifndef IPV6 + if( response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr ) + printf( " [<- %s]", inet_ntoa( response_addr.sin_addr ) ); +- ++#else ++ if(memcmp(&response_addr.sin6_addr, &h->saddr.sin6_addr, sizeof(response_addr.sin6_addr))) ++ { ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ fprintf( stderr, " [<- %s]", buf); ++ } ++#endif + printf( "\n" ); + + }/* IF */ +@@ -1688,9 +1808,17 @@ + ( h->num_recv * 100 ) / h->num_sent ); + + }/* ELSE */ +- ++#ifndef IPV6 + if( response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr ) + printf( " [<- %s]", inet_ntoa( response_addr.sin_addr ) ); ++#else ++ if(memcmp(&response_addr.sin6_addr, &h->saddr.sin6_addr, sizeof(response_addr.sin6_addr))) ++ { ++ char buf[INET6_ADDRSTRLEN]; ++ inet_ntop(response_addr.sin6_family, &response_addr.sin6_addr, buf, INET6_ADDRSTRLEN); ++ fprintf( stderr, " [<- %s]", buf); ++ } ++#endif + + printf( "\n" ); + +@@ -1706,7 +1834,7 @@ + + ************************************************************* + +- Inputs: struct icmp *p, int psize, struct sockaddr_in *addr ++ Inputs: FPING_ICMPHDR *p, int psize, FPING_SOCKADDR *addr + + Returns: int + +@@ -1717,22 +1845,33 @@ + + #ifdef _NO_PROTO + int handle_random_icmp( p, psize, addr ) +- struct icmp *p; ++ FPING_ICMPHDR *p; + int psize; +- struct sockaddr_in *addr; ++ FPING_SOCKADDR *addr; + #else +-int handle_random_icmp( struct icmp *p, int psize, struct sockaddr_in *addr ) ++int handle_random_icmp( FPING_ICMPHDR *p, int psize, FPING_SOCKADDR *addr ) + #endif /* _NO_PROTO */ + { +- struct icmp *sent_icmp; ++ FPING_ICMPHDR *sent_icmp; + struct ip *sent_ip; + u_char *c; + HOST_ENTRY *h; ++#ifdef IPV6 ++ char addr_ascii[INET6_ADDRSTRLEN]; ++ inet_ntop(addr->sin6_family, &addr->sin6_addr, addr_ascii, INET6_ADDRSTRLEN); ++#endif + + c = ( u_char* )p; ++#ifndef IPV6 + switch( p->icmp_type ) ++#else ++ switch( p->icmp6_type ) ++#endif + { + case ICMP_UNREACH: ++ sent_icmp = ( FPING_ICMPHDR* )( c + 28 ); ++ ++#ifndef IPV6 + sent_icmp = ( struct icmp* )( c + 28 ); + + if( ( sent_icmp->icmp_type == ICMP_ECHO ) && +@@ -1747,16 +1886,37 @@ + fprintf( stderr, "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s", + inet_ntoa( addr->sin_addr ), h->host ); + ++#else ++ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) && ++ ( sent_icmp->icmp6_id == ident ) && ++ ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) ) ++ { ++ /* this is a response to a ping we sent */ ++ h = table[sent_icmp->icmp6_seq]; ++ ++ if( p->icmp6_code > ICMP_UNREACH_MAXTYPE ) ++ { ++ fprintf( stderr, "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s", ++ addr_ascii, h->host ); ++#endif + }/* IF */ + else + { + fprintf( stderr, "%s from %s for ICMP Echo sent to %s", ++#ifndef IPV6 + icmp_unreach_str[p->icmp_code], inet_ntoa( addr->sin_addr ), h->host ); ++#else ++ icmp_unreach_str[p->icmp6_code], addr_ascii, h->host ); ++#endif + + }/* ELSE */ + + if( inet_addr( h->host ) == -1 ) ++#ifndef IPV6 + fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) ); ++#else ++ fprintf( stderr, " (%s)", addr_ascii); ++#endif + + fprintf( stderr, "\n" ); + +@@ -1768,7 +1928,8 @@ + case ICMP_REDIRECT: + case ICMP_TIMXCEED: + case ICMP_PARAMPROB: +- sent_icmp = ( struct icmp* )( c + 28 ); ++ sent_icmp = ( FPING_ICMPHDR* )( c + 28 ); ++#ifndef IPV6 + if( ( sent_icmp->icmp_type = ICMP_ECHO ) && + ( sent_icmp->icmp_id = ident ) && + ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) +@@ -1780,6 +1941,19 @@ + + if( inet_addr( h->host ) == -1 ) + fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) ); ++#else ++ if( ( sent_icmp->icmp6_type = ICMP_ECHO ) && ++ ( sent_icmp->icmp6_id = ident ) && ++ ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) ) ++ { ++ /* this is a response to a ping we sent */ ++ h = table[sent_icmp->icmp6_seq]; ++ fprintf( stderr, "%s from %s for ICMP Echo sent to %s", ++ icmp_type_str[p->icmp6_type], addr_ascii, h->host ); ++ ++ if( inet_addr( h->host ) == -1 ) ++ fprintf( stderr, " (%s)", addr_ascii ); ++#endif + + fprintf( stderr, "\n" ); + +@@ -1879,6 +2053,7 @@ + void add_name( char *name ) + #endif /* _NO_PROTO */ + { ++#ifndef IPV6 + struct hostent *host_ent; + u_int ipaddress; + struct in_addr *ipa = ( struct in_addr* )&ipaddress; +@@ -1985,7 +2160,27 @@ + + }/* WHILE */ + }/* ELSE */ +- ++#else ++ FPING_SOCKADDR dst; ++ struct addrinfo *res, hints; ++ int ret_ga; ++ char *hostname; ++ ++ /* getaddrinfo */ ++ bzero(&hints, sizeof(struct addrinfo)); ++ hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = AF_INET6; ++ hints.ai_socktype = SOCK_RAW; ++ hints.ai_protocol = IPPROTO_ICMPV6; ++ ++ ret_ga = getaddrinfo(name, NULL, &hints, &res); ++ if (ret_ga) errx(1, "%s", gai_strerror(ret_ga)); ++ if (res->ai_canonname) hostname = res->ai_canonname; ++ else hostname = name; ++ if (!res->ai_addr) errx(1, "getaddrinfo failed"); ++ (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/ ++ add_addr(name, name, &dst); ++#endif + } /* add_name() */ + + +@@ -2048,9 +2243,17 @@ + void add_addr( name, host, ipaddr ) + char *name; + char *host; ++#ifndef IPV6 + struct in_addr ipaddr; + #else ++FPING_SOCKADDR *ipaddr; ++#endif ++#else ++#ifndef IPV6 + void add_addr( char *name, char *host, struct in_addr ipaddr ) ++#else ++void add_addr( char *name, char *host, FPING_SOCKADDR *ipaddr ) ++#endif + #endif /* _NO_PROTO */ + { + HOST_ENTRY *p; +@@ -2064,8 +2267,13 @@ + + p->name = name; + p->host = host; ++#ifndef IPV6 + p->saddr.sin_family = AF_INET; + p->saddr.sin_addr = ipaddr; ++#else ++ p->saddr.sin6_family = AF_INET6; ++ (void)memcpy(&p->saddr, ipaddr, sizeof(FPING_SOCKADDR)); ++#endif + p->timeout = timeout; + p->running = 1; + p->min_reply = 10000000; +@@ -2193,7 +2401,11 @@ + #endif /* _NO_PROTO */ + { + struct hostent *h; ++#ifndef IPV6 + h = gethostbyaddr( ( char* )&in, sizeof( struct in_addr ),AF_INET ); ++#else ++ h = gethostbyaddr( ( char* )&in, sizeof( FPING_SOCKADDR ),AF_INET6 ); ++#endif + + if( h == NULL || h->h_name == NULL ) + return inet_ntoa( in ); +@@ -2429,7 +2641,7 @@ + + ************************************************************* + +- Inputs: int s, char* buf, int len, struct sockaddr *saddr, int timo ++ Inputs: int s, char* buf, int len, FPING_SOCKADDR *saddr, int timo + + Returns: int + +@@ -2443,9 +2655,9 @@ + + #ifdef _NO_PROTO + int recvfrom_wto( s, buf, len, saddr, timo ) +-int s; char *buf; int len; struct sockaddr *saddr; int timo; ++int s; char *buf; int len; FPING_SOCKADDR *saddr; int timo; + #else +-int recvfrom_wto( int s, char *buf, int len, struct sockaddr *saddr, int timo ) ++int recvfrom_wto( int s, char *buf, int len, FPING_SOCKADDR *saddr, int timo ) + #endif /* _NO_PROTO */ + { + int nfound, slen, n; +@@ -2465,8 +2677,12 @@ + if( nfound == 0 ) + return -1; /* timeout */ + ++#ifndef IPV6 + slen = sizeof( struct sockaddr ); +- n = recvfrom( s, buf, len, 0, saddr, &slen ); ++#else ++ slen = sizeof( FPING_SOCKADDR ); ++#endif ++ n = recvfrom( s, buf, len, 0, (struct sockaddr *)saddr, &slen ); + if( n < 0 ) + errno_crash_and_burn( "recvfrom" ); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 8 18:05:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 08 Oct 2009 16:05:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6787] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6787 http://gar.svn.sourceforge.net/gar/?rev=6787&view=rev Author: bonivart Date: 2009-10-08 16:05:38 +0000 (Thu, 08 Oct 2009) Log Message: ----------- cswclassutils: license change Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-08 15:22:50 UTC (rev 6786) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-08 16:05:38 UTC (rev 6787) @@ -5,11 +5,10 @@ DESCRIPTION = CSW class action utilities MASTER_SITES = +DISTFILES = COPYING ARCHALL = 1 -LICENSE = license - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -33,6 +32,5 @@ @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @cp $(FILEDIR)/CSW$(GARNAME).copyright $(WORKSRC)/license @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-08 15:22:50 UTC (rev 6786) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-08 16:05:38 UTC (rev 6787) @@ -0,0 +1 @@ +48a97af56d55bc90ce90303228ed8cc3 download/COPYING Added: csw/mgar/pkg/cswclassutils/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/COPYING 2009-10-08 16:05:38 UTC (rev 6787) @@ -0,0 +1,5 @@ + +These script(s) are utility scripts used by people who package software +for opencsw.org's Solaris "Community SoftWare" (CSW) effort. The scripts +may be copied free of charge, but may be of limited use to non-opencsw folks. + Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright 2009-10-08 15:22:50 UTC (rev 6786) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.copyright 2009-10-08 16:05:38 UTC (rev 6787) @@ -1,5 +0,0 @@ - -These script(s) are utility scripts used by people who package software -for opencsw.org's Solaris "Community SoftWare" (CSW) effort. The scripts -may be copied free of charge, but may be of limited use to non-opencsw folks. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 8 19:34:28 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Oct 2009 17:34:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6788] csw/mgar/pkg/git/trunk Message-ID: Revision: 6788 http://gar.svn.sourceforge.net/gar/?rev=6788&view=rev Author: bdwalton Date: 2009-10-08 17:34:28 +0000 (Thu, 08 Oct 2009) Log Message: ----------- git: add patch to stop segfault in ls-files Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-08 16:05:38 UTC (rev 6787) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-08 17:34:28 UTC (rev 6788) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +#TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel @@ -87,6 +87,7 @@ GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) DISTFILES = CSWgit.postinstall +PATCHFILES = 0001-ls-files-make-option-parser-keep-argv-0.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-08 16:05:38 UTC (rev 6787) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-08 17:34:28 UTC (rev 6788) @@ -1 +1,2 @@ +286ebdc4e98afca87750145775cbe918 download/0001-ls-files-make-option-parser-keep-argv-0.patch 0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall Added: csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch 2009-10-08 17:34:28 UTC (rev 6788) @@ -0,0 +1,42 @@ +From a613b30af3b8a74e8b2d8f5f9910564fb44bf59d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 7 Oct 2009 16:25:38 -0400 +Subject: [PATCH] ls-files: make option parser keep argv[0] + +The ls-files built-in was not asking the option parser to maintain +argv[0]. This led to the possibility of fprintf(stderr, "...", NULL). +On Solaris, this was causing a segfault. On glibc systems, printed +error messages didn't contain proper strings, but rather, "(null)":... + +A trigger for this bug was: `git ls-files -i` + +Signed-off-by: Ben Walton +--- + builtin-ls-files.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/builtin-ls-files.c b/builtin-ls-files.c +index f473220..9a3705a 100644 +--- a/builtin-ls-files.c ++++ b/builtin-ls-files.c +@@ -482,7 +482,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) + git_config(git_default_config, NULL); + + argc = parse_options(argc, argv, prefix, builtin_ls_files_options, +- ls_files_usage, 0); ++ ls_files_usage, PARSE_OPT_KEEP_ARGV0); + if (show_tag || show_valid_bit) { + tag_cached = "H "; + tag_unmerged = "M "; +@@ -505,7 +505,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) + if (require_work_tree && !is_inside_work_tree()) + setup_work_tree(); + +- pathspec = get_pathspec(prefix, argv); ++ pathspec = get_pathspec(prefix, argv + 1); + + /* be nice with submodule paths ending in a slash */ + read_cache(); +-- +1.6.4.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 8 19:36:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 17:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6789] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6789 http://gar.svn.sourceforge.net/gar/?rev=6789&view=rev Author: wahwah Date: 2009-10-08 17:36:43 +0000 (Thu, 08 Oct 2009) Log Message: ----------- cswutils: Support for stripping paths for comparepkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-08 17:34:28 UTC (rev 6788) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-08 17:36:43 UTC (rev 6789) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = cswutils GARVERSION = 1.14.4 CATEGORIES = utils @@ -7,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 74 +SVN_REV = 77 MASTER_SITES = DISTFILES = COPYING @@ -62,9 +64,9 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw - @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ + @ginstall -m 755 $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/compare_pkgs.py - @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ + @ginstall -m 644 $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/cswutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-10-08 17:34:28 UTC (rev 6788) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-10-08 17:36:43 UTC (rev 6789) @@ -1,10 +1,10 @@ 091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING 30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg 6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 -280eef68336d2896ecc136152014af9c download/compare_pkgs.py-r74 +a60cefbb6829c8dbbfae634a9ab01eba download/compare_pkgs.py-r77 9a637f6546cc50974159a987302d91c0 download/cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 -d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r74 +d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r77 cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:31:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:31:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6790] csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile Message-ID: Revision: 6790 http://gar.svn.sourceforge.net/gar/?rev=6790&view=rev Author: wbonnet Date: 2009-10-08 20:31:55 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-08 17:36:43 UTC (rev 6789) +++ csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-08 20:31:55 UTC (rev 6790) @@ -20,6 +20,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWinputproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:32:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6791] csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile Message-ID: Revision: 6791 http://gar.svn.sourceforge.net/gar/?rev=6791&view=rev Author: wbonnet Date: 2009-10-08 20:32:45 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile 2009-10-08 20:31:55 UTC (rev 6790) +++ csw/mgar/pkg/x11/x11_kbproto/trunk/Makefile 2009-10-08 20:32:45 UTC (rev 6791) @@ -20,6 +20,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWkbproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:34:41 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:34:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6792] csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile Message-ID: Revision: 6792 http://gar.svn.sourceforge.net/gar/?rev=6792&view=rev Author: wbonnet Date: 2009-10-08 20:34:35 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-08 20:32:45 UTC (rev 6791) +++ csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-08 20:34:35 UTC (rev 6792) @@ -19,6 +19,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWrenderproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:35:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6793] csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile Message-ID: Revision: 6793 http://gar.svn.sourceforge.net/gar/?rev=6793&view=rev Author: wbonnet Date: 2009-10-08 20:35:47 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-08 20:34:35 UTC (rev 6792) +++ csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-08 20:35:47 UTC (rev 6793) @@ -20,6 +20,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWxextproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 22:36:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6794] csw/mgar/pkg/x11/x11_xproto/trunk/Makefile Message-ID: Revision: 6794 http://gar.svn.sourceforge.net/gar/?rev=6794&view=rev Author: wbonnet Date: 2009-10-08 20:36:40 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Declare previous package name as incompatible Modified Paths: -------------- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-08 20:35:47 UTC (rev 6793) +++ csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-08 20:36:40 UTC (rev 6794) @@ -19,6 +19,7 @@ CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common +INCOMPATIBLE_PKGS = CSWxproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 8 22:50:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 20:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6795] csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Message-ID: Revision: 6795 http://gar.svn.sourceforge.net/gar/?rev=6795&view=rev Author: wahwah Date: 2009-10-08 20:50:46 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog_ng: Formatting changes to the startup script. Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 20:36:40 UTC (rev 6794) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 20:50:46 UTC (rev 6795) @@ -1,42 +1,44 @@ #!/bin/sh +# vim:set ts=2 sw=2 sts=2 expandtab: # -# $Id: init.d.solaris,v 1.3 2003/04/11 13:37:47 bazsi Exp $ +# $Id$ # # adapted to syslog-ng by BJ, Aug, 7th 2000 # cleaned up by Bazsi, Oct, 12th 2000 # minor fix by Bojan Zdrnja, Apr, 11th 2003 # added nicer options field # changes for OpenCSW by Ihsan Dogan, 10. November 2008 +# changes for zone support by Maciej Blizinski, 2009-07-15. DAEMON=/opt/csw/sbin/syslog-ng OPTIONS="-f /etc/opt/csw/syslog-ng.conf" case "$1" in - start) - if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then - echo 'syslog-ng service starting.' - # - # Before syslog-ng starts, save any messages from previous - # crash dumps so that messages appear in chronological order. - # - /usr/bin/savecore -m - if [ -r /etc/dumpadm.conf ]; then - . /etc/dumpadm.conf - [ "x$DUMPADM_DEVICE" != xswap ] && \ - /usr/bin/savecore -m -f $DUMPADM_DEVICE - fi - $DAEMON $OPTIONS -p /var/run/syslog-ng.pid - fi - ;; + start) + if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then + echo 'syslog-ng service starting.' + # + # Before syslog-ng starts, save any messages from previous + # crash dumps so that messages appear in chronological order. + # + /usr/bin/savecore -m + if [ -r /etc/dumpadm.conf ]; then + . /etc/dumpadm.conf + [ "x$DUMPADM_DEVICE" != xswap ] && \ + /usr/bin/savecore -m -f $DUMPADM_DEVICE + fi + $DAEMON $OPTIONS -p /var/run/syslog-ng.pid + fi + ;; - stop) - if [ -f /var/run/syslog-ng.pid ]; then - syspid=`/usr/bin/cat /var/run/syslog-ng.pid` - [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid - fi - ;; - *) - echo "Usage: $0 { start | stop }" - exit 1 - ;; + stop) + if [ -f /var/run/syslog-ng.pid ]; then + syspid=`/usr/bin/cat /var/run/syslog-ng.pid` + [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid + fi + ;; + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; esac Property changes on: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 8 23:05:40 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Oct 2009 21:05:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6796] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6796 http://gar.svn.sourceforge.net/gar/?rev=6796&view=rev Author: bdwalton Date: 2009-10-08 21:05:39 +0000 (Thu, 08 Oct 2009) Log Message: ----------- git: disable tests until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-08 20:50:46 UTC (rev 6795) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-08 21:05:39 UTC (rev 6796) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -#TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 8 23:10:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 08 Oct 2009 21:10:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6797] csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile Message-ID: Revision: 6797 http://gar.svn.sourceforge.net/gar/?rev=6797&view=rev Author: wbonnet Date: 2009-10-08 21:10:29 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Fix package file name Modified Paths: -------------- csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile Modified: csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile 2009-10-08 21:05:39 UTC (rev 6796) +++ csw/mgar/pkg/x11/x11_xf86vidmodeproto/trunk/Makefile 2009-10-08 21:10:29 UTC (rev 6797) @@ -16,7 +16,7 @@ UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWx11xf86vidmdproto -CATALOGNAME_CSWx11xf86vidmdproto = $(PROTONAME) +CATALOGNAME_CSWx11xf86vidmdproto = x11_$(PROTONAME) REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 00:16:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 22:16:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6798] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 6798 http://gar.svn.sourceforge.net/gar/?rev=6798&view=rev Author: wahwah Date: 2009-10-08 22:16:48 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: Making it use localstatedir, http://www.opencsw.org/bugtrack/view.php?id=3945 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-08 21:10:29 UTC (rev 6797) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-08 22:16:48 UTC (rev 6798) @@ -9,7 +9,7 @@ logs using TCP. endef -MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(GARVERSION)/source/ +MASTER_SITES = http://www.balabit.com/downloads/files/$(GARNAME)/open-source-edition/$(GARVERSION)/source/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += $(GARNAME).conf.CSW DISTFILES += cswsyslog_ng @@ -31,6 +31,10 @@ $$$$3 ~ /\/syslog-ng\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ { print }' +# shared /opt/csw support: +localstatedir = /var/opt/csw +sysconfdir = /etc/opt/csw + PREREQUISITE_PKGS = CSWeventlog PREREQUISITE_PKGS += CSWggettext PREREQUISITE_PKGS += CSWglib2 @@ -42,7 +46,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw REQUIRED_PKGS = CSWgcc4corert REQUIRED_PKGS += CSWeventlog @@ -64,6 +67,7 @@ ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswsyslog_ng \ $(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng - $(MAKECOOKIE) + ginstall -m 755 -d $(DESTDIR)$(localstatedir)/run + @$(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 21:10:29 UTC (rev 6797) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:16:48 UTC (rev 6798) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -fd0f7ccdc627d08a00a2e57fdbfd51d8 download/cswsyslog_ng +efa7aa43448b8a3014a10b2056382379 download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 21:10:29 UTC (rev 6797) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 22:16:48 UTC (rev 6798) @@ -10,12 +10,16 @@ # changes for OpenCSW by Ihsan Dogan, 10. November 2008 # changes for zone support by Maciej Blizinski, 2009-07-15. +localstatedir=/var/opt/csw +sysconfdir=/etc/opt/csw DAEMON=/opt/csw/sbin/syslog-ng -OPTIONS="-f /etc/opt/csw/syslog-ng.conf" +CONFIG_FILE="${sysconfdir}/syslog-ng.conf" +PID_FILE="${localstatedir}/run" +OPTIONS="-f ${CONFIG_FILE}" case "$1" in start) - if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then + if [ -f "${CONFIG_FILE}" -a -f "${DAEMON}" ]; then echo 'syslog-ng service starting.' # # Before syslog-ng starts, save any messages from previous @@ -27,14 +31,14 @@ [ "x$DUMPADM_DEVICE" != xswap ] && \ /usr/bin/savecore -m -f $DUMPADM_DEVICE fi - $DAEMON $OPTIONS -p /var/run/syslog-ng.pid + $DAEMON $OPTIONS -p ${PID_FILE} fi ;; stop) - if [ -f /var/run/syslog-ng.pid ]; then - syspid=`/usr/bin/cat /var/run/syslog-ng.pid` - [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid + if [ -f ${PID_FILE} ]; then + syspid=`/usr/bin/cat ${PID_FILE}` + [ "$syspid" -gt 0 ] && kill -15 $syspid && rm ${PID_FILE} fi ;; *) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 00:24:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 22:24:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6799] csw/mgar/pkg/syslog_ng/trunk/checksums Message-ID: Revision: 6799 http://gar.svn.sourceforge.net/gar/?rev=6799&view=rev Author: wahwah Date: 2009-10-08 22:24:48 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: updating the checksum Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:16:48 UTC (rev 6798) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:24:48 UTC (rev 6799) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -efa7aa43448b8a3014a10b2056382379 download/cswsyslog_ng +f759d093f6f73e037a48c97e2bc46c39 download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 01:14:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 23:14:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6800] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 6800 http://gar.svn.sourceforge.net/gar/?rev=6800&view=rev Author: wahwah Date: 2009-10-08 23:14:47 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: Using /var/run for the pid file. Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 22:24:48 UTC (rev 6799) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 23:14:47 UTC (rev 6800) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -f759d093f6f73e037a48c97e2bc46c39 download/cswsyslog_ng +4f6f1b75b8a95a7a69d93cab0eee23ef download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 22:24:48 UTC (rev 6799) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2009-10-08 23:14:47 UTC (rev 6800) @@ -14,7 +14,7 @@ sysconfdir=/etc/opt/csw DAEMON=/opt/csw/sbin/syslog-ng CONFIG_FILE="${sysconfdir}/syslog-ng.conf" -PID_FILE="${localstatedir}/run" +PID_FILE="/var/run/syslog-ng.pid" OPTIONS="-f ${CONFIG_FILE}" case "$1" in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 9 01:22:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Oct 2009 23:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6801] csw/mgar/pkg/syslog_ng/trunk/checksums Message-ID: Revision: 6801 http://gar.svn.sourceforge.net/gar/?rev=6801&view=rev Author: wahwah Date: 2009-10-08 23:22:09 +0000 (Thu, 08 Oct 2009) Log Message: ----------- syslog-ng: updating checksums Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 23:14:47 UTC (rev 6800) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-08 23:22:09 UTC (rev 6801) @@ -1,5 +1,5 @@ 91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove 7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -4f6f1b75b8a95a7a69d93cab0eee23ef download/cswsyslog_ng +fcd5effdaa96da8abf9788bc5745bda3 download/cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 9 11:20:19 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 09 Oct 2009 09:20:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6802] csw/mgar/pkg Message-ID: Revision: 6802 http://gar.svn.sourceforge.net/gar/?rev=6802&view=rev Author: skayser Date: 2009-10-09 09:20:19 +0000 (Fri, 09 Oct 2009) Log Message: ----------- denyhosts: initial commit Added Paths: ----------- csw/mgar/pkg/denyhosts/ csw/mgar/pkg/denyhosts/branches/ csw/mgar/pkg/denyhosts/tags/ csw/mgar/pkg/denyhosts/trunk/ csw/mgar/pkg/denyhosts/trunk/Makefile csw/mgar/pkg/denyhosts/trunk/checksums csw/mgar/pkg/denyhosts/trunk/files/ Property changes on: csw/mgar/pkg/denyhosts/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-10-09 09:20:19 UTC (rev 6802) @@ -0,0 +1,80 @@ +# TODO +# - Integrate into SMF, do we need daemon-control-dist at all? +# - Test the package +GARNAME = denyhosts +GARVERSION = 2.6 +CATEGORIES = python + +DESCRIPTION = A tool to limit SSH brute force attacks +define BLURB + DenyHosts is a script intended to be run by system administrators + to help thwart SSH server attacks (also known as dictionary based + attacks and brute force attacks). + + If you've ever looked at your ssh log you may be alarmed to see how + many hackers attempted to gain access to your server. Hopefully, none of + them were successful (but then again, how would you know?). Wouldn't it + be better to automatically prevent that attacker from continuing to gain + entry into your system? + + DenyHosts attempts to address the above. +endef + +SPKG_SOURCEURL = http://denyhosts.sf.net/ +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = DenyHosts-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE.txt +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# No test target +TEST_SCRIPTS = +EXTRA_INSTALL_ARGS += --no-compile + +sysconfdir = /etc/opt/csw/ +localstatedir = /var/opt/csw/ +SAMPLECONF = $(sysconfdir)/denyhosts.cfg + +include gar/category.mk + +# setup.py puts everything in /usr/share by default, adjust this to $(datadir) +pre-install-modulated: + gsed -ie 's,/usr/share/denyhosts,$(datadir)/$(GARNAME),' $(WORKSRC)/setup.py + @$(MAKECOOKIE) + +post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + ginstall -d $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)$(localstatedir)/$(GARNAME) + mv $(DESTDIR)$(bindir)/denyhosts.py $(DESTDIR)$(bindir)/denyhosts + rm $(DESTDIR)$(datadir)/$(GARNAME)/README.txt + rm $(DESTDIR)$(datadir)/$(GARNAME)/LICENSE.txt + rm $(DESTDIR)$(datadir)/$(GARNAME)/setup.py + mv $(DESTDIR)$(datadir)/$(GARNAME)/CHANGELOG.txt $(DOCDEST)/changelog + mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ + $(DESTDIR)$(sysconfdir)/denyhosts.cfg + + #Adjust config to match Solaris paths + our package paths + gsed -i \ + -e 's,/var/log/secure,path to ssh log,' \ + -e 's,/usr/share/denyhosts/data,$(localstatedir)/$(GARNAME),' \ + -e 's,/var/lock/subsys/denyhosts,/var/run/denyhosts.pid,' \ + -e 's,/var/log/denyhosts,$(localestatedir)/$(GARNAME)/$(GARNAME).log,' \ + $(DESTDIR)$(sysconfdir)/denyhosts.cfg + + gsed -i \ + -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg' \ + $(DESTDIR)/opt/csw/lib/python/site-packages/DenyHosts/constants.py + + #Adjust daemon-control-dist wrapper script to match our package paths + gsed -i \ + -e 's,/usr/bin/denyhosts.py,$(bindir)/denyhosts,' \ + -e 's,/usr/share/denyhosts/denyhosts.cfg,$(sysconfdir)/denyhosts.cfg,' \ + -e 's,/usr/bin/env python,$(bindir)/python,' \ + -e 's,/var/lock/subsys/denyhosts,/var/run/denyhosts.pid,' \ + $(DESTDIR)$(datadir)/$(GARNAME)/daemon-control-dist + @$(MAKECOOKIE) Added: csw/mgar/pkg/denyhosts/trunk/checksums =================================================================== --- csw/mgar/pkg/denyhosts/trunk/checksums (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/checksums 2009-10-09 09:20:19 UTC (rev 6802) @@ -0,0 +1 @@ +fc2365305a9402886a2b0173d1beb7df download/DenyHosts-2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 11:33:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 09:33:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6803] csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Message-ID: Revision: 6803 http://gar.svn.sourceforge.net/gar/?rev=6803&view=rev Author: dmichelsen Date: 2009-10-09 09:33:58 +0000 (Fri, 09 Oct 2009) Log Message: ----------- x11/xcb-proto: Adjust to new naming and use PYCOMPILE Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-10-09 09:20:19 UTC (rev 6802) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-10-09 09:33:58 UTC (rev 6803) @@ -1,7 +1,8 @@ -GARNAME = xcb-proto GARVERSION = 1.5 - CATEGORIES = x11 +PROTONAME = xcb-proto +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = XCB protocol descriptions (in XML) define BLURB @@ -25,16 +26,19 @@ endef MASTER_SITES = $(XCB_MASTER_SITES) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWxcbproto CSWpyxcbproto +PACKAGES = CSWx11xcbproto CSWpyx11xcbproto +CATALOGNAME_CSWx11xcbproto = x11_xcbproto +CATALOGNAME_CSWpyx11xcbproto = py_x11xcbproto + PREREQUISITE_PKGS = CSWpython REQUIRED_PKGS_CSWxcbproto = CSWx11common -REQUIRED_PKGS_CSWpyxcbproto = CSWxcbproto CSWpython +REQUIRED_PKGS_CSWpyxcbproto = CSWx11xcbproto CSWpython -SPKG_DESC_CSWxcbproto = XCB protocol descriptions (in XML) -SPKG_DESC_CSWpyxcbproto = XCB protocol descriptions (in XML) Python Bindings +SPKG_DESC_CSWx11xcbproto = XCB protocol descriptions (in XML) +SPKG_DESC_CSWpyx11xcbproto = XCB protocol descriptions (in XML) Python Bindings # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -48,11 +52,8 @@ EXTRA_PAX_ARGS = -s ',^.*/\(xcbgen/.*\.py\),.$(BUILD_PREFIX)/lib/python/site-packages/\1,' EXTRA_PAX_ARGS += -s ',^\.$(libdir)/python.*,,' -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils +PYCOMPILE = 1 -PKGFILES_CSWpyxcbproto = .*\.py +PKGFILES_CSWpyx11xcbproto = .*\.py include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 11:41:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 09:41:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6804] csw/mgar/pkg/x11 Message-ID: Revision: 6804 http://gar.svn.sourceforge.net/gar/?rev=6804&view=rev Author: dmichelsen Date: 2009-10-09 09:41:23 +0000 (Fri, 09 Oct 2009) Log Message: ----------- x11/x11_xcbproto: Rename directory to match new structure Added Paths: ----------- csw/mgar/pkg/x11/x11_xcbproto/ Removed Paths: ------------- csw/mgar/pkg/x11/xcb-proto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:09:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6805] csw/mgar/pkg/bdb42/trunk/Makefile Message-ID: Revision: 6805 http://gar.svn.sourceforge.net/gar/?rev=6805&view=rev Author: dmichelsen Date: 2009-10-09 11:09:56 +0000 (Fri, 09 Oct 2009) Log Message: ----------- bdb42: Exclude db.jar on 64 bit Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/Makefile Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-09 09:41:23 UTC (rev 6804) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) @@ -69,8 +69,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb42),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar PKGFILES_CSWbdb42doc = $(PKGFILES_DOC) PKGFILES_CSWbdb42devel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:21:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:21:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6806] csw/mgar/pkg Message-ID: Revision: 6806 http://gar.svn.sourceforge.net/gar/?rev=6806&view=rev Author: dmichelsen Date: 2009-10-09 11:21:54 +0000 (Fri, 09 Oct 2009) Log Message: ----------- bdb ALL: Reapply r6805 to all bdb versions Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb48/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bdb43/trunk/ csw/mgar/pkg/bdb44/trunk/ csw/mgar/pkg/bdb45/trunk/ csw/mgar/pkg/bdb46/trunk/ csw/mgar/pkg/bdb47/trunk/ csw/mgar/pkg/bdb48/trunk/ Property changes on: csw/mgar/pkg/bdb43/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -69,8 +69,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar PKGFILES_CSWbdb43doc = $(PKGFILES_DOC) PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL) Property changes on: csw/mgar/pkg/bdb44/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -69,8 +69,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb44),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar PKGFILES_CSWbdb44doc = $(PKGFILES_DOC) PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL) Property changes on: csw/mgar/pkg/bdb45/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -67,8 +67,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory Property changes on: csw/mgar/pkg/bdb46/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -67,8 +67,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory Property changes on: csw/mgar/pkg/bdb47/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -67,8 +67,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory Property changes on: csw/mgar/pkg/bdb48/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806) @@ -68,8 +68,8 @@ LICENSE = LICENSE EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:31:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:31:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6807] csw/mgar/gar/v2/ Message-ID: Revision: 6807 http://gar.svn.sourceforge.net/gar/?rev=6807&view=rev Author: dmichelsen Date: 2009-10-09 11:31:11 +0000 (Fri, 09 Oct 2009) Log Message: ----------- mGAR v2: Prepare for v2-pbuild update Removed Paths: ------------- csw/mgar/gar/v2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 13:59:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 11:59:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6808] csw/mgar/gar Message-ID: Revision: 6808 http://gar.svn.sourceforge.net/gar/?rev=6808&view=rev Author: dmichelsen Date: 2009-10-09 11:59:38 +0000 (Fri, 09 Oct 2009) Log Message: ----------- mGAR v2: Activate v2-pbuild Added Paths: ----------- csw/mgar/gar/v2/ Removed Paths: ------------- csw/mgar/gar/v2-pbuild/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 15:08:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 13:08:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6809] csw/mgar/pkg/libcroco Message-ID: Revision: 6809 http://gar.svn.sourceforge.net/gar/?rev=6809&view=rev Author: dmichelsen Date: 2009-10-09 13:08:05 +0000 (Fri, 09 Oct 2009) Log Message: ----------- libcroco: Update to GAR Added Paths: ----------- csw/mgar/pkg/libcroco/branches/ csw/mgar/pkg/libcroco/tags/ csw/mgar/pkg/libcroco/tags/legacy/ csw/mgar/pkg/libcroco/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libcroco/trunk/legacy/ Copied: csw/mgar/pkg/libcroco/trunk/Makefile (from rev 6625, csw/mgar/pkg/libgsf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libcroco/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcroco/trunk/Makefile 2009-10-09 13:08:05 UTC (rev 6809) @@ -0,0 +1,26 @@ +GARNAME = libcroco +GARVERSION = 0.6.2 +CATEGORIES = gnome + +DESCRIPTION = A CSS parsing and manipulation toolkit +define BLURB + The Libcroco project is an effort to build a generic Cascading Style + Sheet (CSS) parsing and manipulation toolkit that can be used by GNOME + applications in need of CSS support. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibxml2 + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 9 15:24:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Oct 2009 13:24:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6810] csw/mgar/pkg/libcroco/trunk Message-ID: Revision: 6810 http://gar.svn.sourceforge.net/gar/?rev=6810&view=rev Author: dmichelsen Date: 2009-10-09 13:24:51 +0000 (Fri, 09 Oct 2009) Log Message: ----------- libcroco: Set SVN properties Added Paths: ----------- csw/mgar/pkg/libcroco/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libcroco/trunk/ Property changes on: csw/mgar/pkg/libcroco/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libcroco/trunk/checksums =================================================================== --- csw/mgar/pkg/libcroco/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcroco/trunk/checksums 2009-10-09 13:24:51 UTC (rev 6810) @@ -0,0 +1 @@ +1429c597aa4b75fc610ab3a542c99209 libcroco-0.6.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Oct 9 21:56:00 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 09 Oct 2009 19:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6811] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 6811 http://gar.svn.sourceforge.net/gar/?rev=6811&view=rev Author: chninkel Date: 2009-10-09 19:56:00 +0000 (Fri, 09 Oct 2009) Log Message: ----------- openssh: updated to 5.3p1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-10-09 19:56:00 UTC (rev 6811) @@ -13,10 +13,10 @@ ###### Package information ####### GARNAME = openssh -GARVERSION = 5.2 +GARVERSION = 5.3 RELEASE = p1 GSSKEX_PATCH_VERSION = $(GARVERSION)$(RELEASE) -GSSKEX_PATCH_DATE = 20081003 +GSSKEX_PATCH_DATE = 20090726 CATEGORIES = server DESCRIPTION = OpenSSH Secure Shell @@ -66,7 +66,7 @@ LICENSE = LICENCE # The GSSAPI key exchange patch -PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-$(GSSKEX_PATCH_DATE).patch +PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-all-$(GSSKEX_PATCH_DATE).patch # Prevent TIOCSCTTY from being used to avoid error: # ioctl(TIOCSCTTY): Invalid argument Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-10-09 19:56:00 UTC (rev 6811) @@ -1,16 +1,16 @@ -1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall -0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall -59bf25f92d3660aa7e65fb6bdc85e72f download/CSWossh.prototype -cbe3d9921fca3130e42db09914c6ea07 download/CSWosshclient.prototype -1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWosshlpk.checkinstall -0993813fa5c752215f892cb67c86816f download/CSWosshlpk.preinstall -22ffa2a9b7bf310d58d3b299805a41b1 download/CSWosshlpk.prototype -894264acd8bfda9420b8cf10235b6a3e download/changelog.CSW -9153031524651a18e7edaed4637aa769 download/contrib-openssh-lpk-5.2p1-0.3.9.patch -a5ebb2e3fdaa06c3c9edba55aac5f83b download/cswopenssh -8e765642349b6321d01b33e95304e113 download/cswopenssh.xml -4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch -ca5403c8e1539d5ced0573f289ed7aef download/no_x_forwarding_bug.patch -bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch -ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz -db57ce80e8944213443caa4c52c884e5 download/sshd.smf_wrapper +1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall +0993813fa5c752215f892cb67c86816f CSWossh.preinstall +59bf25f92d3660aa7e65fb6bdc85e72f CSWossh.prototype +cbe3d9921fca3130e42db09914c6ea07 CSWosshclient.prototype +1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall +0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall +22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype +413f3c282c526894bbecc9dbdd6f2973 changelog.CSW +9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch +a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh +8e765642349b6321d01b33e95304e113 cswopenssh.xml +4b3e79120b60e8f25be5141eba53cac5 don_t_use_TIOCSCTTY.patch +ca5403c8e1539d5ced0573f289ed7aef no_x_forwarding_bug.patch +d8f82af1449f36ae9864bd614245fb59 openssh-5.3p1-gsskex-all-20090726.patch +13563dbf61f36ca9a1e4254260131041 openssh-5.3p1.tar.gz +db57ce80e8944213443caa4c52c884e5 sshd.smf_wrapper Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-09 19:56:00 UTC (rev 6811) @@ -1,3 +1,9 @@ +openssh (5.3,REV=2009.10.09_rev=p1) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 09 Oct 2009 21:47:46 +0200 + openssh (5.2,REV=2009.07.25_rev=p1) unstable * Fixed missing /opt/csw/etc/ssh in prototype (Closes: #3765) Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-10-09 13:24:51 UTC (rev 6810) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-10-09 19:56:00 UTC (rev 6811) @@ -1,2170 +0,0 @@ -diff -urN ChangeLog.gssapi ChangeLog.gssapi ---- openssh-5.2p1/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.2p1.new/ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200 -@@ -0,0 +1,75 @@ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff -urN openssh-5.2p1/Makefile.in openssh-5.2p1.new/Makefile.in ---- openssh-5.2p1/Makefile.in 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/Makefile.in 2009-03-21 15:39:14.000000000 +0100 -@@ -71,7 +71,7 @@ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ -- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o -+ entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o jpake.o schnorr.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o -@@ -84,7 +84,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o - -diff -urN openssh-5.2p1/auth-krb5.c openssh-5.2p1.new/auth-krb5.c ---- openssh-5.2p1/auth-krb5.c 2006-08-05 04:39:39.000000000 +0200 -+++ openssh-5.2p1.new/auth-krb5.c 2009-03-21 15:19:18.000000000 +0100 -@@ -166,8 +166,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -219,15 +224,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - umask(old_umask); -@@ -242,6 +254,7 @@ - return errno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -diff -urN openssh-5.2p1/auth.h openssh-5.2p1.new/auth.h ---- openssh-5.2p1/auth.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/auth.h 2009-03-21 15:19:18.000000000 +0100 -@@ -53,6 +53,7 @@ - int valid; /* user exists and is allowed to login */ - int attempt; - int failures; -+ int server_caused_failure; - int force_pwchange; - char *user; /* username sent by the client */ - char *service; -diff -urN openssh-5.2p1/auth2-gss.c openssh-5.2p1.new/auth2-gss.c ---- openssh-5.2p1/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ openssh-5.2p1.new/auth2-gss.c 2009-03-21 15:19:18.000000000 +0100 -@@ -52,6 +52,39 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -102,6 +135,7 @@ - - if (!present) { - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -109,6 +143,7 @@ - if (ctxt != NULL) - ssh_gssapi_delete_ctx(&ctxt); - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -292,6 +327,12 @@ - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, -diff -urN openssh-5.2p1/auth2.c openssh-5.2p1.new/auth2.c ---- openssh-5.2p1/auth2.c 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/auth2.c 2009-03-21 15:19:18.000000000 +0100 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - #ifdef JPAKE -@@ -79,6 +80,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - #ifdef JPAKE -@@ -274,6 +276,7 @@ - #endif - - authctxt->postponed = 0; -+ authctxt->server_caused_failure = 0; - - /* try to authenticate user */ - m = authmethod_lookup(method); -@@ -348,7 +351,9 @@ - /* Allow initial try of "none" auth without failure penalty */ - if (authctxt->attempt > 1 || strcmp(method, "none") != 0) - authctxt->failures++; -- if (authctxt->failures >= options.max_authtries) { -+ /* Dont count server configuration issues against the client */ -+ if (!authctxt->server_caused_failure && -+ authctxt->failures++ > options.max_authtries) { - #ifdef SSH_AUDIT_EVENTS - PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); - #endif -diff -urN openssh-5.2p1/configure.ac openssh-5.2p1.new/configure.ac ---- openssh-5.2p1/configure.ac 2009-02-16 05:37:03.000000000 +0100 -+++ openssh-5.2p1.new/configure.ac 2009-03-21 15:19:19.000000000 +0100 -@@ -473,6 +473,30 @@ - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE(SSH_TUN_PREPEND_AF, 1, - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow(AU_IPv) - AC_CHECK_DECL(AU_IPv4, [], - AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) -diff -urN openssh-5.2p1/gss-genr.c openssh-5.2p1.new/gss-genr.c ---- openssh-5.2p1/gss-genr.c 2007-06-12 15:44:36.000000000 +0200 -+++ openssh-5.2p1.new/gss-genr.c 2009-03-21 15:19:19.000000000 +0100 -@@ -39,12 +39,160 @@ - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ gss_indicate_mechs(&min_status, &gss_supported); -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *data) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), data)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -229,6 +377,9 @@ - OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +387,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -254,6 +418,10 @@ - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -272,7 +440,7 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); -diff -urN openssh-5.2p1/gss-serv-krb5.c openssh-5.2p1.new/gss-serv-krb5.c ---- openssh-5.2p1/gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 -+++ openssh-5.2p1.new/gss-serv-krb5.c 2009-03-21 15:19:19.000000000 +0100 -@@ -120,6 +120,7 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -diff -urN openssh-5.2p1/gss-serv.c openssh-5.2p1.new/gss-serv.c ---- openssh-5.2p1/gss-serv.c 2008-05-19 07:05:07.000000000 +0200 -+++ openssh-5.2p1.new/gss-serv.c 2009-03-21 15:19:19.000000000 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2008 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -45,8 +45,12 @@ - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -@@ -81,25 +85,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +125,28 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -352,14 +385,4 @@ - return (0); - } - --/* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) --{ -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -- -- return (ctx->major); --} -- - #endif -diff -urN openssh-5.2p1/kex.c openssh-5.2p1.new/kex.c ---- openssh-5.2p1/kex.c 2008-11-03 09:19:12.000000000 +0100 -+++ openssh-5.2p1.new/kex.c 2009-03-21 15:19:19.000000000 +0100 -@@ -49,6 +49,10 @@ - #include "dispatch.h" - #include "monitor.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #define KEX_COOKIE_LEN 16 - - #if OPENSSL_VERSION_NUMBER >= 0x00907000L -@@ -327,6 +331,20 @@ - k->kex_type = KEX_DH_GEX_SHA256; - k->evp_md = evp_ssh_sha256(); - #endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); -+#endif - } else - fatal("bad kex alg %s", k->name); - } -diff -urN openssh-5.2p1/kex.h openssh-5.2p1.new/kex.h ---- openssh-5.2p1/kex.h 2007-06-11 06:01:42.000000000 +0200 -+++ openssh-5.2p1.new/kex.h 2009-03-21 15:19:19.000000000 +0100 -@@ -64,6 +64,9 @@ - KEX_DH_GRP14_SHA1, - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -119,6 +122,11 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -141,6 +149,11 @@ - void kexgex_client(Kex *); - void kexgex_server(Kex *); - -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif -+ - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); -diff -urN openssh-5.2p1/key.c openssh-5.2p1.new/key.c ---- openssh-5.2p1/key.c 2008-11-03 09:24:17.000000000 +0100 -+++ openssh-5.2p1.new/key.c 2009-03-21 15:19:19.000000000 +0100 -@@ -764,6 +764,8 @@ - return KEY_RSA; - } else if (strcmp(name, "ssh-dss") == 0) { - return KEY_DSA; -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; - } - debug2("key_type_from_name: unknown key type '%s'", name); - return KEY_UNSPEC; -diff -urN openssh-5.2p1/key.h openssh-5.2p1.new/key.h ---- openssh-5.2p1/key.h 2008-06-12 20:40:35.000000000 +0200 -+++ openssh-5.2p1.new/key.h 2009-03-21 15:19:19.000000000 +0100 -@@ -34,6 +34,7 @@ - KEY_RSA1, - KEY_RSA, - KEY_DSA, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -diff -urN openssh-5.2p1/monitor.c openssh-5.2p1.new/monitor.c ---- openssh-5.2p1/monitor.c 2009-02-14 06:33:31.000000000 +0100 -+++ openssh-5.2p1.new/monitor.c 2009-03-21 15:38:09.000000000 +0100 -@@ -170,6 +170,7 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -239,6 +240,7 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - #ifdef JPAKE - {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, -@@ -251,6 +253,11 @@ - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -355,6 +362,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -441,6 +452,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1699,6 +1714,11 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1942,6 +1962,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1992,6 +2013,44 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ return (0); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff -urN openssh-5.2p1/monitor.h openssh-5.2p1.new/monitor.h ---- openssh-5.2p1/monitor.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1.new/monitor.h 2009-03-21 15:19:19.000000000 +0100 -@@ -53,6 +53,7 @@ - MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, - MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, - MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC, -+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN, - MONITOR_REQ_PAM_START, - MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, - MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, -diff -urN openssh-5.2p1/monitor_wrap.c openssh-5.2p1.new/monitor_wrap.c ---- openssh-5.2p1/monitor_wrap.c 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1.new/monitor_wrap.c 2009-03-21 15:19:19.000000000 +0100 -@@ -1256,6 +1256,29 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff -urN openssh-5.2p1/monitor_wrap.h openssh-5.2p1.new/monitor_wrap.h ---- openssh-5.2p1/monitor_wrap.h 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1.new/monitor_wrap.h 2009-03-21 15:19:19.000000000 +0100 -@@ -59,6 +59,7 @@ - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); - int mm_ssh_gssapi_userok(char *user); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - #endif - - #ifdef USE_PAM -diff -urN openssh-5.2p1/readconf.c openssh-5.2p1.new/readconf.c ---- openssh-5.2p1/readconf.c 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1.new/readconf.c 2009-03-21 15:19:19.000000000 +0100 -@@ -127,6 +127,8 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssKeyEx, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, -@@ -164,10 +166,14 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -453,10 +459,18 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1008,7 +1022,9 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1099,8 +1115,12 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff -urN openssh-5.2p1/readconf.h openssh-5.2p1.new/readconf.h ---- openssh-5.2p1/readconf.h 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1.new/readconf.h 2009-03-21 15:19:19.000000000 +0100 -@@ -44,7 +44,9 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff -urN openssh-5.2p1/servconf.c openssh-5.2p1.new/servconf.c ---- openssh-5.2p1/servconf.c 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1.new/servconf.c 2009-03-21 15:19:20.000000000 +0100 -@@ -92,7 +92,9 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -210,8 +212,12 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -302,7 +308,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, -@@ -364,9 +372,13 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, -@@ -891,10 +903,18 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; -diff -urN openssh-5.2p1/servconf.h openssh-5.2p1.new/servconf.h ---- openssh-5.2p1/servconf.h 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1.new/servconf.h 2009-03-21 15:19:20.000000000 +0100 -@@ -91,7 +91,9 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -diff -urN openssh-5.2p1/ssh-gss.h openssh-5.2p1.new/ssh-gss.h ---- openssh-5.2p1/ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ openssh-5.2p1.new/ssh-gss.h 2009-03-21 15:19:20.000000000 +0100 -@@ -60,6 +60,17 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; -@@ -97,6 +108,7 @@ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -119,6 +131,11 @@ - int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *); -+char *ssh_gssapi_client_mechanisms(const char *host); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - int ssh_gssapi_userok(char *name); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -@@ -126,6 +143,8 @@ - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff -urN openssh-5.2p1/ssh_config openssh-5.2p1.new/ssh_config ---- openssh-5.2p1/ssh_config 2009-02-21 02:45:02.000000000 +0100 -+++ openssh-5.2p1.new/ssh_config 2009-03-21 15:19:20.000000000 +0100 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -diff -urN openssh-5.2p1/ssh_config.5 openssh-5.2p1.new/ssh_config.5 ---- openssh-5.2p1/ssh_config.5 2009-02-23 00:53:58.000000000 +0100 -+++ openssh-5.2p1.new/ssh_config.5 2009-03-21 15:19:20.000000000 +0100 -@@ -478,11 +478,28 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes -+to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no , -+the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff -urN openssh-5.2p1/sshconnect2.c openssh-5.2p1.new/sshconnect2.c ---- openssh-5.2p1/sshconnect2.c 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1.new/sshconnect2.c 2009-03-21 15:19:20.000000000 +0100 -@@ -104,9 +104,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -134,6 +159,16 @@ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - options.hostkeyalgorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -143,10 +178,21 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_host = gss_host; -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -235,6 +281,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -250,6 +297,10 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, -@@ -541,6 +592,12 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ char *gss_host = NULL; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = (char *)authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -553,7 +610,7 @@ - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -650,8 +707,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -761,6 +818,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -diff -urN openssh-5.2p1/sshd.c openssh-5.2p1.new/sshd.c ---- openssh-5.2p1/sshd.c 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1.new/sshd.c 2009-03-21 15:19:20.000000000 +0100 -@@ -119,6 +119,10 @@ - #include "monitor_wrap.h" - #include "version.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -1530,10 +1534,13 @@ - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); -@@ -1817,6 +1824,60 @@ - /* Log the connection. */ - verbose("Connection from %.500s port %d", remote_ip, remote_port); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2194,12 +2255,59 @@ - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -diff -urN openssh-5.2p1/sshd_config openssh-5.2p1.new/sshd_config ---- openssh-5.2p1/sshd_config 2008-07-02 14:35:43.000000000 +0200 -+++ openssh-5.2p1.new/sshd_config 2009-03-21 15:19:20.000000000 +0100 -@@ -73,6 +73,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -diff -urN openssh-5.2p1/sshd_config.5 openssh-5.2p1.new/sshd_config.5 ---- openssh-5.2p1/sshd_config.5 2009-02-23 01:00:24.000000000 +0100 -+++ openssh-5.2p1.new/sshd_config.5 2009-03-21 15:19:20.000000000 +0100 -@@ -374,12 +374,35 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed -diff -N kexgssc.c ---- openssh-5.2p1//dev/null 1 Jan 1970 00:00:00 -0000 -+++ openssh-5.2p1.new/kexgssc.c 4 Apr 2008 12:52:29 -0000 -@@ -0,0 +1,319 @@ -+/* -+ * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ -+ shared_secret = BN_new(); -+ BN_bin2bn(kbuf,kout, shared_secret); -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ serverhostkey, slen, /* server host key */ -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ serverhostkey, slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff -N kexgsss.c ---- openssh-5.2p1/kexgsss.c 1 Jan 1970 00:00:00 -0000 -+++ openssh-5.2p1.new/kexgsss.c 4 Apr 2008 12:52:29 -0000 -@@ -0,0 +1,271 @@ -+/* -+ * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ ssh_gssapi_server_mechanisms(); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ -+ shared_secret = BN_new(); -+ BN_bin2bn(kbuf, kout, shared_secret); -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+#endif /* GSSAPI */ Added: csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch 2009-10-09 19:56:00 UTC (rev 6811) @@ -0,0 +1,3060 @@ +? .kex.h.swp +? .pc +? openssh-5.0p1-gsskex-20080404.patch +? openssh-5.0p1-gssrenew-20080707.patch +? openssh-5.2p1-gsskex-20090726.patch +? openssh-5.2p1-gsskex-all-20090726.patch +? patches +Index: ChangeLog.gssapi +=================================================================== +RCS file: ChangeLog.gssapi +diff -N ChangeLog.gssapi +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ ./ChangeLog.gssapi 26 Jul 2009 12:21:52 -0000 +@@ -0,0 +1,95 @@ ++20090615 ++ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c ++ sshd.c ] ++ Fix issues identified by Greg Hudson following a code review ++ Check return value of gss_indicate_mechs ++ Protect GSSAPI calls in monitor, so they can only be used if enabled ++ Check return values of bignum functions in key exchange ++ Use BN_clear_free to clear other side's DH value ++ Make ssh_gssapi_id_kex more robust ++ Only configure kex table pointers if GSSAPI is enabled ++ Don't leak mechanism list, or gss mechanism list ++ Cast data.length before printing ++ If serverkey isn't provided, use an empty string, rather than NULL ++ ++20090201 ++ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h ++ ssh_config.5 sshconnet2.c ] ++ Add support for the GSSAPIClientIdentity option, which allows the user ++ to specify which GSSAPI identity to use to contact a given server ++ ++20080404 ++ - [ gss-serv.c ] ++ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow ++ been omitted from a previous version of this patch. Reported by Borislav ++ Stoichkov ++ ++20070317 ++ - [ gss-serv-krb5.c ] ++ Remove C99ism, where new_ccname was being declared in the middle of a ++ function ++ ++20061220 ++ - [ servconf.c ] ++ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and ++ documented, behaviour. Reported by Dan Watson. ++ ++20060910 ++ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c ++ ssh-gss.h ] ++ add support for gss-group14-sha1 key exchange mechanisms ++ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] ++ Add GSSAPIStrictAcceptorCheck option to allow the disabling of ++ acceptor principal checking on multi-homed machines. ++ ++ - [ sshd_config ssh_config ] ++ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample ++ configuration files ++ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] ++ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() ++ Limit length of error messages displayed by client ++ ++20060909 ++ - [ gss-genr.c gss-serv.c ] ++ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server ++ only, where they belong ++ ++ ++20060829 ++ - [ gss-serv-krb5.c ] ++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment ++ variable ++ ++20060828 ++ - [ gss-genr.c ] ++ Avoid Heimdal context freeing problem ++ ++ ++20060818 ++ - [ gss-genr.c ssh-gss.h sshconnect2.c ] ++ Make sure that SPENGO is disabled ++ ++ ++20060421 ++ - [ gssgenr.c, sshconnect2.c ] ++ a few type changes (signed versus unsigned, int versus size_t) to ++ fix compiler errors/warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ kexgssc.c, sshconnect2.c ] ++ fix uninitialized variable warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ gssgenr.c ] ++ pass oid to gss_display_status (helpful when using GSSAPI mechglue) ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ gss-serv-krb5.c ] ++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c ++ add client-side GssapiKeyExchange option ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ sshconnect2.c ] ++ add support for GssapiTrustDns option for gssapi-with-mic ++ (from jbasney AT ncsa.uiuc.edu) ++ +Index: Makefile.in +=================================================================== +RCS file: /cvs/openssh/Makefile.in,v +retrieving revision 1.298 +diff -u -r1.298 Makefile.in +--- ./Makefile.in 5 Nov 2008 05:20:46 -0000 1.298 ++++ ./Makefile.in 26 Jul 2009 12:21:53 -0000 +@@ -71,7 +71,8 @@ + atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ + kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ +- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o ++ entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o \ ++ kexgssc.o + + SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ + sshconnect.o sshconnect1.o sshconnect2.o mux.o +@@ -84,7 +85,7 @@ + auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ + monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ + auth-krb5.o \ +- auth2-gss.o gss-serv.o gss-serv-krb5.o \ ++ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ + audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o + +Index: auth-krb5.c +=================================================================== +RCS file: /cvs/openssh/auth-krb5.c,v +retrieving revision 1.35 +diff -u -r1.35 auth-krb5.c +--- ./auth-krb5.c 5 Aug 2006 02:39:39 -0000 1.35 ++++ ./auth-krb5.c 26 Jul 2009 12:21:53 -0000 +@@ -166,8 +166,13 @@ + + len = strlen(authctxt->krb5_ticket_file) + 6; + authctxt->krb5_ccname = xmalloc(len); ++#ifdef USE_CCAPI ++ snprintf(authctxt->krb5_ccname, len, "API:%s", ++ authctxt->krb5_ticket_file); ++#else + snprintf(authctxt->krb5_ccname, len, "FILE:%s", + authctxt->krb5_ticket_file); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -219,15 +224,22 @@ + #ifndef HEIMDAL + krb5_error_code + ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { +- int tmpfd, ret; ++ int ret; + char ccname[40]; + mode_t old_umask; ++#ifdef USE_CCAPI ++ char cctemplate[] = "API:krb5cc_%d"; ++#else ++ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; ++ int tmpfd; ++#endif + + ret = snprintf(ccname, sizeof(ccname), +- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); ++ cctemplate, geteuid()); + if (ret < 0 || (size_t)ret >= sizeof(ccname)) + return ENOMEM; + ++#ifndef USE_CCAPI + old_umask = umask(0177); + tmpfd = mkstemp(ccname + strlen("FILE:")); + umask(old_umask); +@@ -242,6 +254,7 @@ + return errno; + } + close(tmpfd); ++#endif + + return (krb5_cc_resolve(ctx, ccname, ccache)); + } +Index: auth.h +=================================================================== +RCS file: /cvs/openssh/auth.h,v +retrieving revision 1.80 +diff -u -r1.80 auth.h +--- ./auth.h 5 Nov 2008 05:20:46 -0000 1.80 ++++ ./auth.h 26 Jul 2009 12:21:53 -0000 +@@ -53,6 +53,7 @@ + int valid; /* user exists and is allowed to login */ + int attempt; + int failures; ++ int server_caused_failure; + int force_pwchange; + char *user; /* username sent by the client */ + char *service; +Index: auth2-gss.c +=================================================================== +RCS file: /cvs/openssh/auth2-gss.c,v +retrieving revision 1.19 +diff -u -r1.19 auth2-gss.c +--- ./auth2-gss.c 2 Dec 2007 11:59:45 -0000 1.19 ++++ ./auth2-gss.c 26 Jul 2009 12:21:54 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -52,6 +52,40 @@ + static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); + static void input_gssapi_errtok(int, u_int32_t, void *); + ++/* ++ * The 'gssapi_keyex' userauth mechanism. ++ */ ++static int ++userauth_gsskeyex(Authctxt *authctxt) ++{ ++ int authenticated = 0; ++ Buffer b; ++ gss_buffer_desc mic, gssbuf; ++ u_int len; ++ ++ mic.value = packet_get_string(&len); ++ mic.length = len; ++ ++ packet_check_eom(); ++ ++ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, ++ "gssapi-keyex"); ++ ++ gssbuf.value = buffer_ptr(&b); ++ gssbuf.length = buffer_len(&b); ++ ++ /* gss_kex_context is NULL with privsep, so we can't check it here */ ++ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, ++ &gssbuf, &mic)))) ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, ++ authctxt->pw)); ++ ++ buffer_free(&b); ++ xfree(mic.value); ++ ++ return (authenticated); ++} ++ + /* + * We only support those mechanisms that we know about (ie ones that we know + * how to check local user kuserok and the like) +@@ -102,6 +136,7 @@ + + if (!present) { + xfree(doid); ++ authctxt->server_caused_failure = 1; + return (0); + } + +@@ -109,6 +144,7 @@ + if (ctxt != NULL) + ssh_gssapi_delete_ctx(&ctxt); + xfree(doid); ++ authctxt->server_caused_failure = 1; + return (0); + } + +@@ -242,7 +278,8 @@ + + packet_check_eom(); + +- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, ++ authctxt->pw)); + + authctxt->postponed = 0; + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); +@@ -277,7 +314,8 @@ + gssbuf.length = buffer_len(&b); + + if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) +- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); ++ authenticated = ++ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); + else + logit("GSSAPI MIC check failed"); + +@@ -291,6 +329,12 @@ + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); + userauth_finish(authctxt, authenticated, "gssapi-with-mic"); + } ++ ++Authmethod method_gsskeyex = { ++ "gssapi-keyex", ++ userauth_gsskeyex, ++ &options.gss_authentication ++}; + + Authmethod method_gssapi = { + "gssapi-with-mic", +Index: auth2.c +=================================================================== +RCS file: /cvs/openssh/auth2.c,v +retrieving revision 1.149 +diff -u -r1.149 auth2.c +--- ./auth2.c 5 Nov 2008 05:20:46 -0000 1.149 ++++ ./auth2.c 26 Jul 2009 12:21:54 -0000 +@@ -69,6 +69,7 @@ + extern Authmethod method_kbdint; + extern Authmethod method_hostbased; + #ifdef GSSAPI ++extern Authmethod method_gsskeyex; + extern Authmethod method_gssapi; + #endif + #ifdef JPAKE +@@ -79,6 +80,7 @@ + &method_none, + &method_pubkey, + #ifdef GSSAPI ++ &method_gsskeyex, + &method_gssapi, + #endif + #ifdef JPAKE +@@ -274,6 +276,7 @@ + #endif + + authctxt->postponed = 0; ++ authctxt->server_caused_failure = 0; + + /* try to authenticate user */ + m = authmethod_lookup(method); +@@ -346,7 +349,8 @@ + } else { + + /* Allow initial try of "none" auth without failure penalty */ +- if (authctxt->attempt > 1 || strcmp(method, "none") != 0) ++ if (!authctxt->server_caused_failure && ++ (authctxt->attempt > 1 || strcmp(method, "none") != 0)) + authctxt->failures++; + if (authctxt->failures >= options.max_authtries) { + #ifdef SSH_AUDIT_EVENTS +Index: clientloop.c +=================================================================== +RCS file: /cvs/openssh/clientloop.c,v +retrieving revision 1.197 +diff -u -r1.197 clientloop.c +--- ./clientloop.c 14 Feb 2009 05:28:21 -0000 1.197 ++++ ./clientloop.c 26 Jul 2009 12:21:56 -0000 +@@ -110,6 +110,10 @@ + #include "match.h" + #include "msg.h" + ++#ifdef GSSAPI ++#include "ssh-gss.h" ++#endif ++ + /* import options */ + extern Options options; + +@@ -1429,6 +1433,13 @@ + /* Do channel operations unless rekeying in progress. */ + if (!rekeying) { + channel_after_select(readset, writeset); ++ ++ if (options.gss_renewal_rekey && ++ ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { ++ debug("credentials updated - forcing rekey"); ++ need_rekeying = 1; ++ } ++ + if (need_rekeying || packet_need_rekeying()) { + debug("need rekeying"); + xxx_kex->done = 0; +Index: configure.ac +=================================================================== +RCS file: /cvs/openssh/configure.ac,v +retrieving revision 1.415 +diff -u -r1.415 configure.ac +--- ./configure.ac 16 Feb 2009 04:37:03 -0000 1.415 ++++ ./configure.ac 26 Jul 2009 12:22:00 -0000 +@@ -473,6 +473,30 @@ + [Use tunnel device compatibility to OpenBSD]) + AC_DEFINE(SSH_TUN_PREPEND_AF, 1, + [Prepend the address family to IP tunnel traffic]) ++ AC_MSG_CHECKING(if we have the Security Authorization Session API) ++ AC_TRY_COMPILE([#include ], ++ [SessionCreate(0, 0);], ++ [ac_cv_use_security_session_api="yes" ++ AC_DEFINE(USE_SECURITY_SESSION_API, 1, ++ [platform has the Security Authorization Session API]) ++ LIBS="$LIBS -framework Security" ++ AC_MSG_RESULT(yes)], ++ [ac_cv_use_security_session_api="no" ++ AC_MSG_RESULT(no)]) ++ AC_MSG_CHECKING(if we have an in-memory credentials cache) ++ AC_TRY_COMPILE( ++ [#include ], ++ [cc_context_t c; ++ (void) cc_initialize (&c, 0, NULL, NULL);], ++ [AC_DEFINE(USE_CCAPI, 1, ++ [platform uses an in-memory credentials cache]) ++ LIBS="$LIBS -framework Security" ++ AC_MSG_RESULT(yes) ++ if test "x$ac_cv_use_security_session_api" = "xno"; then ++ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) ++ fi], ++ [AC_MSG_RESULT(no)] ++ ) + m4_pattern_allow(AU_IPv) + AC_CHECK_DECL(AU_IPv4, [], + AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) +Index: gss-genr.c +=================================================================== +RCS file: /cvs/openssh/gss-genr.c,v +retrieving revision 1.21 +diff -u -r1.21 gss-genr.c +--- ./gss-genr.c 12 Jun 2007 13:44:36 -0000 1.21 ++++ ./gss-genr.c 26 Jul 2009 12:22:01 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-genr.c,v 1.19 2007/06/12 11:56:15 dtucker Exp $ */ + + /* +- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -39,12 +39,167 @@ + #include "buffer.h" + #include "log.h" + #include "ssh2.h" ++#include "cipher.h" ++#include "key.h" ++#include "kex.h" ++#include + + #include "ssh-gss.h" + + extern u_char *session_id2; + extern u_int session_id2_len; + ++typedef struct { ++ char *encoded; ++ gss_OID oid; ++} ssh_gss_kex_mapping; ++ ++/* ++ * XXX - It would be nice to find a more elegant way of handling the ++ * XXX passing of the key exchange context to the userauth routines ++ */ ++ ++Gssctxt *gss_kex_context = NULL; ++ ++static ssh_gss_kex_mapping *gss_enc2oid = NULL; ++ ++int ++ssh_gssapi_oid_table_ok() { ++ return (gss_enc2oid != NULL); ++} ++ ++/* ++ * Return a list of the gss-group1-sha1 mechanisms supported by this program ++ * ++ * We test mechanisms to ensure that we can use them, to avoid starting ++ * a key exchange with a bad mechanism ++ */ ++ ++char * ++ssh_gssapi_client_mechanisms(const char *host, const char *client) { ++ gss_OID_set gss_supported; ++ OM_uint32 min_status; ++ ++ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) ++ return NULL; ++ ++ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, ++ host, client)); ++} ++ ++char * ++ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, ++ const char *host, const char *client) { ++ Buffer buf; ++ size_t i; ++ int oidpos, enclen; ++ char *mechs, *encoded; ++ u_char digest[EVP_MAX_MD_SIZE]; ++ char deroid[2]; ++ const EVP_MD *evp_md = EVP_md5(); ++ EVP_MD_CTX md; ++ ++ if (gss_enc2oid != NULL) { ++ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) ++ xfree(gss_enc2oid[i].encoded); ++ xfree(gss_enc2oid); ++ } ++ ++ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * ++ (gss_supported->count + 1)); ++ ++ buffer_init(&buf); ++ ++ oidpos = 0; ++ for (i = 0; i < gss_supported->count; i++) { ++ if (gss_supported->elements[i].length < 128 && ++ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { ++ ++ deroid[0] = SSH_GSS_OIDTYPE; ++ deroid[1] = gss_supported->elements[i].length; ++ ++ EVP_DigestInit(&md, evp_md); ++ EVP_DigestUpdate(&md, deroid, 2); ++ EVP_DigestUpdate(&md, ++ gss_supported->elements[i].elements, ++ gss_supported->elements[i].length); ++ EVP_DigestFinal(&md, digest, NULL); ++ ++ encoded = xmalloc(EVP_MD_size(evp_md) * 2); ++ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), ++ encoded, EVP_MD_size(evp_md) * 2); ++ ++ if (oidpos != 0) ++ buffer_put_char(&buf, ','); ++ ++ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, ++ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ buffer_put_char(&buf, ','); ++ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, ++ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ buffer_put_char(&buf, ','); ++ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, ++ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ ++ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); ++ gss_enc2oid[oidpos].encoded = encoded; ++ oidpos++; ++ } ++ } ++ gss_enc2oid[oidpos].oid = NULL; ++ gss_enc2oid[oidpos].encoded = NULL; ++ ++ buffer_put_char(&buf, '\0'); ++ ++ mechs = xmalloc(buffer_len(&buf)); ++ buffer_get(&buf, mechs, buffer_len(&buf)); ++ buffer_free(&buf); ++ ++ if (strlen(mechs) == 0) { ++ xfree(mechs); ++ mechs = NULL; ++ } ++ ++ return (mechs); ++} ++ ++gss_OID ++ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { ++ int i = 0; ++ ++ switch (kex_type) { ++ case KEX_GSS_GRP1_SHA1: ++ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) ++ return GSS_C_NO_OID; ++ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; ++ break; ++ case KEX_GSS_GRP14_SHA1: ++ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) ++ return GSS_C_NO_OID; ++ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; ++ break; ++ case KEX_GSS_GEX_SHA1: ++ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) ++ return GSS_C_NO_OID; ++ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; ++ break; ++ default: ++ return GSS_C_NO_OID; ++ } ++ ++ while (gss_enc2oid[i].encoded != NULL && ++ strcmp(name, gss_enc2oid[i].encoded) != 0) ++ i++; ++ ++ if (gss_enc2oid[i].oid != NULL && ctx != NULL) ++ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); ++ ++ return gss_enc2oid[i].oid; ++} ++ + /* Check that the OID in a data stream matches that in the context */ + int + ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) +@@ -197,7 +352,7 @@ + } + + ctx->major = gss_init_sec_context(&ctx->minor, +- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, ++ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, + GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, + 0, NULL, recv_tok, NULL, send_tok, flags, NULL); + +@@ -227,8 +382,42 @@ + } + + OM_uint32 ++ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) ++{ ++ gss_buffer_desc gssbuf; ++ gss_name_t gssname; ++ OM_uint32 status; ++ gss_OID_set oidset; ++ ++ gssbuf.value = (void *) name; ++ gssbuf.length = strlen(gssbuf.value); ++ ++ gss_create_empty_oid_set(&status, &oidset); ++ gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ ++ ctx->major = gss_import_name(&ctx->minor, &gssbuf, ++ GSS_C_NT_USER_NAME, &gssname); ++ ++ if (!ctx->major) ++ ctx->major = gss_acquire_cred(&ctx->minor, ++ gssname, 0, oidset, GSS_C_INITIATE, ++ &ctx->client_creds, NULL, NULL); ++ ++ gss_release_name(&status, &gssname); ++ gss_release_oid_set(&status, &oidset); ++ ++ if (ctx->major) ++ ssh_gssapi_error(ctx); ++ ++ return(ctx->major); ++} ++ ++OM_uint32 + ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) + { ++ if (ctx == NULL) ++ return -1; ++ + if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, + GSS_C_QOP_DEFAULT, buffer, hash))) + ssh_gssapi_error(ctx); +@@ -236,6 +425,19 @@ + return (ctx->major); + } + ++/* Priviledged when used by server */ ++OM_uint32 ++ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) ++{ ++ if (ctx == NULL) ++ return -1; ++ ++ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, ++ gssbuf, gssmic, NULL); ++ ++ return (ctx->major); ++} ++ + void + ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, + const char *context) +@@ -249,11 +451,16 @@ + } + + int +-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) ++ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, ++ const char *client) + { + gss_buffer_desc token = GSS_C_EMPTY_BUFFER; + OM_uint32 major, minor; + gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; ++ Gssctxt *intctx = NULL; ++ ++ if (ctx == NULL) ++ ctx = &intctx; + + /* RFC 4462 says we MUST NOT do SPNEGO */ + if (oid->length == spnego_oid.length && +@@ -263,6 +470,10 @@ + ssh_gssapi_build_ctx(ctx); + ssh_gssapi_set_oid(*ctx, oid); + major = ssh_gssapi_import_name(*ctx, host); ++ ++ if (!GSS_ERROR(major) && client) ++ major = ssh_gssapi_client_identity(*ctx, client); ++ + if (!GSS_ERROR(major)) { + major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, + NULL); +@@ -272,10 +483,67 @@ + GSS_C_NO_BUFFER); + } + +- if (GSS_ERROR(major)) ++ if (GSS_ERROR(major) || intctx != NULL) + ssh_gssapi_delete_ctx(ctx); + + return (!GSS_ERROR(major)); ++} ++ ++int ++ssh_gssapi_credentials_updated(Gssctxt *ctxt) { ++ static gss_name_t saved_name = GSS_C_NO_NAME; ++ static OM_uint32 saved_lifetime = 0; ++ static gss_OID saved_mech = GSS_C_NO_OID; ++ static gss_name_t name; ++ static OM_uint32 last_call = 0; ++ OM_uint32 lifetime, now, major, minor; ++ int equal; ++ gss_cred_usage_t usage = GSS_C_INITIATE; ++ ++ now = time(NULL); ++ ++ if (ctxt) { ++ debug("Rekey has happened - updating saved versions"); ++ ++ if (saved_name != GSS_C_NO_NAME) ++ gss_release_name(&minor, &saved_name); ++ ++ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, ++ &saved_name, &saved_lifetime, NULL, NULL); ++ ++ if (!GSS_ERROR(major)) { ++ saved_mech = ctxt->oid; ++ saved_lifetime+= now; ++ } else { ++ /* Handle the error */ ++ } ++ return 0; ++ } ++ ++ if (now - last_call < 10) ++ return 0; ++ ++ last_call = now; ++ ++ if (saved_mech == GSS_C_NO_OID) ++ return 0; ++ ++ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, ++ &name, &lifetime, NULL, NULL); ++ if (major == GSS_S_CREDENTIALS_EXPIRED) ++ return 0; ++ else if (GSS_ERROR(major)) ++ return 0; ++ ++ major = gss_compare_name(&minor, saved_name, name, &equal); ++ gss_release_name(&minor, &name); ++ if (GSS_ERROR(major)) ++ return 0; ++ ++ if (equal && (saved_lifetime < lifetime + now - 10)) ++ return 1; ++ ++ return 0; + } + + #endif /* GSSAPI */ +Index: gss-serv-krb5.c +=================================================================== +RCS file: /cvs/openssh/gss-serv-krb5.c,v +retrieving revision 1.17 +diff -u -r1.17 gss-serv-krb5.c +--- ./gss-serv-krb5.c 1 Sep 2006 05:38:36 -0000 1.17 ++++ ./gss-serv-krb5.c 26 Jul 2009 12:22:01 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -120,6 +120,7 @@ + krb5_principal princ; + OM_uint32 maj_status, min_status; + int len; ++ const char *new_ccname; + + if (client->creds == NULL) { + debug("No credentials stored"); +@@ -168,11 +169,16 @@ + return; + } + +- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); ++ new_ccname = krb5_cc_get_name(krb_context, ccache); ++ + client->store.envvar = "KRB5CCNAME"; +- len = strlen(client->store.filename) + 6; +- client->store.envval = xmalloc(len); +- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); ++#ifdef USE_CCAPI ++ xasprintf(&client->store.envval, "API:%s", new_ccname); ++ client->store.filename = NULL; ++#else ++ xasprintf(&client->store.envval, "FILE:%s", new_ccname); ++ client->store.filename = xstrdup(new_ccname); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -184,6 +190,71 @@ + return; + } + ++int ++ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, ++ ssh_gssapi_client *client) ++{ ++ krb5_ccache ccache = NULL; ++ krb5_principal principal = NULL; ++ char *name = NULL; ++ krb5_error_code problem; ++ OM_uint32 maj_status, min_status; ++ ++ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { ++ logit("krb5_cc_resolve(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ return 0; ++ } ++ ++ /* Find out who the principal in this cache is */ ++ if ((problem = krb5_cc_get_principal(krb_context, ccache, ++ &principal))) { ++ logit("krb5_cc_get_principal(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { ++ logit("krb5_unparse_name(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ krb5_free_principal(krb_context, principal); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ ++ if (strcmp(name,client->exportedname.value)!=0) { ++ debug("Name in local credentials cache differs. Not storing"); ++ krb5_free_principal(krb_context, principal); ++ krb5_cc_close(krb_context, ccache); ++ krb5_free_unparsed_name(krb_context, name); ++ return 0; ++ } ++ krb5_free_unparsed_name(krb_context, name); ++ ++ /* Name matches, so lets get on with it! */ ++ ++ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { ++ logit("krb5_cc_initialize(): %.100s", ++ krb5_get_err_text(krb_context, problem)); ++ krb5_free_principal(krb_context, principal); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ krb5_free_principal(krb_context, principal); ++ ++ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, ++ ccache))) { ++ logit("gss_krb5_copy_ccache() failed. Sorry!"); ++ krb5_cc_close(krb_context, ccache); ++ return 0; ++ } ++ ++ return 1; ++} ++ + ssh_gssapi_mech gssapi_kerberos_mech = { + "toWM5Slw5Ew8Mqkay+al2g==", + "Kerberos", +@@ -191,7 +262,8 @@ + NULL, + &ssh_gssapi_krb5_userok, + NULL, +- &ssh_gssapi_krb5_storecreds ++ &ssh_gssapi_krb5_storecreds, ++ &ssh_gssapi_krb5_updatecreds + }; + + #endif /* KRB5 */ +Index: gss-serv.c +=================================================================== +RCS file: /cvs/openssh/gss-serv.c,v +retrieving revision 1.24 +diff -u -r1.24 gss-serv.c +--- ./gss-serv.c 19 May 2008 05:05:07 -0000 1.24 ++++ ./gss-serv.c 26 Jul 2009 12:22:01 -0000 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -45,15 +45,20 @@ + #include "channels.h" + #include "session.h" + #include "misc.h" ++#include "servconf.h" ++#include "uidswap.h" + + #include "ssh-gss.h" ++#include "monitor_wrap.h" ++ ++extern ServerOptions options; + + static ssh_gssapi_client gssapi_client = + { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, +- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; ++ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL}, 0, 0}; + + ssh_gssapi_mech gssapi_null_mech = +- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; ++ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; + + #ifdef KRB5 + extern ssh_gssapi_mech gssapi_kerberos_mech; +@@ -81,25 +86,32 @@ + char lname[MAXHOSTNAMELEN]; + gss_OID_set oidset; + +- gss_create_empty_oid_set(&status, &oidset); +- gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ if (options.gss_strict_acceptor) { ++ gss_create_empty_oid_set(&status, &oidset); ++ gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ ++ if (gethostname(lname, MAXHOSTNAMELEN)) { ++ gss_release_oid_set(&status, &oidset); ++ return (-1); ++ } + +- if (gethostname(lname, MAXHOSTNAMELEN)) { +- gss_release_oid_set(&status, &oidset); +- return (-1); +- } ++ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { ++ gss_release_oid_set(&status, &oidset); ++ return (ctx->major); ++ } ++ ++ if ((ctx->major = gss_acquire_cred(&ctx->minor, ++ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, ++ NULL, NULL))) ++ ssh_gssapi_error(ctx); + +- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { + gss_release_oid_set(&status, &oidset); + return (ctx->major); ++ } else { ++ ctx->name = GSS_C_NO_NAME; ++ ctx->creds = GSS_C_NO_CREDENTIAL; + } +- +- if ((ctx->major = gss_acquire_cred(&ctx->minor, +- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) +- ssh_gssapi_error(ctx); +- +- gss_release_oid_set(&status, &oidset); +- return (ctx->major); ++ return GSS_S_COMPLETE; + } + + /* Privileged */ +@@ -114,6 +126,29 @@ + } + + /* Unprivileged */ ++char * ++ssh_gssapi_server_mechanisms() { ++ gss_OID_set supported; ++ ++ ssh_gssapi_supported_oids(&supported); ++ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, ++ NULL, NULL)); ++} ++ ++/* Unprivileged */ ++int ++ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, ++ const char *dummy) { ++ Gssctxt *ctx = NULL; ++ int res; ++ ++ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); ++ ssh_gssapi_delete_ctx(&ctx); ++ ++ return (res); ++} ++ ++/* Unprivileged */ + void @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Oct 9 22:19:05 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 09 Oct 2009 20:19:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6812] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 6812 http://gar.svn.sourceforge.net/gar/?rev=6812&view=rev Author: chninkel Date: 2009-10-09 20:19:04 +0000 (Fri, 09 Oct 2009) Log Message: ----------- lftp: updated to 4.0.2 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-10-09 19:56:00 UTC (rev 6811) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-10-09 20:19:04 UTC (rev 6812) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 3.7.15 +GARVERSION = 4.0.2 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 19:56:00 UTC (rev 6811) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 20:19:04 UTC (rev 6812) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 download/CSWlftp.prototype -ce93239e79f5c12f5087218c9f34eb66 download/changelog.CSW -6c43ffdb59234ff0533cfdda0c3c305c download/lftp-3.7.15.tar.gz +76c476fab0a20ce50008affff55e4398 download/changelog.CSW +664fd567bb49e1e4dea1ba37430a8449 download/lftp-4.0.2.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 19:56:00 UTC (rev 6811) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 20:19:04 UTC (rev 6812) @@ -1,3 +1,9 @@ +lftp (4.0.2,REV=2009.10.09) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 09 Oct 2009 21:45:36 +0200 + lftp (3.7.15,REV=2009.07.25) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 00:21:41 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 09 Oct 2009 22:21:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6813] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 6813 http://gar.svn.sourceforge.net/gar/?rev=6813&view=rev Author: chninkel Date: 2009-10-09 22:21:41 +0000 (Fri, 09 Oct 2009) Log Message: ----------- lftp: updated changelog Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 20:19:04 UTC (rev 6812) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-10-09 22:21:41 UTC (rev 6813) @@ -1,3 +1,3 @@ -5bc881a13c106b1c97f2137ff1755817 download/CSWlftp.prototype -76c476fab0a20ce50008affff55e4398 download/changelog.CSW -664fd567bb49e1e4dea1ba37430a8449 download/lftp-4.0.2.tar.gz +5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype +7b1750a903f92e01de5978606e4c69aa changelog.CSW +664fd567bb49e1e4dea1ba37430a8449 lftp-4.0.2.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 20:19:04 UTC (rev 6812) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-09 22:21:41 UTC (rev 6813) @@ -1,4 +1,4 @@ -lftp (4.0.2,REV=2009.10.09) unstable +lftp (4.0.2,REV=2009.10.10) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 10 05:06:54 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Oct 2009 03:06:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6814] csw/mgar/pkg Message-ID: Revision: 6814 http://gar.svn.sourceforge.net/gar/?rev=6814&view=rev Author: bdwalton Date: 2009-10-10 03:06:54 +0000 (Sat, 10 Oct 2009) Log Message: ----------- cswpkglogger: initial commit of hooks to syslog package actions Added Paths: ----------- csw/mgar/pkg/cswpkglogger/ csw/mgar/pkg/cswpkglogger/branches/ csw/mgar/pkg/cswpkglogger/tags/ csw/mgar/pkg/cswpkglogger/trunk/ csw/mgar/pkg/cswpkglogger/trunk/Makefile csw/mgar/pkg/cswpkglogger/trunk/checksums csw/mgar/pkg/cswpkglogger/trunk/files/ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade Property changes on: csw/mgar/pkg/cswpkglogger/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-10 03:06:54 UTC (rev 6814) @@ -0,0 +1,34 @@ +GARNAME = cswpkglogger +GARVERSION = 1.0 +CATEGORIES = utils + +DESCRIPTION = Hook scripts to log package maintenance actions +define BLURB +This set of hook scripts will log package maintenance actions to syslog. +It is dependent on the use of a CSW package tool that is 'hook aware.' +endef + +MASTER_SITES = +DISTFILES = + +ARCHALL = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +HOOKDIR=$(DESTDIR)/etc/opt/csw/pkg-hooks +POSTHOOKS = postinstall postupgrade postremove +PREHOOKS = preupgrade +HOOKS = $(PREHOOKS) $(POSTHOOKS) + +install-custom: + @echo Installing CSWcswpkglogger files... + @( ginstall -m 0755 -d $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ + ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ + ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ + ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-preupgrade $(HOOKDIR)/preupgrade.d/;) Added: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-10 03:06:54 UTC (rev 6814) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/bash + +script=$0 + +set -- ${1/-/ } +PKG=$1 +VER=$2 + +function logdie() { + logger -t "CSW Package Logger" "$1" + exit 0 +} + +function success() { + case ${script} in + *install) MSG="installed ${PKG} ${VER}";; + *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; + *remove) MSG="removed ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +function failure() { + case ${script} in + *install) MSG="Failed to install ${PKG} ${VER}";; + *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; + *remove) MSG="Failed to remove ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +if [ -d /var/sadm/pkg/${PKG} ]; then + SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) + pf=/var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} + if [ -f ${pf} ]; then + PREVVER=$(cat ${pf} 2>/dev/null) + rm -f ${pf} + fi + + case ${script} in + *remove) + failure + ;; + *install|*upgrade) + case "${VER}" in + ${SYSTEMVER}) success ${PREVVER};; + *) failure ${SYSTEMVER};; + esac + ;; + esac +else + case ${script} in + *remove) + success + ;; + *install|*upgrade) + failure + ;; + esac +fi Property changes on: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-10 03:06:54 UTC (rev 6814) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -- ${1/-/ } + +PKG=$1 +VER=$2 + +SYSTEMVER=$(pkgparam ${PKG} VERSION) + +# store previous version so we can log smarter things if upgrade fails. +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} Property changes on: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 21:18:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 19:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6815] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 6815 http://gar.svn.sourceforge.net/gar/?rev=6815&view=rev Author: chninkel Date: 2009-10-10 19:18:23 +0000 (Sat, 10 Oct 2009) Log Message: ----------- openssh: now uses platforms feature Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 03:06:54 UTC (rev 6814) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 19:18:23 UTC (rev 6815) @@ -44,6 +44,7 @@ REQUIRED_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib SPKG_CLASSES_CSWosshclient = none cswpreserveconf +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris10-sparc solaris10-i386 ###### Upstream and OpenCSW files information ####### Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 03:06:54 UTC (rev 6814) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 19:18:23 UTC (rev 6815) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -413f3c282c526894bbecc9dbdd6f2973 changelog.CSW +385098d42f4454b7928e0273ee32c00c changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 03:06:54 UTC (rev 6814) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 19:18:23 UTC (rev 6815) @@ -1,8 +1,8 @@ -openssh (5.3,REV=2009.10.09_rev=p1) unstable +openssh (5.3,REV=2009.10.10_rev=p1) unstable * New upstream release. - -- Yann Rouillard Fri, 09 Oct 2009 21:47:46 +0200 + -- Yann Rouillard Fri, 10 Oct 2009 21:47:46 +0200 openssh (5.2,REV=2009.07.25_rev=p1) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 22:30:37 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 20:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6816] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 6816 http://gar.svn.sourceforge.net/gar/?rev=6816&view=rev Author: chninkel Date: 2009-10-10 20:30:37 +0000 (Sat, 10 Oct 2009) Log Message: ----------- rlwrap: updated to 0.32 and switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype Property Changed: ---------------- csw/mgar/pkg/rlwrap/trunk/ Property changes on: csw/mgar/pkg/rlwrap/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for rlwrap +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = rlwrap -GARVERSION = 0.30 +GARVERSION = 0.32 CATEGORIES = utils DESCRIPTION = A readline wrapper @@ -7,18 +21,25 @@ rlwrap is a readline wrapper, a small utility that uses the GNU readline library to allow the editing of keyboard input for any other command. It maintains a separate input history for each command, and can TAB-expand words using all previously seen words and/or a user-specified file. endef +PACKAGES = rlwrap + +REQUIRED_PKGS = CSWreadline + +###### Upstream and opencsw files information ####### + MASTER_SITES = http://utopia.knoware.nl/~hlub/uck/rlwrap/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWrlwrap,depend prototype) DISTFILES += changelog.CSW # replace setenv with putenv #PATCHFILES += putenv.patch +##### Build and installation information ##### + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk @@ -27,8 +48,9 @@ pre-configure: cd $(WORKSRC) && autoconf -post-install: - @ginstall -D $(WORKDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME)/changelog.CSW +post-merge: + @ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW @( for FILE in AUTHORS BUGS INSTALL NEWS README TODO; do \ - ginstall -D $(WORKSRC)/$$FILE $(DESTDIR)$(docdir)/$(GARNAME)/`basename $$FILE`; \ + ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(GARNAME)/`basename $$FILE`; \ done ) + Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,5 +1,5 @@ -03d8bd4996945ea32d3c7d5dc38c956e download/rlwrap-0.30.tar.gz -e699f8a2167f07465cfe891bba7a1bc7 download/CSWrlwrap.gspec -1c940e58cea90e9fd91c3286d5f2a31e download/CSWrlwrap.depend -64db02a1daa57c76f7bf1e501d5cee17 download/CSWrlwrap.prototype -dc4068d113864632f4bda60e219c0908 download/changelog.CSW +1c940e58cea90e9fd91c3286d5f2a31e CSWrlwrap.depend +e699f8a2167f07465cfe891bba7a1bc7 CSWrlwrap.gspec +64db02a1daa57c76f7bf1e501d5cee17 CSWrlwrap.prototype +913fd14e3f46b7bc09c56a3325424123 changelog.CSW +441282a9a65c1d516c1c9a6821184539 rlwrap-0.32.tar.gz Deleted: csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.depend 2009-10-10 20:30:37 UTC (rev 6816) @@ -1 +0,0 @@ -P CSWreadline readline - library to enable interactive line editing Deleted: csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.gspec 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,4 +0,0 @@ -%var bitname rlwrap -%var pkgname CSWrlwrap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/CSWrlwrap.prototype 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,28 +0,0 @@ -f none /opt/csw/bin/rlwrap 0755 root bin -f none /opt/csw/share/doc/rlwrap/changelog.CSW 0644 root bin -f none /opt/csw/share/doc/rlwrap/AUTHORS 0644 root bin -f none /opt/csw/share/doc/rlwrap/BUGS 0644 root bin -f none /opt/csw/share/doc/rlwrap/INSTALL 0644 root bin -f none /opt/csw/share/doc/rlwrap/NEWS 0644 root bin -f none /opt/csw/share/doc/rlwrap/README 0644 root bin -f none /opt/csw/share/doc/rlwrap/TODO 0644 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/en at boldquot 0755 root bin -d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/en at quot 0755 root bin -d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/es 0755 root bin -d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/it 0755 root bin -d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/rlwrap.1 0644 root bin -d none /opt/csw/share/rlwrap 0755 root bin -f none /opt/csw/share/rlwrap/coqtop 0644 root bin -f none /opt/csw/share/rlwrap/ftp 0644 root bin -f none /opt/csw/share/rlwrap/testclient 0644 root bin -i copyright=CSWrlwrap.copyright -i depend=CSWrlwrap.depend -i pkginfo=CSWrlwrap.pkginfo Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-10-10 19:18:23 UTC (rev 6815) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-10-10 20:30:37 UTC (rev 6816) @@ -1,3 +1,9 @@ +rlwrap (0.32,REV=2009.10.09) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 09 Oct 2009 22:10:54 +0200 + rlwrap (0.30,REV=2008.01.21) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 22:41:59 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 20:41:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6817] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 6817 http://gar.svn.sourceforge.net/gar/?rev=6817&view=rev Author: chninkel Date: 2009-10-10 20:41:59 +0000 (Sat, 10 Oct 2009) Log Message: ----------- openssh: PrintMotd value is now no in the default config file Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 20:30:37 UTC (rev 6816) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-10-10 20:41:59 UTC (rev 6817) @@ -151,6 +151,7 @@ sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' \ -e 's,/usr/libexec/,/opt/csw/libexec/,g' \ -e 's,^ *# *UsePAM *.*,UsePAM yes,g' \ + -e 's,^ *# *PrintMotd *.*,PrintMotd no,g' \ -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config" > "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 20:30:37 UTC (rev 6816) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-10-10 20:41:59 UTC (rev 6817) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -385098d42f4454b7928e0273ee32c00c changelog.CSW +d9eea5c8d787a514827e94d80e4f5574 changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 20:30:37 UTC (rev 6816) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-10-10 20:41:59 UTC (rev 6817) @@ -1,6 +1,8 @@ openssh (5.3,REV=2009.10.10_rev=p1) unstable * New upstream release. + * PrintMotd is now no in the default config file to avoid a double login + banner (Closes: #3829) -- Yann Rouillard Fri, 10 Oct 2009 21:47:46 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 22:42:36 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 20:42:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6818] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 6818 http://gar.svn.sourceforge.net/gar/?rev=6818&view=rev Author: chninkel Date: 2009-10-10 20:42:36 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: updated to 1.1 Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 20:41:59 UTC (rev 6817) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 20:42:36 UTC (rev 6818) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash_completion -GARVERSION = 1.0 +GARVERSION = 1.1 CATEGORIES = xtra DESCRIPTION = Programmable completion for bash Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:41:59 UTC (rev 6817) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:42:36 UTC (rev 6818) @@ -1,8 +1,8 @@ -cd1c5648272917fbe0eef4ba30bb93f4 download/bash-completion-1.0.tar.gz -5bc234f6060561c564a20d2a9cc552c1 download/pkg-get.completion -af7a63477c6e81ed5b08f195e153091e download/pkgadd.completion -1389a7771e34fc54fe993d442cce1524 download/pkgrm.completion -f922762210a6f208695c328c040ac90d download/pkgutil.completion -52bd6948f5cc1548c3791a969da0e5e2 download/smf.completion -a413f5d9346c32ef22093b55956bd268 download/changelog.CSW -d0c0d867babf351bca9ee97e03be550d download/opencsw_paths.patch +593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz +d7870800fc6e52484cc8faf32865e2cc changelog.CSW +d0c0d867babf351bca9ee97e03be550d opencsw_paths.patch +5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion +af7a63477c6e81ed5b08f195e153091e pkgadd.completion +1389a7771e34fc54fe993d442cce1524 pkgrm.completion +f922762210a6f208695c328c040ac90d pkgutil.completion +52bd6948f5cc1548c3791a969da0e5e2 smf.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 20:41:59 UTC (rev 6817) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 20:42:36 UTC (rev 6818) @@ -1,3 +1,9 @@ +bash_completion (1.1,REV=2009.10.10) + + * New upstream version. + + -- Yann Rouillard Sat, 10 Oct 2009 22:34:13 +0200 + bash_completion (1.0,REV=2009.04.07) * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 23:34:12 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 21:34:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6819] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 6819 http://gar.svn.sourceforge.net/gar/?rev=6819&view=rev Author: chninkel Date: 2009-10-10 21:34:11 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: updated opencsw paths patch Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 20:42:36 UTC (rev 6818) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 21:34:11 UTC (rev 6819) @@ -1,6 +1,6 @@ 593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz d7870800fc6e52484cc8faf32865e2cc changelog.CSW -d0c0d867babf351bca9ee97e03be550d opencsw_paths.patch +4c7dc3d0486ba84c5c0bbb57ee5ac420 opencsw_paths.patch 5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion af7a63477c6e81ed5b08f195e153091e pkgadd.completion 1389a7771e34fc54fe993d442cce1524 pkgrm.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2009-10-10 20:42:36 UTC (rev 6818) +++ csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2009-10-10 21:34:11 UTC (rev 6819) @@ -1,6 +1,7 @@ ---- bash-completion-1.0/bash_completion 2009-04-02 22:01:39.000000000 +0200 -+++ bash-completion-1.0/bash_completion.new 2009-04-04 19:21:58.156466726 +0200 -@@ -42,8 +42,8 @@ +diff --speed-large-files --minimal -Nru bash-completion-1.1.orig/bash_completion bash-completion-1.1/bash_completion +--- bash-completion-1.1.orig/bash_completion 2009-10-10 23:29:39.177572555 +0200 ++++ bash-completion-1.1/bash_completion 2009-10-10 23:29:13.520556369 +0200 +@@ -40,8 +40,8 @@ # Alter the following to reflect the location of this file. # @@ -8,38 +9,26 @@ -[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d +[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/opt/csw/etc/bash_completion +[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/opt/csw/etc/bash_completion.d - readonly BASH_COMPLETION BASH_COMPLETION_DIR + [ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d + readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR - # Set a couple of useful vars -@@ -2657,6 +2657,8 @@ - [ -r "$configfile" ] && - config=( "${config[@]}" "$configfile" ) - else -+ [ -r /opt/csw/etc/ssh/ssh_config ] && -+ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" ) - [ -r /etc/ssh/ssh_config ] && - config=( "${config[@]}" "/etc/ssh/ssh_config" ) - [ -r "${HOME}/.ssh/config" ] && -@@ -2676,6 +2678,8 @@ - [ -r "$global_kh" ] && - kh=( "${kh[@]}" "$global_kh" ) - if [ -z "$configfile" ]; then -+ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] && -+ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts ) - [ -r /etc/ssh/ssh_known_hosts ] && - kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts ) - [ -r /etc/ssh/ssh_known_hosts2 ] && ---- bash-completion-1.0/bash_completion.sh 2009-04-02 22:01:42.000000000 +0200 -+++ bash-completion-1.0/bash_completion.sh.new 2009-04-04 19:22:33.430034421 +0200 -@@ -4,9 +4,9 @@ - # Check for recent enough version of bash. - bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} - if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then -- if [ -r /etc/bash_completion ]; then -+ if [ -r /opt/csw/etc/bash_completion ]; then - # Source completion code. -- . /etc/bash_completion -+ . /opt/csw/etc/bash_completion - fi - fi - unset bash bminor bmajor +@@ -1196,6 +1196,8 @@ + [ -r "$configfile" ] && + config=( "${config[@]}" "$configfile" ) + else ++ [ -r /opt/csw/etc/ssh/ssh_config ] && ++ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" ) + [ -r /etc/ssh/ssh_config ] && + config=( "${config[@]}" "/etc/ssh/ssh_config" ) + [ -r "${HOME}/.ssh/config" ] && +@@ -1223,6 +1225,10 @@ + [ -r "$global_kh" ] && + kh=( "${kh[@]}" "${global_kh[@]}" ) + if [ -z "$configfile" ]; then ++ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] && ++ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts ) ++ [ -r /opt/csw/etc/ssh/ssh_known_hosts2 ] && ++ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts2 ) + [ -r /etc/ssh/ssh_known_hosts ] && + kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts ) + [ -r /etc/ssh/ssh_known_hosts2 ] && This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 23:35:47 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 21:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6820] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 6820 http://gar.svn.sourceforge.net/gar/?rev=6820&view=rev Author: chninkel Date: 2009-10-10 21:35:47 +0000 (Sat, 10 Oct 2009) Log Message: ----------- elinks: updated changelog Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/checksums csw/mgar/pkg/elinks/trunk/files/changelog.CSW Modified: csw/mgar/pkg/elinks/trunk/checksums =================================================================== --- csw/mgar/pkg/elinks/trunk/checksums 2009-10-10 21:34:11 UTC (rev 6819) +++ csw/mgar/pkg/elinks/trunk/checksums 2009-10-10 21:35:47 UTC (rev 6820) @@ -1,4 +1,4 @@ -9998467007acbd4cb8e46db6e5a9b306 download/CSWelinks.prototype -dccc134301c3dfa95ca4748e9ca948a7 download/changelog.CSW -fcd087a6d2415cd4c6fd1db53dceb646 download/elinks-0.11.7.tar.bz2 -858331d6cc6c8459b2dba5e24f0c8cc3 download/elinks-417789.diff +9998467007acbd4cb8e46db6e5a9b306 CSWelinks.prototype +ff0d7959d92aea06116190bb6f03731b changelog.CSW +fcd087a6d2415cd4c6fd1db53dceb646 elinks-0.11.7.tar.bz2 +858331d6cc6c8459b2dba5e24f0c8cc3 elinks-417789.diff Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-10-10 21:34:11 UTC (rev 6819) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-10-10 21:35:47 UTC (rev 6820) @@ -1,8 +1,8 @@ -elinks (0.11.7,REV=2009.09.04) unstable +elinks (0.11.7,REV=2009.10.10) unstable * New upstream version. - -- Yann Rouillard Sun, 04 Sep 2009 10:38:39 +0100 + -- Yann Rouillard Sun, 10 Oct 2009 21:38:39 +0100 elinks (0.11.6,REV=2009.03.22) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 10 23:38:33 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 21:38:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6821] csw/mgar/pkg/bash_completion/trunk/Makefile Message-ID: Revision: 6821 http://gar.svn.sourceforge.net/gar/?rev=6821&view=rev Author: chninkel Date: 2009-10-10 21:38:33 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: removed CHANGES file Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile Modified: csw/mgar/pkg/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 21:35:47 UTC (rev 6820) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2009-10-10 21:38:33 UTC (rev 6821) @@ -67,7 +67,7 @@ merge-additional-docs: - @( for FILE in AUTHORS README TODO CHANGES; do \ + @( for FILE in AUTHORS README TODO; do \ ginstall -D "$(WORKSRC_FIRSTMOD)/$$FILE" "$(PKGROOT)$(docdir)/$(GARNAME)/$$FILE"; \ done ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:41:27 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:41:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6822] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 6822 http://gar.svn.sourceforge.net/gar/?rev=6822&view=rev Author: chninkel Date: 2009-10-10 22:41:27 +0000 (Sat, 10 Oct 2009) Log Message: ----------- bash_completion: updated changelog Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 21:38:33 UTC (rev 6821) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-10-10 22:41:27 UTC (rev 6822) @@ -1,5 +1,5 @@ 593d3edcf287b9e9d735049bd4d3f229 bash-completion-1.1.tar.gz -d7870800fc6e52484cc8faf32865e2cc changelog.CSW +075292057aa7dce8fb78dba076ee0832 changelog.CSW 4c7dc3d0486ba84c5c0bbb57ee5ac420 opencsw_paths.patch 5bc234f6060561c564a20d2a9cc552c1 pkg-get.completion af7a63477c6e81ed5b08f195e153091e pkgadd.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 21:38:33 UTC (rev 6821) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-10-10 22:41:27 UTC (rev 6822) @@ -1,8 +1,8 @@ -bash_completion (1.1,REV=2009.10.10) +bash_completion (1.1,REV=2009.10.11) * New upstream version. - -- Yann Rouillard Sat, 10 Oct 2009 22:34:13 +0200 + -- Yann Rouillard Sat, 11 Oct 2009 00:34:13 +0200 bash_completion (1.0,REV=2009.04.07) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:41:57 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:41:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6823] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 6823 http://gar.svn.sourceforge.net/gar/?rev=6823&view=rev Author: chninkel Date: 2009-10-10 22:41:57 +0000 (Sat, 10 Oct 2009) Log Message: ----------- lftp: updated changelog Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-10-10 22:41:27 UTC (rev 6822) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-10-10 22:41:57 UTC (rev 6823) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -7b1750a903f92e01de5978606e4c69aa changelog.CSW +90cfdf4e9b3481ab053e46a4baf82845 changelog.CSW 664fd567bb49e1e4dea1ba37430a8449 lftp-4.0.2.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-10 22:41:27 UTC (rev 6822) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-10-10 22:41:57 UTC (rev 6823) @@ -1,8 +1,8 @@ -lftp (4.0.2,REV=2009.10.10) unstable +lftp (4.0.2,REV=2009.10.11) unstable * New upstream release. - -- Yann Rouillard Fri, 09 Oct 2009 21:45:36 +0200 + -- Yann Rouillard Fri, 11 Oct 2009 00:45:36 +0200 lftp (3.7.15,REV=2009.07.25) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:42:59 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6824] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 6824 http://gar.svn.sourceforge.net/gar/?rev=6824&view=rev Author: chninkel Date: 2009-10-10 22:42:59 +0000 (Sat, 10 Oct 2009) Log Message: ----------- vsftpd: removed no_rlimit_nproc patch Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-10-10 22:42:59 UTC (rev 6824) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.1.2 +GARVERSION = 2.2.0 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. @@ -71,9 +71,6 @@ # vsftpd makfile PATCHFILES += destdir.patch -# solaris doesn't have RLIMIT_NPROC -PATCHFILES += no_rlimit_nproc.patch - # Documentation files DOCFILES = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-10-10 22:42:59 UTC (rev 6824) @@ -1,17 +1,16 @@ -a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall -8944fcd302add66d5b2b287d390b9c91 download/CSWvsftpd.prototype -eeaf77528b2da0c7730323838f30b7ef download/README.CSW -281c51282cabd9475cceef363bbc699b download/build_options.patch -16b388b04478ebdc9ee7ebac6a03387d download/changelog.CSW -54c1c39c6bfa8747a4457f135fd5bca1 download/csw_build_system.patch -a9e994d2b57999b76a0e03503745c01a download/csw_paths.patch -98e1d831801985daf5ce2ed01fbc0efd download/cswusergroup -796d46089f9e9c25c897a34e0dcfadc8 download/cswvsftpd -93173edf9931b8eb835c6d0177a7c6bd download/cswvsftpd.xml -73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch -81d5a4a3831f318cd9e7ea3b3634f41b download/no_rlimit_nproc.patch -a9a65f55cbfd01f9d72d1de25e67148d download/set_priv_sep_user.patch -6a8c8579d50adf0d0fc07226c03bfb52 download/vsftpd-2.1.2.tar.gz -f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf -0d4a1cf36560892adb9eb9410a01c522 download/vsftpd.smf_wrapper -60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist +a2f5b70fe49839b0463c9d90af0f11dd CSWvsftpd.preinstall +8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype +eeaf77528b2da0c7730323838f30b7ef README.CSW +281c51282cabd9475cceef363bbc699b build_options.patch +1680c237d8aa01a3571b80e426dba7a3 changelog.CSW +54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch +a9e994d2b57999b76a0e03503745c01a csw_paths.patch +98e1d831801985daf5ce2ed01fbc0efd cswusergroup +796d46089f9e9c25c897a34e0dcfadc8 cswvsftpd +93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml +73e59f9ada47d3d20199f7c97849fb13 destdir.patch +a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch +e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz +f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf +0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper +60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) @@ -1,3 +1,11 @@ +vsftpd (2.2.0,REV=2009.10.10) unstable + + * New upstream version. + * Removed no_rlimit_nproc.patch as the same modification has been applied + upstream. + + -- Yann Rouillard Sat, 10 Oct 2009 23:37:15 +0200 + vsftpd (2.1.2,REV=2009.06.30) unstable * New upstream version. Deleted: csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch 2009-10-10 22:41:57 UTC (rev 6823) +++ csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch 2009-10-10 22:42:59 UTC (rev 6824) @@ -1,19 +0,0 @@ -diff --speed-large-files --minimal -Nru vsftpd-2.1.2.orig/sysutil.c vsftpd-2.1.2/sysutil.c ---- vsftpd-2.1.2.orig/sysutil.c 2009-05-27 08:14:59.000000000 +0200 -+++ vsftpd-2.1.2/sysutil.c 2009-06-09 22:56:52.905511283 +0200 -@@ -2779,6 +2779,7 @@ - void - vsf_sysutil_set_no_procs() - { -+#ifdef RLIMIT_NPROC - int ret; - struct rlimit rlim; - rlim.rlim_cur = 0; -@@ -2788,6 +2789,7 @@ - { - die("setrlimit NPROC"); - } -+#endif - } - - void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 00:49:34 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 10 Oct 2009 22:49:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6825] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6825 http://gar.svn.sourceforge.net/gar/?rev=6825&view=rev Author: chninkel Date: 2009-10-10 22:49:33 +0000 (Sat, 10 Oct 2009) Log Message: ----------- cyrus_imapd: updated to 2.3.15 Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Property Changed: ---------------- csw/mgar/pkg/cyrus_imapd/trunk/ Property changes on: csw/mgar/pkg/cyrus_imapd/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for Cyrus Imap +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = cyrus_imapd -GARVERSION = 2.3.14 +GARVERSION = 2.3.15 CATEGORIES = server DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -15,10 +29,14 @@ multiple SASL mechanisms, and the Sieve mail filtering language. endef -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ +###### Upstream and opencsw files information ####### + +#MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.14/ + # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = cyrus-imapd-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcyrusimapd,prototype preinstall depend checkinstall) @@ -33,9 +51,6 @@ DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz - # compile_et is not provided by krb5lib_dev so we must provide our own version # taken from the krb5 source. DISTFILES += compile_et et_c.awk et_h.awk @@ -48,7 +63,7 @@ # University of Athens patchs to allow autocreation of mailboxes # and autocreation of sub-lolders for filter rules #PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff -PATCHFILES = cyrus-imapd-2.3.13-autocreate-0.10-0.diff cyrus-imapd-2.3.13-autosieve-0.6.0.diff +PATCHFILES = cyrus-imapd-2.3.14-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff # UPDATE: not necessary anymore, integrated upstream # This patch adds a new option which allows cyrus to @@ -72,6 +87,8 @@ #GNU_CC_OPT = -g #GNU_LD_OPT = -g +##### Build and installation information ##### + # files are extracted in cyrus_imapd not cyrus-imapd WORKSRC = $(WORKDIR)/$(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) @@ -124,7 +141,7 @@ find doc -type f -exec perl -pi -e 's/\/opt\/csw\/etc\/cyrus\/sasldb2/\/opt\/csw\/etc\/sasldb2/g' '{}' ';') @$(MAKECOOKIE) -pre-install: +pre-merge: # we must create the directory where perl libraries will be installed mkdir -p $(DESTDIR)/$(prefix)/lib/perl mkdir -p $(DESTDIR)/$(sbindir) @@ -132,7 +149,7 @@ mkdir -p $(DESTDIR)/$(prefix)/share/doc/cyrus_imapd @$(MAKECOOKIE) -post-install: +post-merge: # we install binary under tools as part of the package cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir) ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,35 +1,35 @@ -1030d4d9d04036b2fb9830165723908e download/cyrus-imapd-2.3.14.tar.gz +a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall +248ac6089e88b4eb3365e48c897b9734 download/CSWcyrusimapd.depend 7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec +5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype -5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall -248ac6089e88b4eb3365e48c897b9734 download/CSWcyrusimapd.depend -a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall -19204460216d299f19b6504be90b1d79 download/cyrus_imapd.changelog.CSW +4d5ad6d492ca45da347bd9bd48213ac4 download/CSWcyrusimapdutils.depend +d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec +7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype +fc64965b3c22618fb6b1dff7306a78e7 download/CSWpmcyrus.depend +fdb06983e1a6fdde58ec25834742cf5d download/CSWpmcyrus.gspec +404a6d2b6608c26aaef4e37095200105 download/CSWpmcyrus.prototype d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW -79211aee56db01e15566ced1ba4078da download/i.services -149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services -6dfee20f7c02139350caf9f75199e587 download/services -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf +9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init 628c5cf5f5b01f9e173e090ee0c969aa download/cswcyrus.xml -d41d8cd98f00b204e9800998ecf8427e download/svc-cswcyrus -908dbf764d3ccd541c4de881ac81a6ae download/imapd.conf +95d0eb720cb67d712ab799609c619929 download/cyrus-imapd-2.3.14-autocreate-0.10-0.diff +4f010ee86b24f737c9de9fffa0d194e4 download/cyrus-imapd-2.3.14-autosieve-0.6.0.diff +d89cb1b55023188938f332b7ef120fae download/cyrus-imapd-2.3.15.tar.gz +b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch +6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d download/cyrus.conf -fdb06983e1a6fdde58ec25834742cf5d download/CSWpmcyrus.gspec -404a6d2b6608c26aaef4e37095200105 download/CSWpmcyrus.prototype -fc64965b3c22618fb6b1dff7306a78e7 download/CSWpmcyrus.depend -d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec -7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype -4d5ad6d492ca45da347bd9bd48213ac4 download/CSWcyrusimapdutils.depend -43d004e8a98a9143db8073bd529b8f7a download/cyrus_imapd_utils.changelog.CSW -5f2dbde9c973e714c0a4727e25863f75 download/pm_cyrus.changelog.CSW -9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et +81f9b346bf3c1803381c94ce33f2163e download/cyrus_imapd.changelog.CSW +d722bfe708263b946d7bbc7f4d0ddf46 download/cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 download/et_c.awk d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk +9b2ae27f98333b73ff2b16ed98ee896a download/i.conf +79211aee56db01e15566ced1ba4078da download/i.services +908dbf764d3ccd541c4de881ac81a6ae download/imapd.conf 14bb6e8c6d6914351f80df293982e88a download/install-upgrade -f1957096f173dcc9ea94d0544a07e9db download/cyrus-imapd-2.3.13-autocreate-0.10-0.diff -cce2e7fbc847791182b8f431c59e473a download/cyrus-imapd-2.3.13-autosieve-0.6.0.diff -6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch -b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch +e6730668fa500fc77120ee007e535274 download/pm_cyrus.changelog.CSW +5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf +149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch +6dfee20f7c02139350caf9f75199e587 download/services +d41d8cd98f00b204e9800998ecf8427e download/svc-cswcyrus Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,3 +1,9 @@ +cyrus_imapd (2.3.15,REV=2009.10.11) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 + cyrus_imapd (2.3.14,REV=2009.03.27) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,3 +1,9 @@ +cyrus_imapd_utils (2.3.15,REV=2009.10.11) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 + cyrus_imapd_utils (2.3.14,REV=2009.03.27) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-10-10 22:42:59 UTC (rev 6824) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) @@ -1,3 +1,9 @@ +pm_cyrus (2.3.15,REV=2009.10.11) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 + pm_cyrus (2.3.14,REV=2009.03.27) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 12:59:25 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 10:59:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6826] csw/mgar/pkg/bash/trunk Message-ID: Revision: 6826 http://gar.svn.sourceforge.net/gar/?rev=6826&view=rev Author: chninkel Date: 2009-10-11 10:59:25 +0000 (Sun, 11 Oct 2009) Log Message: ----------- bash: updated to patch level 33 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-10-10 22:49:33 UTC (rev 6825) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-10-11 10:59:25 UTC (rev 6826) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.28 +GARVERSION = 4.0.33 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-10-10 22:49:33 UTC (rev 6825) +++ csw/mgar/pkg/bash/trunk/checksums 2009-10-11 10:59:25 UTC (rev 6826) @@ -1,33 +1,38 @@ -f93b41b44ce6b023df65b72f00386ac5 download/CSWbash.prototype -a90a1b5a6db4838483f05438e05e8eb9 download/bash-4.0.tar.gz -bc7f4762443939bd7dccb42370f0d932 download/bash40-001 -c2a4a4786a83ed4ec366c6a8924369a2 download/bash40-002 -22e8a824eddba21a8fce10d7984c2aba download/bash40-003 -ed7cbced8c7c964323265522369a37a2 download/bash40-004 -8ed86b7d31423d71ecf3148251d63512 download/bash40-005 -5f447338cb98ff156cabf1fd9879d5f3 download/bash40-006 -96e946cb66a4ca186cba1da44f1ee163 download/bash40-007 -d3eb7b6f00d525e032478c33f51d46a8 download/bash40-008 -340601c997ce569532417a7ae92248b8 download/bash40-009 -0bd5ab96d514ffb1afbb8c7984b15146 download/bash40-010 -32cb20f339a20e1e9fb37a5d18f18fca download/bash40-011 -33fd9e93d30a17988c19554ef26d56e0 download/bash40-012 -a266b42df5e9ed7e8818a8b00d50e00b download/bash40-013 -86cac78f191a32cd1404f11264eb9b2a download/bash40-014 -bb41963d030bc61a20e8185367b337c5 download/bash40-015 -f75455048a086528971252fd979b8755 download/bash40-016 -34b2cd57271a452f4a26b39d77ff908f download/bash40-017 -99318eed8dcc05e10a14ae27043f175d download/bash40-018 -af3b9aaeadc71a5007bec2b98c751cde download/bash40-019 -eb7c7ddeb7e8451eb59228dca3329696 download/bash40-020 -585d701b978ceb63967dc020db3a2234 download/bash40-021 -7a70f2608f90f6ac0c2051e5f1c6c414 download/bash40-022 -7a23aa41630dd4fe8d30108a200e2d96 download/bash40-023 -82ba5fc9eb780eb57d8b7628a17b7d74 download/bash40-024 -b26f9007ac4eef5c378f1abcb8959025 download/bash40-025 -83bc844c82d0a30740e8d91a8238bfa9 download/bash40-026 -a41c187f05ecab07389c18acc91214c6 download/bash40-027 -fcc367e6471267d2e397257e703b817d download/bash40-028 -871d6e5e87ea680cdf870f67210be8b3 download/changelog.CSW -60956e6be20f69dafbb06fcc83bab88e download/shells -29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch +f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype +a90a1b5a6db4838483f05438e05e8eb9 bash-4.0.tar.gz +bc7f4762443939bd7dccb42370f0d932 bash40-001 +c2a4a4786a83ed4ec366c6a8924369a2 bash40-002 +22e8a824eddba21a8fce10d7984c2aba bash40-003 +ed7cbced8c7c964323265522369a37a2 bash40-004 +8ed86b7d31423d71ecf3148251d63512 bash40-005 +5f447338cb98ff156cabf1fd9879d5f3 bash40-006 +96e946cb66a4ca186cba1da44f1ee163 bash40-007 +d3eb7b6f00d525e032478c33f51d46a8 bash40-008 +340601c997ce569532417a7ae92248b8 bash40-009 +0bd5ab96d514ffb1afbb8c7984b15146 bash40-010 +32cb20f339a20e1e9fb37a5d18f18fca bash40-011 +33fd9e93d30a17988c19554ef26d56e0 bash40-012 +a266b42df5e9ed7e8818a8b00d50e00b bash40-013 +86cac78f191a32cd1404f11264eb9b2a bash40-014 +bb41963d030bc61a20e8185367b337c5 bash40-015 +f75455048a086528971252fd979b8755 bash40-016 +34b2cd57271a452f4a26b39d77ff908f bash40-017 +99318eed8dcc05e10a14ae27043f175d bash40-018 +af3b9aaeadc71a5007bec2b98c751cde bash40-019 +eb7c7ddeb7e8451eb59228dca3329696 bash40-020 +585d701b978ceb63967dc020db3a2234 bash40-021 +7a70f2608f90f6ac0c2051e5f1c6c414 bash40-022 +7a23aa41630dd4fe8d30108a200e2d96 bash40-023 +82ba5fc9eb780eb57d8b7628a17b7d74 bash40-024 +b26f9007ac4eef5c378f1abcb8959025 bash40-025 +83bc844c82d0a30740e8d91a8238bfa9 bash40-026 +a41c187f05ecab07389c18acc91214c6 bash40-027 +fcc367e6471267d2e397257e703b817d bash40-028 +4d4da1c0be8dfee8e2a6a7703901130f bash40-029 +55cbdc8e5173d7d59bf1113c3ff590dc bash40-030 +389635281133416de9d13295251cabc7 bash40-031 +d646cb4aed8e0f0d1d47eea2ed5f3690 bash40-032 +d3e77d2a0a051478aca8c30d13ded834 bash40-033 +2e65971f182336356e87af544a24ccfe changelog.CSW +60956e6be20f69dafbb06fcc83bab88e shells +29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-10-10 22:49:33 UTC (rev 6825) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-10-11 10:59:25 UTC (rev 6826) @@ -1,3 +1,9 @@ +bash (4.0.33,REV=2009.10.11) unstable + + * Added bash patches bash40-029 to bash40-033. + + -- Yann Rouillard Sun, 11 Oct 2009 11:51:37 +0200 + bash (4.0.28,REV=2009.07.25) unstable * Added bash patches bash40-025 to bash40-028. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Oct 11 13:42:26 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 11 Oct 2009 11:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6827] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 6827 http://gar.svn.sourceforge.net/gar/?rev=6827&view=rev Author: idogan23 Date: 2009-10-11 11:42:25 +0000 (Sun, 11 Oct 2009) Log Message: ----------- Apache2: bump version to 2.2.14 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-10-11 10:59:25 UTC (rev 6826) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-10-11 11:42:25 UTC (rev 6827) @@ -1,5 +1,5 @@ GARNAME = httpd -GARVERSION = 2.2.13 +GARVERSION = 2.2.14 CATEGORIES = server DESCRIPTION = A high performance Unix-based HTTP server. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 11 15:31:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Oct 2009 13:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6828] csw/mgar/pkg/git/trunk Message-ID: Revision: 6828 http://gar.svn.sourceforge.net/gar/?rev=6828&view=rev Author: bdwalton Date: 2009-10-11 13:31:43 +0000 (Sun, 11 Oct 2009) Log Message: ----------- git: bump to 1.6.5 (enable tests again); remove autoconf build dep since patches were accepted; remove ls-files patch since it was accepted; make build quiet again Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-11 11:42:25 UTC (rev 6827) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-11 13:31:43 UTC (rev 6828) @@ -1,10 +1,10 @@ GARNAME = git -GARVERSION = 1.6.4.4 +GARVERSION = 1.6.5 #xPATCHLEVEL = rc3 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +# TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel @@ -30,8 +30,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs -PREREQUISITE_PKGS += CSWautoconf - + REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror REQUIRED_PKGS_CSWgit += CSWpmtermreadkey @@ -87,7 +86,7 @@ GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) DISTFILES = CSWgit.postinstall -PATCHFILES = 0001-ls-files-make-option-parser-keep-argv-0.patch +#PATCHFILES = 0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files @@ -122,7 +121,7 @@ CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ - ETC_GITCONFIG=$(sysconfdir)/gitconfig V=1 \ + ETC_GITCONFIG=$(sysconfdir)/gitconfig \ ASCIIDOC_NO_ROFF=YesPlease \ all @@ -150,7 +149,6 @@ post-build-modulated: @echo Builing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) - @( cd $(WORKSRC)/Documentation; $(MAKE) ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-11 11:42:25 UTC (rev 6827) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-11 13:31:43 UTC (rev 6828) @@ -1,2 +1,2 @@ -286ebdc4e98afca87750145775cbe918 download/0001-ls-files-make-option-parser-keep-argv-0.patch +43f73e9e39bc388253c4c48986ef7b5c download/0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch 0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 15:55:25 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 13:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6829] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6829 http://gar.svn.sourceforge.net/gar/?rev=6829&view=rev Author: chninkel Date: 2009-10-11 13:55:25 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: updated to 2.3.15 cyrus_imapd: switched to cswclassutils for SMF support and configuration file handling cyrus_imapd: removed headers and static libraries cyrus_imapd: switched to automatic gspec and depend file Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW Added Paths: ----------- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff Removed Paths: ------------- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init csw/mgar/pkg/cyrus_imapd/trunk/files/i.conf csw/mgar/pkg/cyrus_imapd/trunk/files/r.conf csw/mgar/pkg/cyrus_imapd/trunk/files/svc-cswcyrus Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 13:55:25 UTC (rev 6829) @@ -29,7 +29,24 @@ multiple SASL mechanisms, and the Sieve mail filtering language. endef +PACKAGES = CSWcyrusimapd CSWcyrusimapdutils CSWpmcyrus +SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system +CATALOGNAME_CSWcyrusimapd = cyrus_imapd +REQUIRED_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert +SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf + +SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd +CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils +REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWpcrert +SPKG_CLASSES_CSWcyrusimapd = none + +SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions +CATALOGNAME_CSWpmcyrus = pm_cyrus +REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb4 CSWosslrt CSWsasl +SPKG_CLASSES_CSWcyrusimapd = none + + ###### Upstream and opencsw files information ####### #MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ @@ -38,16 +55,17 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz -DISTFILES = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWcyrusimapd,prototype preinstall depend checkinstall) +DISTNAME = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) + +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += CSWcyrusimapd.prototype CSWcyrusimapd.preinstall CSWcyrusimapd.checkinstall DISTFILES += cyrus_imapd.changelog.CSW README.CSW DISTFILES += i.services r.services services -DISTFILES += i.conf r.conf -DISTFILES += cswcyrus.init cswcyrus.xml svc-cswcyrus +DISTFILES += cswcyrus cswcyrus.xml DISTFILES += imapd.conf cyrus.conf -DISTFILES += $(call admfiles,CSWpmcyrus,prototype depend) -DISTFILES += $(call admfiles,CSWcyrusimapdutils,prototype depend) +DISTFILES += CSWpmcyrus.prototype +DISTFILES += CSWcyrusimapdutils.prototype DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW @@ -58,18 +76,11 @@ # le fichier install-upgrade de cyrus 2.3.11 est incomplet DISTFILES += install-upgrade -SPKG_CLASSES = none services conf - # University of Athens patchs to allow autocreation of mailboxes # and autocreation of sub-lolders for filter rules #PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff -PATCHFILES = cyrus-imapd-2.3.14-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff +PATCHFILES = cyrus-imapd-2.3.15-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff -# UPDATE: not necessary anymore, integrated upstream -# This patch adds a new option which allows cyrus to -# accept mails with 8bits characters in header -# PATCHFILES += cyrus-imapd-2.2.7-munge8bit.patch - # This patch makes cyrus more tolerant with mails containing # invalid From headers # This avoids "Invalid Message header" error messages @@ -89,9 +100,6 @@ ##### Build and installation information ##### -# files are extracted in cyrus_imapd not cyrus-imapd -WORKSRC = $(WORKDIR)/$(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus @@ -120,7 +128,7 @@ pre-patch: cp $(WORKDIR)/install-upgrade $(WORKSRC)/doc/text -pre-configure: +pre-configure-modulated: # master is a too common name, so we rename it cyrus-master cp $(WORKSRC)/man/master.8 $(WORKSRC)/man/cyrus-master.8 cp $(WORKSRC)/doc/man/master.8.html $(WORKSRC)/doc/man/cyrus-master.8.html @@ -143,33 +151,48 @@ pre-merge: # we must create the directory where perl libraries will be installed - mkdir -p $(DESTDIR)/$(prefix)/lib/perl - mkdir -p $(DESTDIR)/$(sbindir) - mkdir -p $(DESTDIR)/$(sysconfdir)/cyrus - mkdir -p $(DESTDIR)/$(prefix)/share/doc/cyrus_imapd + mkdir -p $(PKGROOT)/$(prefix)/lib/perl + mkdir -p $(PKGROOT)/$(sbindir) + mkdir -p $(PKGROOT)/$(sysconfdir)/cyrus + mkdir -p $(PKGROOT)/$(prefix)/share/doc/cyrus_imapd @$(MAKECOOKIE) post-merge: + # we provide our class action scripts to modify /etc/inet/services + ginstall $(WORKDIR_FIRSTMOD)/*.services $(WORKDIR)/ + ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/inet/services + + # configuration and init file installation + ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus" + ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswcyrus.xml" + ginstall -D "$(WORKDIR_FIRSTMOD)/imapd.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/imapd.conf.CSW" + ginstall -D "$(WORKDIR_FIRSTMOD)/cyrus.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/cyrus.conf.CSW" + + # we install binary under tools as part of the package - cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir) - ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort + cp -r $(WORKSRC_FIRSTMOD)/tools/* $(PKGROOT)$(sbindir) + ginstall -D $(PKGROOT)$(sbindir)/arbitronsort.pl $(PKGROOT)$(sbindir)/arbitronsort # we want perl script to use opencsw perl - perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(DESTDIR)$(sbindir)/* $(DESTDIR)$(bindir)/* + perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(PKGROOT)$(sbindir)/* $(PKGROOT)$(bindir)/* ( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \ - perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(DESTDIR)$(sbindir)/$$FILE; \ + perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(PKGROOT)$(sbindir)/$$FILE; \ done ) # we install the documentation - cp -r $(WORKSRC)/doc/* $(DESTDIR)/$(docdir)/cyrus_imapd + cp -r $(WORKSRC_FIRSTMOD)/doc/* $(PKGROOT)/$(docdir)/cyrus_imapd ( for PKG in cyrus_imapd cyrus_imapd_utils pm_cyrus; do \ - ginstall -D $(WORKDIR)/$$PKG.changelog.CSW $(DESTDIR)/$(docdir)/$$PKG/changelog.CSW; \ + ginstall -D $(WORKDIR_FIRSTMOD)/$$PKG.changelog.CSW $(PKGROOT)/$(docdir)/$$PKG/changelog.CSW; \ + ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$PKG/README.CSW; \ done ) # we rename some tools with too generic names - ginstall -D $(DESTDIR)/$(sbindir)/mkimap $(DESTDIR)/$(sbindir)/mkdirs + ginstall -D $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs ( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \ - ginstall -D $(DESTDIR)/$(sbindir)/$$FILE $(DESTDIR)/$(sbindir)/cyrus-$$FILE; \ + ginstall -D $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \ done ) + + # we fix some permission problems + chmod -R u+w "$(PKGROOT)/" + @$(MAKECOOKIE) - Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,35 +1,26 @@ -a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall -248ac6089e88b4eb3365e48c897b9734 download/CSWcyrusimapd.depend -7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec -5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall -a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype -4d5ad6d492ca45da347bd9bd48213ac4 download/CSWcyrusimapdutils.depend -d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec -7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype -fc64965b3c22618fb6b1dff7306a78e7 download/CSWpmcyrus.depend -fdb06983e1a6fdde58ec25834742cf5d download/CSWpmcyrus.gspec -404a6d2b6608c26aaef4e37095200105 download/CSWpmcyrus.prototype -d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW -9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et -a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init -628c5cf5f5b01f9e173e090ee0c969aa download/cswcyrus.xml -95d0eb720cb67d712ab799609c619929 download/cyrus-imapd-2.3.14-autocreate-0.10-0.diff -4f010ee86b24f737c9de9fffa0d194e4 download/cyrus-imapd-2.3.14-autosieve-0.6.0.diff -d89cb1b55023188938f332b7ef120fae download/cyrus-imapd-2.3.15.tar.gz -b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch -6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch -fdb3416ec41f3a56d1594ca25a6dcd7d download/cyrus.conf -81f9b346bf3c1803381c94ce33f2163e download/cyrus_imapd.changelog.CSW -d722bfe708263b946d7bbc7f4d0ddf46 download/cyrus_imapd_utils.changelog.CSW -5375c25c8bc325a90553d0be87a64a04 download/et_c.awk -d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -79211aee56db01e15566ced1ba4078da download/i.services -908dbf764d3ccd541c4de881ac81a6ae download/imapd.conf -14bb6e8c6d6914351f80df293982e88a download/install-upgrade -e6730668fa500fc77120ee007e535274 download/pm_cyrus.changelog.CSW -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services -dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch -6dfee20f7c02139350caf9f75199e587 download/services -d41d8cd98f00b204e9800998ecf8427e download/svc-cswcyrus +a55d22e88ee57fa81da2ea75c6e0e3d8 CSWcyrusimapd.checkinstall +5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall +63f0e304d69648e4cbaf197a329f1537 CSWcyrusimapd.prototype +7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype +404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype +d0b97b33e75ac75f89ee6236a2d53f05 README.CSW +9cbebaeeafa6eb3320eafa594c253bc1 compile_et +1c2b850f7a264704eefec741a75977ab cswcyrus +628c5cf5f5b01f9e173e090ee0c969aa cswcyrus.xml +4f010ee86b24f737c9de9fffa0d194e4 cyrus-imapd-2.3.14-autosieve-0.6.0.diff +318f1d2bd48bb4a7c2db5fb9f82c9e3d cyrus-imapd-2.3.15-autocreate-0.10-0.diff +d89cb1b55023188938f332b7ef120fae cyrus-imapd-2.3.15.tar.gz +b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch +6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch +fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf +e8868f4e344649d1f2939d5d00f3f800 cyrus_imapd.changelog.CSW +d722bfe708263b946d7bbc7f4d0ddf46 cyrus_imapd_utils.changelog.CSW +5375c25c8bc325a90553d0be87a64a04 et_c.awk +d1d86e61463a1dfefccbadedb11a8604 et_h.awk +79211aee56db01e15566ced1ba4078da i.services +908dbf764d3ccd541c4de881ac81a6ae imapd.conf +14bb6e8c6d6914351f80df293982e88a install-upgrade +e6730668fa500fc77120ee007e535274 pm_cyrus.changelog.CSW +149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services +dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch +6dfee20f7c02139350caf9f75199e587 services Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.depend 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,7 +0,0 @@ -P CSWosslrt - openssl - OpenSSL Secure Sockets Layer lib and utilities -P CSWsasl - sasl - Simple Authentication and Security Layer -P CSWbdb4 - berkeleydb4 - embedded database libraries and utilities -P CSWkrb5lib -P CSWtcpwrap -P CSWnetsnmp -P CSWpcrert Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.gspec 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,13 +0,0 @@ -%var bitname cyrus_imapd -%var pkgname CSWcyrusimapd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT -%var RC_INIT_SCRIPT cswcyrus.init -%var SMF_SCRIPT svc-cswcyrus -%var SMF_MANIFEST cswcyrus.xml -%var INIT_KILL_PRIO 99 -%var INIT_START_PRIO 10 -%var CAN_BE_AUTOENABLED yes -%var SERVICE_CONF_FILES /opt/csw/etc/cyrus/cyrus.conf -%var SERVICE_NAME cyrus_imapd -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,11 +1,11 @@ -i i.conf=i.conf -i r.conf=r.conf -i i.services=i.services -i r.services=r.services -e services /etc/inet/services=services +i i.services +i r.services +e services /etc/inet/services 0444 root sys d none /opt/csw/etc/cyrus 0755 root bin -e conf /opt/csw/etc/cyrus/imapd.conf=imapd.conf 0640 root mail -f none /opt/csw/etc/cyrus/cyrus.conf.CSW=cyrus.conf 0640 root mail +d none /opt/csw/etc/pkg/CSWcyrusimapd 0755 root bin +f cswinitsmf /etc/opt/csw/init.d/cswcyrus 0755 root bin +f preserveconf /opt/csw/etc/cyrus/imapd.conf.CSW 0640 root mail +f preserveconf /opt/csw/etc/cyrus/cyrus.conf.CSW 0640 root mail d none /opt/csw/var/cyrus 0755 cyrus mail d none /opt/csw/var/cyrus/sieve 0755 cyrus mail d none /opt/csw/var/cyrus/config 0755 cyrus mail @@ -17,45 +17,6 @@ d none /opt/csw/var/cyrus/config/ptclient 0755 cyrus mail d none /opt/csw/var/cyrus/mail 0755 cyrus mail d none /opt/csw/var/cyrus/mail/stage. 0755 cyrus mail -d none /opt/csw/include/cyrus 0755 root bin -f none /opt/csw/include/cyrus/acl.h 0644 root bin -f none /opt/csw/include/cyrus/assert.h 0644 root bin -f none /opt/csw/include/cyrus/auth.h 0644 root bin -f none /opt/csw/include/cyrus/bsearch.h 0644 root bin -f none /opt/csw/include/cyrus/byteorder64.h 0644 root bin -f none /opt/csw/include/cyrus/charset.h 0644 root bin -f none /opt/csw/include/cyrus/cyrusdb.h 0644 root bin -f none /opt/csw/include/cyrus/glob.h 0644 root bin -f none /opt/csw/include/cyrus/gmtoff.h 0644 root bin -f none /opt/csw/include/cyrus/hash.h 0644 root bin -f none /opt/csw/include/cyrus/hmac-md5.h 0644 root bin -f none /opt/csw/include/cyrus/imapopts.h 0644 root bin -f none /opt/csw/include/cyrus/imapurl.h 0644 root bin -f none /opt/csw/include/cyrus/imclient.h 0644 root bin -f none /opt/csw/include/cyrus/imparse.h 0644 root bin -f none /opt/csw/include/cyrus/iptostring.h 0644 root bin -f none /opt/csw/include/cyrus/libconfig.h 0644 root bin -f none /opt/csw/include/cyrus/libcyr_cfg.h 0644 root bin -f none /opt/csw/include/cyrus/lock.h 0644 root bin -f none /opt/csw/include/cyrus/lsort.h 0644 root bin -f none /opt/csw/include/cyrus/map.h 0644 root bin -f none /opt/csw/include/cyrus/md5.h 0644 root bin -f none /opt/csw/include/cyrus/mkgmtime.h 0644 root bin -f none /opt/csw/include/cyrus/mpool.h 0644 root bin -f none /opt/csw/include/cyrus/nonblock.h 0644 root bin -f none /opt/csw/include/cyrus/parseaddr.h 0644 root bin -f none /opt/csw/include/cyrus/prot.h 0644 root bin -f none /opt/csw/include/cyrus/retry.h 0644 root bin -f none /opt/csw/include/cyrus/rfc822date.h 0644 root bin -f none /opt/csw/include/cyrus/strhash.h 0644 root bin -f none /opt/csw/include/cyrus/stristr.h 0644 root bin -f none /opt/csw/include/cyrus/sysexits.h 0644 root bin -f none /opt/csw/include/cyrus/util.h 0644 root bin -f none /opt/csw/include/cyrus/xmalloc.h 0644 root bin -f none /opt/csw/include/cyrus/xstrlcat.h 0644 root bin -f none /opt/csw/include/cyrus/xstrlcpy.h 0644 root bin -f none /opt/csw/lib/libcyrus.a 0644 root bin -f none /opt/csw/lib/libcyrus_min.a 0644 root bin f none /opt/csw/share/man/man3/imclient.3 0644 root bin f none /opt/csw/share/man/man5/imapd.conf.5 0644 root bin f none /opt/csw/share/man/man5/krb.equiv.5 0644 root bin @@ -301,5 +262,5 @@ f none /opt/csw/share/doc/cyrus_imapd/text/sieve-protocol 0644 root bin f none /opt/csw/share/doc/cyrus_imapd/text/sieve 0644 root bin f none /opt/csw/share/doc/cyrus_imapd/text/specs 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/README.CSW=README.CSW 0644 root bin +f none /opt/csw/share/doc/cyrus_imapd/README.CSW 0644 root bin f none /opt/csw/share/doc/cyrus_imapd/changelog.CSW 0644 root bin Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.depend 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,6 +0,0 @@ -P CSWpmcyrus -P CSWosslrt - openssl - OpenSSL Secure Sockets Layer lib and utilities -P CSWsasl - sasl - Simple Authentication and Security Layer -P CSWbdb4 - berkeleydb4 - embedded database libraries and utilities -P CSWkrb5lib -P CSWpcrert Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.gspec 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,6 +0,0 @@ -%var bitname cyrus_imapd_utils -%var pkgname CSWcyrusimapdutils -%var desc Various admin utilities for Cyrus Imapd/Popd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT - Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.depend 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,4 +0,0 @@ -P CSWperl -P CSWbdb4 -P CSWosslrt -P CSWsasl Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.gspec 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,6 +0,0 @@ -%var bitname pm_cyrus -%var pkgname CSWpmcyrus -%var desc Perl interface to Cyrus Imap functions -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT - Copied: csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus (from rev 6825, csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init) =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus (rev 0) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus 2009-10-11 13:55:25 UTC (rev 6829) @@ -0,0 +1,78 @@ +#!/sbin/sh +# +# Cyrus startup script for opencsw +# +# Yann Rouillard + +# cswclassutils smf variable +#RC_KNUM 99 +#RC_SNUM 10 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#MANIFEST /var/opt/csw/svc/manifest/network/cswcyrus.xml + + +PID_FILE="/var/run/cyrus-master.pid" +COMMAND=/opt/csw/sbin/cyrus-master + +[ -f /opt/csw/etc/cyrus/cyrus.conf ] || exit 0 + +check_proc () +{ + if [ -f $1 ]; then + _PID=`cat $1 | head -1` + _COMMAND=`ps -p $_PID -o comm | tail -1` + [ "x$_COMMAND" = "x$2" ] + else + return 1 + fi +} + + +case "$1" in + 'start') + # Start Daemons. + if check_proc $PID_FILE $COMMAND; then + echo "Cyrus seems to be already running. If it's not the case, you might want to delete the file $PID_FILE"; + else + /usr/ucb/echo -n "Starting Cyrus..." + $COMMAND -d -p $PID_FILE + if [ "$?" -eq 0 ]; then + echo "Ok" + else + echo "Failed" + fi + fi + ;; + + 'stop') + #stop daemons. + if check_proc $PID_FILE $COMMAND; then + /usr/ucb/echo -n "Stopping Cyrus..." + kill `cat $PID_FILE` + rm $PID_FILE + echo "Ok" + else + echo "Cyrus is not running"; + fi + ;; + + 'restart') + $0 stop + $0 start + ;; + + 'status') + if [ -r $PID_FILE ];then + echo "Cyrus is running." + else + echo "Cyrus is not running"; + fi + ;; + + *) + echo "usage: cyrus {start|stop|restart|status}" + exit 1 +esac + +exit 0 Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init 2009-10-11 13:31:43 UTC (rev 6828) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.init 2009-10-11 13:55:25 UTC (rev 6829) @@ -1,74 +0,0 @@ -#!/sbin/sh -# -# Cyrus startup script for blastwave -# -# Yann Rouillard - -# chkconfig stuff -# chkconfig: 3 90 10 -# description: Pop and Imap server from the Cyrus mail system - -PID_FILE="/var/run/cyrus-master.pid" -COMMAND=/opt/csw/sbin/cyrus-master - -[ -f /opt/csw/etc/cyrus/cyrus.conf ] || exit 0 - -check_proc () -{ - if [ -f $1 ]; then - _PID=`cat $1 | head -1` - _COMMAND=`ps -p $_PID -o comm | tail -1` - [ "x$_COMMAND" = "x$2" ] - else - return 1 - fi -} - - -case "$1" in - 'start') - # Start Daemons. - if check_proc $PID_FILE $COMMAND; then - echo "Cyrus seems to be already running. If it's not the case, you might want to delete the file $PID_FILE"; - else - /usr/ucb/echo -n "Starting Cyrus..." - $COMMAND -d -p $PID_FILE - if [ "$?" -eq 0 ]; then - echo "Ok" - else - echo "Failed" - fi - fi - ;; - - 'stop') - #stop daemons. - if check_proc $PID_FILE $COMMAND; then - /usr/ucb/echo -n "Stopping Cyrus..." - kill `cat $PID_FILE` - rm $PID_FILE - echo "Ok" - else - echo "Cyrus is not running"; - fi - ;; - - 'restart') - $0 stop - $0 start - ;; - - 'status') - if [ -r $PID_FILE ];then - echo "Cyrus is running." - else - echo "Cyrus is not running"; - fi - ;; - - *) - echo "usage: cyrus {start|stop|restart|status}" - exit 1 -esac - -exit 0 Added: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff (rev 0) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff 2009-10-11 13:55:25 UTC (rev 6829) @@ -0,0 +1,2399 @@ +diff -Naur cyrus-imapd-2.3.15.orig/imap/autosieve.c cyrus-imapd-2.3.15/imap/autosieve.c +--- cyrus-imapd-2.3.15.orig/imap/autosieve.c 1970-01-01 01:00:00.000000000 +0100 ++++ cyrus-imapd-2.3.15/imap/autosieve.c 2009-09-09 16:13:03.000000000 +0200 +@@ -0,0 +1,590 @@ ++#include ++#include ++#include ++ ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "global.h" ++#include "util.h" ++#include "xmalloc.h" ++#include "xstrlcpy.h" ++#include "xstrlcat.h" ++#include "mailbox.h" ++#include "imap_err.h" ++#include "sieve_interface.h" ++#include "script.h" ++ ++#define TIMSIEVE_FAIL -1 ++#define TIMSIEVE_OK 0 ++#define MAX_FILENAME 1024 ++ ++static int get_script_name(char *sievename, size_t buflen, const char *filename); ++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir); ++int autoadd_sieve(char *userid, const char *source_script); ++ ++//static void fatal(const char *s, int code); ++static void foo(void); ++static int sieve_notify(void *ac __attribute__((unused)), ++ void *interp_context __attribute__((unused)), ++ void *script_context __attribute__((unused)), ++ void *message_context __attribute__((unused)), ++ const char **errmsg __attribute__((unused))); ++static int mysieve_error(int lineno, const char *msg, ++ void *i __attribute__((unused)), void *s); ++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); ++ ++ ++sieve_vacation_t vacation2 = { ++ 0, /* min response */ ++ 0, /* max response */ ++ (sieve_callback *) &foo, /* autorespond() */ ++ (sieve_callback *) &foo /* send_response() */ ++}; ++ ++ ++/* ++ * Find the name of the sieve script ++ * given the source script and compiled script names ++ */ ++static int get_script_name(char *sievename, size_t buflen, const char *filename) ++{ ++ char *p; ++ int r; ++ ++ p = strrchr(filename, '/'); ++ if (p == NULL) ++ p = (char *) filename; ++ else ++ p++; ++ ++ r = strlcpy(sievename, p, buflen) - buflen; ++ return (r >= 0 || r == -buflen ? 1 : 0); ++} ++ ++ ++/* ++ * Find the directory where the sieve scripts of the user ++ * reside ++ */ ++static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir) ++{ ++ char *user = NULL, *domain = NULL; ++ ++ /* Setup the user and the domain */ ++ if(config_virtdomains && (domain = strchr(userid, '@'))) { ++ user = (char *) xmalloc((domain - userid +1) * sizeof(char)); ++ strlcpy(user, userid, domain - userid + 1); ++ domain++; ++ } else ++ user = userid; ++ ++ /* Find the dir path where the sieve scripts of the user will reside */ ++ if (config_virtdomains && domain) { ++ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/", ++ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) { ++ free(user); ++ return 1; ++ } ++ } else { ++ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", ++ sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen) ++ return 1; ++ } ++ ++ /* Free the xmalloced user memory, reserved above */ ++ if(user != userid) ++ free(user); ++ ++ return 0; ++} ++ ++int autoadd_sieve(char *userid, const char *source_script) ++{ ++ sieve_script_t *s = NULL; ++ bytecode_info_t *bc = NULL; ++ char *err = NULL; ++ FILE *in_stream, *out_fp; ++ int out_fd, in_fd, r, k; ++ int do_compile = 0; ++ const char *sieve_dir = NULL; ++ const char *compiled_source_script = NULL; ++ char sievename[MAX_FILENAME]; ++ char sieve_script_name[MAX_FILENAME]; ++ char sieve_script_dir[MAX_FILENAME]; ++ char sieve_bcscript_name[MAX_FILENAME]; ++ char sieve_default[MAX_FILENAME]; ++ char sieve_tmpname[MAX_FILENAME]; ++ char sieve_bctmpname[MAX_FILENAME]; ++ char sieve_bclink_name[MAX_FILENAME]; ++ char buf[4096]; ++ mode_t oldmask; ++ struct stat statbuf; ++ ++ /* We don't support using the homedirectory, like timsieved */ ++ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) { ++ syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf"); ++ return 1; ++ } ++ ++ /* Check if sievedir is defined in imapd.conf */ ++ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) { ++ syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf"); ++ return 1; ++ } ++ ++ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */ ++ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { ++ syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it"); ++ do_compile = 1; ++ } ++ ++ if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory"); ++ return 1; ++ } ++ ++ if (get_script_name(sievename, sizeof(sievename), source_script)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script); ++ return 1; ++ } ++ ++ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); ++ return 1; ++ } ++ ++ /* Check if a default sieve filter alrady exists */ ++ if(!stat(sieve_default,&statbuf)) { ++ syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists"); ++ fclose(in_stream); ++ return 1; ++ } ++ ++ /* Open the source script. if there is a problem with that exit */ ++ in_stream = fopen(source_script, "r"); ++ if(!in_stream) { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script); ++ return 1; ++ } ++ ++ ++ /* ++ * At this point we start the modifications of the filesystem ++ */ ++ ++ /* Create the directory where the sieve scripts will reside */ ++ r = cyrus_mkdir(sieve_script_dir, 0755); ++ if(r == -1) { ++ /* If this fails we just leave */ ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name); ++ return 1; ++ } ++ ++ /* ++ * We open the file that will be used as the bc file. If this file exists, overwrite it ++ * since something bad has happened. We open the file here so that this error checking is ++ * done before we try to open the rest of the files to start copying etc. ++ */ ++ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ++ if(out_fd < 0) { ++ if(errno == EEXIST) { ++ syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname); ++ } else if (errno == EACCES) { ++ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } else { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } ++ } ++ ++ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) { ++ while((r = read(in_fd, buf, sizeof(buf))) > 0) { ++ if((k=write(out_fd, buf,r)) < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno); ++ close(out_fd); ++ close(in_fd); ++ fclose(in_stream); ++ unlink(sieve_bctmpname); ++ return 1; ++ } ++ } ++ ++ if(r == 0) { /* EOF */ ++ close(out_fd); ++ close(in_fd); ++ } else if (r < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", ++ compiled_source_script); ++ close(in_fd); ++ do_compile = 1; ++ if(lseek(out_fd, 0, SEEK_SET)) { ++ syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting"); ++ return 1; ++ } ++ } ++ close(in_fd); ++ } else { ++ if(compiled_source_script) ++ syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script); ++ do_compile = 1; ++ } ++ ++ ++ /* Because we failed to open a precompiled bc sieve script, we compile one */ ++ if(do_compile) { ++ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { ++ if(err && *err) { ++ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err); ++ free(err); ++ } else ++ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script"); ++ ++ unlink(sieve_bctmpname); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ /* generate the bytecode */ ++ if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) { ++ syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script"); ++ /* removing the copied script and cleaning up memory */ ++ unlink(sieve_bctmpname); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) { ++ syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script"); ++ /* removing the copied script and cleaning up memory */ ++ unlink(sieve_bctmpname); ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ /* clean up the memory */ ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ } ++ ++ close(out_fd); ++ rewind(in_stream); ++ ++ /* Copy the initial script */ ++ oldmask = umask(077); ++ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname); ++ unlink(sieve_bctmpname); ++ umask(oldmask); ++ fclose(in_stream); ++ return 1; ++ } ++ umask(oldmask); ++ ++ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) { ++ if( fwrite(buf,sizeof(char), r, out_fp) != r) { ++ syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname); ++ fclose(out_fp); ++ unlink(sieve_tmpname); ++ unlink(sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } ++ } ++ ++ if(feof(in_stream)) { ++ fclose(out_fp); ++ } else { /* ferror */ ++ fclose(out_fp); ++ unlink(sieve_tmpname); ++ unlink(sieve_bctmpname); ++ fclose(in_stream); ++ return 1; ++ } ++ ++ /* Renaming the necessary stuff */ ++ if(rename(sieve_tmpname, sieve_script_name)) { ++ unlink(sieve_tmpname); ++ unlink(sieve_bctmpname); ++ return 1; ++ } ++ ++ if(rename(sieve_bctmpname, sieve_bcscript_name)) { ++ unlink(sieve_bctmpname); ++ unlink(sieve_bcscript_name); ++ return 1; ++ } ++ ++ /* end now with the symlink */ ++ if(symlink(sieve_bclink_name, sieve_default)) { ++ if(errno != EEXIST) { ++ syslog(LOG_WARNING, "autocreate_sieve: problem making the default link."); ++ /* Lets delete the files */ ++ unlink(sieve_script_name); ++ unlink(sieve_bcscript_name); ++ } ++ } ++ ++ /* ++ * If everything has succeeded AND we have compiled the script AND we have requested ++ * to generate the global script so that it is not compiled each time then we create it. ++ */ ++ if(do_compile && ++ config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) { ++ ++ if(!compiled_source_script) { ++ syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf"); ++ return 0; ++ } ++ ++ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname)) ++ return 0; ++ ++ /* ++ * Copy everything from the newly created bc sieve sieve script. ++ */ ++ if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) { ++ return 0; ++ } ++ ++ if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { ++ if(errno == EEXIST) { ++ /* Someone is already doing this so just bail out. */ ++ syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname); ++ close(in_fd); ++ return 0; ++ } else if (errno == EACCES) { ++ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname); ++ close(in_fd); ++ return 0; ++ } else { ++ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname); ++ close(in_fd); ++ return 0; ++ } ++ } ++ ++ while((r = read(in_fd, buf, sizeof(buf))) > 0) { ++ if((k = write(out_fd,buf,r)) < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); ++ close(out_fd); ++ close(in_fd); ++ unlink(sieve_tmpname); ++ return 0; ++ } ++ } ++ ++ if(r == 0 ) { /*EOF */ ++ close(out_fd); ++ close(in_fd); ++ } else if (r < 0) { ++ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); ++ close(out_fd); ++ close(in_fd); ++ unlink(sieve_tmpname); ++ return 0; ++ } ++ ++ /* Rename the temporary created sieve script to its final name. */ ++ if(rename(sieve_tmpname, compiled_source_script)) { ++ if(errno != EEXIST) { ++ unlink(sieve_tmpname); ++ unlink(compiled_source_script); ++ } ++ return 0; ++ } ++ ++ syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script); ++ } ++ ++ return 0; ++} ++ ++/*static void fatal(const char *s, int code) ++{ ++ printf("Fatal error: %s (%d)\r\n", s, code); ++ exit(1); ++}*/ ++ ++/* to make larry's stupid functions happy :) */ ++static void foo(void) ++{ ++ fatal("stub function called", 0); ++} ++ ++static int sieve_notify(void *ac __attribute__((unused)), ++ void *interp_context __attribute__((unused)), ++ void *script_context __attribute__((unused)), ++ void *message_context __attribute__((unused)), ++ const char **errmsg __attribute__((unused))) ++{ ++ fatal("stub function called", 0); ++ return SIEVE_FAIL; ++} ++ ++static int mysieve_error(int lineno, const char *msg, ++ void *i __attribute__((unused)), void *s) ++{ ++ char buf[1024]; ++ char **errstr = (char **) s; ++ ++ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); ++ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); ++ syslog(LOG_DEBUG, "%s", buf); ++ strcat(*errstr, buf); ++ ++ return SIEVE_OK; ++} ++ ++/* end the boilerplate */ ++ ++/* returns TRUE or FALSE */ ++int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) ++{ ++ sieve_interp_t *i; ++ sieve_script_t *s; ++ int res; ++ ++ res = sieve_interp_alloc(&i, NULL); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_redirect(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_discard(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_reject(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_fileinto(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_keep(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_imapflags(i, NULL); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_size(i, (sieve_get_size *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_header(i, (sieve_get_header *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_vacation(i, &vacation2); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_notify(i, &sieve_notify); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_parse_error(i, &mysieve_error); ++ if (res != SIEVE_OK) { ++ syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ rewind(stream); ++ ++ *errstr = (char *) xmalloc(20 * sizeof(char)); ++ strcpy(*errstr, "script errors:\r\n"); ++ ++ res = sieve_script_parse(i, stream, errstr, &s); ++ ++ if (res == SIEVE_OK) { ++ if(ret) { ++ *ret = s; ++ } else { ++ sieve_script_free(&s); ++ } ++ free(*errstr); ++ *errstr = NULL; ++ } ++ ++ /* free interpreter */ ++ sieve_interp_free(&i); ++ ++ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; ++} ++ ++/* ++ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of ++ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present ++ */ ++ +diff -Naur cyrus-imapd-2.3.15.orig/imap/compile_sieve.c cyrus-imapd-2.3.15/imap/compile_sieve.c +--- cyrus-imapd-2.3.15.orig/imap/compile_sieve.c 1970-01-01 01:00:00.000000000 +0100 ++++ cyrus-imapd-2.3.15/imap/compile_sieve.c 2009-09-09 16:13:03.000000000 +0200 +@@ -0,0 +1,365 @@ ++/* This tool compiles the sieve script from a command ++line so that it can be used wby the autoadd patch */ ++#include ++#include ++ ++#include ++#include ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "global.h" ++ ++#include "util.h" ++#include "xmalloc.h" ++#include "xstrlcpy.h" ++#include "xstrlcat.h" ++#include "mailbox.h" ++#include "imap_err.h" ++#include "sieve_interface.h" ++#include "script.h" ++ ++#include ++ ++#define TIMSIEVE_FAIL -1 ++#define TIMSIEVE_OK 0 ++#define MAX_FILENAME_SIZE 100 ++ ++/* Needed by libconfig */ ++const int config_need_data = 0; ++ ++static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); ++ ++/*static void fatal(const char *s, int code) ++{ ++ printf("Fatal error: %s (%d)\r\n", s, code); ++ ++ exit(1); ++}*/ ++ ++void usage(void) ++{ ++ fprintf(stderr, ++ "Usage:\n\tcompile_sieve [-C ] [-i -o ]\n"); ++ exit(-1); ++} ++ ++ ++int main (int argc, char **argv) ++{ ++ ++ sieve_script_t *s = NULL; ++ bytecode_info_t *bc = NULL; ++ char *err = NULL; ++ FILE *in_stream; ++ int out_fd, opt; ++ char *source_script = NULL; ++ char *compiled_source_script = NULL; ++ char *alt_config = NULL; ++ extern char *optarg; ++ char sieve_tmpname[MAX_MAILBOX_NAME+1]; ++ ++ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); ++ ++ while((opt = getopt(argc, argv, "C:i:o:")) != EOF) { ++ switch (opt) { ++ case 'C': /* alt config file */ ++ alt_config = optarg; ++ break; ++ case 'i': /* input script file */ ++ source_script = optarg; ++ break; ++ case 'o': /* output script file */ ++ compiled_source_script = optarg; ++ break; ++ default: ++ usage(); ++ break; ++ } ++ } ++ ++ if(source_script && !compiled_source_script) { ++ fprintf(stderr, "No output file was defined\n"); ++ usage(); ++ } else if (!source_script && compiled_source_script) { ++ fprintf(stderr, "No input file was defined\n"); ++ usage(); ++ } ++ ++ /* ++ * If no has been defined, then read them from ++ * the configuration file. ++ */ ++ if (!source_script && !compiled_source_script) { ++ cyrus_init(alt_config, "compile_sieve", 0); ++ ++ /* Initially check if we want to have the sieve script created */ ++ if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) { ++ fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n"); ++ return 1; ++ } ++ ++ /* Check if we have an already compiled sieve script*/ ++ if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { ++ fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n"); ++ return 1; ++ } ++ ++ if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) { ++ /* ++ * At this point the only think that is inconsistent is the directory ++ * that was created. But if the user will have any sieve scripts then ++ * they will eventually go there, so no big deal ++ */ ++ fprintf(stderr, ++ "In imapd.conf the full path of the filenames must be defined\n"); ++ return 1; ++ } ++ } ++ ++ printf("input file : %s, output file : %s\n", source_script, compiled_source_script); ++ ++ ++ if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) { ++ fprintf(stderr, "Filename %s is too big\n", compiled_source_script); ++ return 1; ++ } ++ ++ snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script); ++ ++ in_stream = fopen(source_script,"r"); ++ ++ if(!in_stream) { ++ fprintf(stderr,"Unable to open %s source sieve script\n",source_script); ++ return 1; ++ } ++ ++ /* ++ * We open the file that will be used as the bc file. If this file exists, overwrite it ++ * since something bad has happened. We open the file here so that this error checking is ++ * done before we try to open the rest of the files to start copying etc. ++ */ ++ out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ++ if(out_fd < 0) { ++ if(errno == EEXIST) { ++ fprintf(stderr, "File %s already exists\n", sieve_tmpname); ++ } else if (errno == EACCES) { ++ fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n", ++ sieve_tmpname); ++ } else { ++ fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n", ++ sieve_tmpname); ++ } ++ ++ fclose(in_stream); ++ return 1; ++ } ++ ++ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { ++ if(err && *err) { ++ fprintf(stderr, "Error while parsing script %s\n",err); ++ free(err); ++ } ++ else ++ fprintf(stderr,"Error while parsing script\n"); ++ unlink(sieve_tmpname); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ ++ /* generate the bytecode */ ++ if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) { ++ fprintf(stderr,"Error occured while compiling sieve script\n"); ++ /* removing the copied script and cleaning up memory */ ++ unlink(sieve_tmpname); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) { ++ fprintf(stderr, "Error occured while emitting sieve script\n"); ++ unlink(sieve_tmpname); ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ fclose(in_stream); ++ close(out_fd); ++ return 1; ++ } ++ ++ /* clean up the memory */ ++ sieve_free_bytecode(&bc); ++ sieve_script_free(&s); ++ ++ close(out_fd); ++ ++ if(rename(sieve_tmpname, compiled_source_script)) { ++ if(errno != EEXIST) { ++ unlink(sieve_tmpname); ++ unlink(compiled_source_script); ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++ ++/* to make larry's stupid functions happy :) */ ++static void foo(void) ++{ ++ fatal("stub function called", 0); ++} ++ ++extern sieve_vacation_t vacation2;/* = { ++ 0, / min response / ++ 0, / max response / ++ (sieve_callback *) &foo, / autorespond() / ++ (sieve_callback *) &foo / send_response() / ++}; */ ++ ++static int sieve_notify(void *ac __attribute__((unused)), ++ void *interp_context __attribute__((unused)), ++ void *script_context __attribute__((unused)), ++ void *message_context __attribute__((unused)), ++ const char **errmsg __attribute__((unused))) ++{ ++ fatal("stub function called", 0); ++ return SIEVE_FAIL; ++} ++ ++static int mysieve_error(int lineno, const char *msg, ++ void *i __attribute__((unused)), void *s) ++{ ++ char buf[1024]; ++ char **errstr = (char **) s; ++ ++ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); ++ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); ++ fprintf(stderr, "%s\n", buf); ++ strcat(*errstr, buf); ++ ++ return SIEVE_OK; ++} ++ ++/* end the boilerplate */ ++ ++/* returns TRUE or FALSE */ ++int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) ++{ ++ sieve_interp_t *i; ++ sieve_script_t *s; ++ int res; ++ ++ res = sieve_interp_alloc(&i, NULL); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_interp_alloc() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_redirect(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_redirect() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_discard(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_discard() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_reject(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_reject() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_fileinto(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_fileinto() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ res = sieve_register_keep(i, (sieve_callback *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_keep() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_imapflags(i, NULL); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_imapflags() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_size(i, (sieve_get_size *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_size() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_header(i, (sieve_get_header *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_header() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_envelope() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_vacation(i, &vacation2); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_vacation() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_notify(i, &sieve_notify); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_notify() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ res = sieve_register_parse_error(i, &mysieve_error); ++ if (res != SIEVE_OK) { ++ fprintf(stderr, "sieve_register_parse_error() returns %d\n", res); ++ return TIMSIEVE_FAIL; ++ } ++ ++ rewind(stream); ++ ++ *errstr = (char *) xmalloc(20 * sizeof(char)); ++ strcpy(*errstr, "script errors:\r\n"); ++ ++ res = sieve_script_parse(i, stream, errstr, &s); ++ ++ if (res == SIEVE_OK) { ++ if(ret) { ++ *ret = s; ++ } else { ++ sieve_script_free(&s); ++ } ++ free(*errstr); ++ *errstr = NULL; ++ } ++ ++ /* free interpreter */ ++ sieve_interp_free(&i); ++ ++ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; ++} ++ ++ ++ ++ ++ ++ +diff -Naur cyrus-imapd-2.3.15.orig/imap/imapd.c cyrus-imapd-2.3.15/imap/imapd.c +--- cyrus-imapd-2.3.15.orig/imap/imapd.c 2009-07-29 17:51:21.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/imapd.c 2009-09-09 16:13:03.000000000 +0200 +@@ -211,6 +211,7 @@ + void motd_file(int fd); + void shut_down(int code); + void fatal(const char *s, int code); ++void autocreate_inbox(void); + + void cmdloop(void); + void cmd_login(char *tag, char *user); +@@ -2003,6 +2004,43 @@ + } + + /* ++ * Autocreate Inbox and subfolders upon login ++ */ ++void autocreate_inbox() ++{ ++ char inboxname[MAX_MAILBOX_NAME+1]; ++ int autocreatequota; ++ int r; ++ ++ /* ++ * Exlude admin's accounts ++ */ ++ if (imapd_userisadmin || imapd_userisproxyadmin) ++ return; ++ ++ /* ++ * Exclude anonymous ++ */ ++ if (!strcmp(imapd_userid, "anonymous")) ++ return; ++ ++ if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) { ++ /* This is actyally not required ++ as long as the lenght of userid is ok */ ++ r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace, ++ "INBOX", imapd_userid, inboxname); ++ if (!r) ++ r = mboxlist_lookup(inboxname, NULL, NULL); ++ ++ if (r == IMAP_MAILBOX_NONEXISTENT) { ++ mboxlist_autocreateinbox(&imapd_namespace, imapd_userid, ++ imapd_authstate, inboxname, autocreatequota); ++ } ++ } ++} ++ ++ ++/* + * Perform a LOGIN command + */ + void cmd_login(char *tag, char *user) +@@ -2179,6 +2217,9 @@ + strcspn(imapd_userid, "@") : 0); + + freebuf(&passwdbuf); ++ ++ autocreate_inbox(); ++ + return; + } + +@@ -2336,6 +2377,8 @@ + config_virtdomains ? + strcspn(imapd_userid, "@") : 0); + ++ autocreate_inbox(); ++ + return; + } + +diff -Naur cyrus-imapd-2.3.15.orig/imap/lmtpd.c cyrus-imapd-2.3.15/imap/lmtpd.c +--- cyrus-imapd-2.3.15.orig/imap/lmtpd.c 2009-04-23 19:10:06.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/lmtpd.c 2009-09-09 16:13:03.000000000 +0200 +@@ -117,6 +117,8 @@ + static FILE *spoolfile(message_data_t *msgdata); + static void removespool(message_data_t *msgdata); + ++static int autocreate_inbox(const char *user, const char *domain); ++ + /* current namespace */ + static struct namespace lmtpd_namespace; + +@@ -977,6 +979,86 @@ + exit(code); + } + ++ ++/* ++ * Autocreate Inbox and subfolders upon login ++ */ ++int autocreate_inbox(const char *user, const char *domain) ++{ ++ struct auth_state *auth_state; ++ char inboxname[MAX_MAILBOX_NAME+1]; ++ char *rcpt_userid = NULL; ++ int autocreatequota; ++ int r = 0; ++ ++ if (user == NULL) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ if (domain != NULL) { ++ int k; ++ ++ rcpt_userid = (char *) xmalloc((strlen(user) + strlen(domain) + 2) * sizeof(char)); ++ k = strlcpy(rcpt_userid, user, strlen(user) + 1); ++ *(rcpt_userid + k) = '@'; ++ strlcpy(rcpt_userid + k + 1, domain, strlen(domain) + 1); ++ } else { ++ rcpt_userid = (char *) user; ++ } ++ ++ ++ /* ++ * Exclude anonymous ++ */ ++ if (!strcmp(rcpt_userid, "anonymous")) { ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++ /* ++ * Check for autocreatequota and createonpost ++ */ ++ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) || ++ !(config_getswitch(IMAPOPT_CREATEONPOST))) { ++ ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++ ++ /* ++ * Exclude admin's accounts ++ */ ++ auth_state = auth_newstate(rcpt_userid); ++ ++ if (global_authisa(auth_state, IMAPOPT_ADMINS)) { ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++ r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace, ++ "INBOX", rcpt_userid, inboxname); ++ ++ if (!r) ++ r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid, ++ auth_state, inboxname, autocreatequota); ++ ++ if (rcpt_userid != user) { ++ free(rcpt_userid); ++ } ++ ++ return r; ++} ++ ++ + static int verify_user(const char *user, const char *domain, char *mailbox, + quota_t quotacheck, struct auth_state *authstate) + { +@@ -1020,6 +1102,15 @@ + */ + r = mlookup(namebuf, &server, &acl, NULL); + ++ /* If user mailbox does not exist, then invoke autocreate inbox function */ ++ if (r == IMAP_MAILBOX_NONEXISTENT) { ++ r = autocreate_inbox(user, domain); ++ ++ /* Try to locate the mailbox again */ ++ if (!r) ++ r = mlookup(namebuf, &server, &acl, NULL); ++ } ++ + if (r == IMAP_MAILBOX_NONEXISTENT && !user && + config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && + /* see if we have a mailbox whose name is close */ +@@ -1046,6 +1137,7 @@ + aclcheck, (quotacheck < 0) + || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? + quotacheck : 0); ++ + } + } + +diff -Naur cyrus-imapd-2.3.15.orig/imap/Makefile.in cyrus-imapd-2.3.15/imap/Makefile.in +--- cyrus-imapd-2.3.15.orig/imap/Makefile.in 2009-03-30 18:04:56.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/Makefile.in 2009-09-09 16:28:02.000000000 +0200 +@@ -101,7 +101,7 @@ + convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ + annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ + imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ +- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ ++ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ + statuscache_db.o + + IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o +@@ -118,7 +118,7 @@ + fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ + cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ + ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ +- unexpunge cyr_df @IMAP_PROGS@ ++ unexpunge cyr_df compile_sieve @IMAP_PROGS@ + + BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ + lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ +@@ -183,9 +183,9 @@ + mupdate_err.h: mupdate_err.c + + ### Services +-idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) ++idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o idled \ +- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) ++ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ + libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) +@@ -199,166 +199,170 @@ + $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ + mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o imapd \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ +- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) ++imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ + $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ +- libimap.a $(DEPLIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o mupdate \ + $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ + mutex_pthread.o tls.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread + + mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ +- libimap.a $(DEPLIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ + $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ +- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread ++ mutex_pthread.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread + + pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(SERVICE) ++ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ +- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ +- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) ++ mutex_fake.o nntp_err.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ + smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ +- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) ++fud: fud.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) ++smmapd: smmapd.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + sync_server: sync_server.o sync_support.o sync_commit.o \ +- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) ++ imapparse.o tls.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o \ + sync_server sync_server.o sync_support.o sync_commit.o \ + imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ +- $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) + + ### Command Line Utilities +-arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) ++arbitron: arbitron.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) ++cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) ++cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) ++cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) ++chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) ++deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ +- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) ++ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) ++fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) ++squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ +- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) ++mbpath: mbpath.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ +- $(DEPLIBS) $(LIBS) ++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) ++ipurge: ipurge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) -lclamav ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -lclamav + +-cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) ++cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ cyr_df cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) ++mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) ++reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) ++quota: quota.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) ++tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ +- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) ++unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ +- libimap.a $(DEPLIBS) $(LIBS) ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) +- $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++make_md5: make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) ++ $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + +-make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) +- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++make_sha1: make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) ++ $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + sync_client: sync_client.o sync_support.o \ +- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) ++ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ + sync_client sync_client.o sync_support.o \ +- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + sync_reset: sync_reset.o sync_support.o sync_commit.o \ +- libimap.a mutex_fake.o $(DEPLIBS) ++ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) + $(CC) $(LDFLAGS) -o \ + sync_reset sync_reset.o sync_support.o sync_commit.o \ +- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) ++ ++compile_sieve: compile_sieve.o libimap.a $(DEPLIBS) $(SIEVE_LIBS) ++ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \ ++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) + + ### Other Misc Targets + +diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.c cyrus-imapd-2.3.15/imap/mboxlist.c +--- cyrus-imapd-2.3.15.orig/imap/mboxlist.c 2009-07-28 04:46:23.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/mboxlist.c 2009-09-09 16:13:03.000000000 +0200 +@@ -83,6 +83,12 @@ + #include "quota.h" + #include "sync_log.h" + ++#ifdef USE_SIEVE ++extern int autoadd_sieve(char *userid, ++ const char *source_script); ++#endif ++ ++ + #define DB config_mboxlist_db + #define SUBDB config_subscription_db + +@@ -100,11 +106,29 @@ + static int mboxlist_changequota(const char *name, int matchlen, int maycreate, + void *rock); + ++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, ++ void *rock); ++ ++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, ++ char *userid, char *auth_userid, ++ struct auth_state *auth_state); ++ + struct change_rock { + struct quota *quota; + struct txn **tid; + }; + ++/* ++ * Struct needed to be passed as void *rock to ++ * mboxlist_autochangesub(); ++ */ ++struct changesub_rock_st { ++ char *userid; ++ char *auth_userid; ++ struct auth_state *auth_state; ++}; ++ ++ + #define FNAME_SUBSSUFFIX ".sub" + + /* +@@ -3413,3 +3437,349 @@ + + return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED); + } ++ ++/* ++ * Automatically subscribe user to *ALL* shared folders, ++ * one has permissions to be subscribed to. ++ * INBOX subfolders are excluded. ++ */ ++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, ++ void *rock) { ++ ++ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock; ++ char *userid = changesub_rock->userid; ++ char *auth_userid = changesub_rock->auth_userid; ++ struct auth_state *auth_state = changesub_rock->auth_state; ++ int r; ++ ++ ++ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */ ++ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */ ++ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */ ++ return 0; ++ ++ ++ r = mboxlist_changesub(name, userid, auth_state, 1, 0); ++ ++ if (r) { ++ syslog(LOG_WARNING, ++ "autosubscribe: User %s to folder %s, subscription failed: %s", ++ auth_userid, name, error_message(r)); ++ } else { ++ syslog(LOG_NOTICE, ++ "autosubscribe: User %s to folder %s, subscription succeeded", ++ auth_userid, name); ++ } ++ ++ return 0; ++} ++ ++#define SEP '|' ++ ++/* ++ * Automatically subscribe user to a shared folder. ++ * Subscription is done successfully, if the shared ++ * folder exists and the user has the necessary ++ * permissions. ++ */ ++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, ++ char *userid, char *auth_userid, ++ struct auth_state *auth_state) { ++ ++ const char *sub ; ++ char *p, *q, *next_sub; ++ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1]; ++ int len; ++ int r = 0; ++ int subscribe_all_sharedfolders = 0; ++ ++ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS); ++ ++ /* ++ * If subscribeallsharedfolders is set to yes in imapd.conf, then ++ * subscribe user to every shared folder one has the apropriate ++ * permissions. ++ */ ++ if(subscribe_all_sharedfolders) { ++ char pattern[MAX_MAILBOX_PATH+1]; ++ struct changesub_rock_st changesub_rock; ++ ++ strcpy(pattern, "*"); ++ changesub_rock.userid = userid; ++ changesub_rock.auth_userid = auth_userid; ++ changesub_rock.auth_state = auth_state; ++ ++ r = mboxlist_findall(namespace, pattern, 0, userid, ++ auth_state, mboxlist_autochangesub, &changesub_rock); ++ ++ return r; ++ } ++ ++ if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL) ++ return r; ++ ++ next_sub = (char *) sub; ++ while (*next_sub) { ++ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); ++ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); ++ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); ++ if (!*p ) continue; ++ ++ len = q - p + 1; ++ /* Check for folder length */ ++ if (len > sizeof(folder)-1) ++ continue; ++ ++ if (!r) { ++ strncpy(folder, p, len); ++ folder[len] = '\0'; ++ ++ strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name)); ++ len = strlcat(name, folder, sizeof(name)); ++ ++ r = (namespace->mboxname_tointernal) (namespace, name, userid, ++ mailboxname); ++ } ++ ++ if (!r) ++ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0); ++ ++ if (!r) { ++ syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded", ++ userid, folder); ++ } else { ++ syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s", ++ userid, folder, error_message(r)); ++ r = 0; ++ } ++ } ++ ++ return r; ++} ++ ++ ++ ++int mboxlist_autocreateinbox(struct namespace *namespace, ++ char *userid, ++ struct auth_state *auth_state, ++ char *mailboxname, int autocreatequota) { ++ char name [MAX_MAILBOX_NAME+1]; ++ char folder [MAX_MAILBOX_NAME+1]; ++ char *auth_userid = NULL; ++ char *partition = NULL; ++ const char *crt; ++ const char *sub; ++ char *p, *q, *next_crt, *next_sub; ++ int len; ++ int r = 0; ++ int numcrt = 0; ++ int numsub = 0; ++#ifdef USE_SIEVE ++ const char *source_script; ++#endif ++ ++ ++ ++ auth_userid = auth_canonuser(auth_state); ++ if (auth_userid == NULL) { ++ /* ++ * Couldn't get cannon userid ++ */ ++ syslog(LOG_ERR, ++ "autocreateinbox: Could not get canonified userid for user %s", userid); ++ return IMAP_PARTITION_UNKNOWN; ++ } ++ ++ /* Added this for debug information. */ ++ syslog(LOG_DEBUG, "autocreateinbox: autocreate inbox for user %s was called", auth_userid); ++ ++ /* ++ * While this is not needed for admins ++ * and imap_admins accounts, it would be ++ * better to separate *all* admins and ++ * proxyservers from normal accounts ++ * (accounts that have mailboxes). ++ * UOA Specific note(1): Even if we do not ++ * exclude these servers-classes here, ++ * UOA specific code, will neither return ++ * role, nor create INBOX, because none of these ++ * administrative accounts belong to the ++ * mailRecipient objectclass, or have imapPartition. ++ * UOA Specific note(2): Another good reason for doing ++ * this, is to prevent the code, from getting into ++ * cyrus_ldap.c because of the continues MSA logins to LMTPd. ++ */ ++ ++ /* ++ * admins and the coresponding imap ++ * service, had already been excluded. ++ */ ++ ++ /* ++ * Do we really need group membership ++ * for admins or service_admins? ++ */ ++ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0; ++ ++ /* ++ * Do we really need group membership ++ * for proxyservers? ++ */ ++ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0; ++ ++ /* ++ * Check if user belongs to the autocreate_users group. This option ++ * controls for whom the mailbox may be automatically created. Default ++ * value for this option is 'anyone'. So, if not declared, all mailboxes ++ * will be created. ++ */ ++ if (!global_authisa(auth_state, IMAPOPT_AUTOCREATE_USERS)) { ++ syslog(LOG_DEBUG, "autocreateinbox: User %s does not belong to the autocreate_users. No mailbox is created", ++ auth_userid); ++ return IMAP_MAILBOX_NONEXISTENT; ++ } ++ ++#if 0 ++ /* ++ * Get Partition info or return. ++ * (Here you should propably use ++ * you own "get_partition(char *userid)" ++ * function. Otherwise all new INBOXes will be ++ * created into whatever partition has been declared ++ * as default in your imapd.conf) ++ */ ++ ++ partition = get_partition(userid); ++ if (partition == NULL) { ++ /* ++ * Couldn't get partition info ++ */ ++ syslog(LOG_ERR, ++ "Could not get imapPartition info for user %s", userid); ++ return IMAP_PARTITION_UNKNOWN; ++ } ++#endif ++ ++ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, ++ 1, userid, auth_state, 0, 0, 0); ++ ++ if (!r && autocreatequota > 0) ++ r = mboxlist_setquota(mailboxname, autocreatequota, 0); ++ ++ if (!r) ++ r = mboxlist_changesub(mailboxname, userid, ++ auth_state, 1, 1); ++ ++ if (!r) { ++ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s", ++ auth_userid, partition == NULL ? "default" : partition); ++ } else { ++ syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s", ++ auth_userid, error_message(r)); ++ } ++ ++#if 0 ++ /* Allocated from get_partition, and not needed any more */ ++ free_partition(partition); ++#endif ++ ++ if (r) return r; ++ ++ /* INBOX's subfolders */ ++ if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS))) ++ sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS); ++ ++ /* Roll through crt */ ++ next_crt = (char *) crt; ++ while (next_crt!=NULL && *next_crt) { ++ for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++); ++ for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++); ++ for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--); ++ ++ if (!*p) continue; ++ ++ len = q - p + 1; ++ ++ /* First time we check for length */ ++ if (len > sizeof(folder) - 5) ++ r = IMAP_MAILBOX_BADNAME; ++ ++ if (!r) { ++ strncpy(folder, p, len); ++ folder[len] = '\0'; ++ ++ strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name)); ++ len = strlcat(name, folder, sizeof(name)); ++ } ++ ++ if (!r) ++ r = (namespace->mboxname_tointernal) (namespace, name, userid, ++ mailboxname); ++ if (!r) ++ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, ++ 1, userid, auth_state, 0, 0, 0); ++ ++ if (!r) { ++ numcrt++; ++ syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", ++ auth_userid, name); ++ } else { ++ syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", ++ auth_userid, name, error_message(r)); ++ r=0; ++ continue; ++ } ++ ++ /* Roll through sub */ ++ next_sub = (char *) sub; ++ while (next_sub!=NULL && *next_sub) { ++ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); ++ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); ++ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); ++ if (!*p ) continue; ++ ++ len = q - p + 1; ++ ++ if (len != strlen(folder) || strncmp(folder, p, len)) ++ continue; ++ ++ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1); ++ ++ if (!r) { ++ numsub++; ++ syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded", ++ auth_userid, name); ++ } else ++ syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s", ++ auth_userid, name, error_message(r)); ++ ++ break; ++ } ++ } ++ ++ if (crt!=NULL && *crt) ++ syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", ++ auth_userid, numcrt, numsub); ++ ++ /* ++ * Check if shared folders are available for subscription. ++ */ ++ mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state); ++ ++#ifdef USE_SIEVE ++ /* ++ * Here the autocreate sieve script feature is iniated from. ++ */ ++ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT); ++ ++ if (source_script) { ++ if (!autoadd_sieve(userid, source_script)) ++ syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid); ++ else ++ syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid); ++ } ++#endif ++ ++ return r; ++} ++ +diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.h cyrus-imapd-2.3.15/imap/mboxlist.h +--- cyrus-imapd-2.3.15.orig/imap/mboxlist.h 2009-05-05 03:20:03.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/mboxlist.h 2009-09-09 16:13:03.000000000 +0200 +@@ -216,4 +216,8 @@ + int mboxlist_abort(struct txn *tid); + + int mboxlist_delayed_delete_isenabled(void); ++int mboxlist_autocreateinbox(struct namespace *namespace,char *userid, ++ struct auth_state *auth_state, char *mailboxname, ++ int autocreatequota); ++ + #endif +diff -Naur cyrus-imapd-2.3.15.orig/imap/pop3d.c cyrus-imapd-2.3.15/imap/pop3d.c +--- cyrus-imapd-2.3.15.orig/imap/pop3d.c 2009-04-23 19:10:07.000000000 +0200 ++++ cyrus-imapd-2.3.15/imap/pop3d.c 2009-09-09 16:13:03.000000000 +0200 +@@ -173,6 +173,8 @@ + static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* */ + static void cmd_apop(char *response); + ++static int autocreate_inbox(char *inboxname, char *userid); ++ + static void cmd_auth(char *arg); + static void cmd_capa(void); + static void cmd_pass(char *pass); +@@ -1246,6 +1248,7 @@ + popd_userid = xstrdup(userbuf); + prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); + } ++ + } + + void cmd_pass(char *pass) +@@ -1549,6 +1552,43 @@ + } + + /* ++ * Autocreate Inbox and subfolders upon login ++ */ ++int autocreate_inbox(char *inboxname, char *auth_userid) ++{ ++ struct auth_state *auth_state; ++ int autocreatequota; ++ int r; ++ ++ if (inboxname == NULL || auth_userid == NULL) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ /* ++ * Exclude anonymous ++ */ ++ if (!strcmp(popd_userid, "anonymous")) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ /* ++ * Check for autocreatequota ++ */ ++ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ /* ++ * Exclude admin's accounts ++ */ ++ auth_state = auth_newstate(popd_userid); ++ if (global_authisa(auth_state, IMAPOPT_ADMINS)) ++ return IMAP_MAILBOX_NONEXISTENT; ++ ++ r = mboxlist_autocreateinbox(&popd_namespace, auth_userid, ++ auth_state, inboxname, autocreatequota); ++ return r; ++} ++ ++ ++/* + * Complete the login process by opening and locking the user's inbox + */ + int openinbox(void) +@@ -1577,6 +1617,12 @@ + + if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL, + &server, &acl, NULL); ++ ++ /* Try once again after autocreate_inbox */ ++ if (r == IMAP_MAILBOX_NONEXISTENT && !(r = autocreate_inbox(inboxname, userid))) ++ r = mboxlist_detail(inboxname, &type, NULL, NULL, ++ &server, &acl, NULL); ++ + if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && + (!acl || + !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.c cyrus-imapd-2.3.15/lib/auth.c +--- cyrus-imapd-2.3.15.orig/lib/auth.c 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth.c 2009-09-09 16:13:03.000000000 +0200 +@@ -118,3 +118,11 @@ + + auth->freestate(auth_state); + } ++ ++char *auth_canonuser(struct auth_state *auth_state) ++{ ++ struct auth_mech *auth = auth_fromname(); ++ ++ return auth->auth_canonuser(auth_state); ++} ++ +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.h cyrus-imapd-2.3.15/lib/auth.h +--- cyrus-imapd-2.3.15.orig/lib/auth.h 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth.h 2009-09-09 16:13:03.000000000 +0200 +@@ -55,6 +55,7 @@ + const char *identifier); + struct auth_state *(*newstate)(const char *identifier); + void (*freestate)(struct auth_state *auth_state); ++ char *(*auth_canonuser)(struct auth_state *auth_state); + }; + + extern struct auth_mech *auth_mechs[]; +@@ -77,5 +78,6 @@ + const char *identifier); + struct auth_state *auth_newstate(const char *identifier); + void auth_freestate(struct auth_state *auth_state); ++char *auth_canonuser(struct auth_state *auth_state); + + #endif /* INCLUDED_AUTH_H */ +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb5.c cyrus-imapd-2.3.15/lib/auth_krb5.c +--- cyrus-imapd-2.3.15.orig/lib/auth_krb5.c 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth_krb5.c 2009-09-09 16:13:03.000000000 +0200 +@@ -199,6 +199,14 @@ + free(auth_state); + } + ++static char *mycanonuser(struct auth_state *auth_state) ++{ ++ if (auth_state) ++ return auth_state->userid; ++ ++ return NULL; ++} ++ + #else /* HAVE_GSSAPI_H */ + + static int mymemberof( +@@ -230,6 +238,13 @@ + fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); + } + ++static char *mycanonuser( ++ struct auth_state *auth_state __attribute__((unused))) ++{ ++ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); ++ return NULL; ++} ++ + #endif + + struct auth_mech auth_krb5 = +@@ -240,4 +255,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb.c cyrus-imapd-2.3.15/lib/auth_krb.c +--- cyrus-imapd-2.3.15.orig/lib/auth_krb.c 2009-03-31 06:11:21.000000000 +0200 ++++ cyrus-imapd-2.3.15/lib/auth_krb.c 2009-09-09 16:13:03.000000000 +0200 +@@ -341,6 +341,15 @@ + free((char *)auth_state); + } + ++static char *mycanonuser(struct auth_state *auth_state) ++{ ++ if (auth_state) ++ return auth_state->userid; ++ ++ return NULL; ++} ++ ++ + #else /* HAVE_KRB */ + + static int mymemberof( +@@ -372,6 +381,13 @@ + fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); + } + ++static char *mycanonuser( ++ struct auth_state *auth_state __attribute__((unused))) ++{ ++ fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); ++} ++ ++ + #endif + + struct auth_mech auth_krb = +@@ -382,4 +398,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_pts.c cyrus-imapd-2.3.15/lib/auth_pts.c +--- cyrus-imapd-2.3.15.orig/lib/auth_pts.c 2008-03-24 18:43:08.000000000 +0100 ++++ cyrus-imapd-2.3.15/lib/auth_pts.c 2009-09-09 16:13:03.000000000 +0200 +@@ -512,6 +512,14 @@ + free(auth_state); + } + ++static char *mycanonuser(struct auth_state *auth_state) ++{ ++ if (auth_state) ++ return auth_state->userid.id; ++ ++ return NULL; ++} ++ + struct auth_mech auth_pts = + { + "pts", /* name */ +@@ -520,4 +528,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_unix.c cyrus-imapd-2.3.15/lib/auth_unix.c +--- cyrus-imapd-2.3.15.orig/lib/auth_unix.c 2009-03-31 06:11:22.000000000 +0200 ++++ cyrus-imapd-2.3.15/lib/auth_unix.c 2009-09-09 16:13:03.000000000 +0200 +@@ -315,6 +315,16 @@ + free((char *)auth_state); + } + ++static char *mycanonuser(auth_state) ++ struct auth_state *auth_state; ++{ ++ if (auth_state) ++ return auth_state->userid; ++ ++ return NULL; ++} ++ ++ + + struct auth_mech auth_unix = + { +@@ -324,4 +334,5 @@ + &mymemberof, + &mynewstate, + &myfreestate, ++ &mycanonuser, + }; +diff -Naur cyrus-imapd-2.3.15.orig/lib/imapoptions cyrus-imapd-2.3.15/lib/imapoptions +--- cyrus-imapd-2.3.15.orig/lib/imapoptions 2009-06-29 19:21:06.000000000 +0200 ++++ cyrus-imapd-2.3.15/lib/imapoptions 2009-09-09 16:13:03.000000000 +0200 +@@ -198,6 +198,55 @@ + /* Number of seconds to wait before returning a timeout failure when + performing a client connection (e.g., in a murder environment) */ + ++{ "createonpost", 0, SWITCH } ++/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist, ++ then the INBOX is automatically created by lmtpd. */ ++ ++{ "autocreateinboxfolders", NULL, STRING } ++/* If a user does not have an INBOX created then the INBOX as well as some INBOX ++ subfolders are created under two conditions. ++ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value) ++ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes) ++ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that ++ are automatically created by the server under the previous two situations. */ ++ ++{ "autosubscribeinboxfolders", NULL, STRING } ++/* A list of folder names, separated by "|", that the users get automatically subscribed to, ++ when their INBOX is created. These folder names must have been included in the ++ autocreateinboxfolders option of the imapd.conf. */ ++ ++{ "autosubscribesharedfolders", NULL, STRING } ++/* A list of shared folders (bulletin boards), separated by "|", that the users get ++ automatically subscribed to, after their INBOX is created. The shared folder must ++ have been created and the user must have the required permissions to get subscribed ++ to it. Otherwise, subscribing to the shared folder fails. */ ++ ++{ "autosubscribe_all_sharedfolders", 0, SWITCH } ++/* If set to yes, the user is automatically subscribed to all shared folders, one has permission ++ to subscribe to. */ ++ ++{ "autocreate_sieve_script", NULL, STRING } ++/* The full path of a file that contains a sieve script. This script automatically becomes a ++ user's initial default sieve filter script. When this option is not defined, no default ++ sieve filter is created. The file must be readable by the cyrus daemon. */ ++ ++{ "autocreate_sieve_compiledscript", NULL, STRING } ++/* The full path of a file that contains a compiled in bytecode sieve script. This script ++ automatically becomes a user's initial default sieve filter script. If this option is ++ not specified, or the filename doesn't exist then the script defined by ++ autocreate_sieve_script is compiled on the fly and installed as the user's default ++ sieve script */ ++ ++{ "generate_compiled_sieve_script", 0, SWITCH } ++/* If set to yes and no compiled sieve script file exists, the sieve script which is ++ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript ++ option points to. In order a compiled script to be generated, autocreate_sieve_script and ++ autocreate_sieve_compiledscript must have valid values */ ++ ++{ "autocreate_users", "anyone", STRING } ++/* A space separated list of users and/or groups that are allowed their INBOX to be ++ automatically created. */ ++ + { "configdirectory", NULL, STRING } + /* The pathname of the IMAP configuration directory. This field is + required. */ +diff -Naur cyrus-imapd-2.3.15.orig/notifyd/Makefile.in cyrus-imapd-2.3.15/notifyd/Makefile.in +--- cyrus-imapd-2.3.15.orig/notifyd/Makefile.in 2008-03-24 20:59:32.000000000 +0100 ++++ cyrus-imapd-2.3.15/notifyd/Makefile.in 2009-09-09 16:13:03.000000000 +0200 +@@ -71,10 +71,11 @@ + SERVICE=../master/service.o + + IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ ++SIEVE_LIBS = @SIEVE_LIBS@ + IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ + LIB_WRAP = @LIB_WRAP@ + LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS) +-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ ++DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + + PURIFY=/usr/local/bin/purify + PUREOPT=-best-effort +diff -Naur cyrus-imapd-2.3.15.orig/notifyd/notifyd.c cyrus-imapd-2.3.15/notifyd/notifyd.c +--- cyrus-imapd-2.3.15.orig/notifyd/notifyd.c 2008-03-24 20:59:32.000000000 +0100 ++++ cyrus-imapd-2.3.15/notifyd/notifyd.c 2009-09-09 16:13:03.000000000 +0200 +@@ -96,7 +96,7 @@ + + #define NOTIFY_MAXSIZE 8192 + +-int do_notify() ++static int do_notify() + { + struct sockaddr_un sun_data; + socklen_t sunlen = sizeof(sun_data); +diff -Naur cyrus-imapd-2.3.15.orig/ptclient/Makefile.in cyrus-imapd-2.3.15/ptclient/Makefile.in +--- cyrus-imapd-2.3.15.orig/ptclient/Makefile.in 2008-03-24 19:34:22.000000000 +0100 ++++ cyrus-imapd-2.3.15/ptclient/Makefile.in 2009-09-09 16:13:03.000000000 +0200 +@@ -57,10 +57,11 @@ + AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ + AFS_LIBS = @AFS_LIBS@ + IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ ++SIEVE_LIBS = @SIEVE_LIBS@ + LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@ + LIB_SASL = @LIB_SASL@ + LIB_WRAP = @LIB_WRAP@ +-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ ++DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o + + LDAP_LIBS=@LDAP_LIBS@ +diff -Naur cyrus-imapd-2.3.15.orig/README.autocreate cyrus-imapd-2.3.15/README.autocreate +--- cyrus-imapd-2.3.15.orig/README.autocreate 1970-01-01 01:00:00.000000000 +0100 ++++ cyrus-imapd-2.3.15/README.autocreate 2009-09-09 16:13:03.000000000 +0200 +@@ -0,0 +1,211 @@ ++Cyrus IMAP autocreate Inbox patch ++---------------------------------- ++ ++NOTE : This patch has been created at the University of Athens. For more info, as well ++as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ ++ ++The design of Cyrus IMAP server does not predict the automatic creation of users' ++INBOX folders. The creation of a user's INBOX is considered to be an external task, ++that has to be completed as part of the user email account creation procedure. ++Hence, to create a new email account the site administrator has to: ++ ++ a) Include the new account in the user database for the authentication procedure ++ (e.g. sasldb, shadow, mysql, ldap). ++ b) Create the corresponding INBOX folder. ++ ++Alternatively, the user, if succesfully authenticated, may create his own INBOX folder, ++as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf). ++Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't ++lead to the automatic INBOX folder creation by Cyrus IMAP server. ++In fact, "autocreate" means that the IMAP clients are allowed to automatically create ++the user INBOX. ++ ++This patch adds the functionality of automatic creation of the users' INBOX folders into ++the Cyrus IMAP server. It is implemented as two features, namely the "create on login" ++and "create on post". ++ ++ ++ ++Create on login ++=============== ++This feauture provides automatic creation of a user's INBOX folder when all of the ++following requirements are met: ++ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 16:09:48 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 14:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6830] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6830 http://gar.svn.sourceforge.net/gar/?rev=6830&view=rev Author: chninkel Date: 2009-10-11 14:09:48 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: added cyr_df in prototype Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 13:55:25 UTC (rev 6829) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 14:09:48 UTC (rev 6830) @@ -1,6 +1,6 @@ a55d22e88ee57fa81da2ea75c6e0e3d8 CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall -63f0e304d69648e4cbaf197a329f1537 CSWcyrusimapd.prototype +219ba1dc6ec1593132019389064eeeff CSWcyrusimapd.prototype 7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype 404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype d0b97b33e75ac75f89ee6236a2d53f05 README.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 13:55:25 UTC (rev 6829) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-11 14:09:48 UTC (rev 6830) @@ -59,6 +59,7 @@ s none /opt/csw/sbin/sievec=../libexec/cyrus/sievec s none /opt/csw/sbin/cyrus-master=../libexec/cyrus/cyrus-master f none /opt/csw/libexec/cyrus/cyrus-master 0755 root bin +f none /opt/csw/libexec/cyrus/cyr_df 0755 root bin f none /opt/csw/libexec/cyrus/imapd 0755 root bin f none /opt/csw/libexec/cyrus/pop3d 0755 root bin f none /opt/csw/libexec/cyrus/fud 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 16:10:58 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 14:10:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6831] csw/mgar/pkg/cyrus_imapd/trunk/Makefile Message-ID: Revision: 6831 http://gar.svn.sourceforge.net/gar/?rev=6831&view=rev Author: chninkel Date: 2009-10-11 14:10:57 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: disables temporarily package check Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 14:09:48 UTC (rev 6830) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 14:10:57 UTC (rev 6831) @@ -120,6 +120,9 @@ TEST_SCRIPTS = +# Disable package check for now as pmcyrus dependancy is not recognized +ENABLE_CHECK=0 + include gar/category.mk # compile_et is missing so we want our to be used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 11 19:22:50 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 11 Oct 2009 17:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6832] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6832 http://gar.svn.sourceforge.net/gar/?rev=6832&view=rev Author: chninkel Date: 2009-10-11 17:22:49 +0000 (Sun, 11 Oct 2009) Log Message: ----------- cyrus_imapd: removed unuseful checkinstall code and fixed classes list Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 14:10:57 UTC (rev 6831) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-10-11 17:22:49 UTC (rev 6832) @@ -39,12 +39,12 @@ SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWpcrert -SPKG_CLASSES_CSWcyrusimapd = none +SPKG_CLASSES_CSWcyrusimapdutils = none SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions CATALOGNAME_CSWpmcyrus = pm_cyrus REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb4 CSWosslrt CSWsasl -SPKG_CLASSES_CSWcyrusimapd = none +SPKG_CLASSES_CSWpmcyrus = none ###### Upstream and opencsw files information ####### Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 14:10:57 UTC (rev 6831) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-11 17:22:49 UTC (rev 6832) @@ -1,4 +1,4 @@ -a55d22e88ee57fa81da2ea75c6e0e3d8 CSWcyrusimapd.checkinstall +585646739e9403c02e868900ebed892a CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall 219ba1dc6ec1593132019389064eeeff CSWcyrusimapd.prototype 7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall 2009-10-11 14:10:57 UTC (rev 6831) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.checkinstall 2009-10-11 17:22:49 UTC (rev 6832) @@ -1,27 +1,5 @@ -# begin content of csw_smf_checkinstall -# (we must manually copy the content as we use -# our own checkinstall file, is there a better way ?) - trap `exit 3` 15 -# Assign Solaris release class to install release specific files -if [ -f "$BASEDIR/usr/sbin/svccfg" -a -f "$BASEDIR/usr/sbin/svcadm" ]; then - CLASSES="$CLASSES smf" - SMF="yes" -else - CLASSES="$CLASSES init" - SMF="no" -fi - -# Make env variables available to other packaging scripts -cat >$1 < Revision: 6833 http://gar.svn.sourceforge.net/gar/?rev=6833&view=rev Author: j_arndt Date: 2009-10-11 18:06:59 +0000 (Sun, 11 Oct 2009) Log Message: ----------- nrpe: use of cswusergroup, switched to dynamic dependencies, configuration file moved to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype csw/mgar/pkg/nrpe/trunk/files/cswnrpe Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 18:06:59 UTC (rev 6833) @@ -12,20 +12,30 @@ SF_PROJ = nagios MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall preremove ) -DISTFILES += cswnrpe + +# Distfiles for CSWnrpe + +DISTFILES += CSWnrpe.preinstall CSWnrpe.prototype +DISTFILES += cswnrpe cswusergroup DISTFILES += README_8k -DISTFILES += $(call admfiles,CSWnrpeplugin, prototype ) +# Distfiles for check_nrpe + +DISTFILES += CSWnrpeplugin.prototype + PATCHFILES = patch.diff configure.diff PATCHFILES_isa-sparcv8-size-8k = common.h.diff PATCHFILES_isa-i386-size-8k = common.h.diff +PACKAGES = CSWnrpe CSWnrpeplugin +CATALOGNAME_CSWmuninmaster = nrpe +CATALOGNAME_CSWmuninnode = nrpe_plugin + REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt -SPKG_CLASSES_CSWnrpe = none cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf EXTRA_MODULATORS = SIZE MODULATIONS_SIZE = 1k 8k @@ -41,12 +51,7 @@ CONFIGURE_ARGS += --prefix=/opt/csw CONFIGURE_ARGS += --exec-prefix=/opt/csw -#PATCHFILES = patch.diff # Removal of LOG_AUTHPRIV and LOG_FTP - # Solaris doesn't have these log facilities -#PATCHFILES += configure.diff -#PATCHFILES += common.h.diff # Enable packet size of 8192 bytes - -sysconfdir = $(prefix)/etc +sysconfdir = /etc/${prefix} bindir = $(prefix)/bin libexecdir = $(prefix)/libexec/nagios-plugins datadir = $(prefix)/share @@ -71,6 +76,7 @@ ginstall -m 775 -d $(DESTDIR)$(DOCDIR) ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR) ginstall -m 755 -d $(DESTDIR)$(BINDIR) + ginstall -m 755 -d $(DESTDIR)/nagios ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR) ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR) @@ -83,6 +89,8 @@ ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg.CSW ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe + @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe/cswusergroup @$(MAKECOOKIE) merge-copy-nrpe-only: Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-10-11 18:06:59 UTC (rev 6833) @@ -1,13 +1,10 @@ -bda68135e2b65da40c3d2b68a3b8dc78 download/CSWnrpe.checkinstall -1c656040abd280f9228b42df744d93eb download/CSWnrpe.gspec -53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall -393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove -ff0be2f6b8d7fa72875d570fff53c3e6 download/CSWnrpe.prototype -2b35d5e0d57bcb3aff096040e0d06b8b download/CSWnrpeplugin.gspec +afe807962bd3d189e78a92f040b10eff download/CSWnrpe.preinstall +67dc14268283a23ac8ee9ae29614b6dc download/CSWnrpe.prototype 6eafe4b86758d91ac3fc4c0e759f25a0 download/CSWnrpeplugin.prototype 3bb2fbb228a6e2d0a99d981d82610d9a download/README_8k 36b85dd37d47a3813bfef5dee5804b61 download/common.h.diff 4b51476c782d2c5764d10f8ed530ada0 download/configure.diff -0e9afe89caf7b60817165842c6e36780 download/cswnrpe +f7b166f02aa2cefb76fc235f6edd1745 download/cswnrpe +0a98ba4dd462e50f23239433117bae5e download/cswusergroup b2d75e2962f1e3151ef58794d60c9e97 download/nrpe-2.12.tar.gz 5b02d4385daaea2a8c13903539aa6189 download/patch.diff Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2009-10-11 18:06:59 UTC (rev 6833) @@ -1,23 +1,18 @@ -# This script exists to make sure the required user -# accounts nagios and groups nagios exist. -# 2006-02-27: group nagioscm is required. -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. +cat << EOF -#If installing package on a filesystem tree not running the OS; then exit. -if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi +======================================================================= -NAGIOSHOME=/opt/csw/nagios +From package revision nrpe-2.12,REV=2009.10.11 on the configuration +file for NRPE is stored in /etc/opt/csw/. -if [ "$NEEDNAGGROUP" = 1 ] ; then - echo adding nagios group - /usr/sbin/groupadd nagios -fi +No further action is needed (to have a backup is always a good idea). -if [ "$NEEDNAGUSER" = 1 ] ; then - echo adding nagios user - /usr/sbin/useradd -g nagios nagios - /usr/sbin/usermod -s /bin/false -d $NAGIOSHOME nagios -fi + Installation will proceed in 10 seconds. + Press CTRL+C if you want to stop now. +======================================================================= +EOF + +sleep 10 + exit 0 Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove 2009-10-11 18:06:59 UTC (rev 6833) @@ -1,27 +0,0 @@ -# nrpe - preremove script -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# -# Stop nagios if it is running. - -#If removing package from a filesystem tree not running the OS; then exit. -if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi - -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - - echo "## Stopping nrpe" - if [ $smf = yes ] - then - # Disable service - /usr/sbin/svcadm disable -s svc:application/cswnrpe:default >/dev/null 2>&1 - else - /etc/init.d/cswnrpe stop >/dev/null 2>&1 - fi - -if [ $smf = yes ] ; then - # Unregister with SMF - /usr/sbin/svccfg delete svc:application/cswnrpe:default >/dev/null 2>&1 -fi - -exit 0 Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-10-11 18:06:59 UTC (rev 6833) @@ -3,7 +3,7 @@ f none /opt/csw/bin/nrpe_8k 0775 root bin s none /opt/csw/bin/nrpe=/opt/csw/bin/nrpe_1k d none /opt/csw/etc 0755 root bin -f cswpreserveconf /opt/csw/etc/nrpe.cfg.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/nrpe.cfg.CSW 0644 root bin d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin @@ -11,6 +11,9 @@ f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin f none /opt/csw/share/doc/nrpe/README.SSL 0644 root bin f none /opt/csw/share/doc/nrpe/SECURITY 0644 root bin +d none /opt/csw/nagios 755 root bin f cswinitsmf /etc/opt/csw/init.d/cswnrpe 0755 root bin +d none /opt/csw/etc/pkg/CSWnrpe 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWnrpe/cswusergroup 0644 root bin i depend=CSWnrpe.depend i pkginfo=CSWnrpe.pkginfo Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-10-11 17:22:49 UTC (rev 6832) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-10-11 18:06:59 UTC (rev 6833) @@ -9,7 +9,12 @@ # 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. # Modified for OpenCSW by Juergen Arndt 2009-03-14 +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink #FMRI application # FMRI path for service +#AUTOENABLE yes SMF_EXIT_ERR_CONFIG=1 Added: csw/mgar/pkg/nrpe/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/cswusergroup 2009-10-11 18:06:59 UTC (rev 6833) @@ -0,0 +1 @@ +nagios:nagios:Nagios user:/opt/csw/nagios:/bin/false:m:r This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Oct 11 20:59:46 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Oct 2009 18:59:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6834] csw/mgar/pkg/nrpe/trunk/Makefile Message-ID: Revision: 6834 http://gar.svn.sourceforge.net/gar/?rev=6834&view=rev Author: j_arndt Date: 2009-10-11 18:59:46 +0000 (Sun, 11 Oct 2009) Log Message: ----------- nrpe: fixed typo Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 18:06:59 UTC (rev 6833) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-10-11 18:59:46 UTC (rev 6834) @@ -19,7 +19,7 @@ DISTFILES += cswnrpe cswusergroup DISTFILES += README_8k -# Distfiles for check_nrpe +# Distfiles for nrpe_plugin DISTFILES += CSWnrpeplugin.prototype @@ -29,8 +29,8 @@ PATCHFILES_isa-i386-size-8k = common.h.diff PACKAGES = CSWnrpe CSWnrpeplugin -CATALOGNAME_CSWmuninmaster = nrpe -CATALOGNAME_CSWmuninnode = nrpe_plugin +CATALOGNAME_CSWnrpe = nrpe +CATALOGNAME_CSWnrpeplugin = nrpe_plugin REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 01:18:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Oct 2009 23:18:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6835] csw/mgar/pkg/git/trunk Message-ID: Revision: 6835 http://gar.svn.sourceforge.net/gar/?rev=6835&view=rev Author: bdwalton Date: 2009-10-11 23:18:39 +0000 (Sun, 11 Oct 2009) Log Message: ----------- git: actually remove patch file, update checksums Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-11 18:59:46 UTC (rev 6834) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-11 23:18:39 UTC (rev 6835) @@ -1,2 +1 @@ -43f73e9e39bc388253c4c48986ef7b5c download/0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch -0f3606cd6720f525e7261cea87c11a61 download/CSWgit.postinstall +0f3606cd6720f525e7261cea87c11a61 CSWgit.postinstall Deleted: csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch 2009-10-11 18:59:46 UTC (rev 6834) +++ csw/mgar/pkg/git/trunk/files/0001-ls-files-make-option-parser-keep-argv-0.patch 2009-10-11 23:18:39 UTC (rev 6835) @@ -1,42 +0,0 @@ -From a613b30af3b8a74e8b2d8f5f9910564fb44bf59d Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 7 Oct 2009 16:25:38 -0400 -Subject: [PATCH] ls-files: make option parser keep argv[0] - -The ls-files built-in was not asking the option parser to maintain -argv[0]. This led to the possibility of fprintf(stderr, "...", NULL). -On Solaris, this was causing a segfault. On glibc systems, printed -error messages didn't contain proper strings, but rather, "(null)":... - -A trigger for this bug was: `git ls-files -i` - -Signed-off-by: Ben Walton ---- - builtin-ls-files.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/builtin-ls-files.c b/builtin-ls-files.c -index f473220..9a3705a 100644 ---- a/builtin-ls-files.c -+++ b/builtin-ls-files.c -@@ -482,7 +482,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) - git_config(git_default_config, NULL); - - argc = parse_options(argc, argv, prefix, builtin_ls_files_options, -- ls_files_usage, 0); -+ ls_files_usage, PARSE_OPT_KEEP_ARGV0); - if (show_tag || show_valid_bit) { - tag_cached = "H "; - tag_unmerged = "M "; -@@ -505,7 +505,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) - if (require_work_tree && !is_inside_work_tree()) - setup_work_tree(); - -- pathspec = get_pathspec(prefix, argv); -+ pathspec = get_pathspec(prefix, argv + 1); - - /* be nice with submodule paths ending in a slash */ - read_cache(); --- -1.6.4.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 01:31:46 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Oct 2009 23:31:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6836] csw/mgar/pkg Message-ID: Revision: 6836 http://gar.svn.sourceforge.net/gar/?rev=6836&view=rev Author: bdwalton Date: 2009-10-11 23:31:46 +0000 (Sun, 11 Oct 2009) Log Message: ----------- tig: initial commit Added Paths: ----------- csw/mgar/pkg/tig/ csw/mgar/pkg/tig/branches/ csw/mgar/pkg/tig/tags/ csw/mgar/pkg/tig/trunk/ csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tig/trunk/checksums csw/mgar/pkg/tig/trunk/files/ Property changes on: csw/mgar/pkg/tig/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-11 23:31:46 UTC (rev 6836) @@ -0,0 +1,24 @@ +GARNAME = tig +GARVERSION = 0.14.1 +CATEGORIES = utils + +DESCRIPTION = A git repository browser +define BLURB +Tig is a git repository browser that additionally can act as a pager +for output from various git commands. + +When browsing repositories, it uses the underlying git commands to +present the user with various views, such as summarized revision log +and showing the commit with the log message, diffstat, and the diff. + +Using it as a pager, it will display input from stdin and colorize it. +endef + +PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv + +GIT_REPOS = http://jonas.nitro.dk/tig/tig.git +GIT_TREEISH_tig.git = $(GARNAME)-$(GARVERSION) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 02:28:04 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 00:28:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6837] csw/mgar/pkg/tig/trunk Message-ID: Revision: 6837 http://gar.svn.sourceforge.net/gar/?rev=6837&view=rev Author: bdwalton Date: 2009-10-12 00:28:04 +0000 (Mon, 12 Oct 2009) Log Message: ----------- tig: steps up to install-doc work Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-11 23:31:46 UTC (rev 6836) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:28:04 UTC (rev 6837) @@ -14,11 +14,29 @@ Using it as a pager, it will display input from stdin and colorize it. endef +GARCOMPILER = GNU + PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv +REQUIRED_PKGS = CSWncurses CSWiconv CSWgit + GIT_REPOS = http://jonas.nitro.dk/tig/tig.git GIT_TREEISH_tig.git = $(GARNAME)-$(GARVERSION) +PATCHFILES = 0001-add-install-detection-to-the-autoconf-setup.patch + +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libiconv=$(prefix) +TEST_SCRIPTS = + +INSTALL_ARGS = install install-doc + include gar/category.mk + +# automake isn't used, but we want install-sh. automake exits 1, so +# we run true after to keep gmake happy +pre-configure-modulated: + @(cd $(WORKSRC); autoreconf; automake --add-missing; true) \ No newline at end of file Modified: csw/mgar/pkg/tig/trunk/checksums =================================================================== --- csw/mgar/pkg/tig/trunk/checksums 2009-10-11 23:31:46 UTC (rev 6836) +++ csw/mgar/pkg/tig/trunk/checksums 2009-10-12 00:28:04 UTC (rev 6837) @@ -0,0 +1 @@ +5fe966f3db6c641cc10dbef40913dddf 0001-add-install-detection-to-the-autoconf-setup.patch Added: csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch =================================================================== --- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch (rev 0) +++ csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch 2009-10-12 00:28:04 UTC (rev 6837) @@ -0,0 +1,73 @@ +From d12d5d6f186ac25d83324c6cd87eaef87d6df6bb Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 12 Oct 2009 02:03:17 +0200 +Subject: [PATCH] add install detection to the autoconf setup + +--- + Makefile | 8 ++++---- + config.make.in | 2 ++ + configure.ac | 2 ++ + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index d764644..cf0771b 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,7 @@ doc-html: $(HTMLDOC) + install: all + mkdir -p $(DESTDIR)$(bindir) && \ + for prog in $(PROGS); do \ +- install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \ ++ $(INSTALL) -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \ + done + + install-doc-man: doc-man +@@ -77,8 +77,8 @@ install-doc-man: doc-man + for doc in $(MANDOC); do \ + sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \ + case "$$doc" in \ +- *.1) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \ +- *.5) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \ ++ *.1) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \ ++ *.5) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \ + esac; \ + $(RM) "$$doc+"; \ + done +@@ -88,7 +88,7 @@ install-doc-html: doc-html + for doc in $(HTMLDOC); do \ + sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \ + case "$$doc" in \ +- *.html) install -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \ ++ *.html) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \ + esac; \ + $(RM) "$$doc+"; \ + done +diff --git a/config.make.in b/config.make.in +index 3962050..a5621e9 100644 +--- a/config.make.in ++++ b/config.make.in +@@ -12,6 +12,8 @@ CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H + LDFLAGS = @LDFLAGS@ + LDLIBS = @LIBS@ + ++INSTALL = @INSTALL@ ++ + ASCIIDOC = @ASCIIDOC@ + XMLTO = @XMLTO@ + DOCBOOK2PDF = @DOCBOOK2PDF@ +diff --git a/configure.ac b/configure.ac +index b179389..5225c7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,8 @@ AM_ICONV + + AC_PROG_CC + ++AC_PROG_INSTALL ++ + AC_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])]) + AC_MSG_CHECKING([which config subcommand git supports]) + GIT_CONFIG="repo-config" +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 02:33:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 00:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6838] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 6838 http://gar.svn.sourceforge.net/gar/?rev=6838&view=rev Author: bdwalton Date: 2009-10-12 00:33:02 +0000 (Mon, 12 Oct 2009) Log Message: ----------- tig: use the current tip of master to get patches that allow doc building with asciidoc 8.4.5 Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:28:04 UTC (rev 6837) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:33:02 UTC (rev 6838) @@ -1,6 +1,7 @@ GARNAME = tig GARVERSION = 0.14.1 CATEGORIES = utils +PATCHLEVEL = 1e69632 DESCRIPTION = A git repository browser define BLURB @@ -21,7 +22,7 @@ REQUIRED_PKGS = CSWncurses CSWiconv CSWgit GIT_REPOS = http://jonas.nitro.dk/tig/tig.git -GIT_TREEISH_tig.git = $(GARNAME)-$(GARVERSION) +GIT_TREEISH_tig.git = $(PATCHLEVEL) PATCHFILES = 0001-add-install-detection-to-the-autoconf-setup.patch @@ -36,6 +37,10 @@ include gar/category.mk +# Set a slightly altered revstamp to indicate that we're not using a +# pressed release. +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) + # automake isn't used, but we want install-sh. automake exits 1, so # we run true after to keep gmake happy pre-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 02:34:36 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 00:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6839] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 6839 http://gar.svn.sourceforge.net/gar/?rev=6839&view=rev Author: bdwalton Date: 2009-10-12 00:34:36 +0000 (Mon, 12 Oct 2009) Log Message: ----------- tig: depends on gcc4 runtime Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:33:02 UTC (rev 6838) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-12 00:34:36 UTC (rev 6839) @@ -19,7 +19,7 @@ PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv -REQUIRED_PKGS = CSWncurses CSWiconv CSWgit +REQUIRED_PKGS = CSWncurses CSWiconv CSWgit CSWgcc4corert GIT_REPOS = http://jonas.nitro.dk/tig/tig.git GIT_TREEISH_tig.git = $(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 05:11:12 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 03:11:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6840] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6840 http://gar.svn.sourceforge.net/gar/?rev=6840&view=rev Author: bdwalton Date: 2009-10-12 03:11:12 +0000 (Mon, 12 Oct 2009) Log Message: ----------- cswclassutils: add cas for /etc/services manipulation; bump version to 1.20 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-12 00:34:36 UTC (rev 6839) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-12 03:11:12 UTC (rev 6840) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.19 +GARVERSION = 1.20 CATEGORIES = utils DESCRIPTION = CSW class action utilities Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-12 03:11:12 UTC (rev 6840) @@ -0,0 +1,39 @@ +#!/bin/sh +# +# r.cswetcservices - Class action script +# for CSW /etc/inet/services registrations +# +# Written and maintained by Ben Walton +# +# 2009-10-11 Initial release + +# set DEBUG to any value to enable trace outpu. +DEBUG= + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + svcfile=/etc/inet/services + + /usr/xpg4/bin/grep -v "^#" $dest | while read svc; do + set -- $svc + svcname=$1 + port_proto=$2 + + if [ -n "$DEBUG" ]; then + echo "svcname: $svcname; port/proto: $port_proto" + fi + + + /usr/xpg4/bin/grep -q "^$svcname[[:space:]]$port_proto" $svcfile + if [ $? -ne 0 ]; then + echo "$svcname $port_proto # $PKGINST" >> $svcfile + fi + done +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcservices 2009-10-12 03:11:12 UTC (rev 6840) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# r.cswetcservices - Class action script +# for CSW /etc/inet/services registrations +# +# Written and maintained by Ben Walton +# +# 2009-10-11 Initial release + +# NOTE: In the future, we could offer a variable in csw.conf +# to remove values from /etc/services too. For now, we'll +# just leave them. + +while read dest; do + echo $dest + rm -f $dest +done + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 12 05:43:07 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Oct 2009 03:43:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6841] csw/mgar/pkg/git/trunk Message-ID: Revision: 6841 http://gar.svn.sourceforge.net/gar/?rev=6841&view=rev Author: bdwalton Date: 2009-10-12 03:43:07 +0000 (Mon, 12 Oct 2009) Log Message: ----------- git: remove /etc/service manipulation from postinstall script (soon to be in cswclassutils) Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-10-12 03:11:12 UTC (rev 6840) +++ csw/mgar/pkg/git/trunk/checksums 2009-10-12 03:43:07 UTC (rev 6841) @@ -1 +1 @@ -0f3606cd6720f525e7261cea87c11a61 CSWgit.postinstall +92482ca3b4e8626f428f8878bcc1477f CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-12 03:11:12 UTC (rev 6840) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-10-12 03:43:07 UTC (rev 6841) @@ -16,11 +16,3 @@ EOF fi - -/usr/xpg4/bin/grep -q CSWgit /etc/inet/services -if [ $? -ne 0 ]; then - cat <>/etc/inet/services -git 9418/tcp # CSWgit: git transfer service -git 9418/udp # CSWgit: git transfer service -EOF -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 12 09:47:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Oct 2009 07:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6842] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswetcservices Message-ID: Revision: 6842 http://gar.svn.sourceforge.net/gar/?rev=6842&view=rev Author: bonivart Date: 2009-10-12 07:47:40 +0000 (Mon, 12 Oct 2009) Log Message: ----------- cswclassutils: fix typo in i.cswetcservices Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-12 03:43:07 UTC (rev 6841) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-12 07:47:40 UTC (rev 6842) @@ -1,6 +1,6 @@ #!/bin/sh # -# r.cswetcservices - Class action script +# i.cswetcservices - Class action script # for CSW /etc/inet/services registrations # # Written and maintained by Ben Walton This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 12 11:12:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 12 Oct 2009 09:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6843] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 6843 http://gar.svn.sourceforge.net/gar/?rev=6843&view=rev Author: wahwah Date: 2009-10-12 09:12:22 +0000 (Mon, 12 Oct 2009) Log Message: ----------- syslog-ng: Removing old .ctl and .persist files from /opt/csw/var. Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-12 07:47:40 UTC (rev 6842) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-10-12 09:12:22 UTC (rev 6843) @@ -15,34 +15,17 @@ DISTFILES += cswsyslog_ng DISTFILES += CSWsyslogng.preinstall DISTFILES += CSWsyslogng.postremove - -CATALOGNAME = syslog_ng - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES = CSWsyslogng - +CATALOGNAME = syslog_ng SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ +INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng +SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW -SPKG_CLASSES = none cswcpsampleconf cswinitsmf -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswsyslog_ng$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/syslog-ng\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' - # shared /opt/csw support: localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw -PREREQUISITE_PKGS = CSWeventlog -PREREQUISITE_PKGS += CSWggettext -PREREQUISITE_PKGS += CSWglib2 -PREREQUISITE_PKGS += CSWglib2devel -PREREQUISITE_PKGS += CSWtcpwrap -PREREQUISITE_PKGS += CSWpkgconfig -PREREQUISITE_PKGS += CSWgcc4core - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no @@ -57,6 +40,12 @@ REQUIRED_PKGS += CSWtcpwrap REQUIRED_PKGS += CSWcswclassutils +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS += CSWggettext +PREREQUISITE_PKGS += CSWglib2devel +PREREQUISITE_PKGS += CSWpkgconfig +PREREQUISITE_PKGS += CSWgcc4core + GARCOMPILER = GNU TEST_SCRIPTS = Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-12 07:47:40 UTC (rev 6842) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-10-12 09:12:22 UTC (rev 6843) @@ -1,5 +1,5 @@ -91e692a52c4c9668e3bcf8b8816425c3 download/CSWsyslogng.postremove -7f8beb7c27a9b9ddf0ff1add6a5d4e50 download/CSWsyslogng.preinstall -fcd5effdaa96da8abf9788bc5745bda3 download/cswsyslog_ng -69bad95775b98d26e52db8a8292e2790 download/syslog-ng.conf.CSW -86c39779261545d2289e9c309e262b8d download/syslog-ng_3.0.4.tar.gz +91e692a52c4c9668e3bcf8b8816425c3 CSWsyslogng.postremove +c3da292b828f03158c7227f5b35feb12 CSWsyslogng.preinstall +fcd5effdaa96da8abf9788bc5745bda3 cswsyslog_ng +69bad95775b98d26e52db8a8292e2790 syslog-ng.conf.CSW +86c39779261545d2289e9c309e262b8d syslog-ng_3.0.4.tar.gz Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-10-12 07:47:40 UTC (rev 6842) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-10-12 09:12:22 UTC (rev 6843) @@ -4,3 +4,13 @@ echo "Disabling svc:/system/system-log:default" /usr/sbin/svcadm disable svc:/system/system-log:default fi + +# The assumption is that this script is going to be run from the global zone +# first. The -f option is for the rm command not to complain if it can't remove +# the file. +for f in /opt/csw/var/syslog-ng.{ctl,persist}; do + if [ -r "${f}" ]; + echo "Removing an obsolete file: '${f}'." + rm -f "${f}" + fi +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Oct 12 19:15:18 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 12 Oct 2009 17:15:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6844] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 6844 http://gar.svn.sourceforge.net/gar/?rev=6844&view=rev Author: j_arndt Date: 2009-10-12 17:15:17 +0000 (Mon, 12 Oct 2009) Log Message: ----------- nsca: switched to dynamic gspec, packages uses cswusergroup, config and var moved to /etc/opt/csw and /var/opt/csw Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/CSWnsca.preinstall csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.preinstall csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype Added Paths: ----------- csw/mgar/pkg/nsca/trunk/files/CSWnsca.cswusergroup csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.cswusergroup Removed Paths: ------------- csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-10-12 17:15:17 UTC (rev 6844) @@ -11,23 +11,38 @@ MASTER_SITES = http://mesh.dl.sourceforge.net/sourceforge/nagios/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall ) -DISTFILES += $(call admfiles,CSWsendnsca, prototype preinstall ) -DISTFILES += cswnsca +# +## Distfiles for CSWnsca +# + +DISTFILES += CSWnsca.prototype CSWnsca.preinstall +DISTFILES += cswnsca CSWnsca.cswusergroup + +# +## Distfiles for CSWsendnsca +# + +DISTFILES += CSWsendnsca.prototype CSWsendnsca.preinstall +DISTFILES += CSWsendnsca.cswusergroup + PATCHFILES += submit_check_results.diff +PACKAGES = CSWnsca CSWsendnsca +CATALOGNAME_CSWnsca = nsca +CATALOGNAME_CSWsendnsca = send_nsca + REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils -SPKG_CLASSES_CSWnsca = none cswpreserveconf cswinitsmf -SPKG_CLASSES_CSWsendnsca = none cswpreserveconf +SPKG_CLASSES_CSWnsca = none cswusergroup cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWsendnsca = none cswusergroup cswpreserveconf NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 -CONFIGURE_ARGS += --localstatedir=/opt/csw/nagios/var +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/nagios BUILD_TARGETS = nsca @@ -37,8 +52,7 @@ BINDIR=$(prefix)/bin NAGIOSBINDIR=$(prefix)/nagios/bin -CFGDIR=$(prefix)/etc -NAGIOSCFGDIR=$(prefix)/nagios/etc +NAGIOSCFGDIR=/etc$(prefix)/nagios NSCADOCDIR=$(prefix)/share/doc/nsca SENDNSCADOCDIR=$(prefix)/share/doc/send_nsca @@ -57,11 +71,15 @@ ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR) ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) - ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg.CSW + ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/send_nsca.cfg.CSW ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(SENDNSCADOCDIR) ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ ginstall -m 755 $(FILEDIR)/cswnsca $(DESTDIR)/etc/opt/csw/init.d/ + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWsendnsca + @ginstall -m 644 $(FILEDIR)/CSWsendnsca.cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWsendnsca/cswusergroup + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWnsca + @ginstall -m 644 $(FILEDIR)/CSWnsca.cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWnsca/cswusergroup @$(MAKECOOKIE) Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/checksums 2009-10-12 17:15:17 UTC (rev 6844) @@ -1,10 +1,9 @@ -33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz -82f1144c12dc6247524609dbeefc3023 download/CSWnsca.gspec -6c3e8f2bf654a03cc7e993bf26bb066d download/CSWnsca.prototype -1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall -7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall -0f458cf358b1aab192c02fd0d37b1220 download/CSWsendnsca.gspec -664e84201491b489ae20b983a150d72a download/CSWsendnsca.prototype -8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall +e9ed8b90404f0aebfc6f77355d8c9bbe download/CSWnsca.cswusergroup +ec54b953469889200d99a86669653173 download/CSWnsca.preinstall +c9578d6892ce725133fcef365adcc6fe download/CSWnsca.prototype +0a98ba4dd462e50f23239433117bae5e download/CSWsendnsca.cswusergroup +e275462ffbf488fe5f7e29dd3abab0ae download/CSWsendnsca.preinstall +d8d3eeee6cb8fbc3534734590d83a13b download/CSWsendnsca.prototype 55a1c5523b2fe1ee66b45a2807e80bd6 download/cswnsca +33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz cbb38cacd3ca318f00dfa0877b6017df download/submit_check_results.diff Deleted: csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.checkinstall 2009-10-12 17:15:17 UTC (rev 6844) @@ -1,32 +0,0 @@ -# checkinstall script for nsca -# Verify that the external command group nagioscm exists -# 2007-12-02 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# -# See if group are needed -NEEDCMDGROUP=0 - -# First check target machines group file, THEN check -# NIS/NIS+/whatever - -/usr/bin/grep '^nagioscm:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent group nagioscm >/dev/null - if [ $? -ne 0 ] ; then - NEEDCMDGROUP=1 - fi -fi - -if [ "$NEEDCMDGROUP" = 1 ] ; then - echo "***" - echo "Group nagioscm must exist for this package install." - echo "nagioscm group will be added." - ADDCMDGROUP=1 -else - echo "nagioscm group detected" -fi - -cat >$1 </dev/null -if [ $? -ne 0 ] ; then - getent passwd nagios >/dev/null - if [ $? -ne 0 ] ; then - NEEDUSER=1 - fi -fi +From NSCA 2.7.2,REV=2009.10.05 on the configuration file for the +OpenCSW package is stored in /etc/opt/csw/nagios/. -grep '^nagios:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - getent group nagios >/dev/null - if [ $? -ne 0 ] ; then - NEEDGROUP=1 - fi -fi +No further action is needed (to have a backup is always a good idea). -if [ "$NEEDGROUP" = 1 ] ; then - echo adding nagios group - /usr/sbin/groupadd nagios -else - echo nagios group detected -fi + Installation will proceed in 10 seconds. + Press CTRL+C if you want to stop now. + +======================================================================= +EOF -if [ "$NEEDUSER" = 1 ] ; then - echo adding nagios user - /usr/sbin/useradd -g nagios nagios - /usr/sbin/usermod -s /bin/false -d $NAGIOSHOME nagios -else - echo nagios user detected -fi +sleep 10 + +exit 0 Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-10-12 17:15:17 UTC (rev 6844) @@ -1,12 +1,14 @@ d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/send_nsca 0755 root bin d none /opt/csw/etc 0755 root bin -f cswpreserveconf /opt/csw/etc/send_nsca.cfg.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/nagios/send_nsca.cfg.CSW 0644 root bin d none /opt/csw/share/doc/send_nsca 0755 root bin f none /opt/csw/share/doc/send_nsca/Changelog 0644 root bin f none /opt/csw/share/doc/send_nsca/LEGAL 0644 root bin f none /opt/csw/share/doc/send_nsca/README 0644 root bin f none /opt/csw/share/doc/send_nsca/SECURITY 0644 root bin f none /opt/csw/share/doc/send_nsca/submit_check_result-sample 0755 root bin +d none /opt/csw/etc/pkg/CSWsendnsca 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWsendnsca/cswusergroup 0644 root bin i pkginfo=CSWsendnsca.pkginfo i preinstall=CSWsendnsca.preinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Tue Oct 13 12:47:15 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Tue, 13 Oct 2009 10:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6845] csw/mgar/pkg/ncmpc/trunk Message-ID: Revision: 6845 http://gar.svn.sourceforge.net/gar/?rev=6845&view=rev Author: trygvis Date: 2009-10-13 10:47:14 +0000 (Tue, 13 Oct 2009) Log Message: ----------- o Upgrading to latest; 0.15. Modified Paths: -------------- csw/mgar/pkg/ncmpc/trunk/Makefile csw/mgar/pkg/ncmpc/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ncmpc/trunk/files/ Modified: csw/mgar/pkg/ncmpc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncmpc/trunk/Makefile 2009-10-12 17:15:17 UTC (rev 6844) +++ csw/mgar/pkg/ncmpc/trunk/Makefile 2009-10-13 10:47:14 UTC (rev 6845) @@ -1,9 +1,9 @@ GARNAME = ncmpc -GARVERSION = 0.11.1 +GARVERSION = 0.15 CATEGORIES = apps GARCOMPILER = GNU -OPTARCH_i386 = i686 +#OPTARCH_i386 = i686 DESCRIPTION = ncurses client for controlling Music Player Daemons (MPD) define BLURB @@ -14,9 +14,9 @@ to manage playlists and control MPD with a remote control. endef -MASTER_SITES = http://hem.bredband.net/kaw/ncmpc/files/ +SF_PROJ = musicpd +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWncmpc,prototype) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -26,4 +26,10 @@ include gar/category.mk CPPFLAGS += -I/opt/csw/include/ncurses LDFLAGS += -lsocket -lnsl -lintl -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-colors +CONFIGURE_ARGS += --enable-lyrics-screen + +REQUIRED_PKGS = CSWggettextrt +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWncurses Modified: csw/mgar/pkg/ncmpc/trunk/checksums =================================================================== --- csw/mgar/pkg/ncmpc/trunk/checksums 2009-10-12 17:15:17 UTC (rev 6844) +++ csw/mgar/pkg/ncmpc/trunk/checksums 2009-10-13 10:47:14 UTC (rev 6845) @@ -1,3 +1,3 @@ -c90668b12f3676c73913a863482ec405 download/ncmpc-0.11.1.tar.gz -539c628ad5e2574fbf13885e1ce41969 download/CSWncmpc.gspec -07ba532add82c860335cd0f35154df0b download/CSWncmpc.prototype +539c628ad5e2574fbf13885e1ce41969 CSWncmpc.gspec +07ba532add82c860335cd0f35154df0b CSWncmpc.prototype +363fde730c9b4a5cec05e00e7ae64e03 ncmpc-0.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 13:45:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 11:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6846] csw/mgar/pkg/postgresql Message-ID: Revision: 6846 http://gar.svn.sourceforge.net/gar/?rev=6846&view=rev Author: dmichelsen Date: 2009-10-13 11:45:16 +0000 (Tue, 13 Oct 2009) Log Message: ----------- postgresql: Relocate legacy to tags/ Added Paths: ----------- csw/mgar/pkg/postgresql/tags/legacy-8.3.3/ Removed Paths: ------------- csw/mgar/pkg/postgresql/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 13:48:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 11:48:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6847] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 6847 http://gar.svn.sourceforge.net/gar/?rev=6847&view=rev Author: dmichelsen Date: 2009-10-13 11:48:57 +0000 (Tue, 13 Oct 2009) Log Message: ----------- posgresql: Start converting legacy scripts to GAR Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt csw/mgar/pkg/postgresql/trunk/files/cswpostgres csw/mgar/pkg/postgresql/trunk/files/cswusergroup csw/mgar/pkg/postgresql/trunk/files/postgresql.conf Property Changed: ---------------- csw/mgar/pkg/postgresql/trunk/ Property changes on: csw/mgar/pkg/postgresql/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-10-13 11:45:16 UTC (rev 6846) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-10-13 11:48:57 UTC (rev 6847) @@ -1,16 +1,68 @@ -GARNAME = package -GARVERSION = 1.0 -CATEGORIES = category +GARNAME = postgresql +GARVERSION = 8.4.1 +CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = An advanced open source database define BLURB - Long description endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += cswpostgres +DISTFILES += cswusergroup +DISTFILES += postgresql.conf +DISTFILES += README-CSW.txt +PACKAGES = CSWpostgresql CSWpostgresqldoc CSWpostgresqldevel CSWlibpq + +CATALOGNAME_CSWpostgresql = postgresql +CATALOGNAME_CSWpostgresqldoc = postgresql_doc +CATALOGNAME_CSWpostgresqldevel = postgresql_devel +CATALOGNAME_CSWlibpq = libpq + +SPKG_DESC_CSWpostgresql = An advanced open source database +SPKG_DESC_CSWpostgresqldoc = PostgreSQL Documentation +SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files +SPKG_DESC_CSWlibpq = PostgreSQL Libraries + +SPKG_SOURCEURL = http://www.postgresql.org/ + +REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq +REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql + +LICENSE = COPYRIGHT + +prefix = $(BUILD_PREFIX)/postgresql +docdir = $(BUILD_PREFIX)/share/doc + +EXTRA_INC = $(BUILD_PREFIX)/include +EXTRA_LIB = $(BUILD_PREFIX)/lib + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + +EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" + +PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpq = $(PKGFILES_RT) + +# -> TODO: start in rc3.d S10, Stop everywhere else in K90 +INITSMF = /etc/init.d/cswpostgres + +# -> TODO: Migrate /opt/csw/var/pgdata to /var/opt/csw/postgresql/pgdata +USERGROUP = /opt/csw/etc/pkg/postgresql + +# -> TODO: Migrate /opt/csw/etc/postgresql.conf to /etc/opt/csw/postgresql.conf +PRESERVECONF = /opt/csw/etc/postgresql.conf + include gar/category.mk + +post-merge: + ginstall -d $(PKGROOT)/etc/init.d && ginstall $(WORKDIR)/cswpostgres $(PKGROOT)/etc/init.d/ + ginstall -d $(PKGROOT)/opt/csw/etc/pkg/postgresql && ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/opt/csw/etc/pkg/postgresql/ + ginstall -d $(PKGROOT)/opt/csw/etc && ginstall $(WORKDIR)/postgresql.conf $(PKGROOT)/opt/csw/etc/ + ginstall -d $(PKGROOT)$(docdir)/postgresql/ && ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/postgresql/ + @$(MAKECOOKIE) Added: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums (rev 0) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,5 @@ +45613fd5367cd230505ad68feb9ad634 README-CSW.txt +6916c5b1a6e1285c6a564abf4b659697 cswpostgres +443171cc5303a8ea0f0a13cbb5e32189 cswusergroup +f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 +121c45f17350191ca5676453c25716da postgresql.conf Copied: csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt (from rev 6825, csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,103 @@ +*** Important information - please make sure you read this ! *** + +*** Migrating from older versions *** + +If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, +your databases will NOT work on this 8.3.x version. Before upgrading, you +should dump your databases using the old utilities. You can then create a +new data directory using this 8.3.x package, and import your dumps. +See the "64-bit support" section below for pointers to documentation on t +his. + +Another point to note is that the location of the PostgreSQL install has +changed. Previous 7.3.x packages used /opt/csw as the base - this package +uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your +$PATH, and any scripts you have written using the old locations will have to +be changed. + + +*** User configuration of server options *** + +Configuration of the server start-up options is now done through a user- +configuration file, /opt/csw/etc/postgresql.conf. A sample template has been +provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change +any of the server options discussed below, make a copy of this file to +/opt/csw/etc/postgresql.conf and edit it accordingly. + +If you cannot modify this file (for instance, you are mounting /opt/csw +from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf +instead, and it will take precedence over /opt/csw/etc/postgresql.conf. + +*** Networking *** + +By default, the cswpostgres init script will start the server up listening on +localhost only. If you want to allow other hosts on your network to connect, you +will need to add "-o -i" to the value of SERVEROPTS in the user configuration +file and restart your server. The included template has the line already +entered, you just need to uncomment it (remove the leading #). + +Once this is done, PostgreSQL will now bind to all network interfaces and +listen for connections. You will still need to configure which hosts are allowed +access by modifying the pg_hba.conf file in your data directory - read the manual +for more information on this. + +*** 64-bit support *** + +The SPARC packages have been built with 64-bit support, but by default, the +32-bit version of the server will be run. If you need the 64-bit version, +edit the user configuration file and change the values of PGINIT and PGCTL +accordingly. + +It is important to note that the 64-bit server WILL NOT WORK with databases +created with the 32-bit version, and vice versa. You will get an error +message if you attempt this. + +In order to migrate your system to the 64-bit server, you will need to dump +your databases while running the 32-bit client, stop and upgrade the server, +initialise a new database directory, and import your dumps. For more information +on this procedure, see the PostgreSQL manual (included with this package), +chapter 9 - Backup and restore. This is located at : + +/opt/csw/postgresql/share/doc/html/backup.html + +All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the +'isaexec' wrapper, which will run the appropriate binary for your +architecture and/or kernel. + +*** Starting the server *** + +The PostgreSQL database runs under the user 'postgres' - this has been created +for you by the installation script. + +The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not +exist, you will need to create it yourself before the database will start. +You can change the location of the data directory by altering the user +configuration file, and modifying the value of PGDATA. + +A startup script has been provided for you that handles database initialisation, +startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You +should always use this script to start or stop the server, otherwise you may +find that you are running the wrong binaries (64-bit instead of 32-bit). + +It is set to start the database the next time the system enters runlevel 3 - +usually, this will be at the next boot. + +To create the data directory, the startup script accepts the "init" argument : + +/etc/init.d/cswpostgres init + +This will create and initialise the data directory. After this step has been +completed succesfully, the database can be started with : + +/etc/init.d/cswpostgres start + +If you get errors relating to shared memory on startup, make sure you have read +the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the +PostgreSQL HTML Administrator's Guide, located at + +/opt/csw/postgresql/share/doc/html/index.html + + +Mark Round, +mark at blastwave.org + Copied: csw/mgar/pkg/postgresql/trunk/files/cswpostgres (from rev 6825, csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,97 @@ +#!/bin/sh +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf + +# Defaults +[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata +[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + + +# The following attempts to catch any mistakes in the server +# version - it checks if the 64-bit server was last run. If so, +# it forces the 64-bit server, otherwise it won't start up! +# And vice-versa for the 32-bit server... +if [ -f $PGDATA/postmaster.opts ]; then + grep 'sparcv9' $PGDATA/postmaster.opts > /dev/null + if [ $? -eq 0 ]; then + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -eq 0 ]; then + echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," + echo " but 64-bit version was last run. Using 64-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + else + # Did not detect 64-bit server last used + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -ne 0 ]; then + echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," + echo " but 32-bit version was last run. Using 32-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + fi +fi + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to /var/tmp, as pgctl etc. need to be started from +# a directory that they can read +cd /var/tmp + +case "$1" in +start) + if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" + ;; + +status) + su postgres -c "$PGCTL -D $PGDATA status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at $PGDATA..." + # Create it, unless it's already there and empty + [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA + chown postgres $PGDATA + echo "Initialising PostgreSQL database..." + su postgres -c "$PGINIT -D $PGDATA > /dev/null" + ;; + +*) + echo "Usage: $0 (init|start|stop|restart|reload|status)" + ;; + +esac + Added: csw/mgar/pkg/postgresql/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1 @@ +postgres::CSW Postgres:/opt/csw/var/pgdata:/bin/sh:: Copied: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf (from rev 6825, csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf 2009-10-13 11:48:57 UTC (rev 6847) @@ -0,0 +1,34 @@ +# Example PostgreSQL server configuration file. +# Provided by the Blastwave package of PostgreSQL. +# This file is read by the /etc/init.d/cswpostgres startup script, +# and can be used to override the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=/opt/csw/var/pgdata + + +# Which binaries to use, 32- or 64-bit. +# Only use the 64-bit server if you're sure you need it. +# Make sure you have read /opt/csw/postgresql/share/doc/README-CSW.txt +# before changing these, as your databases may not work without +# a 'dump and restore' cycle ! + +# 32-bit server - default, and fine for most uses +PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + +# 64-bit server - uncomment these lines only if you really need them. +#PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl +#PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + + +# Additional options to pass to postmaster. +# These options will be passed to the postmaster program. The most common use of +# these is to allow network access to PostgreSQL from other hosts over TCP/IP. +# This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. +# Note that you will still need to configure authentication in the pg_hba.conf +# in your data directory. +# SERVEROPTS="-o -i" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 15:02:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 13:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6848] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswetcservices Message-ID: Revision: 6848 http://gar.svn.sourceforge.net/gar/?rev=6848&view=rev Author: bdwalton Date: 2009-10-13 13:02:15 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: correct regex used for /etc/services registration detection Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 11:48:57 UTC (rev 6847) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:02:15 UTC (rev 6848) @@ -29,7 +29,7 @@ fi - /usr/xpg4/bin/grep -q "^$svcname[[:space:]]$port_proto" $svcfile + /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile if [ $? -ne 0 ]; then echo "$svcname $port_proto # $PKGINST" >> $svcfile fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 15:10:36 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 13:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6849] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 6849 http://gar.svn.sourceforge.net/gar/?rev=6849&view=rev Author: bdwalton Date: 2009-10-13 13:10:36 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: use /etc/{inetd.conf,services} instead of files in /etc/inet to have better effect on opensolaris Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:02:15 UTC (rev 6848) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:10:36 UTC (rev 6849) @@ -1,7 +1,7 @@ #!/bin/sh # # i.cswetcservices - Class action script -# for CSW /etc/inet/services registrations +# for CSW /etc/services registrations # # Written and maintained by Ben Walton # @@ -17,7 +17,7 @@ echo $dest /usr/bin/cp $src $dest || exit 2 - svcfile=/etc/inet/services + svcfile=/etc/services /usr/xpg4/bin/grep -v "^#" $dest | while read svc; do set -- $svc @@ -28,7 +28,6 @@ echo "svcname: $svcname; port/proto: $port_proto" fi - /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile if [ $? -ne 0 ]; then echo "$svcname $port_proto # $PKGINST" >> $svcfile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 13:02:15 UTC (rev 6848) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 13:10:36 UTC (rev 6849) @@ -58,7 +58,7 @@ # we won't register with inetd if the service name isn't registered # in the global services file. - /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/inet/services + /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/services if [ $? -eq 0 ]; then if [ -n "$DEBUG" ]; then echo "Installing inetd service:" @@ -92,7 +92,7 @@ else [ -n "$DEBUG" ] && echo "For solaris 8 or 9" - inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf + inetdconf=$PKG_INSTALL_ROOT/etc/inetd.conf echo "Installing '$svcname' into inetd.conf." echo "# $PKGINST: added by i.cswinetd" >> $inetdconf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 13 15:27:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Oct 2009 13:27:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6850] csw/mgar/pkg/examples Message-ID: Revision: 6850 http://gar.svn.sourceforge.net/gar/?rev=6850&view=rev Author: wahwah Date: 2009-10-13 13:27:05 +0000 (Tue, 13 Oct 2009) Log Message: ----------- examples/loose-files: Initial commit Modified Paths: -------------- csw/mgar/pkg/examples/loose-files/trunk/Makefile csw/mgar/pkg/examples/loose-files/trunk/checksums Added Paths: ----------- csw/mgar/pkg/examples/loose-files/ Modified: csw/mgar/pkg/examples/loose-files/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/examples/loose-files/trunk/Makefile 2009-10-13 13:27:05 UTC (rev 6850) @@ -2,181 +2,38 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg +GARNAME = loose-files GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +CATEGORIES = utils +DESCRIPTION = An example of a package created from loose files. define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +PACKAGES = CSWloosefilesexa +CATALOGNAME = loose_files_example + +# The directory where all the sources are kept. The slash at the end is +# necessary. +LOCAL_SRC = /usr/xpg4/ + +# The list of files to include, relative to LOCAL_SRC +FILES = bin/grep +FILES += include/curses.h + +MASTER_SITES = $(sort $(addprefix file://$(LOCAL_SRC),$(dir $(FILES)))) +DISTFILES = $(notdir $(FILES)) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/examples/loose-files/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-12 09:12:22 UTC (rev 6843) +++ csw/mgar/pkg/examples/loose-files/trunk/checksums 2009-10-13 13:27:05 UTC (rev 6850) @@ -0,0 +1,2 @@ +1738ceecf464e2b847c27cf9e7c410a6 curses.h +f50d8b08c2ae68dc9b090c2c39abc4f0 grep This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Oct 13 16:27:44 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 13 Oct 2009 14:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6851] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6851 http://gar.svn.sourceforge.net/gar/?rev=6851&view=rev Author: bonivart Date: 2009-10-13 14:27:44 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: new version with minor bug fixes Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-13 13:27:05 UTC (rev 6850) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-13 14:27:44 UTC (rev 6851) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.20 +GARVERSION = 1.21 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 13:27:05 UTC (rev 6850) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2009-10-13 14:27:44 UTC (rev 6851) @@ -7,7 +7,7 @@ # # 2009-10-11 Initial release -# set DEBUG to any value to enable trace outpu. +# set DEBUG to any value to enable trace output DEBUG= echo "Installing class ..." Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 13:27:05 UTC (rev 6850) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-13 14:27:44 UTC (rev 6851) @@ -6,7 +6,7 @@ # # 2009-10-02 Initial release -# set DEBUG to any value to enable trace outpu. +# set DEBUG to any value to enable trace output DEBUG= # Source csw.conf, if it exists This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 16:41:02 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 14:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6852] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.README.CSW Message-ID: Revision: 6852 http://gar.svn.sourceforge.net/gar/?rev=6852&view=rev Author: bdwalton Date: 2009-10-13 14:41:01 +0000 (Tue, 13 Oct 2009) Log Message: ----------- cswclassutils: update README for cswinetdconf and cswetcservices Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-10-13 14:27:44 UTC (rev 6851) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-10-13 14:41:01 UTC (rev 6852) @@ -38,11 +38,21 @@ - cswpycompile This class takes care of creating/removing python's normal and optimized - bytecode files. Set all *.py files' class = pycompile to activate. - Example: - # use prototype filters to set the class - PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } { print }' + bytecode files. Set all *.py files' class = cswpycompile to activate. + In GAR, set the variable PYCOMPILE = 1 to activate. + +- cswinetdconf + + This class manipulates /etc/inetd.conf (solaris 8/9) or enables an + inetd service in smf (solaris 10+). + +- cswetcservices + + This class takes care of registering services in the global + /etc/services file. It is a one way manipulation. At package + removal, the service entries are left behind. + Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package. -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 13 17:08:14 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 13 Oct 2009 15:08:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6853] csw/mgar/pkg/gitosis/trunk Message-ID: Revision: 6853 http://gar.svn.sourceforge.net/gar/?rev=6853&view=rev Author: bdwalton Date: 2009-10-13 15:08:14 +0000 (Tue, 13 Oct 2009) Log Message: ----------- gitosis: prepare for cswinetdconf class utils support Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gitosis/trunk/files/inetd.conf Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-13 14:41:01 UTC (rev 6852) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-13 15:08:14 UTC (rev 6853) @@ -59,9 +59,10 @@ GITOSISHOME = /var/opt/csw/gitosis CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:: -CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) +CSWPKGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup +INETDCONF = /opt/csw/etc/pkg/CSWgitosis/inetd.conf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }' @@ -78,8 +79,9 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) post-install-modulated: - @( gmkdir -p $(CSWUGD); \ - echo "$(CSWUG)" > $(CSWUGD)/cswusergroup; \ + @( gmkdir -p $(CSWPKGD); \ + echo "$(CSWUG)" > $(CSWPKGD)/cswusergroup; \ + ginstall -m 0644 $(FILEDIR)/inetd.conf $(CSWPKGD); \ gmkdir -p $(INSTALLISADIR)$(GITOSISHOME); \ echo 'PATH=/opt/csw/bin:$$PATH' > $(INSTALLISADIR)$(GITOSISHOME)/.bashrc; \ echo 'PATH=/opt/csw/bin:$$PATH' > $(INSTALLISADIR)$(GITOSISHOME)/.bash_profile; \ Added: csw/mgar/pkg/gitosis/trunk/files/inetd.conf =================================================================== --- csw/mgar/pkg/gitosis/trunk/files/inetd.conf (rev 0) +++ csw/mgar/pkg/gitosis/trunk/files/inetd.conf 2009-10-13 15:08:14 UTC (rev 6853) @@ -0,0 +1 @@ +git stream tcp nowait gitosis /opt/csw/bin/git git daemon --base-path=/var/opt/csw/gitosis/repositories --syslog --inetd --verbose \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 18:01:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 16:01:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6854] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6854 http://gar.svn.sourceforge.net/gar/?rev=6854&view=rev Author: dmichelsen Date: 2009-10-13 16:01:17 +0000 (Tue, 13 Oct 2009) Log Message: ----------- mGAR v2: Preserve perms etc. on merge-phase Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-13 15:08:14 UTC (rev 6853) +++ csw/mgar/gar/v2/gar.mk 2009-10-13 16:01:17 UTC (rev 6854) @@ -691,14 +691,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -706,7 +706,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -714,7 +714,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -722,7 +722,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 18:01:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 16:01:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6855] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 6855 http://gar.svn.sourceforge.net/gar/?rev=6855&view=rev Author: dmichelsen Date: 2009-10-13 16:01:56 +0000 (Tue, 13 Oct 2009) Log Message: ----------- mGAR v2: Allow special chars in package names Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:01:17 UTC (rev 6854) +++ csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:01:56 UTC (rev 6855) @@ -143,7 +143,7 @@ # checksums without path this is not necessary. checksum-%: $(CHECKSUM_FILE) @echo " ==> Running checksum on $*" - @if gegrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + @if ggrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ echo '(!!!) $* failed checksum test!' 1>&2; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 13 18:23:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Oct 2009 16:23:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6856] csw/mgar/gar/v2 Message-ID: Revision: 6856 http://gar.svn.sourceforge.net/gar/?rev=6856&view=rev Author: dmichelsen Date: 2009-10-13 16:23:26 +0000 (Tue, 13 Oct 2009) Log Message: ----------- mGAR v2: Copy stuff from DISTFILES to global WORKDIR without unpacking Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:01:56 UTC (rev 6855) +++ csw/mgar/gar/v2/gar.lib.mk 2009-10-13 16:23:26 UTC (rev 6856) @@ -393,6 +393,9 @@ extract-archive-%.git: git-extract-%.git @$(MAKECOOKIE) +extract-copy-%: cp-extract-% + @$(MAKECOOKIE) + # anything we don't know about, we just assume is already # uncompressed and unarchived in plain format extract-archive-%: cp-extract-% Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-13 16:01:56 UTC (rev 6855) +++ csw/mgar/gar/v2/gar.mk 2009-10-13 16:23:26 UTC (rev 6856) @@ -329,8 +329,9 @@ garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) +EXTRACT_TARGETS-global ?= $(addprefix extract-copy-,$(filter-out $(NOEXTRACT),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS-default = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS = $(or $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-default)) # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 02:19:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 00:19:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6857] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6857 http://gar.svn.sourceforge.net/gar/?rev=6857&view=rev Author: bdwalton Date: 2009-10-14 00:19:34 +0000 (Wed, 14 Oct 2009) Log Message: ----------- git: rework doc build/install; update for pending ETCSERVICES support Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-13 16:23:26 UTC (rev 6856) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-14 00:19:34 UTC (rev 6857) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -# TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel @@ -30,7 +30,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs - + REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror REQUIRED_PKGS_CSWgit += CSWpmtermreadkey @@ -123,15 +123,17 @@ BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ETC_GITCONFIG=$(sysconfdir)/gitconfig \ ASCIIDOC_NO_ROFF=YesPlease \ - all + all doc INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \ INSTALLDIRS=vendor \ - install-doc + install-man install-html # We want static libs installed for our devel package MERGE_EXCLUDE_STATICLIBS = +ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services + include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts @@ -155,6 +157,10 @@ post-install-modulated: ID=$(DESTDIR)/$(includedir)/git post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git post-install-modulated: + @echo Installing /etc/services definitions file + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWgit/; \ + echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \ + echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); ) @echo Cleaning up perl stuff @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* @rm -rf $(DESTDIR)/$(perllib)/ @@ -172,13 +178,6 @@ done; \ ginstall -c -m 0444 libgit.a $(LD)/; \ ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a ) - @echo Installing Documentation - @( cd $(WORKSRC); \ - ginstall -c -m 0755 -d $(GD); \ - cp -R Documentation/*.txt $(GD)/; \ - cp -R contrib/hooks README COPYING $(GD)/; \ - cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \ - cp -R Documentation/howto Documentation/technical $(GD)/; ) @echo Installing Bash Completion files @( cd $(WORKSRC); \ ginstall -c -m 0755 -d $(BD); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 04:37:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 02:37:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6858] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 6858 http://gar.svn.sourceforge.net/gar/?rev=6858&view=rev Author: bdwalton Date: 2009-10-14 02:37:00 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: add ability to specify that created account is NP instead of *LK* Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 00:19:34 UTC (rev 6857) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 02:37:00 UTC (rev 6858) @@ -34,6 +34,7 @@ dir=`echo $i | awk -F':' '{print $4}'` shell=`echo $i | awk -F':' '{print $5}'` create=`echo $i | awk -F':' '{print $6}'` + nopass=`echo $i | awk -F':' '{print $8}'` if [ -n "$group" ]; then /bin/getent group $group > /dev/null if [ $? -ne 0 ]; then @@ -77,6 +78,27 @@ else echo User $user already exists fi + + if [ -n "$nopass" ]; then + omask=`umask` + umask 0377 + awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST + if [ $? -eq 0 ]; then + cmp -s /etc/shadow /etc/shadow.$PKGINST + if [ $? -ne 0 ]; then + echo "Updating account '$user' to be no-login (NP)" + chgrp sys /etc/shadow.$PKGINST + cp -p /etc/shadow /etc/shadow.CSW && \ + mv /etc/shadow.$PKGINST /etc/shadow + else + rm /etc/shadow.$PKGINST + fi + else + echo "ERROR: Setting NP for '$user' failed." + rm /etc/shadow.$PKGINST + fi + umask $omask + fi else echo No user to create fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 16:04:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:04:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6859] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 6859 http://gar.svn.sourceforge.net/gar/?rev=6859&view=rev Author: bdwalton Date: 2009-10-14 14:04:00 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: cswusergroup: use passwd -N on solaris 10 or newer, only munge shadow manually on 8/9 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 02:37:00 UTC (rev 6858) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2009-10-14 14:04:00 UTC (rev 6859) @@ -80,24 +80,36 @@ fi if [ -n "$nopass" ]; then - omask=`umask` - umask 0377 - awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST - if [ $? -eq 0 ]; then - cmp -s /etc/shadow /etc/shadow.$PKGINST - if [ $? -ne 0 ]; then - echo "Updating account '$user' to be no-login (NP)" - chgrp sys /etc/shadow.$PKGINST - cp -p /etc/shadow /etc/shadow.CSW && \ - mv /etc/shadow.$PKGINST /etc/shadow - else - rm /etc/shadow.$PKGINST - fi - else - echo "ERROR: Setting NP for '$user' failed." - rm /etc/shadow.$PKGINST - fi - umask $omask + case "`uname -r`" in + 5.8|5.9) + # for old solaris, we munge the shadow file manually. + omask=`umask` + umask 0377 + awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST + if [ $? -eq 0 ]; then + cmp -s /etc/shadow /etc/shadow.$PKGINST + if [ $? -ne 0 ]; then + echo "Updating account '$user' to be no-login (NP)" + chgrp sys /etc/shadow.$PKGINST + cp -p /etc/shadow /etc/shadow.CSW && \ + mv /etc/shadow.$PKGINST /etc/shadow + else + rm /etc/shadow.$PKGINST + fi + else + echo "ERROR: Setting NP for '$user' failed." + rm /etc/shadow.$PKGINST + fi + umask $omask + ;; + *) + # for modern solaris, use the built-in tools + passwd -N $user + if [ $? -ne 0 ]; then + echo "ERROR: Setting NP for '$user' failed." + fi + ;; + esac fi else echo No user to create This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 16:26:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6860] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6860 http://gar.svn.sourceforge.net/gar/?rev=6860&view=rev Author: bdwalton Date: 2009-10-14 14:26:39 +0000 (Wed, 14 Oct 2009) Log Message: ----------- gar: add support for ETCSERVICES (cswetcservices) and INETDCONF (cswinetd) class action scripts; arrange ordering of SPKG_CLASSES to ensure initsmf/inetd are added last; factor the conditional adding of classes into a function Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-10-14 14:04:00 UTC (rev 6859) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-10-14 14:26:39 UTC (rev 6860) @@ -160,17 +160,30 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils -# - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) +# append $2 to SPKG_CLASSES if $1 is non-null +define _spkg_cond_add +$(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) +endef + +# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should +# always be the last two added. The reason for this is that +# you need to ensure any binaries and config files are already on disk +# and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) +SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) +SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) +SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) +SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) +SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) +SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) + # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 14 16:52:08 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6861] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 6861 http://gar.svn.sourceforge.net/gar/?rev=6861&view=rev Author: bonivart Date: 2009-10-14 14:52:07 +0000 (Wed, 14 Oct 2009) Log Message: ----------- miltergreylist: update to 4.2.3, use new gar features Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums Added Paths: ----------- csw/mgar/pkg/miltergreylist/trunk/files/COPYING csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug csw/mgar/pkg/miltergreylist/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2009-10-14 14:26:39 UTC (rev 6860) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2009-10-14 14:52:07 UTC (rev 6861) @@ -1,29 +1,32 @@ GARNAME = miltergreylist -GARVERSION = 4.2 -RELEASE = b1 -DISTVERSION = $(GARVERSION)$(RELEASE) +GARVERSION = 4.2.3 +#RELEASE = rc1 +#DISTVERSION = $(GARVERSION)$(RELEASE) +DISTVERSION = $(GARVERSION) DISTNAME = milter-greylist-$(DISTVERSION) WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net -DESCRIPTION = greylist mail filtering method +DESCRIPTION = Greylist mail filtering method define BLURB + Greylist mail filtering method endef MASTER_SITES = http://ftp.espci.fr/pub/milter-greylist/ DISTFILES = milter-greylist-$(DISTVERSION).tgz -DISTFILES += $(call admfiles,CSWmiltergreylist,) +DISTFILES += COPYING -REQUIRED_PKGS = CSWsendmail CSWcurlrt CSWgeoip CSWcswclassutils +REQUIRED_PKGS = CSWsendmail CSWcurlrt CSWgeoip # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz -#CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw -CONFIGURE_ARGS += --with-user=bonivart +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw #CONFIGURE_ARGS += --with-user=greylist -CONFIGURE_ARGS += --with-conffile=/opt/csw/etc/mail/greylist.conf +CONFIGURE_ARGS += --with-user=`/usr/xpg4/bin/id -u` +CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf CONFIGURE_ARGS += --enable-dnsrbl CONFIGURE_ARGS += --enable-stdio-hack CONFIGURE_ARGS += --localstatedir=/var/opt/csw/milter-greylist @@ -31,12 +34,40 @@ CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man +#SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf + TEST_SCRIPTS = +INSTALL_SCRIPTS = custom +USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup +SAMPLECONF = /etc/opt/csw/greylist.conf.CSW +INITSMF = /etc/opt/csw/init.d/cswmiltergreylist -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswmiltergreylist$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/greylist.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" } { print }' +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/var\/opt\/csw\/miltergreylist/ { $$$$4 = "0700" ; $$$$5 = "greylist" } \ + { print }' include gar/category.mk #WORKSRC := $(WORKDIR)/$(GARNAME)-$(GARVERSION)b1 SPKG_SOURCEURL = http://hcpnet.free.fr/milter-greylist -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) +#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + +DOCLIST = README ChangeLog greylist.conf greylist2.conf milter-greylist.m4 + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake DESTDIR=$(DESTDIR) install ) + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw + @mv $(DESTDIR)/etc/mail/greylist.conf $(DESTDIR)/etc/opt/csw/greylist.conf.CSW + @rmdir $(DESTDIR)/etc/mail + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + @ginstall -d -m 755 $(DESTDIR)/var/opt/csw/$(GARNAME) + @rmdir $(DESTDIR)/var/milter-greylist + @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) + @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)/cswusergroup + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d + @cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist + @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)$(GARNAME) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2009-10-14 14:26:39 UTC (rev 6860) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2009-10-14 14:52:07 UTC (rev 6861) @@ -1,2 +1,2 @@ -2e76e2643469ec393a15dfce9f8ff695 download/milter-greylist-4.2b1.tgz -e8f3c634293ea11273eeb1bd78d95d35 download/CSWmiltergreylist.gspec +e61edd088404cd2a0eacb03ce70e2d5f COPYING +e821a8a4527c1e313f21fe36dbde4a24 milter-greylist-4.2.3.tgz Added: csw/mgar/pkg/miltergreylist/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/COPYING 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1,149 @@ + 20 License + ========== + +This software is available under a 3 clauses BSD license: + Copyright (c) 2004-2007 Emmanuel Dreyfus + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Emmanuel Dreyfus + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + +If you run on a non-BSD system, two files with different licenses might +be required for building or installing. + +install-sh has a MIT BSD-like license: + Copyright 1991 by the Massachusetts Institute of Technology + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. M.I.T. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + + +queue.h has a 4 clause BSD license: + Copyright (c) 1991, 1993 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + +The configure script has the following license: + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + + +If you use the 32 bit ABI on Solaris and have a large traffic, you will +need the a workaround for stdio unability to use streams with associated +file dexriptor above 255. The files implementing the workaround are +fd_pool.c and fd_pool.h, and they have a 3 clause BSD license: + Copyright (c) 2007 Johann Klasek + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Johann Klasek + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + +SpamAssassin binding requires the spamd.c file, which has a 3-clauses +BSD licence: + Copyright (c) 2008 Manuel Badzong, Emmanuel Dreyfus + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Manuel Badzong + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec 2009-10-14 14:26:39 UTC (rev 6860) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec 2009-10-14 14:52:07 UTC (rev 6861) @@ -1,7 +0,0 @@ -%var bitname miltergreylist -%var pkgname CSWmiltergreylist -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/miltergreylist/README for license information - Added: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1,47 @@ +#!/sbin/sh + +# 2009-10-13 Peter Bonivart + +if [ -f /lib/svc/share/smf_include.sh ]; then + . /lib/svc/share/smf_include.sh +fi + +MILDIR=/var/opt/csw/miltergreylist +BINDIR=/opt/csw/bin +USER=greylist + +#OPTIONS="-v -w 14m" +OPTIONS="-u $USER -f /etc/opt/csw/greylist.conf" + +case "$1" in + start) + # Start daemon + echo "Starting milter-greylist ..." + chown $USER $MILDIR + ulimit -n 1024 + $BINDIR/milter-greylist $OPTIONS + ;; + stop) + # Stop daemon + echo "Shutting down milter-greylist ..." + /usr/bin/kill `cat $MILDIR/milter-greylist.pid` > /dev/null 2>&1 + ;; + restart) + echo "Restarting milter-greylist ... " + $0 stop + echo "Waiting for milter-greylist to stop: \c" + while ( pgrep milter-greylist > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; + *) + echo "Usage: `basename $0` { start | stop | restart}" + exit 1 +esac + +exit 0 Added: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1 @@ +greylist:greylist:CSW Milter-Greylist:/bin/false:/false::NP Added: csw/mgar/pkg/miltergreylist/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/README.CSW 2009-10-14 14:52:07 UTC (rev 6861) @@ -0,0 +1,26 @@ +README.CSW +========== + +Installation +------------ + +1. If you're adding directly to your mc-file you should use this instead of + what's in the official README since the location of the socket isn't correct. + +INPUT_MAIL_FILTER(`greylist', `S=local:/var/opt/csw/milter-greylist/milter-greyl +ist.sock') +define(`confMILTER_MACROS_CONNECT', `j, {if_addr}') +define(`confMILTER_MACROS_HELO', `{verify}, {cert_subject}') +define(`confMILTER_MACROS_ENVFROM', `i, {auth_authen}') +define(`confMILTER_MACROS_ENVRCPT', `{greylist}') + + The included m4-file is fixed. + +2. Build a new cf-file. +3. Modify /etc/opt/csw/greylist.conf as needed. +4. Start milter-greylist with "/etc/init.d/cswmiltergreylist start" or + "svcadm enable cswmiltergreylist". + +More info: http://milter-greylist.wikidot.com. + +bonivart/091013 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 14 16:57:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Oct 2009 14:57:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6862] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 6862 http://gar.svn.sourceforge.net/gar/?rev=6862&view=rev Author: wahwah Date: 2009-10-14 14:57:08 +0000 (Wed, 14 Oct 2009) Log Message: ----------- wxwidgets: Modulation over version, building 2.8.5 and 2.8.10 (0.2.0 and 0.6.0) shared objects. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch csw/mgar/pkg/wxwidgets/trunk/files/0501-a-possible-fix-to-wxchar.h.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 14:52:07 UTC (rev 6861) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 14:57:08 UTC (rev 6862) @@ -12,14 +12,33 @@ wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them. endef +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 2.8.5 2.8.10 +MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only +MERGE_DIRS_isa-i386-garversion-2.8.5 = $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.5 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-2.8.5 = $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-2.8.10 = copy-all +MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.10 = copy-all + +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows -PATCHFILES = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES += 0002-Fixing-retarded-checks-for-libGL.patch -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +DISTFILES = $(SOURCEFILES) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = wxwidgets PACKAGES = CSWwxwidgetscommon PACKAGES += CSWwxwidgetsdevel PACKAGES += CSWwxwidgetsgtk2 @@ -27,6 +46,7 @@ SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support + REQUIRED_PKGS = CSWexpat REQUIRED_PKGS += CSWfconfig REQUIRED_PKGS += CSWftype2 @@ -42,6 +62,9 @@ REQUIRED_PKGS += CSWtiff REQUIRED_PKGS += CSWzlib +REQUIRED_PKGS_CSWwxwidgetsgtk2 = CSWwxwidgetscommon +REQUIRED_PKGS_CSWwxwidgetsdevel = CSWwxwidgetscommon + PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWgtk2devel PREREQUISITE_PKGS += CSWlibpthreadstubs @@ -56,13 +79,11 @@ PREREQUISITE_PKGS += SUNWxwinc PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) -REQUIRED_PKGS_CSWwxwidgetsgtk2 = CSWwxwidgetscommon -REQUIRED_PKGS_CSWwxwidgetsdevel = CSWwxwidgetscommon - CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 @@ -81,9 +102,10 @@ CONFIGURE_ARGS_5.10 = --enable-unicode CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt +EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include EXTRA_LIB = /opt/csw/X11/lib -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig INSTALL_SCRIPTS = wxwidgets Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-10-14 14:52:07 UTC (rev 6861) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-10-14 14:57:08 UTC (rev 6862) @@ -1,3 +1,6 @@ 7830ab8006ade9b14567341b5481eadd download/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 download/0002-Fixing-retarded-checks-for-libGL.patch +75ecdc04af4392f918ff6856a3ba6605 download/0500-wxT-macro-first-iteration.patch +17d8d019fd2e4137b4cd44816b14e282 download/0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf download/wxWidgets-2.8.10.tar.gz +43274231ee50eb1f35e04e693ebab902 download/wxWidgets-2.8.5.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0500-wxT-macro-first-iteration.patch 2009-10-14 14:57:08 UTC (rev 6862) @@ -0,0 +1,3382 @@ +From e2e9f4c5e270479d0c8e19e4763c314f5525b3c9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 14 Oct 2009 11:57:39 +0200 +Subject: [PATCH 500/501] wxT macro first iteration + +--- + Makefile.in | 78 ++++---- + build/bakefiles/common.bkl | 2 + + include/wx/afterstd.h | 11 + + include/wx/arrstr.h | 4 +- + include/wx/artprov.h | 6 +- + include/wx/beforestd.h | 10 + + include/wx/buffer.h | 2 +- + include/wx/cocoa/dirdlg.h | 2 +- + include/wx/confbase.h | 4 +- + include/wx/cppunit.h | 2 +- + include/wx/cshelp.h | 2 +- + include/wx/datectrl.h | 2 +- + include/wx/datetime.h | 42 ++-- + include/wx/dbgrid.h | 6 +- + include/wx/dbtable.h | 2 +- + include/wx/dcbuffer.h | 6 +- + include/wx/dcmirror.h | 6 +- + include/wx/debug.h | 6 +- + include/wx/debugrpt.h | 2 +- + include/wx/defs.h | 18 +- + include/wx/dynlib.h | 2 +- + include/wx/dynload.h | 2 +- + include/wx/event.h | 4 +- + include/wx/ffile.h | 4 +- + include/wx/filefn.h | 2 +- + include/wx/filename.h | 4 +- + include/wx/generic/calctrl.h | 6 +- + include/wx/generic/combo.h | 4 +- + include/wx/generic/grid.h | 14 +- + include/wx/generic/gridctrl.h | 4 +- + include/wx/generic/spinctlg.h | 8 +- + include/wx/generic/splitter.h | 2 +- + include/wx/glcanvas.h | 2 +- + include/wx/gtk/checklst.h | 6 +- + include/wx/gtk/spinctrl.h | 4 +- + include/wx/gtk1/checklst.h | 6 +- + include/wx/gtk1/spinctrl.h | 4 +- + include/wx/imagbmp.h | 26 ++-- + include/wx/image.h | 12 +- + include/wx/imagtiff.h | 8 +- + include/wx/intl.h | 16 +- + include/wx/list.h | 2 +- + include/wx/longlong.h | 8 +- + include/wx/mimetype.h | 6 +- + include/wx/module.h | 2 +- + include/wx/msgdlg.h | 4 +- + include/wx/object.h | 2 +- + include/wx/palette.h | 2 +- + include/wx/private/fileback.h | 2 +- + include/wx/protocol/ftp.h | 2 +- + include/wx/recguard.h | 2 +- + include/wx/selstore.h | 2 +- + include/wx/sound.h | 2 +- + include/wx/spinbutt.h | 2 +- + include/wx/stopwatch.h | 2 +- + include/wx/string.h | 30 ++-- + include/wx/tbarbase.h | 4 +- + include/wx/thrimpl.cpp | 22 +- + include/wx/tokenzr.h | 2 +- + include/wx/univ/button.h | 8 +- + include/wx/univ/checkbox.h | 6 +- + include/wx/univ/checklst.h | 2 +- + include/wx/univ/combobox.h | 6 +- + include/wx/univ/control.h | 4 +- + include/wx/univ/inpcons.h | 2 +- + include/wx/univ/inphand.h | 30 ++-- + include/wx/univ/listbox.h | 36 ++-- + include/wx/univ/menuitem.h | 4 +- + include/wx/univ/notebook.h | 6 +- + include/wx/univ/scrolbar.h | 18 +- + include/wx/univ/slider.h | 20 +- + include/wx/univ/spinbutt.h | 4 +- + include/wx/univ/textctrl.h | 52 +++--- + include/wx/univ/toolbar.h | 4 +- + include/wx/univ/toplevel.h | 12 +- + include/wx/valtext.h | 4 +- + include/wx/vector.h | 2 +- + include/wx/version.h | 4 +- + include/wx/vlbox.h | 4 +- + include/wx/wfstream.h | 4 +- + include/wx/wxchar.h | 27 ++-- + include/wx/x11/textctrl.h | 50 +++--- + include/wx/xrc/xmlres.h | 2 +- + utils/wxrc/wxrc.cpp | 406 ++++++++++++++++++++-------------------- + 84 files changed, 597 insertions(+), 571 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 92b60e1..ef0c052 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -72,7 +72,7 @@ WX_RELEASE = 2.8 + WX_RELEASE_NODOT = 28 + WX_VERSION = $(WX_RELEASE).5 + LIBDIRNAME = $(wx_top_builddir)/lib +-WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ ++WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ -DWXBUILDING $(__WXUNIV_DEFINE_p) $(____SHARED) \ + $(CPPFLAGS) $(CFLAGS) + WXREGEX_OBJECTS = \ + wxregex_regcomp.o \ +@@ -674,11 +674,13 @@ MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \ ++ -DWXBUILDING \ + -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) + MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ ++ -DWXBUILDING \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + MONODLL_OBJECTS = \ + $(__monodll___win32rc) \ +@@ -871,12 +873,12 @@ MONOLIB_OBJECTS = \ + MONOLIB_ODEP = $(___pch_wxprec_monolib_wx_wxprec_h_gch___depname) + BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \ + -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) + BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) +@@ -957,12 +959,12 @@ BASEDLL_OBJECTS = \ + BASEDLL_ODEP = $(___pch_wxprec_basedll_wx_wxprec_h_gch___depname) + BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) + BASELIB_OBJECTS = \ +@@ -1041,7 +1043,7 @@ BASELIB_OBJECTS = \ + BASELIB_ODEP = $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname) + NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + NETDLL_OBJECTS = \ +@@ -1060,7 +1062,7 @@ NETDLL_OBJECTS = \ + NETDLL_ODEP = $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname) + NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ + $(CXXFLAGS) + NETLIB_OBJECTS = \ +@@ -1164,7 +1166,7 @@ MEDIALIB_OBJECTS = \ + MEDIALIB_ODEP = $(___pch_wxprec_medialib_wx_wxprec_h_gch___depname) + ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) +@@ -1175,7 +1177,7 @@ ODBCDLL_OBJECTS = \ + ODBCDLL_ODEP = $(___pch_wxprec_odbcdll_wx_wxprec_h_gch___depname) + ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) + ODBCLIB_OBJECTS = \ +@@ -1184,7 +1186,7 @@ ODBCLIB_OBJECTS = \ + ODBCLIB_ODEP = $(___pch_wxprec_odbclib_wx_wxprec_h_gch___depname) + DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + DBGRIDDLL_OBJECTS = \ +@@ -1193,7 +1195,7 @@ DBGRIDDLL_OBJECTS = \ + DBGRIDDLL_ODEP = $(___pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname) + DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) + DBGRIDLIB_OBJECTS = \ +@@ -1201,7 +1203,7 @@ DBGRIDLIB_OBJECTS = \ + DBGRIDLIB_ODEP = $(___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname) + HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_HTML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + HTMLDLL_OBJECTS = \ +@@ -1233,7 +1235,7 @@ HTMLDLL_OBJECTS = \ + HTMLDLL_ODEP = $(___pch_wxprec_htmldll_wx_wxprec_h_gch___depname) + HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) + HTMLLIB_OBJECTS = \ +@@ -1264,7 +1266,7 @@ HTMLLIB_OBJECTS = \ + HTMLLIB_ODEP = $(___pch_wxprec_htmllib_wx_wxprec_h_gch___depname) + QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ + -DWXMAKINGDLL_QA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + QADLL_OBJECTS = \ +@@ -1274,7 +1276,7 @@ QADLL_OBJECTS = \ + QADLL_ODEP = $(___pch_wxprec_qadll_wx_wxprec_h_gch___depname) + QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) + QALIB_OBJECTS = \ + qalib_debugrpt.o \ +@@ -1282,7 +1284,7 @@ QALIB_OBJECTS = \ + QALIB_ODEP = $(___pch_wxprec_qalib_wx_wxprec_h_gch___depname) + XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + XMLDLL_OBJECTS = \ +@@ -1292,7 +1294,7 @@ XMLDLL_OBJECTS = \ + XMLDLL_ODEP = $(___pch_wxprec_xmldll_wx_wxprec_h_gch___depname) + XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ + $(CXXFLAGS) + XMLLIB_OBJECTS = \ +@@ -1301,7 +1303,7 @@ XMLLIB_OBJECTS = \ + XMLLIB_ODEP = $(___pch_wxprec_xmllib_wx_wxprec_h_gch___depname) + XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ + -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + XRCDLL_OBJECTS = \ +@@ -1365,7 +1367,7 @@ XRCDLL_OBJECTS = \ + XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname) + XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) + XRCLIB_OBJECTS = \ + xrclib_xh_animatctrl.o \ +@@ -1427,7 +1429,7 @@ XRCLIB_OBJECTS = \ + XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname) + AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ + -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + AUIDLL_OBJECTS = \ +@@ -1440,7 +1442,7 @@ AUIDLL_OBJECTS = \ + AUIDLL_ODEP = $(___pch_wxprec_auidll_wx_wxprec_h_gch___depname) + AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ +- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ ++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ + $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) + AUILIB_OBJECTS = \ + auilib_framemanager.o \ +@@ -1451,7 +1453,7 @@ AUILIB_OBJECTS = \ + AUILIB_ODEP = $(___pch_wxprec_auilib_wx_wxprec_h_gch___depname) + RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + RICHTEXTDLL_OBJECTS = \ +@@ -1468,7 +1470,7 @@ RICHTEXTDLL_OBJECTS = \ + RICHTEXTDLL_ODEP = $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname) + RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ +- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ ++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) + RICHTEXTLIB_OBJECTS = \ +@@ -12550,7 +12552,7 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c + $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c + + monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL + + monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +@@ -20809,7 +20811,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) + @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp + + basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + + basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +@@ -21988,7 +21990,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP) + @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp + + netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + + netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp +@@ -22093,7 +22095,7 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP) + @COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gsocket.cpp + + coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + + coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp +@@ -28018,7 +28020,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp + + advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV + + advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp +@@ -28441,7 +28443,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) + @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp + + mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + + mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) + $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp +@@ -28528,7 +28530,7 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP) + @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp + + odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC + + odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP) + $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp +@@ -28543,7 +28545,7 @@ odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP) + $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp + + dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID + + dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP) + $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp +@@ -28552,7 +28554,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP) + $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp + + htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML + + htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) + $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp +@@ -28711,7 +28713,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) + @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp + + qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA + + qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) + $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp +@@ -28726,7 +28728,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) + $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp + + xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + + xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) + $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp +@@ -28741,7 +28743,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) + $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp + + xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC + + xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp +@@ -29080,7 +29082,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp + + auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI + + auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) + $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp +@@ -29113,7 +29115,7 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) + $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp + + richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + + richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp +@@ -29170,7 +29172,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp + + gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) +- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL ++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL + + @COND_TOOLKIT_MAC at gldll_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP) + @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp +diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl +index 15ac39b..5a31808 100644 +--- a/build/bakefiles/common.bkl ++++ b/build/bakefiles/common.bkl +@@ -592,6 +592,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r + $(wxwin.mkLibName(wxid)) + $(WXLIBNAME) + ++ WXBUILDING ++ + + + $(WXTOPDIR)src/common/dummy.cpp +diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h +index 4c1d4a5..a1ad8d1 100644 +--- a/include/wx/afterstd.h ++++ b/include/wx/afterstd.h +@@ -46,3 +46,14 @@ + #endif + #endif + ++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) ++#ifndef _T ++#if !wxUSE_UNICODE ++#define _T(x) x ++#else /* Unicode */ ++/* use wxCONCAT_HELPER so that x could be expanded if it's a macro */ ++#define _T(x) wxCONCAT_HELPER(L, x) ++#endif /* ASCII/Unicode */ ++#endif /* !defined(_T) */ ++ ++#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */ +diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h +index 0229f18..fbf04cb 100644 +--- a/include/wx/arrstr.h ++++ b/include/wx/arrstr.h +@@ -152,7 +152,7 @@ public: + wxString& Item(size_t nIndex) const + { + wxASSERT_MSG( nIndex < m_nCount, +- _T("wxArrayString: index out of bounds") ); ++ wxT("wxArrayString: index out of bounds") ); + + return *(wxString *)&(m_pItems[nIndex]); + } +@@ -163,7 +163,7 @@ public: + wxString& Last() const + { + wxASSERT_MSG( !IsEmpty(), +- _T("wxArrayString: index out of bounds") ); ++ wxT("wxArrayString: index out of bounds") ); + return Item(Count() - 1); + } + +diff --git a/include/wx/artprov.h b/include/wx/artprov.h +index 03df39e..2e83493 100644 +--- a/include/wx/artprov.h ++++ b/include/wx/artprov.h +@@ -27,10 +27,10 @@ class wxArtProviderModule; + typedef wxString wxArtClient; + typedef wxString wxArtID; + +-#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + _T("_C")) +-#define wxART_MAKE_CLIENT_ID(id) _T(#id) _T("_C") ++#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + wxT("_C")) ++#define wxART_MAKE_CLIENT_ID(id) wxT(#id) wxT("_C") + #define wxART_MAKE_ART_ID_FROM_STR(id) (id) +-#define wxART_MAKE_ART_ID(id) _T(#id) ++#define wxART_MAKE_ART_ID(id) wxT(#id) + + // ---------------------------------------------------------------------------- + // Art clients +diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h +index aacfc7c..609073c 100644 +--- a/include/wx/beforestd.h ++++ b/include/wx/beforestd.h +@@ -63,3 +63,13 @@ + #pragma warning(disable:4786) + #endif // VC++ < 7 + ++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) ++#undef _T ++#endif // SUNCC ++ ++#if defined (WXBUILDING) ++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) ++#undef _T ++#endif /* SUNCC */ ++#endif /* WXBUILDING */ ++ +diff --git a/include/wx/buffer.h b/include/wx/buffer.h +index 605f4f1..f169f22 100644 +--- a/include/wx/buffer.h ++++ b/include/wx/buffer.h +@@ -286,7 +286,7 @@ public: + // Other ways to append to the buffer + void AppendByte(char data) + { +- wxCHECK_RET( m_bufdata->m_data, _T("invalid wxMemoryBuffer") ); ++ wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") ); + + m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1); + *(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data; +diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h +index 3c5b8dc..084d561 100644 +--- a/include/wx/cocoa/dirdlg.h ++++ b/include/wx/cocoa/dirdlg.h +@@ -26,7 +26,7 @@ class WXDLLEXPORT wxDirDialog: public wxDirDialogBase + public: + wxDirDialog(wxWindow *parent, + const wxString& message = wxDirSelectorPromptStr, +- const wxString& defaultPath = _T(""), ++ const wxString& defaultPath = wxT(""), + long style = wxDD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, +diff --git a/include/wx/confbase.h b/include/wx/confbase.h +index 62b9507..852f7d6 100644 +--- a/include/wx/confbase.h ++++ b/include/wx/confbase.h +@@ -30,13 +30,13 @@ class WXDLLIMPEXP_BASE wxArrayString; + + /// separates group and entry names (probably shouldn't be changed) + #ifndef wxCONFIG_PATH_SEPARATOR +- #define wxCONFIG_PATH_SEPARATOR _T('/') ++ #define wxCONFIG_PATH_SEPARATOR wxT('/') + #endif + + /// introduces immutable entries + // (i.e. the ones which can't be changed from the local config file) + #ifndef wxCONFIG_IMMUTABLE_PREFIX +- #define wxCONFIG_IMMUTABLE_PREFIX _T('!') ++ #define wxCONFIG_IMMUTABLE_PREFIX wxT('!') + #endif + + #if wxUSE_CONFIG +diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h +index 707ac72..ad20cc4 100644 +--- a/include/wx/cppunit.h ++++ b/include/wx/cppunit.h +@@ -65,7 +65,7 @@ + if (Condition) \ + { anyTest; } \ + else \ +- wxLogInfo(wxString::Format(_T("skipping: %s.%s\n reason: %s equals false\n"), \ ++ wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n reason: %s equals false\n"), \ + wxString(suiteName, wxConvUTF8).c_str(), \ + wxString(#testMethod, wxConvUTF8).c_str(), \ + wxString(#Condition, wxConvUTF8).c_str())) +diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h +index f77ac4f..4cee508 100644 +--- a/include/wx/cshelp.h ++++ b/include/wx/cshelp.h +@@ -134,7 +134,7 @@ public: + const wxPoint& pt, + wxHelpEvent::Origin origin) + { +- wxCHECK_MSG( window, false, _T("window must not be NULL") ); ++ wxCHECK_MSG( window, false, wxT("window must not be NULL") ); + + m_helptextAtPoint = pt; + m_helptextOrigin = origin; +diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h +index 0da1277..085a8d1 100644 +--- a/include/wx/datectrl.h ++++ b/include/wx/datectrl.h +@@ -19,7 +19,7 @@ + #include "wx/control.h" // the base class + #include "wx/datetime.h" + +-#define wxDatePickerCtrlNameStr _T("datectrl") ++#define wxDatePickerCtrlNameStr wxT("datectrl") + + // wxDatePickerCtrl styles + enum +diff --git a/include/wx/datetime.h b/include/wx/datetime.h +index 772f656..1b16520 100644 +--- a/include/wx/datetime.h ++++ b/include/wx/datetime.h +@@ -938,37 +938,37 @@ public: + + inline bool operator<(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() < dt.GetValue(); + } + + inline bool operator<=(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() <= dt.GetValue(); + } + + inline bool operator>(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() > dt.GetValue(); + } + + inline bool operator>=(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() >= dt.GetValue(); + } + + inline bool operator==(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() == dt.GetValue(); + } + + inline bool operator!=(const wxDateTime& dt) const + { +- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); ++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); + return GetValue() != dt.GetValue(); + } + +@@ -1062,15 +1062,15 @@ public: + wxString Format(const wxChar *format = wxDefaultDateTimeFormat, + const TimeZone& tz = Local) const; + // preferred date representation for the current locale +- wxString FormatDate() const { return Format(_T("%x")); } ++ wxString FormatDate() const { return Format(wxT("%x")); } + // preferred time representation for the current locale +- wxString FormatTime() const { return Format(_T("%X")); } ++ wxString FormatTime() const { return Format(wxT("%X")); } + // returns the string representing the date in ISO 8601 format + // (YYYY-MM-DD) +- wxString FormatISODate() const { return Format(_T("%Y-%m-%d")); } ++ wxString FormatISODate() const { return Format(wxT("%Y-%m-%d")); } + // returns the string representing the time in ISO 8601 format + // (HH:MM:SS) +- wxString FormatISOTime() const { return Format(_T("%H:%M:%S")); } ++ wxString FormatISOTime() const { return Format(wxT("%H:%M:%S")); } + + // implementation + // ------------------------------------------------------------------------ +@@ -1639,7 +1639,7 @@ inline wxDateTime::wxDateTime(double jdn) + + inline wxDateTime& wxDateTime::Set(const Tm& tm) + { +- wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") ); ++ wxASSERT_MSG( tm.IsValid(), wxT("invalid broken down date/time") ); + + return Set(tm.mday, (Month)tm.mon, tm.year, + tm.hour, tm.min, tm.sec, tm.msec); +@@ -1670,14 +1670,14 @@ inline wxDateTime::wxDateTime(wxDateTime_t day, + + inline wxLongLong wxDateTime::GetValue() const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + return m_time; + } + + inline time_t wxDateTime::GetTicks() const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + if ( !IsInStdRange() ) + { + return (time_t)-1; +@@ -1745,21 +1745,21 @@ inline wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const + + inline bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return m_time == datetime.m_time; + } + + inline bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return m_time < datetime.m_time; + } + + inline bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return m_time > datetime.m_time; + } +@@ -1816,14 +1816,14 @@ inline bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, + + inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + return wxDateTime(m_time + diff.GetValue()); + } + + inline wxDateTime& wxDateTime::Add(const wxTimeSpan& diff) + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + m_time += diff.GetValue(); + +@@ -1837,14 +1837,14 @@ inline wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff) + + inline wxDateTime wxDateTime::Subtract(const wxTimeSpan& diff) const + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + return wxDateTime(m_time - diff.GetValue()); + } + + inline wxDateTime& wxDateTime::Subtract(const wxTimeSpan& diff) + { +- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); + + m_time -= diff.GetValue(); + +@@ -1858,7 +1858,7 @@ inline wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff) + + inline wxTimeSpan wxDateTime::Subtract(const wxDateTime& datetime) const + { +- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); ++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); + + return wxTimeSpan(GetValue() - datetime.GetValue()); + } +diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h +index 4e8655c..7e3b513 100644 +--- a/include/wx/dbgrid.h ++++ b/include/wx/dbgrid.h +@@ -23,7 +23,7 @@ + #include "wx/grid.h" + #include "wx/dbkeyg.h" + +-#define wxGRID_VALUE_DBAUTO _T("dbauto") ++#define wxGRID_VALUE_DBAUTO wxT("dbauto") + + WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID); + +@@ -119,12 +119,12 @@ public: + + virtual int GetNumberRows() + { +- wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal); ++ wxLogDebug(wxT(" GetNumberRows() = %i"),m_rowtotal); + return m_rowtotal; + } + virtual int GetNumberCols() + { +- wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols); ++ wxLogDebug(wxT(" GetNumberCols() = %i"),m_nocols); + return m_nocols; + } + virtual bool IsEmptyCell(int row, int col) ; +diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h +index 1bbef54..9fb6260 100644 +--- a/include/wx/dbtable.h ++++ b/include/wx/dbtable.h +@@ -305,7 +305,7 @@ public: + HSTMT *NewCursor(bool setCursor = false, bool bindColumns = true) { return GetNewCursor(setCursor,bindColumns); } + #endif + +- ULONG Count(const wxString &args=_T("*")); ++ ULONG Count(const wxString &args=wxT("*")); + int DB_STATUS(void) { return(pDb->DB_STATUS); } + + bool IsColNull(UWORD colNumber) const; +diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h +index 46c28ba..7249235 100644 +--- a/include/wx/dcbuffer.h ++++ b/include/wx/dcbuffer.h +@@ -100,8 +100,8 @@ public: + // blitting to) is destroyed. + void UnMask() + { +- wxCHECK_RET( m_dc, _T("no underlying wxDC?") ); +- wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") ); ++ wxCHECK_RET( m_dc, wxT("no underlying wxDC?") ); ++ wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") ); + + wxCoord x = 0, + y = 0; +@@ -122,7 +122,7 @@ private: + // common part of Init()s + void InitCommon(wxDC *dc, int style) + { +- wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") ); ++ wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") ); + + m_dc = dc; + m_style = style; +diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h +index bc15a39..3b9dcb9 100644 +--- a/include/wx/dcmirror.h ++++ b/include/wx/dcmirror.h +@@ -135,7 +135,7 @@ protected: + wxCoord x2, wxCoord y2, + wxCoord xc, wxCoord yc) + { +- wxFAIL_MSG( _T("this is probably wrong") ); ++ wxFAIL_MSG( wxT("this is probably wrong") ); + + m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1), + GetX(x2, y2), GetY(x2, y2), +@@ -152,7 +152,7 @@ protected: + virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, + double sa, double ea) + { +- wxFAIL_MSG( _T("this is probably wrong") ); ++ wxFAIL_MSG( wxT("this is probably wrong") ); + + m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y), + GetX(w, h), GetY(w, h), +@@ -256,7 +256,7 @@ protected: + + virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region)) + { +- wxFAIL_MSG( _T("not implemented") ); ++ wxFAIL_MSG( wxT("not implemented") ); + } + + virtual void DoSetClippingRegion(wxCoord x, wxCoord y, +diff --git a/include/wx/debug.h b/include/wx/debug.h +index b08a71e..3cdd990 100644 +--- a/include/wx/debug.h ++++ b/include/wx/debug.h +@@ -123,13 +123,13 @@ + if ( cond ) \ + {} \ + else \ +- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg) ++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg) + #else + #define wxASSERT_MSG(cond, msg) \ + if ( cond ) \ + ; \ + else \ +- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg) ++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg) + #endif + + /* special form of assert: always triggers it (in debug mode) */ +@@ -140,7 +140,7 @@ + + /* FAIL with some message and a condition */ + #define wxFAIL_COND_MSG(cond, msg) \ +- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(cond), msg) ++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(cond), msg) + + /* An assert helper used to avoid warning when testing constant expressions, */ + /* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */ +diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h +index d1778f1..f05036b 100644 +--- a/include/wx/debugrpt.h ++++ b/include/wx/debugrpt.h +@@ -161,7 +161,7 @@ public: + wxDebugReportUpload(const wxString& url, + const wxString& input, + const wxString& action, +- const wxString& curl = _T("curl")); ++ const wxString& curl = wxT("curl")); + + protected: + virtual bool DoProcess(); +diff --git a/include/wx/defs.h b/include/wx/defs.h +index f533aa7..b3ab0e2 100644 +--- a/include/wx/defs.h ++++ b/include/wx/defs.h +@@ -915,28 +915,28 @@ inline void *wxUIntToPtr(wxUIntPtr p) + #if (defined(__VISUALC__) && defined(__WIN32__)) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 +- #define wxLongLongFmtSpec _T("I64") ++ #define wxLongLongFmtSpec wxT("I64") + #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 +- #define wxLongLongFmtSpec _T("L") ++ #define wxLongLongFmtSpec wxT("L") + #elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__))) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 +- #define wxLongLongFmtSpec _T("L") ++ #define wxLongLongFmtSpec wxT("L") + #elif defined(__DIGITALMARS__) + #define wxLongLong_t __int64 + #define wxLongLongSuffix LL +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #elif defined(__MINGW32__) + #define wxLongLong_t long long + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("I64") ++ #define wxLongLongFmtSpec wxT("I64") + #elif defined(__MWERKS__) + #if __option(longlong) + #define wxLongLong_t long long + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #else + #error "The 64 bit integer support in CodeWarrior has been disabled." + #error "See the documentation on the 'longlong' pragma." +@@ -944,7 +944,7 @@ inline void *wxUIntToPtr(wxUIntPtr p) + #elif defined(__WXPALMOS__) + #define wxLongLong_t int64_t + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 + #define wxLongLong_t long long + #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ +@@ -954,11 +954,11 @@ inline void *wxUIntToPtr(wxUIntPtr p) + (defined(__DJGPP__) && __DJGPP__ >= 2) + #define wxLongLong_t long long + #define wxLongLongSuffix ll +- #define wxLongLongFmtSpec _T("ll") ++ #define wxLongLongFmtSpec wxT("ll") + #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) + #define wxLongLong_t long + #define wxLongLongSuffix l +- #define wxLongLongFmtSpec _T("l") ++ #define wxLongLongFmtSpec wxT("l") + #define wxLongLongIsLong + #endif + +diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h +index fd4fe60..27eac06 100644 +--- a/include/wx/dynlib.h ++++ b/include/wx/dynlib.h +@@ -103,7 +103,7 @@ enum wxPluginCategory + // type only once, as the first parameter, and creating a variable of this type + // called "pfn" initialized with the "name" from the "dynlib" + #define wxDYNLIB_FUNCTION(type, name, dynlib) \ +- type pfn ## name = (type)(dynlib).GetSymbol(_T(#name)) ++ type pfn ## name = (type)(dynlib).GetSymbol(wxT(#name)) + + // ---------------------------------------------------------------------------- + // wxDynamicLibraryDetails: contains details about a loaded wxDynamicLibrary +diff --git a/include/wx/dynload.h b/include/wx/dynload.h +index b90a645..b53662d 100644 +--- a/include/wx/dynload.h ++++ b/include/wx/dynload.h +@@ -71,7 +71,7 @@ public: + void RefObj() { ++m_objcount; } + void UnrefObj() + { +- wxASSERT_MSG( m_objcount > 0, _T("Too many objects deleted??") ); ++ wxASSERT_MSG( m_objcount > 0, wxT("Too many objects deleted??") ); + --m_objcount; + } + +diff --git a/include/wx/event.h b/include/wx/event.h +index 9022c0b..22aa281 100644 +--- a/include/wx/event.h ++++ b/include/wx/event.h +@@ -451,7 +451,7 @@ public: + wxPropagateOnce(wxEvent& event) : m_event(event) + { + wxASSERT_MSG( m_event.m_propagationLevel > 0, +- _T("shouldn't be used unless ShouldPropagate()!") ); ++ wxT("shouldn't be used unless ShouldPropagate()!") ); + + m_event.m_propagationLevel--; + } +@@ -1398,7 +1398,7 @@ public: + // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it + // doesn't make sense for wxEVT_CLOSE_WINDOW + wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW, +- _T("this flag is for end session events only") ); ++ wxT("this flag is for end session events only") ); + + return m_loggingOff; + } +diff --git a/include/wx/ffile.h b/include/wx/ffile.h +index c3dda75..5577484 100644 +--- a/include/wx/ffile.h ++++ b/include/wx/ffile.h +@@ -37,13 +37,13 @@ public: + // def ctor + wxFFile() { m_fp = NULL; } + // open specified file (may fail, use IsOpened()) +- wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); ++ wxFFile(const wxChar *filename, const wxChar *mode = wxT("r")); + // attach to (already opened) file + wxFFile(FILE *lfp) { m_fp = lfp; } + + // open/close + // open a file (existing or not - the mode controls what happens) +- bool Open(const wxChar *filename, const wxChar *mode = _T("r")); ++ bool Open(const wxChar *filename, const wxChar *mode = wxT("r")); + // closes the opened file (this is a NOP if not opened) + bool Close(); + +diff --git a/include/wx/filefn.h b/include/wx/filefn.h +index 7e3af21..c424649 100644 +--- a/include/wx/filefn.h ++++ b/include/wx/filefn.h +@@ -387,7 +387,7 @@ enum wxFileKind + #define wxHAS_LARGE_FFILES + #endif + #else +- #define wxFileOffsetFmtSpec _T("") ++ #define wxFileOffsetFmtSpec wxT("") + #endif + // functions + #define wxClose close +diff --git a/include/wx/filename.h b/include/wx/filename.h +index 314819b..c7bec56 100644 +--- a/include/wx/filename.h ++++ b/include/wx/filename.h +@@ -488,10 +488,10 @@ public: + static wxULongLong GetSize(const wxString &file); + + // returns the size in a human readable form +- wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(_T("Not available")), ++ wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(wxT("Not available")), + int precision = 1) const; + static wxString GetHumanReadableSize(const wxULongLong &sz, +- const wxString &nullsize = wxGetTranslation(_T("Not available")), ++ const wxString &nullsize = wxGetTranslation(wxT("Not available")), + int precision = 1); + + +diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h +index c135bef..bbcfc13 100644 +--- a/include/wx/generic/calctrl.h ++++ b/include/wx/generic/calctrl.h +@@ -19,7 +19,7 @@ class WXDLLEXPORT wxComboBox; + class WXDLLEXPORT wxStaticText; + class WXDLLEXPORT wxSpinCtrl; + +-#define wxCalendarNameStr _T("CalendarCtrl") ++#define wxCalendarNameStr wxT("CalendarCtrl") + + // ---------------------------------------------------------------------------- + // wxCalendarCtrl: a control allowing the user to pick a date interactively +@@ -124,14 +124,14 @@ public: + + wxCalendarDateAttr *GetAttr(size_t day) const + { +- wxCHECK_MSG( day > 0 && day < 32, NULL, _T("invalid day") ); ++ wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") ); + + return m_attrs[day - 1]; + } + + void SetAttr(size_t day, wxCalendarDateAttr *attr) + { +- wxCHECK_RET( day > 0 && day < 32, _T("invalid day") ); ++ wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") ); + + delete m_attrs[day - 1]; + m_attrs[day - 1] = attr; +diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h +index 1b25185..06814aa 100644 +--- a/include/wx/generic/combo.h ++++ b/include/wx/generic/combo.h +@@ -26,8 +26,8 @@ + // all actions of single line text controls are supported + + // popup/dismiss the choice window +-#define wxACTION_COMBOBOX_POPUP _T("popup") +-#define wxACTION_COMBOBOX_DISMISS _T("dismiss") ++#define wxACTION_COMBOBOX_POPUP wxT("popup") ++#define wxACTION_COMBOBOX_DISMISS wxT("dismiss") + + #endif + +diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h +index c768756..ddc18d1 100644 +--- a/include/wx/generic/grid.h ++++ b/include/wx/generic/grid.h +@@ -42,11 +42,11 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[]; + #define WXGRID_DEFAULT_SCROLLBAR_WIDTH 16 + + // type names for grid table values +-#define wxGRID_VALUE_STRING _T("string") +-#define wxGRID_VALUE_BOOL _T("bool") +-#define wxGRID_VALUE_NUMBER _T("long") +-#define wxGRID_VALUE_FLOAT _T("double") +-#define wxGRID_VALUE_CHOICE _T("choice") ++#define wxGRID_VALUE_STRING wxT("string") ++#define wxGRID_VALUE_BOOL wxT("bool") ++#define wxGRID_VALUE_NUMBER wxT("long") ++#define wxGRID_VALUE_FLOAT wxT("double") ++#define wxGRID_VALUE_CHOICE wxT("choice") + + #define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING + #define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER +@@ -466,7 +466,7 @@ protected: + + // string representation of m_valueOld + wxString GetString() const +- { return wxString::Format(_T("%ld"), m_valueOld); } ++ { return wxString::Format(wxT("%ld"), m_valueOld); } + + private: + int m_min, +@@ -546,7 +546,7 @@ public: + + // set the string values returned by GetValue() for the true and false + // states, respectively +- static void UseStringValues(const wxString& valueTrue = _T("1"), ++ static void UseStringValues(const wxString& valueTrue = wxT("1"), + const wxString& valueFalse = wxEmptyString); + + // return true if the given string is equal to the string representation of +diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h +index 2581fd2..477e0f1 100644 +--- a/include/wx/generic/gridctrl.h ++++ b/include/wx/generic/gridctrl.h +@@ -16,8 +16,8 @@ + + #if wxUSE_GRID + +-#define wxGRID_VALUE_CHOICEINT _T("choiceint") +-#define wxGRID_VALUE_DATETIME _T("datetime") ++#define wxGRID_VALUE_CHOICEINT wxT("choiceint") ++#define wxGRID_VALUE_DATETIME wxT("datetime") + + #if wxUSE_DATETIME + +diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h +index 940d214..b47a7a8 100644 +--- a/include/wx/generic/spinctlg.h ++++ b/include/wx/generic/spinctlg.h +@@ -41,7 +41,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Init(); + Create(parent, id, value, pos, size, style, min, max, initial, name); +@@ -54,7 +54,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")); ++ const wxString& name = wxT("wxSpinCtrl")); + + virtual ~wxSpinCtrl(); + +@@ -124,7 +124,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Create(parent, id, value, pos, size, style, min, max, initial, name); + } +@@ -136,7 +136,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + SetRange(min, max); + +diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h +index 8601083..d2014d5 100644 +--- a/include/wx/generic/splitter.h ++++ b/include/wx/generic/splitter.h +@@ -91,7 +91,7 @@ public: + void SetSplitMode(int mode) + { + wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL, +- _T("invalid split mode") ); ++ wxT("invalid split mode") ); + + m_splitMode = (wxSplitMode)mode; + } +diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h +index 25e2eac..c6ed1c8 100644 +--- a/include/wx/glcanvas.h ++++ b/include/wx/glcanvas.h +@@ -44,7 +44,7 @@ enum + WX_GL_MIN_ACCUM_ALPHA /* use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) */ + }; + +-#define wxGLCanvasName _T("GLCanvas") ++#define wxGLCanvasName wxT("GLCanvas") + + #if defined(__WXMSW__) + #include "wx/msw/glcanvas.h" +diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h +index fa89477..2c1ff65 100644 +--- a/include/wx/gtk/checklst.h ++++ b/include/wx/gtk/checklst.h +@@ -18,10 +18,10 @@ + // there is no "right" choice of the checkbox indicators, so allow the user to + // define them himself if he wants + #ifndef wxCHECKLBOX_CHECKED +- #define wxCHECKLBOX_CHECKED _T('x') +- #define wxCHECKLBOX_UNCHECKED _T(' ') ++ #define wxCHECKLBOX_CHECKED wxT('x') ++ #define wxCHECKLBOX_UNCHECKED wxT(' ') + +- #define wxCHECKLBOX_STRING _T("[ ] ") ++ #define wxCHECKLBOX_STRING wxT("[ ] ") + #endif + + //----------------------------------------------------------------------------- +diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h +index 2929f7f..8fc1dc9 100644 +--- a/include/wx/gtk/spinctrl.h ++++ b/include/wx/gtk/spinctrl.h +@@ -26,7 +26,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Create(parent, id, value, pos, size, style, min, max, initial, name); + } +@@ -38,7 +38,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")); ++ const wxString& name = wxT("wxSpinCtrl")); + + void SetValue(const wxString& text); + void SetSelection(long from, long to); +diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h +index 5a9b8cb..de75b1f 100644 +--- a/include/wx/gtk1/checklst.h ++++ b/include/wx/gtk1/checklst.h +@@ -18,10 +18,10 @@ + // there is no "right" choice of the checkbox indicators, so allow the user to + // define them himself if he wants + #ifndef wxCHECKLBOX_CHECKED +- #define wxCHECKLBOX_CHECKED _T('x') +- #define wxCHECKLBOX_UNCHECKED _T(' ') ++ #define wxCHECKLBOX_CHECKED wxT('x') ++ #define wxCHECKLBOX_UNCHECKED wxT(' ') + +- #define wxCHECKLBOX_STRING _T("[ ] ") ++ #define wxCHECKLBOX_STRING wxT("[ ] ") + #endif + + //----------------------------------------------------------------------------- +diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h +index 7c94538..2c60b77 100644 +--- a/include/wx/gtk1/spinctrl.h ++++ b/include/wx/gtk1/spinctrl.h +@@ -32,7 +32,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")) ++ const wxString& name = wxT("wxSpinCtrl")) + { + Create(parent, id, value, pos, size, style, min, max, initial, name); + } +@@ -44,7 +44,7 @@ public: + const wxSize& size = wxDefaultSize, + long style = wxSP_ARROW_KEYS, + int min = 0, int max = 100, int initial = 0, +- const wxString& name = _T("wxSpinCtrl")); ++ const wxString& name = wxT("wxSpinCtrl")); + + void SetValue(const wxString& text); + void SetSelection(long from, long to); +diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h +index b7a5222..780736b 100644 +--- a/include/wx/imagbmp.h ++++ b/include/wx/imagbmp.h +@@ -14,7 +14,7 @@ + + // defines for saving the BMP file in different formats, Bits Per Pixel + // USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP ); +-#define wxIMAGE_OPTION_BMP_FORMAT wxString(_T("wxBMP_FORMAT")) ++#define wxIMAGE_OPTION_BMP_FORMAT wxString(wxT("wxBMP_FORMAT")) + + // These two options are filled in upon reading CUR file and can (should) be + // specified when saving a CUR file - they define the hotspot of the cursor: +@@ -52,10 +52,10 @@ class WXDLLEXPORT wxBMPHandler : public wxImageHandler + public: + wxBMPHandler() + { +- m_name = _T("Windows bitmap file"); +- m_extension = _T("bmp"); ++ m_name = wxT("Windows bitmap file"); ++ m_extension = wxT("bmp"); + m_type = wxBITMAP_TYPE_BMP; +- m_mime = _T("image/x-bmp"); ++ m_mime = wxT("image/x-bmp"); + } + + #if wxUSE_STREAMS +@@ -86,10 +86,10 @@ class WXDLLEXPORT wxICOHandler : public wxBMPHandler + public: + wxICOHandler() + { +- m_name = _T("Windows icon file"); +- m_extension = _T("ico"); ++ m_name = wxT("Windows icon file"); ++ m_extension = wxT("ico"); + m_type = wxBITMAP_TYPE_ICO; +- m_mime = _T("image/x-ico"); ++ m_mime = wxT("image/x-ico"); + } + + #if wxUSE_STREAMS +@@ -115,10 +115,10 @@ class WXDLLEXPORT wxCURHandler : public wxICOHandler + public: + wxCURHandler() + { +- m_name = _T("Windows cursor file"); +- m_extension = _T("cur"); ++ m_name = wxT("Windows cursor file"); ++ m_extension = wxT("cur"); + m_type = wxBITMAP_TYPE_CUR; +- m_mime = _T("image/x-cur"); ++ m_mime = wxT("image/x-cur"); + } + + // VS: This handler's meat is implemented inside wxICOHandler (the two +@@ -142,10 +142,10 @@ class WXDLLEXPORT wxANIHandler : public wxCURHandler + public: + wxANIHandler() + { +- m_name = _T("Windows animated cursor file"); +- m_extension = _T("ani"); ++ m_name = wxT("Windows animated cursor file"); ++ m_extension = wxT("ani"); + m_type = wxBITMAP_TYPE_ANI; +- m_mime = _T("image/x-ani"); ++ m_mime = wxT("image/x-ani"); + } + + +diff --git a/include/wx/image.h b/include/wx/image.h +index 18d89c6..c9dfe1a 100644 +--- a/include/wx/image.h ++++ b/include/wx/image.h +@@ -27,14 +27,14 @@ + // which breaks the compilation below + #undef index + +-#define wxIMAGE_OPTION_QUALITY wxString(_T("quality")) +-#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName")) ++#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality")) ++#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName")) + +-#define wxIMAGE_OPTION_RESOLUTION wxString(_T("Resolution")) +-#define wxIMAGE_OPTION_RESOLUTIONX wxString(_T("ResolutionX")) +-#define wxIMAGE_OPTION_RESOLUTIONY wxString(_T("ResolutionY")) ++#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution")) ++#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX")) ++#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY")) + +-#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit")) ++#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit")) + + // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT + enum +diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h +index d236b75..d807ae7 100644 +--- a/include/wx/imagtiff.h ++++ b/include/wx/imagtiff.h +@@ -21,10 +21,10 @@ + #include "wx/image.h" + + // defines for wxImage::SetOption +-#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(_T("BitsPerSample")) +-#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(_T("SamplesPerPixel")) +-#define wxIMAGE_OPTION_COMPRESSION wxString(_T("Compression")) +-#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(_T("ImageDescriptor")) ++#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample")) ++#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) ++#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression")) ++#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) + + class WXDLLEXPORT wxTIFFHandler: public wxImageHandler + { +diff --git a/include/wx/intl.h b/include/wx/intl.h +index 0322f41..b3c934e 100644 +--- a/include/wx/intl.h ++++ b/include/wx/intl.h +@@ -42,13 +42,13 @@ enum wxLayoutDirection + // --keyword="_" --keyword="wxPLURAL:1,2" options + // to extract the strings from the sources) + #ifndef WXINTL_NO_GETTEXT_MACRO +- #define _(s) wxGetTranslation(_T(s)) +- #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n) ++ #define _(s) wxGetTranslation(wxT(s)) ++ #define wxPLURAL(sing, plur, n) wxGetTranslation(wxT(sing), wxT(plur), n) + #endif + + // another one which just marks the strings for extraction, but doesn't + // perform the translation (use -kwxTRANSLATE with xgettext!) +-#define wxTRANSLATE(str) _T(str) ++#define wxTRANSLATE(str) wxT(str) + + // ---------------------------------------------------------------------------- + // forward decls +@@ -590,12 +590,12 @@ wxGetTranslation(const wxChar *sz1, const wxChar *sz2, + + #if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(_) +- #define _(s) (_T(s)) ++ #define _(s) (wxT(s)) + #endif +- #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur)) ++ #define wxPLURAL(sing, plur, n) ((n) == 1 ? wxT(sing) : wxT(plur)) + #endif + +-#define wxTRANSLATE(str) _T(str) ++#define wxTRANSLATE(str) wxT(str) + + inline const wxChar * + wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL) +@@ -609,10 +609,10 @@ wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL) + // wxTRANSLATE) too + #if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(gettext_noop) +- #define gettext_noop(str) _T(str) ++ #define gettext_noop(str) wxT(str) + #endif + #if !defined(N_) +- #define N_(s) _T(s) ++ #define N_(s) wxT(s) + #endif + #endif + +diff --git a/include/wx/list.h b/include/wx/list.h +index 821a0f1..f6d94d2 100644 +--- a/include/wx/list.h ++++ b/include/wx/list.h +@@ -207,7 +207,7 @@ private: + bool operator==(const compatibility_iterator& i) const \ + { \ + wxASSERT_MSG( m_list && i.m_list, \ +- _T("comparing invalid iterators is illegal") ); \ ++ wxT("comparing invalid iterators is illegal") ); \ + return (m_list == i.m_list) && (m_iter == i.m_iter); \ + } \ + bool operator!=(const compatibility_iterator& i) const \ +diff --git a/include/wx/longlong.h b/include/wx/longlong.h +index 628efaa..50be474 100644 +--- a/include/wx/longlong.h ++++ b/include/wx/longlong.h +@@ -177,7 +177,7 @@ public: + long ToLong() const + { + wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX), +- _T("wxLongLong to long conversion loss of precision") ); ++ wxT("wxLongLong to long conversion loss of precision") ); + + return wx_truncate_cast(long, m_ll); + } +@@ -405,7 +405,7 @@ public: + unsigned long ToULong() const + { + wxASSERT_MSG( m_ll <= LONG_MAX, +- _T("wxULongLong to long conversion loss of precision") ); ++ wxT("wxULongLong to long conversion loss of precision") ); + + return wx_truncate_cast(unsigned long, m_ll); + } +@@ -683,7 +683,7 @@ public: + long ToLong() const + { + wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l), +- _T("wxLongLong to long conversion loss of precision") ); ++ wxT("wxLongLong to long conversion loss of precision") ); + + return (long)m_lo; + } +@@ -908,7 +908,7 @@ public: + unsigned long ToULong() const + { + wxASSERT_MSG( m_hi == 0ul, +- _T("wxULongLong to long conversion loss of precision") ); ++ wxT("wxULongLong to long conversion loss of precision") ); + + return (unsigned long)m_lo; + } +diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h +index 9717235..8602050 100644 +--- a/include/wx/mimetype.h ++++ b/include/wx/mimetype.h +@@ -51,12 +51,12 @@ class WXDLLIMPEXP_BASE wxMimeType : public wxString + public: + // all string ctors here + +- wxString GetType() const { return BeforeFirst(_T('/')); } +- wxString GetSubType() const { return AfterFirst(_T('/')); } ++ wxString GetType() const { return BeforeFirst(wxT('/')); } ++ wxString GetSubType() const { return AfterFirst(wxT('/')); } + + void SetSubType(const wxString& subtype) + { +- *this = GetType() + _T('/') + subtype; ++ *this = GetType() + wxT('/') + subtype; + } + + bool Matches(const wxMimeType& wildcard) +diff --git a/include/wx/module.h b/include/wx/module.h +index 18b235b..ffeff9f 100644 +--- a/include/wx/module.h ++++ b/include/wx/module.h +@@ -68,7 +68,7 @@ protected: + // after that + void AddDependency(wxClassInfo *dep) + { +- wxCHECK_RET( dep, _T("NULL module dependency") ); ++ wxCHECK_RET( dep, wxT("NULL module dependency") ); + + m_dependencies.Add(dep); + } +diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h +index d1e212a..f67a38f 100644 +--- a/include/wx/msgdlg.h ++++ b/include/wx/msgdlg.h +@@ -23,10 +23,10 @@ protected: + void SetMessageDialogStyle(long style) + { + wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || ((style & wxYES_NO) == 0), +- _T("wxYES and wxNO may only be used together in wxMessageDialog") ); ++ wxT("wxYES and wxNO may only be used together in wxMessageDialog") ); + + wxASSERT_MSG( (style & wxID_OK) != wxID_OK, +- _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); ++ wxT("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); + + m_dialogStyle = style; + } +diff --git a/include/wx/object.h b/include/wx/object.h +index 2ff6a51..e2b60e3 100644 +--- a/include/wx/object.h ++++ b/include/wx/object.h +@@ -311,7 +311,7 @@ name##PluginSentinel m_pluginsentinel; + #ifdef __WXDEBUG__ + inline void* wxCheckCast(void *ptr) + { +- wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") ); ++ wxASSERT_MSG( ptr, wxT("wxStaticCast() used incorrectly") ); + return ptr; + } + #define wxStaticCast(obj, className) \ +diff --git a/include/wx/palette.h b/include/wx/palette.h +index 9a09456..43757ab 100644 +--- a/include/wx/palette.h ++++ b/include/wx/palette.h +@@ -27,7 +27,7 @@ public: + + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const = 0; +- virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; } ++ virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } + }; + + #if defined(__WXPALMOS__) +diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h +index 534a0f3..7f5e722 100644 +--- a/include/wx/private/fileback.h ++++ b/include/wx/private/fileback.h +@@ -33,7 +33,7 @@ public: + // backing file is never created and the backing is done with memory. + wxBackingFile(wxInputStream *stream, + size_t bufsize = DefaultBufSize, +- const wxString& prefix = _T("wxbf")); ++ const wxString& prefix = wxT("wxbf")); + + wxBackingFile() : m_impl(NULL) { } + ~wxBackingFile(); +diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h +index b074e15..0c5cfbc 100644 +--- a/include/wx/protocol/ftp.h ++++ b/include/wx/protocol/ftp.h +@@ -175,7 +175,7 @@ protected: + + // the trace mask used by assorted wxLogTrace() in ftp code, do + // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output +-#define FTP_TRACE_MASK _T("ftp") ++#define FTP_TRACE_MASK wxT("ftp") + + #endif // wxUSE_PROTOCOL_FTP + +diff --git a/include/wx/recguard.h b/include/wx/recguard.h +index f2c6ffe..8133a12 100644 +--- a/include/wx/recguard.h ++++ b/include/wx/recguard.h +@@ -35,7 +35,7 @@ public: + + ~wxRecursionGuard() + { +- wxASSERT_MSG( m_flag > 0, _T("unbalanced wxRecursionGuards!?") ); ++ wxASSERT_MSG( m_flag > 0, wxT("unbalanced wxRecursionGuards!?") ); + + m_flag--; + } +diff --git a/include/wx/selstore.h b/include/wx/selstore.h +index 7df7e79..fca6043 100644 +--- a/include/wx/selstore.h ++++ b/include/wx/selstore.h +@@ -51,7 +51,7 @@ public: + void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = false; } + + // must be called when a new item is inserted/added +- void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( _T("TODO") ); } ++ void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( wxT("TODO") ); } + + // must be called when an item is deleted + void OnItemDelete(size_t item); +diff --git a/include/wx/sound.h b/include/wx/sound.h +index 765f818..4596cd4 100644 +--- a/include/wx/sound.h ++++ b/include/wx/sound.h +@@ -43,7 +43,7 @@ public: + { + wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || + (flags & wxSOUND_ASYNC) != 0, +- _T("sound can only be looped asynchronously") ); ++ wxT("sound can only be looped asynchronously") ); + return DoPlay(flags); + } + #if WXWIN_COMPATIBILITY_2_4 +diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h +index 72e250b..52677a6 100644 +--- a/include/wx/spinbutt.h ++++ b/include/wx/spinbutt.h +@@ -23,7 +23,7 @@ + #include "wx/control.h" + #include "wx/event.h" + +-#define wxSPIN_BUTTON_NAME _T("wxSpinButton") ++#define wxSPIN_BUTTON_NAME wxT("wxSpinButton") + + // ---------------------------------------------------------------------------- + // The wxSpinButton is like a small scrollbar than is often placed next +diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h +index 9f1d188..29a9307 100644 +--- a/include/wx/stopwatch.h ++++ b/include/wx/stopwatch.h +@@ -40,7 +40,7 @@ public: + void Resume() + { + wxASSERT_MSG( m_pauseCount > 0, +- _T("Resuming stop watch which is not paused") ); ++ wxT("Resuming stop watch which is not paused") ); + + if ( --m_pauseCount == 0 ) + Start(m_pause); +diff --git a/include/wx/string.h b/include/wx/string.h +index e133bc6..aa062e8 100644 +--- a/include/wx/string.h ++++ b/include/wx/string.h +@@ -70,7 +70,7 @@ class WXDLLIMPEXP_BASE wxString; + + // implementation only + #define wxASSERT_VALID_INDEX(i) \ +- wxASSERT_MSG( (size_t)(i) <= length(), _T("invalid index in wxString") ) ++ wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") ) + + // ---------------------------------------------------------------------------- + // constants +@@ -349,7 +349,7 @@ public: + wxStringBase(const wxStringBase& stringSrc) + { + wxASSERT_MSG( stringSrc.GetStringData()->IsValid(), +- _T("did you forget to call UngetWriteBuf()?") ); ++ wxT("did you forget to call UngetWriteBuf()?") ); + + if ( stringSrc.empty() ) { + // nothing to do for an empty string +@@ -376,7 +376,7 @@ public: + wxStringBase(const wxStringBase& str, size_t nPos, size_t nLen) + { + wxASSERT_MSG( str.GetStringData()->IsValid(), +- _T("did you forget to call UngetWriteBuf()?") ); ++ wxT("did you forget to call UngetWriteBuf()?") ); + Init(); + size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen; + InitWith(str.c_str(), nPos, nLen); +@@ -754,7 +754,7 @@ public: + { + Truncate(0); + +- wxASSERT_MSG( empty(), _T("string not empty after call to Empty()?") ); ++ wxASSERT_MSG( empty(), wxT("string not empty after call to Empty()?") ); + } + // empty the string and free memory + void Clear() +@@ -785,7 +785,7 @@ public: + // get last character + wxChar Last() const + { +- wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") ); ++ wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); + + return at(length() - 1); + } +@@ -793,7 +793,7 @@ public: + // get writable last character + wxChar& Last() + { +- wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") ); ++ wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); + return at(length() - 1); + } + +@@ -993,7 +993,7 @@ public: + { + #if !wxUSE_STL + wxASSERT_MSG( s.GetStringData()->IsValid(), +- _T("did you forget to call UngetWriteBuf()?") ); ++ wxT("did you forget to call UngetWriteBuf()?") ); + #endif + + append(s); +@@ -1058,36 +1058,36 @@ public: + // stream-like functions + // insert an int into string + wxString& operator<<(int i) +- { return (*this) << Format(_T("%d"), i); } ++ { return (*this) << Format(wxT("%d"), i); } + // insert an unsigned int into string + wxString& operator<<(unsigned int ui) +- { return (*this) << Format(_T("%u"), ui); } ++ { return (*this) << Format(wxT("%u"), ui); } + // insert a long into string + wxString& operator<<(long l) +- { return (*this) << Format(_T("%ld"), l); } ++ { return (*this) << Format(wxT("%ld"), l); } + // insert an unsigned long into string + wxString& operator<<(unsigned long ul) +- { return (*this) << Format(_T("%lu"), ul); } ++ { return (*this) << Format(wxT("%lu"), ul); } + #if defined wxLongLong_t && !defined wxLongLongIsLong + // insert a long long if they exist and aren't longs + wxString& operator<<(wxLongLong_t ll) + { +- const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("d"); ++ const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("d"); + return (*this) << Format(fmt, ll); + } + // insert an unsigned long long + wxString& operator<<(wxULongLong_t ull) + { +- const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("u"); ++ const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("u"); + return (*this) << Format(fmt , ull); + } + #endif + // insert a float into string + wxString& operator<<(float f) +- { return (*this) << Format(_T("%f"), f); } ++ { return (*this) << Format(wxT("%f"), f); } + // insert a double into string + wxString& operator<<(double d) +- { return (*this) << Format(_T("%g"), d); } ++ { return (*this) << Format(wxT("%g"), d); } + + // string comparison + // case-sensitive comparison (returns a value < 0, = 0 or > 0) +diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h +index 8dae3d1..ca34ba7 100644 +--- a/include/wx/tbarbase.h ++++ b/include/wx/tbarbase.h +@@ -115,7 +115,7 @@ public: + + wxControl *GetControl() const + { +- wxASSERT_MSG( IsControl(), _T("this toolbar tool is not a control") ); ++ wxASSERT_MSG( IsControl(), wxT("this toolbar tool is not a control") ); + + return m_control; + } +@@ -129,7 +129,7 @@ public: + int GetStyle() const { return m_toolStyle; } + wxItemKind GetKind() const + { +- wxASSERT_MSG( IsButton(), _T("only makes sense for buttons") ); ++ wxASSERT_MSG( IsButton(), wxT("only makes sense for buttons") ); + + return m_kind; + } +diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp +index d8226ec..e0fb247 100644 +--- a/include/wx/thrimpl.cpp ++++ b/include/wx/thrimpl.cpp +@@ -39,7 +39,7 @@ bool wxMutex::IsOk() const + wxMutexError wxMutex::Lock() + { + wxCHECK_MSG( m_internal, wxMUTEX_INVALID, +- _T("wxMutex::Lock(): not initialized") ); ++ wxT("wxMutex::Lock(): not initialized") ); + + return m_internal->Lock(); + } +@@ -47,7 +47,7 @@ wxMutexError wxMutex::Lock() + wxMutexError wxMutex::TryLock() + { + wxCHECK_MSG( m_internal, wxMUTEX_INVALID, +- _T("wxMutex::TryLock(): not initialized") ); ++ wxT("wxMutex::TryLock(): not initialized") ); + + return m_internal->TryLock(); + } +@@ -55,7 +55,7 @@ wxMutexError wxMutex::TryLock() + wxMutexError wxMutex::Unlock() + { + wxCHECK_MSG( m_internal, wxMUTEX_INVALID, +- _T("wxMutex::Unlock(): not initialized") ); ++ wxT("wxMutex::Unlock(): not initialized") ); + + return m_internal->Unlock(); + } +@@ -243,7 +243,7 @@ bool wxCondition::IsOk() const + wxCondError wxCondition::Wait() + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Wait(): not initialized") ); ++ wxT("wxCondition::Wait(): not initialized") ); + + return m_internal->Wait(); + } +@@ -251,7 +251,7 @@ wxCondError wxCondition::Wait() + wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Wait(): not initialized") ); ++ wxT("wxCondition::Wait(): not initialized") ); + + return m_internal->WaitTimeout(milliseconds); + } +@@ -259,7 +259,7 @@ wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) + wxCondError wxCondition::Signal() + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Signal(): not initialized") ); ++ wxT("wxCondition::Signal(): not initialized") ); + + return m_internal->Signal(); + } +@@ -267,7 +267,7 @@ wxCondError wxCondition::Signal() + wxCondError wxCondition::Broadcast() + { + wxCHECK_MSG( m_internal, wxCOND_INVALID, +- _T("wxCondition::Broadcast(): not initialized") ); ++ wxT("wxCondition::Broadcast(): not initialized") ); + + return m_internal->Broadcast(); + } +@@ -299,7 +299,7 @@ bool wxSemaphore::IsOk() const + wxSemaError wxSemaphore::Wait() + { + wxCHECK_MSG( m_internal, wxSEMA_INVALID, +- _T("wxSemaphore::Wait(): not initialized") ); ++ wxT("wxSemaphore::Wait(): not initialized") ); + + return m_internal->Wait(); + } +@@ -307,7 +307,7 @@ wxSemaError wxSemaphore::Wait() + wxSemaError wxSemaphore::TryWait() + { @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 14 17:07:00 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 14 Oct 2009 15:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6863] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 6863 http://gar.svn.sourceforge.net/gar/?rev=6863&view=rev Author: bonivart Date: 2009-10-14 15:07:00 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: update to 1.22 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 14:57:08 UTC (rev 6862) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 15:07:00 UTC (rev 6863) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.21 +GARVERSION = 1.22 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 14 17:08:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Oct 2009 15:08:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6864] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6864 http://gar.svn.sourceforge.net/gar/?rev=6864&view=rev Author: wahwah Date: 2009-10-14 15:08:49 +0000 (Wed, 14 Oct 2009) Log Message: ----------- wxwidgets: Setting PKG_CONFIG_PATH the correct way. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 15:07:00 UTC (rev 6863) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-10-14 15:08:49 UTC (rev 6864) @@ -105,7 +105,7 @@ EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib INSTALL_SCRIPTS = wxwidgets This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 14 20:11:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 18:11:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6865] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6865 http://gar.svn.sourceforge.net/gar/?rev=6865&view=rev Author: bdwalton Date: 2009-10-14 18:11:34 +0000 (Wed, 14 Oct 2009) Log Message: ----------- gitosis: leverage new NP setting in cswclassutils Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-14 15:08:49 UTC (rev 6864) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-10-14 18:11:34 UTC (rev 6865) @@ -15,8 +15,6 @@ define CSWgitosis_postinstall #!/bin/sh -/usr/bin/passwd -N gitosis - # in case the gitosis package was still using /bin/bash. /usr/bin/getent passwd gitosis | /usr/xpg4/bin/grep -q ':/bin/bash' if [ $$? -eq 0 ]; then @@ -58,7 +56,7 @@ INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed GITOSISHOME = /var/opt/csw/gitosis -CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:: +CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:::NP CSWPKGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Oct 14 20:43:50 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 14 Oct 2009 18:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6866] csw/mgar/pkg/nagios_plugins/trunk Message-ID: Revision: 6866 http://gar.svn.sourceforge.net/gar/?rev=6866&view=rev Author: j_arndt Date: 2009-10-14 18:43:50 +0000 (Wed, 14 Oct 2009) Log Message: ----------- nagios_plugins: update to 1.4.14, switched to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile csw/mgar/pkg/nagios_plugins/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff Removed Paths: ------------- csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,5 +1,5 @@ GARNAME = nagios-plugins -GARVERSION = 1.4.13 +GARVERSION = 1.4.14 CATEGORIES = apps DESCRIPTION = plugins for nagios @@ -9,11 +9,16 @@ MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagiosplug/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnagiosp,prototype ) +DISTFILES += CSWnagiosp.prototype + PATCHFILES += check_procs.c.diff PATCHFILES += subst.in.diff +PATCHFILES += pst3.c.diff +PACKAGES = CSWnagiosp +CATALOGNAME_CSWnagiosp = nagios_plugins + REQUIRED_PKGS_CSWnagiosp = CSWggettextrt CSWiconv CSWlibnet CSWlibpq REQUIRED_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl REQUIRED_PKGS_CSWnagiosp += CSWzlib CSWperl Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,5 +1,5 @@ -61f490e92b603ac8628fb0c6cebb39ce download/CSWnagiosp.gspec 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff -be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz +a1835a48a777863ed2583de3c82446a9 download/nagios-plugins-1.4.14.tar.gz +03263abe39cb30741932b878323127e1 download/pst3.c.diff 54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.gspec 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,3 +0,0 @@ -%var bitname nagios_plugins -%var pkgname CSWnagiosp -%include url file://%{PKGLIB}/csw_dyndepend.gspec Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff 2009-10-14 18:11:34 UTC (rev 6865) +++ csw/mgar/pkg/nagios_plugins/trunk/files/makefile.diff 2009-10-14 18:43:50 UTC (rev 6866) @@ -1,22 +0,0 @@ -diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/Makefile.in nagios-plugins-1.4.13/Makefile.in ---- nagios-plugins-1.4.13.orig/Makefile.in 2008-09-25 10:33:22.000000000 +0200 -+++ nagios-plugins-1.4.13/Makefile.in 2009-02-03 21:53:58.207039758 +0100 -@@ -1037,6 +1037,12 @@ - install-root: - cd plugins-root && $(MAKE) $@ - -+install-contrib: -+ tar cf contrib.tar contrib/ -+ $(INSTALL) -d $(DESTDIR)$(docdir) -+ $(INSTALL) -m 644 contrib.tar $(DESTDIR)$(docdir) -+ -+ - tap: - cd @TAP_DIR@ && $(MAKE) - -@@ -1073,3 +1079,5 @@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -+ -+none: Added: csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff (rev 0) +++ csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2009-10-14 18:43:50 UTC (rev 6866) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru nagios-plugins-1.4.14.orig/plugins-root/pst3.c nagios-plugins-1.4.14/plugins-root/pst3.c +--- nagios-plugins-1.4.14.orig/plugins-root/pst3.c 2009-09-14 12:21:24.000000000 +0200 ++++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 19:50:47.193501484 +0200 +@@ -43,8 +43,6 @@ + + #include + #include +-#include +-#include + #include + #include + #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Oct 14 22:29:09 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 14 Oct 2009 20:29:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6867] csw/mgar/pkg/nagios_plugins/trunk Message-ID: Revision: 6867 http://gar.svn.sourceforge.net/gar/?rev=6867&view=rev Author: j_arndt Date: 2009-10-14 20:29:08 +0000 (Wed, 14 Oct 2009) Log Message: ----------- nagios_plugins: patch for pst3 tool for compiling on sparc _and_ i386 Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/checksums csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 18:43:50 UTC (rev 6866) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-10-14 20:29:08 UTC (rev 6867) @@ -1,5 +1,5 @@ 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff a1835a48a777863ed2583de3c82446a9 download/nagios-plugins-1.4.14.tar.gz -03263abe39cb30741932b878323127e1 download/pst3.c.diff +91aaa11cae02b6855a2fdb055c27f767 download/pst3.c.diff 54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2009-10-14 18:43:50 UTC (rev 6866) +++ csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2009-10-14 20:29:08 UTC (rev 6867) @@ -1,12 +1,18 @@ diff --speed-large-files --minimal -Nru nagios-plugins-1.4.14.orig/plugins-root/pst3.c nagios-plugins-1.4.14/plugins-root/pst3.c --- nagios-plugins-1.4.14.orig/plugins-root/pst3.c 2009-09-14 12:21:24.000000000 +0200 -+++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 19:50:47.193501484 +0200 -@@ -43,8 +43,6 @@ ++++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 22:02:53.643787730 +0200 +@@ -43,11 +43,11 @@ #include #include -#include -#include ++#include "/usr/include/string.h" ++#include "/usr/include/unistd.h" #include #include - #include +-#include ++#include "/usr/include/fcntl.h" + #include + #include + #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 15 00:42:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Oct 2009 22:42:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6868] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6868 http://gar.svn.sourceforge.net/gar/?rev=6868&view=rev Author: bdwalton Date: 2009-10-14 22:42:38 +0000 (Wed, 14 Oct 2009) Log Message: ----------- cswclassutils: rework python compilation so only package specific files are compiled Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 20:29:08 UTC (rev 6867) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) @@ -1,5 +1,5 @@ GARNAME = cswclassutils -GARVERSION = 1.22 +GARVERSION = 1.23 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-14 20:29:08 UTC (rev 6867) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-14 22:42:38 UTC (rev 6868) @@ -7,6 +7,7 @@ # Written by Mike Watters # # 2009-05-25 First Release +# 2009-10-14 Update to only compile package specific files (Ben Walton) # # Force Path for the script to use @@ -20,34 +21,51 @@ if [ "${DEBUG}" ]; then echo PACKAGE: $PKGINST fi + +TMPPY=/tmp/pycomp.$$.`date +%Y%m%d%H%M%S`.py + +cat < $TMPPY +import py_compile + +pyfiles = [ +EOF + +echo "Installing class ..." + while read src dest; do if [ "$DEBUG" ]; then echo SRC: $src DEST: $dest fi /usr/bin/cp -p $src $dest || exit 2 + echo $dest + + echo " \"$dest\"," >> $TMPPY done +cat <> $TMPPY + ] + +for f in pyfiles: + try: + py_compile.compile(f, doraise=True) + except PyCompileError: + print "Error compiling: %s" % f + +EOF + if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then echo "Could not find or execute ${PY_BINDIR}/python" echo "Check your Python installation." exit 2 fi -if [ ! -f ${PY_LIBDIR}/compileall.py ]; then - echo "Could not find ${PY_LIBDIR}/compileall.py" - echo "Check your Python installation." - exit 2 -fi - echo "Compiling py files to normal bytecode ..." -# Compile .py libraries to .pyc files -${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \ - -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR} +${PY_BINDIR}/python -Wi -tt $TMPPY echo "Compiling py files to optimized bytecode ..." -# Compile .py libraries to .pyo files -${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \ - -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR} - +${PY_BINDIR}/python -Wi -tt -O $TMPPY + +rm $TMPPY + exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 11:21:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 09:21:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6869] csw/mgar/pkg Message-ID: Revision: 6869 http://gar.svn.sourceforge.net/gar/?rev=6869&view=rev Author: wahwah Date: 2009-10-15 09:21:43 +0000 (Thu, 15 Oct 2009) Log Message: ----------- gdata-python-client: Initial commit Modified Paths: -------------- csw/mgar/pkg/gdata-python-client/trunk/Makefile csw/mgar/pkg/gdata-python-client/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gdata-python-client/ Modified: csw/mgar/pkg/gdata-python-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/gdata-python-client/trunk/Makefile 2009-10-15 09:21:43 UTC (rev 6869) @@ -2,181 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = gdata-python-client +GARVERSION = 2.0.3 +CATEGORIES = python +DESCRIPTION = Google Data Protocol, a REST-inspired technology define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://code.google.com/apis/gdata/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = gdata-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/gdata-$(GARVERSION) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +CATALOGNAME = py_gdata +PACKAGES = CSWpygdata +REQUIRED_PKGS = +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpysetuptools +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/gdata-python-client/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/gdata-python-client/trunk/checksums 2009-10-15 09:21:43 UTC (rev 6869) @@ -0,0 +1 @@ +43d4975caeebbe8d64e101638be966cd gdata-2.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 11:31:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 09:31:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6870] csw/mgar/pkg/gdata-python-client/trunk/Makefile Message-ID: Revision: 6870 http://gar.svn.sourceforge.net/gar/?rev=6870&view=rev Author: wahwah Date: 2009-10-15 09:31:45 +0000 (Thu, 15 Oct 2009) Log Message: ----------- gdata-python-client: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/gdata-python-client/trunk/Makefile Modified: csw/mgar/pkg/gdata-python-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdata-python-client/trunk/Makefile 2009-10-15 09:21:43 UTC (rev 6869) +++ csw/mgar/pkg/gdata-python-client/trunk/Makefile 2009-10-15 09:31:45 UTC (rev 6870) @@ -15,6 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_gdata PACKAGES = CSWpygdata +ARCHALL_CSWpygdata = 1 REQUIRED_PKGS = PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpysetuptools TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 15 14:04:19 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 15 Oct 2009 12:04:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6871] csw/mgar/pkg/cpan/libwww-perl/trunk Message-ID: Revision: 6871 http://gar.svn.sourceforge.net/gar/?rev=6871&view=rev Author: bonivart Date: 2009-10-15 12:04:19 +0000 (Thu, 15 Oct 2009) Log Message: ----------- libwww: update to 5.833 Modified Paths: -------------- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/checksums Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2009-10-15 09:31:45 UTC (rev 6870) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2009-10-15 12:04:19 UTC (rev 6871) @@ -1,5 +1,5 @@ GARNAME = libwww-perl -GARVERSION = 5.830 +GARVERSION = 5.833 CATEGORIES = cpan AUTHOR = GAAS Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2009-10-15 09:31:45 UTC (rev 6870) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2009-10-15 12:04:19 UTC (rev 6871) @@ -1,2 +1,2 @@ -d6d74a59bf794b8ffc8da8bbf1e4e15a download/COPYING -55049cd17e73c94bee3aee4b65b465c5 download/libwww-perl-5.830.tar.gz +d6d74a59bf794b8ffc8da8bbf1e4e15a COPYING +8fd7d7e793355c4e6e6806c70f6d2917 libwww-perl-5.833.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 15:00:19 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 13:00:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6872] csw/mgar/pkg Message-ID: Revision: 6872 http://gar.svn.sourceforge.net/gar/?rev=6872&view=rev Author: wahwah Date: 2009-10-15 13:00:19 +0000 (Thu, 15 Oct 2009) Log Message: ----------- googletest: Initial commit Modified Paths: -------------- csw/mgar/pkg/googletest/trunk/Makefile csw/mgar/pkg/googletest/trunk/checksums Added Paths: ----------- csw/mgar/pkg/googletest/ Modified: csw/mgar/pkg/googletest/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/googletest/trunk/Makefile 2009-10-15 13:00:19 UTC (rev 6872) @@ -2,181 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = googletest +GARVERSION = 1.4.0 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = a framework for writing C++ tests on a variety of platforms define BLURB - + Google's framework for writing C++ tests on a variety of platforms (Linux, + Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit + architecture. Supports automatic test discovery, a rich set of assertions, + user-defined assertions, death tests, fatal and non-fatal failures, value- + and type-parameterized tests, various options for running the tests, and XML + test report generation. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://code.google.com/p/googletest/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = gtest-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) +UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/googletest/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/googletest/trunk/checksums 2009-10-15 13:00:19 UTC (rev 6872) @@ -0,0 +1 @@ +ec1dd5ab07cde5da033b1d631e621167 gtest-1.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 15:18:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 13:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6873] csw/mgar/pkg Message-ID: Revision: 6873 http://gar.svn.sourceforge.net/gar/?rev=6873&view=rev Author: wahwah Date: 2009-10-15 13:18:19 +0000 (Thu, 15 Oct 2009) Log Message: ----------- googlemock: Initial commit (doesn't compile at the moment) Modified Paths: -------------- csw/mgar/pkg/googlemock/trunk/Makefile csw/mgar/pkg/googlemock/trunk/checksums Added Paths: ----------- csw/mgar/pkg/googlemock/ Modified: csw/mgar/pkg/googlemock/trunk/Makefile =================================================================== --- csw/mgar/pkg/googletest/trunk/Makefile 2009-10-15 13:00:19 UTC (rev 6872) +++ csw/mgar/pkg/googlemock/trunk/Makefile 2009-10-15 13:18:19 UTC (rev 6873) @@ -2,22 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = googletest +GARNAME = googlemock GARVERSION = 1.4.0 CATEGORIES = lib -DESCRIPTION = a framework for writing C++ tests on a variety of platforms +DESCRIPTION = a library for writing and using C++ mock classes define BLURB - Google's framework for writing C++ tests on a variety of platforms (Linux, - Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit - architecture. Supports automatic test discovery, a rich set of assertions, - user-defined assertions, death tests, fatal and non-fatal failures, value- - and type-parameterized tests, various options for running the tests, and XML - test report generation. + Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s specifics + in mind, Google C++ Mocking Framework (or Google Mock for short) is a library + for writing and using C++ mock classes. endef -SPKG_SOURCEURL = http://code.google.com/p/googletest/ +SPKG_SOURCEURL = http://code.google.com/p/googlemock/ MASTER_SITES = $(GOOGLE_MIRROR) -DISTFILES = gtest-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) -UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz +DISTFILES = gmock-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/gmock-$(GARVERSION) +UFILES_REGEX = gmock-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -include gar/category.mk + +# Compilation unfortunately fails: +# +# "./include/gmock/gmock-printers.h", line 480: Error: static +# testing::internal::TuplePrefixPrinter<1>::PrintPrefixTo::Tuple>(const +# testing::internal::TuplePrefixPrinter<1>::Tuple&, std::ostream *) already had +# a body defined. +# +# include gar/category.mk Modified: csw/mgar/pkg/googlemock/trunk/checksums =================================================================== --- csw/mgar/pkg/googletest/trunk/checksums 2009-10-15 13:00:19 UTC (rev 6872) +++ csw/mgar/pkg/googlemock/trunk/checksums 2009-10-15 13:18:19 UTC (rev 6873) @@ -1 +1 @@ -ec1dd5ab07cde5da033b1d631e621167 gtest-1.4.0.tar.gz +f2ac810a5e601792f4a99f296ccb1269 gmock-1.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 15 17:35:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Oct 2009 15:35:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6874] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6874 http://gar.svn.sourceforge.net/gar/?rev=6874&view=rev Author: wahwah Date: 2009-10-15 15:35:18 +0000 (Thu, 15 Oct 2009) Log Message: ----------- cups-1.4: Cosmetic changes to the Makefile. It turns out that 1.3.11 and 1.4.0 use the same major library numbers, there's no need to include libs from 1.3.11 in 1.4.0. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-15 13:18:19 UTC (rev 6873) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-15 15:35:18 UTC (rev 6874) @@ -31,25 +31,27 @@ GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. -CUPS_MIRRORS = http://ftp.easysw.com/pub +CUPS_MIRRORS = http://ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp2.easysw.com/pub CUPS_MIRRORS += ftp://ftp3.easysw.com/pub CUPS_MIRRORS += http://www.nu6.org/_/mirror/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub + # Complete the mirror paths by adding /cups/x.y.z/ at the end. -FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) +FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -PATCHFILES = 0001-cswcups-for-service-name.patch -PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch -PATCHFILES += 0003-Reference-counting-for-printers-only.patch -DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 DISTFILES += CSWcupsclient.preinstall DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove +PATCHFILES = 0001-cswcups-for-service-name.patch +PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch +PATCHFILES += 0003-Reference-counting-for-printers-only.patch + PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg PREREQUISITE_PKGS += CSWkrb5libdev @@ -183,6 +185,8 @@ OPTIM = $(OPTIM_$(GARFLAVOR)) export OPTIM +include gar/category.mk + post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ @@ -194,5 +198,3 @@ fi \ done) @$(MAKECOOKIE) - -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 16 19:22:09 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 16 Oct 2009 17:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6875] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 6875 http://gar.svn.sourceforge.net/gar/?rev=6875&view=rev Author: bdwalton Date: 2009-10-16 17:22:09 +0000 (Fri, 16 Oct 2009) Log Message: ----------- tig: remove CSWgcc4corert dep Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2009-10-15 15:35:18 UTC (rev 6874) +++ csw/mgar/pkg/tig/trunk/Makefile 2009-10-16 17:22:09 UTC (rev 6875) @@ -19,7 +19,7 @@ PREREQUISITE_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv -REQUIRED_PKGS = CSWncurses CSWiconv CSWgit CSWgcc4corert +REQUIRED_PKGS = CSWncurses CSWiconv CSWgit GIT_REPOS = http://jonas.nitro.dk/tig/tig.git GIT_TREEISH_tig.git = $(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Fri Oct 16 20:33:30 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Fri, 16 Oct 2009 18:33:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6876] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 6876 http://gar.svn.sourceforge.net/gar/?rev=6876&view=rev Author: harpchad Date: 2009-10-16 18:33:27 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Bump version to 2.6.3 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-10-16 17:22:09 UTC (rev 6875) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-10-16 18:33:27 UTC (rev 6876) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.2 +GARVERSION = 2.6.3 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-10-16 17:22:09 UTC (rev 6875) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-10-16 18:33:27 UTC (rev 6876) @@ -1 +1 @@ -2db20c9c44e9a84ae4a9290f9e47ae83 download/pidgin-2.6.2.tar.gz +d0b030f0f746251b48fc78f59fe71861 download/pidgin-2.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 17 16:35:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Oct 2009 14:35:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6877] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6877 http://gar.svn.sourceforge.net/gar/?rev=6877&view=rev Author: wahwah Date: 2009-10-17 14:35:43 +0000 (Sat, 17 Oct 2009) Log Message: ----------- cswutils: added submitpkg -- a script to submit a package to the release manager Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-16 18:33:27 UTC (rev 6876) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-17 14:35:43 UTC (rev 6877) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswutils -GARVERSION = 1.14.4 +GARVERSION = 1.14.5 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 77 +SVN_REV = 90 MASTER_SITES = DISTFILES = COPYING @@ -20,6 +20,7 @@ DISTFILES += stagepkg stagepkg.8 DISTFILES += compare_pkgs.py-r$(SVN_REV) DISTFILES += opencsw_lib.py-r$(SVN_REV) +DISTFILES += submit_to_newpkgs.py-r$(SVN_REV) REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree @@ -42,14 +43,11 @@ include gar/category.mk -download/compare_pkgs.py-r$(SVN_REV): - svn export -r $(SVN_REV) $(SVNROOT)compare_pkgs.py - mv compare_pkgs.py download/compare_pkgs.py-r$(SVN_REV) - @$(MAKECOOKIE) +SVN_FILES = submit_to_newpkgs compare_pkgs opencsw_lib -download/opencsw_lib.py-r$(SVN_REV): - svn export -r $(SVN_REV) $(SVNROOT)opencsw_lib.py - mv opencsw_lib.py download/opencsw_lib.py-r$(SVN_REV) +$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F).py-r$(SVN_REV)): + svn export -r $(SVN_REV) $(SVNROOT)$(subst -r$(SVN_REV),,$(notdir $@)) + mv $(subst -r$(SVN_REV),,$(notdir $@)) $@ @$(MAKECOOKIE) install-custom: @@ -64,9 +62,12 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw - @ginstall -m 755 $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/csw/compare_pkgs.py @ginstall -m 644 $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py + @for f in compare_pkgs.py submit_to_newpkgs.py; do \ + ginstall -m 755 $(WORKSRC)/$${f}-r$(SVN_REV) \ + $(DESTDIR)$(libdir)/python/csw/$${f}; \ + done @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg + @ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-10-16 18:33:27 UTC (rev 6876) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-10-17 14:35:43 UTC (rev 6877) @@ -1,10 +1,11 @@ -091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING -30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg -6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 -a60cefbb6829c8dbbfae634a9ab01eba download/compare_pkgs.py-r77 -9a637f6546cc50974159a987302d91c0 download/cpan2pkg -93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg -a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 -d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r77 -cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg -8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 +091b12575ebc0e45cf8c3d8b43d8b638 COPYING +30b6598a4453e3ce0c1fabeede5eb5f8 checkpkg +6ec3b6597e04714430987ccc199db3c4 checkpkg.8 +24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r90 +9a637f6546cc50974159a987302d91c0 cpan2pkg +93b6a811d303ce3be0050c5a7b3c8e69 createpkg +a605598f30195f9ab1b29fc3944d3b31 createpkg.8 +a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r90 +cd4496ee27bf86d5c8bc656c9c5974be stagepkg +8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 +989839890af2cbdc13e6bb37f3b95ba6 submit_to_newpkgs.py-r90 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 17 16:43:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Oct 2009 14:43:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6878] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6878 http://gar.svn.sourceforge.net/gar/?rev=6878&view=rev Author: wahwah Date: 2009-10-17 14:43:44 +0000 (Sat, 17 Oct 2009) Log Message: ----------- cswutils: Added dependency on CSWpython, DISTFILES are now created based on SVN_FILES Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-17 14:35:43 UTC (rev 6877) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-17 14:43:44 UTC (rev 6878) @@ -12,18 +12,18 @@ SVN_REV = 90 MASTER_SITES = +SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 DISTFILES += cpan2pkg DISTFILES += createpkg createpkg.8 DISTFILES += stagepkg stagepkg.8 DISTFILES += stagepkg stagepkg.8 -DISTFILES += compare_pkgs.py-r$(SVN_REV) -DISTFILES += opencsw_lib.py-r$(SVN_REV) -DISTFILES += submit_to_newpkgs.py-r$(SVN_REV) +DISTFILES += $(foreach F,$(SVN_FILES),$(F)-r$(SVN_REV)) REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree +REQUIRED_PKGS += CSWpython WORKSRC = $(WORKDIR) @@ -43,9 +43,8 @@ include gar/category.mk -SVN_FILES = submit_to_newpkgs compare_pkgs opencsw_lib - -$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F).py-r$(SVN_REV)): +# This target doesn't work when defined as $(DOWNLOADDIR)/%-r$(SVN_REV) +$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F)-r$(SVN_REV)): svn export -r $(SVN_REV) $(SVNROOT)$(subst -r$(SVN_REV),,$(notdir $@)) mv $(subst -r$(SVN_REV),,$(notdir $@)) $@ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 17 17:19:22 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 17 Oct 2009 15:19:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6879] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 6879 http://gar.svn.sourceforge.net/gar/?rev=6879&view=rev Author: chninkel Date: 2009-10-17 15:19:22 +0000 (Sat, 17 Oct 2009) Log Message: ----------- ca_certificates: postinstall should not fail if /opt/csw is shared by nfs or among solaris zones Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2009-10-17 14:43:44 UTC (rev 6878) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2009-10-17 15:19:22 UTC (rev 6879) @@ -40,6 +40,7 @@ cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" install-custom: install-certificates $(WORKDIR)/hash.db $(WORKDIR)/LICENSE + ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl" ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs" ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates" ginstall -D "$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates" Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 14:43:44 UTC (rev 6878) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 15:19:22 UTC (rev 6879) @@ -5,5 +5,5 @@ c7fd74bceddf27039a26a5f1dfede163 download/README.CSW 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend -32e6ea27867c760d2279330fd4c480d3 download/CSWcacertificates.postinstall +3f166eabf87f3f97ce51351eb070724d download/CSWcacertificates.postinstall 0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 14:43:44 UTC (rev 6878) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 15:19:22 UTC (rev 6879) @@ -1,3 +1,15 @@ +# workaround to not fail if /opt/csw is read-only +# in the nfs-shared or sparse zone case +# this is temporary until configuration is moved in /etc/opt/csw +if touch /opt/csw/.ca_certificate.test 2>/dev/null; then + rm -f /opt/csw/.ca_certificate.test +else + echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated" + echo " if /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have + echo " to worry about it, the certification authorities list present on the nfs server or in + echo " the global zone will be used." + exit 0 +fi # Update ca lists if [ -n "${BASEDIR}" ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Oct 17 17:20:45 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 17 Oct 2009 15:20:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6880] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 6880 http://gar.svn.sourceforge.net/gar/?rev=6880&view=rev Author: chninkel Date: 2009-10-17 15:20:45 +0000 (Sat, 17 Oct 2009) Log Message: ----------- ca_certificates: fixed missing double quotes Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 15:19:22 UTC (rev 6879) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2009-10-17 15:20:45 UTC (rev 6880) @@ -5,5 +5,5 @@ c7fd74bceddf27039a26a5f1dfede163 download/README.CSW 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend -3f166eabf87f3f97ce51351eb070724d download/CSWcacertificates.postinstall +1fb44412e1ee60dd4f7bd9bd66d4af34 download/CSWcacertificates.postinstall 0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 15:19:22 UTC (rev 6879) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2009-10-17 15:20:45 UTC (rev 6880) @@ -4,9 +4,9 @@ if touch /opt/csw/.ca_certificate.test 2>/dev/null; then rm -f /opt/csw/.ca_certificate.test else - echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated" - echo " if /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have - echo " to worry about it, the certification authorities list present on the nfs server or in + echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated." + echo " If /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have" + echo " to worry about it, the certification authorities list present on the nfs server or in" echo " the global zone will be used." exit 0 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:28:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:28:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6881] csw/mgar/pkg/bdb3 Message-ID: Revision: 6881 http://gar.svn.sourceforge.net/gar/?rev=6881&view=rev Author: dmichelsen Date: 2009-10-18 09:28:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3,bdb33: Prepare for rechange CSWbdb33 to CSWbdb3 Added Paths: ----------- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/checksums Removed Paths: ------------- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/checksums csw/mgar/pkg/bdb3/trunk/ csw/mgar/pkg/bdb33/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ Deleted: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-08 23:22:09 UTC (rev 6801) +++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2009-10-18 09:28:04 UTC (rev 6881) @@ -1,33 +0,0 @@ -GARNAME = db -GARVERSION = 3.3.11 -CATEGORIES = lib - -DESCRIPTION = Stub package as contents moved to CSWbdb33 -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -PACKAGES = CSWbdb3 -CATALOGNAME = berkeleydb3 - -ARCHALL = 1 -REQUIRED_PKGS = CSWbdb33 - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom - -TEST_SCRIPTS = - -include gar/category.mk - -install-custom: - ginstall -d $(DESTDIR)$(libdir) - ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile (from rev 6657, csw/mgar/pkg/bdb3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile (rev 0) +++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2009-10-18 09:28:04 UTC (rev 6881) @@ -0,0 +1,33 @@ +GARNAME = db +GARVERSION = 3.3.11 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb33 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb3 +CATALOGNAME = berkeleydb3 + +ARCHALL = 1 +REQUIRED_PKGS = CSWbdb33 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 18 11:31:23 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:31:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6882] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6882 http://gar.svn.sourceforge.net/gar/?rev=6882&view=rev Author: trygvis Date: 2009-10-18 09:31:17 +0000 (Sun, 18 Oct 2009) Log Message: ----------- o Adding a patch to the latest wip branch. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-18 09:28:04 UTC (rev 6881) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-18 09:31:17 UTC (rev 6882) @@ -1,5 +1,5 @@ GARNAME = cgit -GARVERSION = 0.8.3-opencsw-1 +GARVERSION = 0.8.3_opencsw_1 CATEGORIES = devel DESCRIPTION = Web front-end for Git @@ -38,7 +38,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PATCHFILES = 0001-cgit.conf +PATCHFILES = 0001-cgit.conf +PATCHFILES += 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-18 09:28:04 UTC (rev 6881) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-18 09:31:17 UTC (rev 6882) @@ -1,3 +1,4 @@ -b013ec63820f1841df1cddaa35d66ed3 download/0001-cgit.conf -27ef98eeb9066a301e60def5b6895a2c download/apache.conf.CSW -03d013bbfdad0143ddcb4c29acf1b637 download/cgitrc.CSW +b013ec63820f1841df1cddaa35d66ed3 0001-cgit.conf +ab2c07418eec63118a2da512a99d7e34 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff +27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW +03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW Added: csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff =================================================================== --- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff 2009-10-18 09:31:17 UTC (rev 6882) @@ -0,0 +1,887 @@ +diff --git a/Makefile b/Makefile +index 60d8c58..cb7875e 100644 +--- a/Makefile ++++ b/Makefile +@@ -90,6 +90,7 @@ OBJECTS += ui-refs.o + OBJECTS += ui-repolist.o + OBJECTS += ui-shared.o + OBJECTS += ui-snapshot.o ++OBJECTS += ui-ssdiff.o + OBJECTS += ui-stats.o + OBJECTS += ui-summary.o + OBJECTS += ui-tag.o +diff --git a/cgit.c b/cgit.c +index bd37788..84f44ba 100644 +--- a/cgit.c ++++ b/cgit.c +@@ -182,6 +182,8 @@ void config_cb(const char *name, const char *value) + ctx.cfg.summary_branches = atoi(value); + else if (!strcmp(name, "summary-tags")) + ctx.cfg.summary_tags = atoi(value); ++ else if (!strcmp(name, "side-by-side-diffs")) ++ ctx.cfg.ssdiff = atoi(value); + else if (!strcmp(name, "agefile")) + ctx.cfg.agefile = xstrdup(value); + else if (!strcmp(name, "renamelimit")) +@@ -209,6 +211,8 @@ static void querystring_cb(const char *name, const char *value) + } else if (!strcmp(name, "p")) { + ctx.qry.page = xstrdup(value); + } else if (!strcmp(name, "url")) { ++ if (*value == '/') ++ value++; + ctx.qry.url = xstrdup(value); + cgit_parse_url(value); + } else if (!strcmp(name, "qt")) { +@@ -238,6 +242,8 @@ static void querystring_cb(const char *name, const char *value) + ctx.qry.showmsg = atoi(value); + } else if (!strcmp(name, "period")) { + ctx.qry.period = xstrdup(value); ++ } else if (!strcmp(name, "ss")) { ++ ctx.qry.ssdiff = atoi(value); + } + } + +@@ -279,6 +285,7 @@ static void prepare_context(struct cgit_context *ctx) + ctx->cfg.summary_branches = 10; + ctx->cfg.summary_log = 10; + ctx->cfg.summary_tags = 10; ++ ctx->cfg.ssdiff = 0; + ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); + ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); + ctx->env.https = xstrdupn(getenv("HTTPS")); +diff --git a/cgit.css b/cgit.css +index c47ebc9..3f37165 100644 +--- a/cgit.css ++++ b/cgit.css +@@ -601,3 +601,92 @@ table.hgraph div.bar { + background-color: #eee; + height: 1em; + } ++ ++table.ssdiff { ++ width: 100%; ++} ++ ++table.ssdiff td { ++ font-size: 75%; ++ font-family: monospace; ++ white-space: pre; ++ padding: 1px 4px 1px 4px; ++ border-left: solid 1px #aaa; ++ border-right: solid 1px #aaa; ++} ++ ++table.ssdiff td.add { ++ color: black; ++ background: #cfc; ++ min-width: 50%; ++} ++ ++table.ssdiff td.add_dark { ++ color: black; ++ background: #aca; ++ min-width: 50%; ++} ++ ++table.ssdiff td.del { ++ color: black; ++ background: #fcc; ++ min-width: 50%; ++} ++ ++table.ssdiff td.del_dark { ++ color: black; ++ background: #caa; ++ min-width: 50%; ++} ++ ++table.ssdiff td.changed { ++ color: black; ++ background: #ffc; ++ min-width: 50%; ++} ++ ++table.ssdiff td.changed_dark { ++ color: black; ++ background: #cca; ++ min-width: 50%; ++} ++ ++table.ssdiff td.lineno { ++ color: black; ++ background: #eee; ++ text-align: right; ++ width: 3em; ++ min-width: 3em; ++} ++ ++table.ssdiff td.hunk { ++ color: #black; ++ background: #ccf; ++ border-top: solid 1px #aaa; ++ border-bottom: solid 1px #aaa; ++} ++ ++table.ssdiff td.head { ++ border-top: solid 1px #aaa; ++ border-bottom: solid 1px #aaa; ++} ++ ++table.ssdiff td.head div.head { ++ font-weight: bold; ++ color: black; ++} ++ ++table.ssdiff td.foot { ++ border-top: solid 1px #aaa; ++ border-left: none; ++ border-right: none; ++ border-bottom: none; ++} ++ ++table.ssdiff td.space { ++ border: none; ++} ++ ++table.ssdiff td.space div { ++ min-height: 3em; ++} +\ No newline at end of file +diff --git a/cgit.h b/cgit.h +index 6c6c460..b7b0adb 100644 +--- a/cgit.h ++++ b/cgit.h +@@ -143,6 +143,7 @@ struct cgit_query { + int nohead; + char *sort; + int showmsg; ++ int ssdiff; + }; + + struct cgit_config { +@@ -194,6 +195,7 @@ struct cgit_config { + int summary_branches; + int summary_log; + int summary_tags; ++ int ssdiff; + struct string_list mimetypes; + struct cgit_filter *about_filter; + struct cgit_filter *commit_filter; +diff --git a/cgitrc.5.txt b/cgitrc.5.txt +index 0c13485..d0fd9a1 100644 +--- a/cgitrc.5.txt ++++ b/cgitrc.5.txt +@@ -241,6 +241,10 @@ section:: + after this option will inherit the current section name. Default value: + none. + ++side-by-side-diffs:: ++ If set to "1" shows side-by-side diffs instead of unidiffs per ++ default. Default value: "0". ++ + snapshots:: + Text which specifies the default set of snapshot formats generated by + cgit. The value is a space-separated list of zero or more of the +diff --git a/ui-commit.c b/ui-commit.c +index f5b0ae5..b5e3c01 100644 +--- a/ui-commit.c ++++ b/ui-commit.c +@@ -58,9 +58,14 @@ void cgit_print_commit(char *hex) + html("\n"); + html("commit"); + tmp = sha1_to_hex(commit->object.sha1); +- cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); ++ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); + html(" ("); + cgit_patch_link("patch", NULL, NULL, NULL, tmp); ++ html(") ("); ++ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) ++ cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); ++ else ++ cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); + html(")\n"); + html("tree"); + tmp = xstrdup(hex); +@@ -78,10 +83,10 @@ void cgit_print_commit(char *hex) + html("parent" + ""); + cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, +- ctx.qry.head, sha1_to_hex(p->item->object.sha1)); ++ ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); + html(" ("); + cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, +- sha1_to_hex(p->item->object.sha1), NULL); ++ sha1_to_hex(p->item->object.sha1), NULL, 0); + html(")"); + parents++; + } +diff --git a/ui-diff.c b/ui-diff.c +index 2196745..a92a768 100644 +--- a/ui-diff.c ++++ b/ui-diff.c +@@ -9,6 +9,7 @@ + #include "cgit.h" + #include "html.h" + #include "ui-shared.h" ++#include "ui-ssdiff.h" + + unsigned char old_rev_sha1[20]; + unsigned char new_rev_sha1[20]; +@@ -32,6 +33,7 @@ static struct fileinfo { + int binary:1; + } *items; + ++static int use_ssdiff = 0; + + static void print_fileinfo(struct fileinfo *info) + { +@@ -83,7 +85,7 @@ static void print_fileinfo(struct fileinfo *info) + } + htmlf("", class); + cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, +- ctx.qry.sha2, info->new_path); ++ ctx.qry.sha2, info->new_path, 0); + if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) + htmlf(" (%s from %s)", + info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", +@@ -158,7 +160,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1, + + html("
"); + cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, +- ctx.qry.sha2, NULL); ++ ctx.qry.sha2, NULL, 0); + html("
"); + html(""); + max_changes = 0; +@@ -246,26 +248,54 @@ static void header(unsigned char *sha1, char *path1, int mode1, + html(""); + } + ++static void print_ssdiff_link() ++{ ++ if (!strcmp(ctx.qry.page, "diff")) { ++ if (use_ssdiff) ++ cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, ++ ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); ++ else ++ cgit_diff_link("Side-by-side diff", NULL, NULL, ++ ctx.qry.head, ctx.qry.sha1, ++ ctx.qry.sha2, ctx.qry.path, 1); ++ } ++} ++ + static void filepair_cb(struct diff_filepair *pair) + { + unsigned long old_size = 0; + unsigned long new_size = 0; + int binary = 0; ++ linediff_fn print_line_fn = print_line; + ++ if (use_ssdiff) { ++ cgit_ssdiff_header_begin(); ++ print_line_fn = cgit_ssdiff_line_cb; ++ } + header(pair->one->sha1, pair->one->path, pair->one->mode, + pair->two->sha1, pair->two->path, pair->two->mode); ++ if (use_ssdiff) ++ cgit_ssdiff_header_end(); + if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { + if (S_ISGITLINK(pair->one->mode)) +- print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); ++ print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); + if (S_ISGITLINK(pair->two->mode)) +- print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); ++ print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); ++ if (use_ssdiff) ++ cgit_ssdiff_footer(); + return; + } +- if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, +- &new_size, &binary, print_line)) ++ if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, ++ &new_size, &binary, print_line_fn)) + cgit_print_error("Error running diff"); +- if (binary) +- html("Binary files differ"); ++ if (binary) { ++ if (use_ssdiff) ++ html(""); ++ else ++ html("Binary files differ"); ++ } ++ if (use_ssdiff) ++ cgit_ssdiff_footer(); + } + + void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) +@@ -303,11 +333,21 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi + if (!commit2 || parse_commit(commit2)) + cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); + } ++ ++ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) ++ use_ssdiff = 1; ++ ++ print_ssdiff_link(); + cgit_print_diffstat(old_rev_sha1, new_rev_sha1); + +- html("
Binary files differ
"); +- html("", + ctx.qry.showmsg ? " class='logsubject'" : ""); + cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, +- sha1_to_hex(commit->object.sha1)); ++ sha1_to_hex(commit->object.sha1), 0); + show_commit_decorations(commit); + html(""); ++ if (old_line_no > 0) ++ htmlf(""); ++ ++ if (new_line_no > 0) ++ htmlf(""); ++} ++ ++static void print_deferred_old_lines() ++{ ++ struct deferred_lines *iter_old, *tmp; ++ ++ iter_old = deferred_old; ++ while (iter_old) { ++ print_ssdiff_line("del", iter_old->line_no, ++ iter_old->line, -1, NULL); ++ tmp = iter_old->next; ++ free(iter_old); ++ iter_old = tmp; ++ } ++} ++ ++static void print_deferred_new_lines() ++{ ++ struct deferred_lines *iter_new, *tmp; ++ ++ iter_new = deferred_new; ++ while (iter_new) { ++ print_ssdiff_line("add", -1, NULL, iter_new->line_no, ++ iter_new->line); ++ tmp = iter_new->next; ++ free(iter_new); ++ iter_new = tmp; ++ } ++} ++ ++static void print_deferred_changed_lines() ++{ ++ struct deferred_lines *iter_old, *iter_new, *tmp; ++ ++ iter_old = deferred_old; ++ iter_new = deferred_new; ++ while (iter_old || iter_new) { ++ if (iter_old && iter_new) ++ print_ssdiff_line("changed", iter_old->line_no, ++ iter_old->line, ++ iter_new->line_no, iter_new->line); ++ else if (iter_old) ++ print_ssdiff_line("changed", iter_old->line_no, ++ iter_old->line, -1, NULL); ++ else if (iter_new) ++ print_ssdiff_line("changed", -1, NULL, ++ iter_new->line_no, iter_new->line); ++ ++ if (iter_old) { ++ tmp = iter_old->next; ++ free(iter_old); ++ iter_old = tmp; ++ } ++ ++ if (iter_new) { ++ tmp = iter_new->next; ++ free(iter_new); ++ iter_new = tmp; ++ } ++ } ++} ++ ++void cgit_ssdiff_print_deferred_lines() ++{ ++ if (!deferred_old && !deferred_new) ++ return; ++ ++ if (deferred_old && !deferred_new) ++ print_deferred_old_lines(); ++ else if (!deferred_old && deferred_new) ++ print_deferred_new_lines(); ++ else ++ print_deferred_changed_lines(); ++ ++ deferred_old = deferred_old_last = NULL; ++ deferred_new = deferred_new_last = NULL; ++} ++ ++/* ++ * print a single line returned from xdiff ++ */ ++void cgit_ssdiff_line_cb(char *line, int len) ++{ ++ char c = line[len - 1]; ++ ++ line[len - 1] = '\0'; ++ ++ if (line[0] == '@') { ++ current_old_line = line_from_hunk(line, '-'); ++ current_new_line = line_from_hunk(line, '+'); ++ } ++ ++ if (line[0] == ' ') { ++ if (deferred_old || deferred_new) ++ cgit_ssdiff_print_deferred_lines(); ++ print_ssdiff_line("ctx", current_old_line, line, ++ current_new_line, line); ++ current_old_line += 1; ++ current_new_line += 1; ++ } else if (line[0] == '+') { ++ deferred_new_add(line, current_new_line); ++ current_new_line += 1; ++ } else if (line[0] == '-') { ++ deferred_old_add(line, current_old_line); ++ current_old_line += 1; ++ } else if (line[0] == '@') { ++ html(""); ++ } else { ++ html(""); ++ } ++ line[len - 1] = c; ++} ++ ++void cgit_ssdiff_header_begin() ++{ ++ current_old_line = -1; ++ current_new_line = -1; ++ html(""); ++ html(""); ++} ++ ++void cgit_ssdiff_footer() ++{ ++ if (deferred_old || deferred_new) ++ cgit_ssdiff_print_deferred_lines(); ++ html(""); ++} +diff --git a/ui-ssdiff.h b/ui-ssdiff.h +new file mode 100644 +index 0000000..64b4b12 +--- /dev/null ++++ b/ui-ssdiff.h +@@ -0,0 +1,13 @@ ++#ifndef UI_SSDIFF_H ++#define UI_SSDIFF_H ++ ++extern void cgit_ssdiff_print_deferred_lines(); ++ ++extern void cgit_ssdiff_line_cb(char *line, int len); ++ ++extern void cgit_ssdiff_header_begin(); ++extern void cgit_ssdiff_header_end(); ++ ++extern void cgit_ssdiff_footer(); ++ ++#endif /* UI_SSDIFF_H */ +diff --git a/ui-tag.c b/ui-tag.c +index c2d72af..39e4cb8 100644 +--- a/ui-tag.c ++++ b/ui-tag.c +@@ -30,6 +30,14 @@ static void print_tag_content(char *buf) + } + } + ++void print_download_links(char *revname) ++{ ++ html(""); ++} ++ + void cgit_print_tag(char *revname) + { + unsigned char sha1[20]; +@@ -56,16 +64,16 @@ void cgit_print_tag(char *revname) + return; + } + html("
"); ++ if (use_ssdiff) { ++ html(""); ++ } else { ++ html("
"); ++ html(""); ++ if (!use_ssdiff) ++ html(""); + html("
"); ++ } + cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); +- html("
"); + } +diff --git a/ui-log.c b/ui-log.c +index f3132c9..0947604 100644 +--- a/ui-log.c ++++ b/ui-log.c +@@ -66,7 +66,7 @@ void show_commit_decorations(struct commit *commit) + else { + strncpy(buf, deco->name, sizeof(buf) - 1); + cgit_commit_link(buf, NULL, "deco", ctx.qry.head, +- sha1_to_hex(commit->object.sha1)); ++ sha1_to_hex(commit->object.sha1), 0); + } + deco = deco->next; + } +@@ -89,7 +89,7 @@ void print_commit(struct commit *commit) + htmlf("		"); + html_txt(info->author); +diff --git a/ui-refs.c b/ui-refs.c +index d3b4f6e..33d9bec 100644 +--- a/ui-refs.c ++++ b/ui-refs.c +@@ -74,7 +74,7 @@ static int print_branch(struct refinfo *ref) + html(""); + + if (ref->object->type == OBJ_COMMIT) { +- cgit_commit_link(info->subject, NULL, NULL, name, NULL); ++ cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0); + html(""); + html_txt(info->author); + html(""); +diff --git a/ui-repolist.c b/ui-repolist.c +index 3ef2e99..0a0b6ca 100644 +--- a/ui-repolist.c ++++ b/ui-repolist.c +@@ -94,7 +94,7 @@ int is_in_url(struct cgit_repo *repo) + + void print_sort_header(const char *title, const char *sort) + { +- htmlf(""); ++ html_txt(name); ++ html(""); + } + + void cgit_refs_link(char *name, char *title, char *class, char *head, +@@ -341,7 +357,8 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head, + } + + void cgit_diff_link(char *name, char *title, char *class, char *head, +- char *new_rev, char *old_rev, char *path) ++ char *new_rev, char *old_rev, char *path, ++ int toggle_ssdiff) + { + char *delim; + +@@ -356,6 +373,11 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, + html(delim); + html("id2="); + html_url_arg(old_rev); ++ delim = "&"; ++ } ++ if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { ++ html(delim); ++ html("ss=1"); + } + html("'>"); + html_txt(name); +@@ -383,7 +405,7 @@ void cgit_object_link(struct object *obj) + shortrev[10] = '\0'; + if (obj->type == OBJ_COMMIT) { + cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, +- ctx.qry.head, fullrev); ++ ctx.qry.head, fullrev, 0); + return; + } else if (obj->type == OBJ_TREE) + page = "tree"; +@@ -695,9 +717,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) + cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, + ctx->qry.sha1, NULL); + cgit_commit_link("commit", NULL, hc(cmd, "commit"), +- ctx->qry.head, ctx->qry.sha1); ++ ctx->qry.head, ctx->qry.sha1, 0); + cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, +- ctx->qry.sha1, ctx->qry.sha2, NULL); ++ ctx->qry.sha1, ctx->qry.sha2, NULL, 0); + if (ctx->repo->max_stats) + cgit_stats_link("stats", NULL, hc(cmd, "stats"), + ctx->qry.head, NULL); +@@ -760,13 +782,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head, + const char *hex, int snapshots) + { + const struct cgit_snapshot_format* f; ++ char *prefix; + char *filename; ++ unsigned char sha1[20]; + ++ if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && ++ (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) ++ hex++; ++ prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); + for (f = cgit_snapshot_formats; f->suffix; f++) { + if (!(snapshots & f->bit)) + continue; +- filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, +- f->suffix); ++ filename = fmt("%s%s", prefix, f->suffix); + cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); + html("
"); + } +diff --git a/ui-shared.h b/ui-shared.h +index bff4826..9ebc1f9 100644 +--- a/ui-shared.h ++++ b/ui-shared.h +@@ -3,6 +3,7 @@ + + extern char *cgit_httpscheme(); + extern char *cgit_hosturl(); ++extern char *cgit_rooturl(); + extern char *cgit_repourl(const char *reponame); + extern char *cgit_fileurl(const char *reponame, const char *pagename, + const char *filename, const char *query); +@@ -22,7 +23,7 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, + char *rev, char *path, int ofs, char *grep, + char *pattern, int showmsg); + extern void cgit_commit_link(char *name, char *title, char *class, char *head, +- char *rev); ++ char *rev, int toggle_ssdiff); + extern void cgit_patch_link(char *name, char *title, char *class, char *head, + char *rev); + extern void cgit_refs_link(char *name, char *title, char *class, char *head, +@@ -30,7 +31,8 @@ extern void cgit_refs_link(char *name, char *title, char *class, char *head, + extern void cgit_snapshot_link(char *name, char *title, char *class, + char *head, char *rev, char *archivename); + extern void cgit_diff_link(char *name, char *title, char *class, char *head, +- char *new_rev, char *old_rev, char *path); ++ char *new_rev, char *old_rev, char *path, ++ int toggle_ssdiff); + extern void cgit_stats_link(char *name, char *title, char *class, char *head, + char *path); + extern void cgit_object_link(struct object *obj); +diff --git a/ui-ssdiff.c b/ui-ssdiff.c +new file mode 100644 +index 0000000..5673642 +--- /dev/null ++++ b/ui-ssdiff.c +@@ -0,0 +1,274 @@ ++#include "cgit.h" ++#include "html.h" ++#include "ui-shared.h" ++ ++extern int use_ssdiff; ++ ++static int current_old_line, current_new_line; ++ ++struct deferred_lines { ++ int line_no; ++ char *line; ++ struct deferred_lines *next; ++}; ++ ++static struct deferred_lines *deferred_old, *deferred_old_last; ++static struct deferred_lines *deferred_new, *deferred_new_last; ++ ++static int line_from_hunk(char *line, char type) ++{ ++ char *buf1, *buf2; ++ int len; ++ ++ buf1 = strchr(line, type); ++ if (buf1 == NULL) ++ return 0; ++ buf1 += 1; ++ buf2 = strchr(buf1, ','); ++ if (buf2 == NULL) ++ return 0; ++ len = buf2 - buf1; ++ buf2 = xmalloc(len + 1); ++ strncpy(buf2, buf1, len); ++ buf2[len] = '\0'; ++ int res = atoi(buf2); ++ free(buf2); ++ return res; ++} ++ ++static char *replace_tabs(char *line) ++{ ++ char *prev_buf = line; ++ char *cur_buf; ++ int linelen = strlen(line); ++ int n_tabs = 0; ++ int i; ++ char *result; ++ char *spaces = " "; ++ ++ if (linelen == 0) { ++ result = xmalloc(1); ++ result[0] = '\0'; ++ return result; ++ } ++ ++ for (i = 0; i < linelen; i++) ++ if (line[i] == '\t') ++ n_tabs += 1; ++ result = xmalloc(linelen + n_tabs * 8 + 1); ++ result[0] = '\0'; ++ ++ while (1) { ++ cur_buf = strchr(prev_buf, '\t'); ++ if (!cur_buf) { ++ strcat(result, prev_buf); ++ break; ++ } else { ++ strcat(result, " "); ++ strncat(result, spaces, 8 - (strlen(result) % 8)); ++ strncat(result, prev_buf, cur_buf - prev_buf); ++ } ++ prev_buf = cur_buf + 1; ++ } ++ return result; ++} ++ ++static void deferred_old_add(char *line, int line_no) ++{ ++ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); ++ item->line = xstrdup(line); ++ item->line_no = line_no; ++ item->next = NULL; ++ if (deferred_old) { ++ deferred_old_last->next = item; ++ deferred_old_last = item; ++ } else { ++ deferred_old = deferred_old_last = item; ++ } ++} ++ ++static void deferred_new_add(char *line, int line_no) ++{ ++ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); ++ item->line = xstrdup(line); ++ item->line_no = line_no; ++ item->next = NULL; ++ if (deferred_new) { ++ deferred_new_last->next = item; ++ deferred_new_last = item; ++ } else { ++ deferred_new = deferred_new_last = item; ++ } ++} ++ ++static void print_ssdiff_line(char *class, int old_line_no, char *old_line, ++ int new_line_no, char *new_line) ++{ ++ html("
%d", ++ old_line_no, class); ++ else if (old_line) ++ htmlf("", class); ++ else ++ htmlf("", class); ++ ++ if (old_line) { ++ old_line = replace_tabs(old_line + 1); ++ html_txt(old_line); ++ free(old_line); ++ } ++ ++ html("%d", ++ new_line_no, class); ++ else if (new_line) ++ htmlf("", class); ++ else ++ htmlf("", class); ++ ++ if (new_line) { ++ new_line = replace_tabs(new_line + 1); ++ html_txt(new_line); ++ free(new_line); ++ } ++ ++ html("
"); ++ html_txt(line); ++ html("
"); ++ html_txt(line); ++ html("
"); ++} ++ ++void cgit_ssdiff_header_end() ++{ ++ html("
download"); ++ cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, ++ revname, ctx.repo->snapshots); ++ html("
\n"); +- htmlf("\n", sha1_to_hex(sha1)); + if (info->tagger_date > 0) { +- html("\n"); + } + if (info->tagger) { +- html("\n"); + } +- html("\n"); ++ if (ctx.repo->snapshots) ++ print_download_links(revname); + html("
Tag name"); ++ htmlf("
tag name"); + html_txt(revname); + htmlf(" (%s)
Tag date"); ++ html("
tag date"); + cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); + html("
Tagged by"); ++ html("
tagged by"); + html_txt(info->tagger); + if (info->tagger_email && !ctx.cfg.noplainemail) { + html(" "); +@@ -73,19 +81,23 @@ void cgit_print_tag(char *revname) + } + html("
Tagged object"); ++ html("
tagged object"); + cgit_object_link(tag->tagged); + html("
\n"); + print_tag_content(info->msg); + } else { + html("\n"); +- htmlf("\n"); +- html("\n"); ++ if (ctx.repo->snapshots) ++ print_download_links(revname); + html("
Tag name"); ++ htmlf("
tag name"); + html_txt(revname); + html("
Tagged object"); ++ html("
Tagged object"); + cgit_object_link(obj); + html("
\n"); + } + return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:37:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6883] csw/mgar/pkg/bdb3 Message-ID: Revision: 6883 http://gar.svn.sourceforge.net/gar/?rev=6883&view=rev Author: dmichelsen Date: 2009-10-18 09:37:23 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3,bdb33: Move content from CSWbdb33 to CSWbdb3 verbatim Added Paths: ----------- csw/mgar/pkg/bdb3/trunk/ Removed Paths: ------------- csw/mgar/pkg/bdb33/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:40:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6884] csw/mgar/pkg/bdb33/ Message-ID: Revision: 6884 http://gar.svn.sourceforge.net/gar/?rev=6884&view=rev Author: dmichelsen Date: 2009-10-18 09:40:10 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb33: Remove now empty hull, contents now in bdb3 Removed Paths: ------------- csw/mgar/pkg/bdb33/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:43:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:43:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6885] csw/mgar/pkg/bdb3/trunk Message-ID: Revision: 6885 http://gar.svn.sourceforge.net/gar/?rev=6885&view=rev Author: dmichelsen Date: 2009-10-18 09:43:39 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3: Change package names from CSWbdb33 to CSWbdb3 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bdb3/trunk/ Property changes on: csw/mgar/pkg/bdb3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 09:40:10 UTC (rev 6884) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 09:43:39 UTC (rev 6885) @@ -50,32 +50,32 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb33 CSWbdb33devel CSWbdb33doc +PACKAGES = CSWbdb3 CSWbdb3devel CSWbdb3doc -CATALOGNAME_CSWbdb33 = berkeleydb33 -CATALOGNAME_CSWbdb33devel = berkeleydb33_devel -CATALOGNAME_CSWbdb33doc = berkeleydb33_doc +CATALOGNAME_CSWbdb3 = berkeleydb3 +CATALOGNAME_CSWbdb3devel = berkeleydb3_devel +CATALOGNAME_CSWbdb3doc = berkeleydb3_doc -ARCHALL_CSWbdb33doc = 1 +ARCHALL_CSWbdb3doc = 1 -SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities -SPKG_DESC_CSWbdb33devel = BerkeleyDB 3.3 development support -SPKG_DESC_CSWbdb33doc = BerkeleyDB 3.3 documentation +SPKG_DESC_CSWbdb3 = BerkeleyDB 3.3 embedded database libraries and utilities +SPKG_DESC_CSWbdb3devel = BerkeleyDB 3.3 development support +SPKG_DESC_CSWbdb3doc = BerkeleyDB 3.3 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb33devel = CSWbdb33 +REQUIRED_PKGS_CSWbdb3devel = CSWbdb3 LICENSE = LICENSE INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb33),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb3),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb33doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb33devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb3doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb3devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:50:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:50:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6886] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6886 http://gar.svn.sourceforge.net/gar/?rev=6886&view=rev Author: dmichelsen Date: 2009-10-18 09:50:19 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb43: Change package names from CSWbdb43devel to CSWbdb43-devel to match existing package, pending later fixing. Same for CSWbdb43doc Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-18 09:43:39 UTC (rev 6885) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-18 09:50:19 UTC (rev 6886) @@ -50,21 +50,21 @@ # bdb tests are time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb43 CSWbdb43devel CSWbdb43doc +PACKAGES = CSWbdb43 CSWbdb43-devel CSWbdb43-doc -CATALOGNAME_CSWbdb43 = berkeleydb43 -CATALOGNAME_CSWbdb43devel = berkeleydb43_devel -CATALOGNAME_CSWbdb43doc = berkeleydb43_doc +CATALOGNAME_CSWbdb43 = berkeleydb43 +CATALOGNAME_CSWbdb43-devel = berkeleydb43_devel +CATALOGNAME_CSWbdb43-doc = berkeleydb43_doc -ARCHALL_CSWbdb43doc = 1 +ARCHALL_CSWbdb43-doc = 1 -SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 -SPKG_DESC_CSWbdb43devel = BerkeleyDB 4.3 development support -SPKG_DESC_CSWbdb43doc = BerkeleyDB 4.3 documentation +SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 +SPKG_DESC_CSWbdb43-devel = BerkeleyDB 4.3 development support +SPKG_DESC_CSWbdb43-doc = BerkeleyDB 4.3 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html -REQUIRED_PKGS_CSWbdb43devel = CSWbdb43 +REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 LICENSE = LICENSE @@ -72,8 +72,8 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar -PKGFILES_CSWbdb43doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb43-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 11:56:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 09:56:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6887] csw/mgar/pkg/bdb44/trunk Message-ID: Revision: 6887 http://gar.svn.sourceforge.net/gar/?rev=6887&view=rev Author: dmichelsen Date: 2009-10-18 09:56:41 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb44: Change package names from CSWbdb44devel to CSWbdb44-devel to match existing package, pending later fixing. Same for CSWbdb44doc Modified Paths: -------------- csw/mgar/pkg/bdb44/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bdb44/trunk/ Property changes on: csw/mgar/pkg/bdb44/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-18 09:50:19 UTC (rev 6886) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-18 09:56:41 UTC (rev 6887) @@ -50,21 +50,21 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb44 CSWbdb44devel CSWbdb44doc +PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc -CATALOGNAME_CSWbdb44 = berkeleydb44 -CATALOGNAME_CSWbdb44devel = berkeleydb44_devel -CATALOGNAME_CSWbdb44doc = berkeleydb44_doc +CATALOGNAME_CSWbdb44 = berkeleydb44 +CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel +CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc -ARCHALL_CSWbdb44doc = 1 +ARCHALL_CSWbdb44-doc = 1 -SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities -SPKG_DESC_CSWbdb44devel = BerkeleyDB 4.4 development support -SPKG_DESC_CSWbdb44doc = BerkeleyDB 4.4 documentation +SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities +SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support +SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb44devel = CSWbdb44 +REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 LICENSE = LICENSE @@ -72,8 +72,8 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar -PKGFILES_CSWbdb44doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 12:30:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:30:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6888] csw/mgar/pkg Message-ID: Revision: 6888 http://gar.svn.sourceforge.net/gar/?rev=6888&view=rev Author: wahwah Date: 2009-10-18 10:30:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- pysvn: Initial commit Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile csw/mgar/pkg/pysvn/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pysvn/ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:30:04 UTC (rev 6888) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = pysvn +GARVERSION = 1.7.1 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,7 +25,7 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = python ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. @@ -35,11 +35,11 @@ ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://pysvn.tigris.org/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://pysvn.barrys-emacs.org/source_kits/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,7 +49,12 @@ ## A list of space separated patch filenames from files/ that are to be applied ## to the extracted software before the ./configure stage. Patches need to be ## included in the DISTFILES variable as well. -## PATCHFILES = +PATCHFILES = 0002-pysvn.hpp-string-includes-first.patch +PATCHFILES += 0005-Use-dash-capital-R-for-runtime-path.patch +PATCHFILES += 0006-Use-opt-csw-lib.patch +PATCHFILES += 0003-bin-bash-instead-of-bin-sh.patch +PATCHFILES += 0001-fixes-for-tests.patch +PATCHFILES += 0008-gid-in-two-more-places.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the @@ -120,10 +125,20 @@ ## INITSMF = ## USERGROUP = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = CSWexpat +REQUIRED_PKGS += CSWgcc3core +REQUIRED_PKGS += CSWgcc3corert +REQUIRED_PKGS += CSWgcc3g++ +REQUIRED_PKGS += CSWgcc3g++rt +REQUIRED_PKGS += CSWgcc4corert +REQUIRED_PKGS += CSWgcc4g++rt +REQUIRED_PKGS += CSWneon +REQUIRED_PKGS += CSWsvn + ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel +INCOMPATIBELE_PKGS = CSWpyxml ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -142,10 +157,10 @@ ## completely (for example when your software doesn't need to be compiled) assign ## this variable an empty value. The procedure works for configure, build, ## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +CONFIGURE_SCRIPTS = pysvn +BUILD_SCRIPTS = pysvn +INSTALL_SCRIPTS = pysvn +TEST_SCRIPTS = pysvn ## ## Compilation settings ## @@ -172,11 +187,34 @@ ## ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 +GARCOMPILER = GNU ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +include gar/category.mk + +configure-pysvn: + (cd $(WORKSRC)/Source \ + && $(CONFIGURE_ENV) python setup.py configure \ + --apr-inc-dir=/opt/csw/apache2/include \ + --apr-lib-dir=/opt/csw/apache2/lib \ + --svn-bin-dir=/opt/csw/bin \ + --svn-inc-dir=/opt/csw/include/subversion-1 \ + --svn-lib-dir=/opt/csw/lib/svn \ + ) + @$(MAKECOOKIE) + +build-pysvn: + (cd $(WORKSRC)/Source \ + && $(BUILD_ENV) gmake \ + ) + @$(MAKECOOKIE) + +test-pysvn: + (cd $(WORKSRC)/Tests && gmake) + @$(MAKECOOKIE) + +install-pysvn: + ginstall -m 755 -d $(DESTDIR)$(libdir)/python/site-packages/pysvn + ginstall -m 644 $(WORKSRC)/Source/pysvn/__init__.py $(DESTDIR)$(libdir)/python/site-packages/pysvn + $(foreach F,$(wildcard $(WORKSRC)/Source/pysvn/_pysvn*.so),ginstall -m 755 $(F) $(DESTDIR)$(libdir)/python/site-packages/pysvn) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/pysvn/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868) +++ csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,7 @@ +b698502c7a43d9623189924f08904c3a 0001-fixes-for-tests.patch +20381f5964a9fc08b04eb6fc69a47d04 0002-pysvn.hpp-string-includes-first.patch +64c9418717dee60ed1a613cc7d85c682 0003-bin-bash-instead-of-bin-sh.patch +a69e791dd03491aca2cfeba83528389a 0005-Use-dash-capital-R-for-runtime-path.patch +be7690f1395b76f984bf12de84418b68 0006-Use-opt-csw-lib.patch +ac24c9b4348fd857353d1444c8448d8d 0008-gid-in-two-more-places.patch +55688ec2083dcada32aa0a4128f6c309 pysvn-1.7.1.tar.gz Added: csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,53 @@ +From ec286163180177e43b95e5fce366b19cc7750f27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 11:04:23 +0100 +Subject: [PATCH] fixes for tests + +--- + Tests/test-04.sh | 2 +- + Tests/test-05.sh | 2 +- + Tests/test-07.sh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Tests/test-04.sh b/Tests/test-04.sh +index a8e2faa..c360615 100755 +--- a/Tests/test-04.sh ++++ b/Tests/test-04.sh +@@ -30,7 +30,7 @@ cmd ${PYSVN} mkdir file://${TESTROOT}/repos/trunk -m "test-04 add trunk" + cmd ${PYSVN} mkdir file://${TESTROOT}/repos/trunk/test -m "test-04 add test" + + echo Info: Install hooks +-echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit ++echo '#!/bin/bash' >${TESTROOT}/repos/hooks/pre-commit + echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit + echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit + echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit +diff --git a/Tests/test-05.sh b/Tests/test-05.sh +index 32976c0..81f2754 100755 +--- a/Tests/test-05.sh ++++ b/Tests/test-05.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +diff --git a/Tests/test-07.sh b/Tests/test-07.sh +index 903d321..d7c48a4 100755 +--- a/Tests/test-07.sh ++++ b/Tests/test-07.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,38 @@ +From 16c4295ff5290649ea7952624c5201992434b4bf Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 09:27:32 +0100 +Subject: [PATCH 2/2] pysvn.hpp: includes first + +--- + Source/pysvn.hpp | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Source/pysvn.hpp b/Source/pysvn.hpp +index 4a1d65c..ab60f82 100644 +--- a/Source/pysvn.hpp ++++ b/Source/pysvn.hpp +@@ -7,6 +7,10 @@ + // + // ==================================================================== + // ++#include ++#include ++#include ++ + #include "Python.h" + #include "CXX/Objects.hxx" + #include "CXX/Extensions.hxx" +@@ -14,10 +18,6 @@ + + #include "pysvn_svnenv.hpp" + +-#include +-#include +-#include +- + //-------------------------------------------------------------------------------- + class pysvn_module : public Py::ExtensionModule + { +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,85 @@ +From 848b922929a73b8c9587aec91876da7e544d376d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 10:38:05 +0100 +Subject: [PATCH 3/3] /bin/bash instead of /bin/sh + +--- + Tests/test-01.sh | 2 +- + Tests/test-03.sh | 2 +- + Tests/test-04.sh | 4 ++-- + Tests/test-05.sh | 2 +- + Tests/test-06.sh | 2 +- + Tests/test-07.sh | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Tests/test-01.sh b/Tests/test-01.sh +index 22ef9d0..ed79049 100755 +--- a/Tests/test-01.sh ++++ b/Tests/test-01.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-03.sh b/Tests/test-03.sh +index bd36b00..7f63e5c 100755 +--- a/Tests/test-03.sh ++++ b/Tests/test-03.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-04.sh b/Tests/test-04.sh +index 1c61fdc..a8e2faa 100755 +--- a/Tests/test-04.sh ++++ b/Tests/test-04.sh +@@ -1,11 +1,11 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: Command: $* +diff --git a/Tests/test-05.sh b/Tests/test-05.sh +index 8e892b9..32976c0 100755 +--- a/Tests/test-05.sh ++++ b/Tests/test-05.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-06.sh b/Tests/test-06.sh +index 9b8cc6b..b6e2fb4 100755 +--- a/Tests/test-06.sh ++++ b/Tests/test-06.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +diff --git a/Tests/test-07.sh b/Tests/test-07.sh +index 5847027..903d321 100755 +--- a/Tests/test-07.sh ++++ b/Tests/test-07.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # need to get rid of any symbolic links in the WORKDIR + export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,25 @@ +From e1c99ab2895e81b627aeed5be5e71cb0655cc0b6 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 09:36:12 +0100 +Subject: [PATCH 5/6] Use dash-capital-R for runtime path + +--- + Source/setup_configure.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Source/setup_configure.py b/Source/setup_configure.py +index 39c5019..8e4ccac 100644 +--- a/Source/setup_configure.py ++++ b/Source/setup_configure.py +@@ -381,7 +381,7 @@ CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s + PYCXX=%(pycxx_dir)s + PYCXXSRC=%(pycxx_src_dir)s + LDSHARED=g++ -shared %(debug_cflags)s +-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \ ++LDLIBS=-L%(svn_lib_dir)s -R%(svn_lib_dir)s \ + -lsvn_client-1 \ + -lsvn_diff-1 \ + -lsvn_repos-1 \ +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,25 @@ +From a110241e323d4029c2ebc82ee57b1af41adb47c1 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 09:39:07 +0100 +Subject: [PATCH 6/6] Use /opt/csw/lib + +--- + Source/setup_configure.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Source/setup_configure.py b/Source/setup_configure.py +index 8e4ccac..36cda90 100644 +--- a/Source/setup_configure.py ++++ b/Source/setup_configure.py +@@ -381,7 +381,7 @@ CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s + PYCXX=%(pycxx_dir)s + PYCXXSRC=%(pycxx_src_dir)s + LDSHARED=g++ -shared %(debug_cflags)s +-LDLIBS=-L%(svn_lib_dir)s -R%(svn_lib_dir)s \ ++LDLIBS=-L%(svn_lib_dir)s -L/opt/csw/lib -R/opt/csw/lib -R%(svn_lib_dir)s \ + -lsvn_client-1 \ + -lsvn_diff-1 \ + -lsvn_repos-1 \ +-- +1.6.3.2 + Added: csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch (rev 0) +++ csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch 2009-10-18 10:30:04 UTC (rev 6888) @@ -0,0 +1,39 @@ +From 89ec666ff204e5d45f0d051ff5a2ed9e7236f7ef Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 11:12:30 +0100 +Subject: [PATCH] gid in two more places + +--- + Tests/test-01.sh | 2 +- + Tests/test-06.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Tests/test-01.sh b/Tests/test-01.sh +index ed79049..bc11292 100755 +--- a/Tests/test-01.sh ++++ b/Tests/test-01.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +diff --git a/Tests/test-06.sh b/Tests/test-06.sh +index b6e2fb4..07a8597 100755 +--- a/Tests/test-06.sh ++++ b/Tests/test-06.sh +@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) + cd ${WORKDIR}/Tests + echo WorkDir: ${WORKDIR} + echo PYTHON: ${PYTHON} +-echo Username: $(id -u -n) ++echo Username: $(gid -u -n) + + cmd () { + echo Info: CWD: $(pwd) +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 12:34:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6889] csw/mgar/pkg/pysvn/trunk/Makefile Message-ID: Revision: 6889 http://gar.svn.sourceforge.net/gar/?rev=6889&view=rev Author: wahwah Date: 2009-10-18 10:34:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- pysvn: Removed template comments from the Makefile, added blurb Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:30:04 UTC (rev 6888) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:34:04 UTC (rev 6889) @@ -2,129 +2,37 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = pysvn GARVERSION = 1.7.1 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = python -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB - + + The pysvn project's goal is to enable Tools to be written in Python that use + Subversion. + + Windows, Mac OS X, Linux and other unix platforms are supported. + + pysvn Extension Features + + * Supports all svn client features + * Supports svn transaction features required to write svn pre-commit hooks + * Easy to learn and use + * Python like interface + * Good Documentation and examples + * No need to understand the Subversion C API + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://pysvn.tigris.org/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = http://pysvn.barrys-emacs.org/source_kits/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. PATCHFILES = 0002-pysvn.hpp-string-includes-first.patch PATCHFILES += 0005-Use-dash-capital-R-for-runtime-path.patch PATCHFILES += 0006-Use-opt-csw-lib.patch PATCHFILES += 0003-bin-bash-instead-of-bin-sh.patch PATCHFILES += 0001-fixes-for-tests.patch PATCHFILES += 0008-gid-in-two-more-places.patch -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. REQUIRED_PKGS = CSWexpat REQUIRED_PKGS += CSWgcc3core REQUIRED_PKGS += CSWgcc3corert @@ -135,60 +43,14 @@ REQUIRED_PKGS += CSWneon REQUIRED_PKGS += CSWsvn -## -## A list of packages necessary to build this package PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel INCOMPATIBELE_PKGS = CSWpyxml -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. CONFIGURE_SCRIPTS = pysvn BUILD_SCRIPTS = pysvn INSTALL_SCRIPTS = pysvn TEST_SCRIPTS = pysvn -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 GARCOMPILER = GNU -## include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 12:54:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6890] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 6890 http://gar.svn.sourceforge.net/gar/?rev=6890&view=rev Author: dmichelsen Date: 2009-10-18 10:54:38 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3: Add link to /opt/csw/lib Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:34:04 UTC (rev 6889) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:54:38 UTC (rev 6890) @@ -92,6 +92,7 @@ post-merge: gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s ../bdb33/lib/libdb-3.3.so $(PKGROOT)$(libpath) @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 12:56:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 10:56:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6891] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 6891 http://gar.svn.sourceforge.net/gar/?rev=6891&view=rev Author: dmichelsen Date: 2009-10-18 10:56:28 +0000 (Sun, 18 Oct 2009) Log Message: ----------- bdb3: Add link to /opt/csw/lib Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:54:38 UTC (rev 6890) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2009-10-18 10:56:28 UTC (rev 6891) @@ -92,6 +92,7 @@ post-merge: gln -s . $(PKGROOT)$(libdir)/32 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + ginstall -d $(PKGROOT)$(libpath) gln -s ../bdb33/lib/libdb-3.3.so $(PKGROOT)$(libpath) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 16:15:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 14:15:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6892] csw/mgar/pkg/pysvn/trunk Message-ID: Revision: 6892 http://gar.svn.sourceforge.net/gar/?rev=6892&view=rev Author: wahwah Date: 2009-10-18 14:15:28 +0000 (Sun, 18 Oct 2009) Log Message: ----------- pysvn: using CSWbash, disabling tests on Solaris 8 due to lack of UTF-8 locale support Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile csw/mgar/pkg/pysvn/trunk/checksums csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 14:15:28 UTC (rev 6892) @@ -43,12 +43,15 @@ REQUIRED_PKGS += CSWneon REQUIRED_PKGS += CSWsvn -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash INCOMPATIBELE_PKGS = CSWpyxml CONFIGURE_SCRIPTS = pysvn BUILD_SCRIPTS = pysvn INSTALL_SCRIPTS = pysvn -TEST_SCRIPTS = pysvn +TEST_SCRIPTS_5.8 = +TEST_SCRIPTS_5.9 = pysvn +TEST_SCRIPTS_5.10 = pysvn +TEST_SCRIPTS = $(TEST_SCRIPTS_$(GAROSREL)) CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU Modified: csw/mgar/pkg/pysvn/trunk/checksums =================================================================== --- csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 14:15:28 UTC (rev 6892) @@ -1,6 +1,6 @@ -b698502c7a43d9623189924f08904c3a 0001-fixes-for-tests.patch +e6168840de7c75fcecffc6fc7e1831ba 0001-fixes-for-tests.patch 20381f5964a9fc08b04eb6fc69a47d04 0002-pysvn.hpp-string-includes-first.patch -64c9418717dee60ed1a613cc7d85c682 0003-bin-bash-instead-of-bin-sh.patch +2f3e1b6c0ffed9baecdb1e0719748813 0003-bin-bash-instead-of-bin-sh.patch a69e791dd03491aca2cfeba83528389a 0005-Use-dash-capital-R-for-runtime-path.patch be7690f1395b76f984bf12de84418b68 0006-Use-opt-csw-lib.patch ac24c9b4348fd857353d1444c8448d8d 0008-gid-in-two-more-places.patch Modified: csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 14:15:28 UTC (rev 6892) @@ -18,7 +18,7 @@ echo Info: Install hooks -echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit -+echo '#!/bin/bash' >${TESTROOT}/repos/hooks/pre-commit ++echo '#!/opt/csw/bin/bash' >${TESTROOT}/repos/hooks/pre-commit echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit Modified: csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch =================================================================== --- csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 10:56:28 UTC (rev 6891) +++ csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 14:15:28 UTC (rev 6892) @@ -1,7 +1,7 @@ From 848b922929a73b8c9587aec91876da7e544d376d Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= Date: Sun, 18 Oct 2009 10:38:05 +0100 -Subject: [PATCH 3/3] /bin/bash instead of /bin/sh +Subject: [PATCH 3/3] /opt/csw/bin/bash instead of /bin/sh --- Tests/test-01.sh | 2 +- @@ -18,7 +18,7 @@ +++ b/Tests/test-01.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -28,7 +28,7 @@ +++ b/Tests/test-03.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -38,7 +38,7 @@ +++ b/Tests/test-04.sh @@ -1,11 +1,11 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -56,7 +56,7 @@ +++ b/Tests/test-05.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -66,7 +66,7 @@ +++ b/Tests/test-06.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) @@ -76,7 +76,7 @@ +++ b/Tests/test-07.sh @@ -1,4 +1,4 @@ -#!/bin/sh -+#!/bin/bash ++#!/opt/csw/bin/bash # need to get rid of any symbolic links in the WORKDIR export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 19:00:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 17:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6893] csw/mgar/pkg Message-ID: Revision: 6893 http://gar.svn.sourceforge.net/gar/?rev=6893&view=rev Author: wahwah Date: 2009-10-18 17:00:20 +0000 (Sun, 18 Oct 2009) Log Message: ----------- log4sh: Initial commit Modified Paths: -------------- csw/mgar/pkg/log4sh/trunk/Makefile csw/mgar/pkg/log4sh/trunk/checksums Added Paths: ----------- csw/mgar/pkg/log4sh/ Modified: csw/mgar/pkg/log4sh/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/log4sh/trunk/Makefile 2009-10-18 17:00:20 UTC (rev 6893) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = log4sh +GARVERSION = 1.4.2 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,26 +25,30 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = A logging framework for shell scripts ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + http://log4sh.sourceforge.net/ + + log4sh is an advanced logging framework for shell scripts (eg. sh, bash) that + works similar to the logging products available from the Apache Software + Foundataion (eg. log4j, log4perl). endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://sites.google.com/a/forestent.com/projects/log4sh ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge ## project name of the software you wish to download. -## SF_PROJ = +SF_PROJ = log4sh ## ## A list of space separated patch filenames from files/ that are to be applied ## to the extracted software before the ./configure stage. Patches need to be @@ -54,10 +58,9 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz ## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz ## ## Catalog name is the name to be used with pkg{-get,util} -i . ## It is different from the system package name, which by convention is CSWpkgname. @@ -173,10 +176,21 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +ARCHALL = 1 +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +install-custom: + ginstall -d $(DESTDIR)$(libdir)/log4sh + ginstall $(WORKSRC)/src/shell/log4sh $(DESTDIR)$(libdir)/log4sh/log4sh + ginstall -d $(DESTDIR)$(datadir)/doc + ginstall -d $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/FAQ.txt $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/log4sh.html $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/README.txt $(DESTDIR)$(datadir)/doc/log4sh + ginstall $(WORKSRC)/doc/contributors.txt $(DESTDIR)$(datadir)/doc/log4sh + +include gar/category.mk Modified: csw/mgar/pkg/log4sh/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/log4sh/trunk/checksums 2009-10-18 17:00:20 UTC (rev 6893) @@ -0,0 +1 @@ +b2177ab1f84a6cd91faf123bce74c899 download/log4sh-1.4.2.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 19:29:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 17:29:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6894] csw/mgar/gar Message-ID: Revision: 6894 http://gar.svn.sourceforge.net/gar/?rev=6894&view=rev Author: dmichelsen Date: 2009-10-18 17:29:04 +0000 (Sun, 18 Oct 2009) Log Message: ----------- mGAR v2: Fork collapsed modulations Added Paths: ----------- csw/mgar/gar/v2-collapsed-modulations/ csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk csw/mgar/gar/v2-collapsed-modulations/gar.mk Removed Paths: ------------- csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk csw/mgar/gar/v2-collapsed-modulations/gar.mk Deleted: csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-09 11:59:38 UTC (rev 6808) +++ csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -1,753 +0,0 @@ -# vim: ft=make ts=4 sw=4 noet -# -# $Id$ -# -# Copyright (C) 2001 Nick Moffitt -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# - -# cookies go here, so we have to be able to find them for -# dependency checking. -VPATH += $(COOKIEDIR) - -# convenience variable to make the cookie. -MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ - -URLSTRIP = $(subst ://,//,$(1)) - -# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a -# default proxy script that works with the (squid?) proxy at the BO buildfarm. -# override GIT_PROXY_SCRIPT to something else if you need to. -GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) -GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) - -#################### FETCH RULES #################### - -URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M))))) - -# if the caller has defined _postinstall, etc targets for a package, add -# these 'dynamic script' targets to our fetch list -URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr//$(DYN)) - -ifdef GIT_REPOS -URLS += $(foreach R,$(GIT_REPOS),gitrepo//$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) -endif - -# Download the file if and only if it doesn't have a preexisting -# checksum file. Loop through available URLs and stop when you -# get one that doesn't return an error code. -$(DOWNLOADDIR)/%: - @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ - echo " ==> Grabbing $@"; \ - for i in $(filter %/$*,$(URLS)); do \ - echo " ==> Trying $$i"; \ - $(MAKE) -s $$i || continue; \ - mv $(PARTIALDIR)/$* $@; \ - break; \ - done; \ - if test -r $@ ; then : ; else \ - echo '(!!!) Failed to download $@!' 1>&2; \ - false; \ - fi; \ - fi - -gitrepo//%: - @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ - ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ - $(GIT_MAYBEPROXY) git --bare fetch ) && \ - gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ - else \ - false; \ - fi ) - -# the git remote add commands are so that we can later do a fetch -# to update the code. -# we possibly proxy the git:// references depending on GIT_USE_PROXY -git-http//%: - @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin http://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -git//%: - @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin git://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -# create ADMSCRIPTS 'on the fly' from variables defined by the caller -# This version is private and should only be called from the non-private -# version directly below -_dynscr//%: - $($(subst .,_,$*)) - -dynscr//%: - $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* - -# download an http URL (colons omitted) -http//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* - -https//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* - -# download an ftp URL (colons omitted) -#ftp//%: -# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* -ftp//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* - -# link to a local copy of the file -# (absolute path) -file///%: - @if test -f /$*; then \ - gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# link to a local copy of the file -# (relative path) -file//%: - @if test -f $*; then \ - gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# Using Jeff Waugh's rsync rule. -# DOES NOT PRESERVE SYMLINKS! -rsync//%: - @rsync -azvLP rsync://$* $(PARTIALDIR)/ - -# Using Jeff Waugh's scp rule -scp//%: - @scp -C $* $(PARTIALDIR)/ - -# Fetch a SVN repo via http -svn-http//%: - @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) - -svn-https//%: - @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) - -#################### CHECKSUM RULES #################### - -# check a given file's checksum against $(CHECKSUM_FILE) and -# error out if it mentions the file without an "OK". -# The removal of the download prefix is for legacy checksums. For newstyle -# checksums without path this is not necessary. -checksum-%: $(CHECKSUM_FILE) - @echo " ==> Running checksum on $*" - @if gegrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ - if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ - ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ - echo '(!!!) $* failed checksum test!' 1>&2; \ - false; \ - else \ - echo 'file $* passes checksum test!'; \ - $(MAKECOOKIE); \ - fi \ - else \ - echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ - false; \ - fi - -#################### CHECKNEW RULES #################### - -UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) -UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) -SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) - -define files2check -$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) -endef - -check-upstream-and-mail: FILES2CHECK = $(call files2check) -check-upstream-and-mail: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "--"; \ -# echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ - fi - -check-upstream: FILES2CHECK = $(call files2check) -check-upstream: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ - fi - -checknew-%: - @$(MAKECOOKIE) - - -#################### GARCHIVE RULES #################### - -# while we're here, let's just handle how to back up our -# checksummed files - -$(GARCHIVEDIR)/%: $(GARCHIVEDIR) - @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ - gcp -Lr $(DOWNLOADDIR)/$* $@; \ - fi - - -#################### EXTRACT RULES #################### - -TAR_ARGS = --no-same-owner - -# rule to extract uncompressed tarballs -tar-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @gtar $(TAR_ARGS) -xf $(DOWNLOADDIR)/$* -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar xzf -tar-gz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar and bzip -tar-bz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# extract compressed single files -bz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @bzip2 -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -gz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @gzip -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -# extra dependency rule for git repos, that will allow the user -# to supply an alternate target at their discretion -git-extract-%: - @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" - git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with unzip -zip-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) - @$(MAKECOOKIE) - -# this is a null extract rule for files which are constant and -# unchanged (not archives) -cp-extract-%: - @echo " ==> Copying $(DOWNLOADDIR)/$*" - @cp -rp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @$(MAKECOOKIE) - -#gets the meat of a .deb into $(WORKSRC) -deb-bin-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @ar x $(DOWNLOADDIR)/$* - @rm debian-binary && \ - mv *.tar.gz $(DOWNLOADDIR) && \ - mkdir $(WORKSRC) && \ - gtar $(TAR_ARGS) -xvz -C $(WORKSRC) \ - -f $(DOWNLOADDIR)/data.tar.gz - @$(MAKECOOKIE) - -### EXTRACT FILE TYPE MAPPINGS ### -# These rules specify which of the above extract action rules to use for a -# given file extension. Often support for a given extract type can be handled -# by simply adding a rule here. - -extract-archive-%.tar: tar-extract-%.tar - @$(MAKECOOKIE) - -extract-archive-%.tar.gz: tar-gz-extract-%.tar.gz - @$(MAKECOOKIE) - -extract-archive-%.tar.Z: tar-gz-extract-%.tar.Z - @$(MAKECOOKIE) - -extract-archive-%.tgz: tar-gz-extract-%.tgz - @$(MAKECOOKIE) - -extract-archive-%.taz: tar-gz-extract-%.taz - @$(MAKECOOKIE) - -extract-archive-%.tar.bz: tar-bz-extract-%.tar.bz - @$(MAKECOOKIE) - -extract-archive-%.tar.bz2: tar-bz-extract-%.tar.bz2 - @$(MAKECOOKIE) - -extract-archive-%.tbz: tar-bz-extract-%.tbz - @$(MAKECOOKIE) - -extract-archive-%.zip: zip-extract-%.zip - @$(MAKECOOKIE) - -extract-archive-%.ZIP: zip-extract-%.ZIP - @$(MAKECOOKIE) - -extract-archive-%.deb: deb-bin-extract-%.deb - @$(MAKECOOKIE) - -extract-archive-%.bz2: bz-extract-%.bz2 - @$(MAKECOOKIE) - -extract-archive-%.gz: gz-extract-%.gz - @$(MAKECOOKIE) - -extract-archive-%.git: git-extract-%.git - @$(MAKECOOKIE) - -# anything we don't know about, we just assume is already -# uncompressed and unarchived in plain format -extract-archive-%: cp-extract-% - @$(MAKECOOKIE) - -#################### PATCH RULES #################### - -PATCHDIR ?= $(WORKSRC) -PATCHDIRLEVEL ?= 1 -PATCHDIRFUZZ ?= 2 -GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) -BASEWORKSRC = $(shell basename $(WORKSRC)) - -# apply bzipped patches -bz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @$(MAKECOOKIE) - -# apply gzipped patches -gz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @$(MAKECOOKIE) - -# apply normal patches -normal-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - $(GARPATCH) < $(DOWNLOADDIR)/$* - @$(MAKECOOKIE) - -# This is used by makepatch -%/gar-base.diff: - @echo " ==> Creating patch $@" - @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract - @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch - @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig - @( cd $(WORKDIR_FIRSTMOD); \ - if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ - cd $(CURDIR); \ - mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ - fi ) - -### PATCH FILE TYPE MAPPINGS ### -# These rules specify which of the above patch action rules to use for a given -# file extension. Often support for a given patch format can be handled by -# simply adding a rule here. - -patch-extract-%.bz: bz-patch-%.bz - @$(MAKECOOKIE) - -patch-extract-%.bz2: bz-patch-%.bz2 - @$(MAKECOOKIE) - -patch-extract-%.gz: gz-patch-%.gz - @$(MAKECOOKIE) - -patch-extract-%.Z: gz-patch-%.Z - @$(MAKECOOKIE) - -patch-extract-%.diff: normal-patch-%.diff - @$(MAKECOOKIE) - -patch-extract-%.patch: normal-patch-%.patch - @$(MAKECOOKIE) - -patch-extract-%: normal-patch-% - @$(MAKECOOKIE) - -#################### CONFIGURE RULES #################### - -TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) - -NODIRPATHS += --lispdir - -DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) - -# configure a package that has an autoconf-style configure -# script. -configure-%/configure: - @echo " ==> Running configure in $*" - cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -configure-%/autogen.sh: - @echo " ==> Running autogen.sh in $*" - @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -# configure a package that uses imake -# FIXME: untested and likely not the right way to handle the -# arguments -configure-%/Imakefile: - @echo " ==> Running xmkmf in $*" - @cd $* && $(CONFIGURE_ENV) xmkmf $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -configure-%/setup.rb: - @echo " ==> Running setup.rb config in $*" - @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) - @$(MAKECOOKIE) - -#################### BUILD RULES #################### - -# build from a standard gnu-style makefile's default rule. -build-%/Makefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/makefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/GNUmakefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/Jamfile: - @echo " ==> Running bjam in $*" - @( cd $* ; $(BUILD_ENV) bjam $(JAMFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# Ruby makefiles -build-%/Rakefile: - @echo " ==> Running rake in $*" - @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -build-%/rakefile: - @echo " ==> Running rake in $*" - @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -build-%/setup.rb: - @echo " ==> Running setup.rb setup in $*" - @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# This can be: build, build_py, build_ext, build_clib, build_scripts -# See setup.py --help-commands for details -PYBUILD_CMD ?= build -build-%/setup.py: - @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" - @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -#################### TEST RULES #################### - -TEST_TARGET ?= test - -# Run tests on pre-built sources -test-%/Makefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -test-%/makefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -test-%/GNUmakefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -# Ruby makefiles -test-%/Rakefile: - @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) - @$(MAKECOOKIE) - -test-%/rakefile: - @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) - @$(MAKECOOKIE) - -test-%/setup.py: - @echo " ==> Running setup.py test in $*" - @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) - @$(MAKECOOKIE) - -################# INSTALL RULES #################### - -# just run make install and hope for the best. -install-%/Makefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -install-%/makefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -install-%/GNUmakefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -# Ruby makefiles -install-%/Rakefile: - @echo " ==> Running rake install in $*" - @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -install-%/rakefile: - @echo " ==> Running rake install in $*" - @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -install-%/setup.rb: - @echo " ==> Running setup.rb install in $*" - @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) - @$(MAKECOOKIE) - -# This can be: install, install_lib, install_headers, install_scripts, -# or install_data. See setup.py --help-commands for details. -PYINSTALL_CMD ?= install -install-%/setup.py: - @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" - @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -# pkg-config scripts -install-%-config: - mkdir -p $(STAGINGDIR)/$(GARNAME) - cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ - $(MAKECOOKIE) - -###################################### -# Use a manifest file of the format: -# src:dest[:mode[:owner[:group]]] -# as in... -# ${WORKSRC}/nwall:${bindir}/nwall:2755:root:tty -# ${WORKSRC}/src/foo:${sharedstatedir}/foo -# ${WORKSRC}/yoink:${sysconfdir}/yoink:0600 - -# Okay, so for the benefit of future generations, this is how it -# works: -# -# First of all, we have this file with colon-separated lines. -# The $(shell cat foo) routine turns it into a space-separated -# list of words. The foreach iterates over this list, putting a -# colon-separated record in $(ZORCH) on each pass through. -# -# Next, we have the macro $(MANIFEST_LINE), which splits a record -# into a space-separated list, and $(MANIFEST_SIZE), which -# determines how many elements are in such a list. These are -# purely for convenience, and could be inserted inline if need -# be. -MANIFEST_LINE = $(subst :, ,$(ZORCH)) -MANIFEST_SIZE = $(words $(MANIFEST_LINE)) - -# So the install command takes a variable number of parameters, -# and our records have from two to five elements. Gmake can't do -# any sort of arithmetic, so we can't do any really intelligent -# indexing into the list of parameters. -# -# Since the last three elements of the $(MANIFEST_LINE) are what -# we're interested in, we make a parallel list with the parameter -# switch text (note the dummy elements at the beginning): -MANIFEST_FLAGS = notused notused --mode= --owner= --group= - -# The following environment variables are set before the -# installation boogaloo begins. This ensures that WORKSRC is -# available to the manifest and that all of the location -# variables are suitable for *installation* (that is, using -# DESTDIR) - -MANIFEST_ENV += WORKSRC=$(WORKSRC) -# This was part of the "implicit DESTDIR" regime. However: -# http://gar.lnx-bbc.org/wiki/ImplicitDestdirConsideredHarmful -#MANIFEST_ENV += $(foreach TTT,prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir lispdir includedir mandir,$(TTT)=$(DESTDIR)$($(TTT))) - -# ...and then we join a slice of it with the corresponding slice -# of the $(MANIFEST_LINE), starting at 3 and going to -# $(MANIFEST_SIZE). That's where all the real magic happens, -# right there! -# -# following that, we just splat elements one and two of -# $(MANIFEST_LINE) on the end, since they're the ones that are -# always there. Slap a semicolon on the end, and you've got a -# completed iteration through the foreach! Beaujolais! - -# FIXME: using -D may not be the right thing to do! -install-$(MANIFEST_FILE): - @echo " ==> Installing from $(MANIFEST_FILE)" - $(MANIFEST_ENV) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)), ginstall -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE)) $(word 2,$(MANIFEST_LINE)) ;) - @$(MAKECOOKIE) - -#################### DEPENDENCY RULES #################### - -# These two lines are here to grandfather in all the packages that use -# BUILDDEPS -IMGDEPS += build -build_DEPENDS = $(BUILDDEPS) - -# Standard deps install into the standard install dir. For the -# BBC, we set the includedir to the build tree and the libdir to -# the install tree. Most dependencies work this way. - -$(GARDIR)/%/$(COOKIEDIR)/install: - @echo ' ==> Building $* as a dependency' - @$(MAKE) -C $(GARDIR)/$* install DESTIMG=$(DESTIMG) - -# builddeps need to have everything put in the build DESTIMG -#$(GARDIR)/%/$(COOKIEROOTDIR)/build.d/install: -# @echo ' ==> Building $* as a build dependency' -# @$(MAKE) -C $(GARDIR)/$* install DESTIMG=build - -# Source Deps grab the source code for another package -# XXX: nobody uses this, but it should really be more like -# $(GARDIR)/%/cookies/patch: -srcdep-$(GARDIR)/%: - @echo ' ==> Grabbing source for $* as a dependency' - @$(MAKE) -C $(GARDIR)/$* patch-p extract-p > /dev/null 2>&1 || \ - $(MAKE) -C $(GARDIR)/$* patch - -# Image deps create dependencies on package installations in -# images other than the current package's DESTIMG. -IMGDEP_TARGETS = $(foreach TTT,$($*_DEPENDS),$(subst xyzzy,$(TTT),$(GARDIR)/xyzzy/$(COOKIEROOTDIR)/$*.d/install)) -imgdep-%: - @test -z "$(strip $(IMGDEP_TARGETS))" || $(MAKE) DESTIMG="$*" $(IMGDEP_TARGETS) - -# Igor's info and man gzipper rule -gzip-info-man: gzip-info gzip-man - -gzip-info: - gfind $(DESTDIR) -type f -iname *.info* -not -iname *.gz | \ - gxargs -r gzip --force - -gzip-man: - gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ - gxargs -r gzip --force - -compile-elisp: - @(for d in $(ELISP_DIRS); do \ - echo " ===> Compiling .el files in $$d"; \ - cd $(PKGROOT)/$$d; \ - for f in `find . -name "*el"`; do \ - bf=`basename $$f`; \ - bd=`dirname $$f`; \ - cd $$bd; \ - emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ - cd $(PKGROOT)/$$d; \ - done; \ - done) - -include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) - -# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it -# is! We mustn't have nasty little gmakeses deleting our -# precious cookieses now must we? -.PRECIOUS: $(DOWNLOADDIR)/% $(COOKIEDIR)/% $(FILEDIR)/% Copied: csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk (from rev 6855, csw/mgar/gar/v2/gar.lib.mk) =================================================================== --- csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk (rev 0) +++ csw/mgar/gar/v2-collapsed-modulations/gar.lib.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -0,0 +1,753 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright (C) 2001 Nick Moffitt +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# + +# cookies go here, so we have to be able to find them for +# dependency checking. +VPATH += $(COOKIEDIR) + +# convenience variable to make the cookie. +MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ + +URLSTRIP = $(subst ://,//,$(1)) + +# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a +# default proxy script that works with the (squid?) proxy at the BO buildfarm. +# override GIT_PROXY_SCRIPT to something else if you need to. +GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) +GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) + +#################### FETCH RULES #################### + +URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M))))) + +# if the caller has defined _postinstall, etc targets for a package, add +# these 'dynamic script' targets to our fetch list +URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr//$(DYN)) + +ifdef GIT_REPOS +URLS += $(foreach R,$(GIT_REPOS),gitrepo//$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) +endif + +# Download the file if and only if it doesn't have a preexisting +# checksum file. Loop through available URLs and stop when you +# get one that doesn't return an error code. +$(DOWNLOADDIR)/%: + @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ + echo " ==> Grabbing $@"; \ + for i in $(filter %/$*,$(URLS)); do \ + echo " ==> Trying $$i"; \ + $(MAKE) -s $$i || continue; \ + mv $(PARTIALDIR)/$* $@; \ + break; \ + done; \ + if test -r $@ ; then : ; else \ + echo '(!!!) Failed to download $@!' 1>&2; \ + false; \ + fi; \ + fi + +gitrepo//%: + @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ + ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ + $(GIT_MAYBEPROXY) git --bare fetch ) && \ + gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ + else \ + false; \ + fi ) + +# the git remote add commands are so that we can later do a fetch +# to update the code. +# we possibly proxy the git:// references depending on GIT_USE_PROXY +git-http//%: + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin http://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +git//%: + @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin git://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +# create ADMSCRIPTS 'on the fly' from variables defined by the caller +# This version is private and should only be called from the non-private +# version directly below +_dynscr//%: + $($(subst .,_,$*)) + +dynscr//%: + $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* + +# download an http URL (colons omitted) +http//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* + +https//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* + +# download an ftp URL (colons omitted) +#ftp//%: +# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* +ftp//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* + +# link to a local copy of the file +# (absolute path) +file///%: + @if test -f /$*; then \ + gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ + else \ + false; \ + fi + +# link to a local copy of the file +# (relative path) +file//%: + @if test -f $*; then \ + gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ + else \ + false; \ + fi + +# Using Jeff Waugh's rsync rule. +# DOES NOT PRESERVE SYMLINKS! +rsync//%: + @rsync -azvLP rsync://$* $(PARTIALDIR)/ + +# Using Jeff Waugh's scp rule +scp//%: + @scp -C $* $(PARTIALDIR)/ + +# Fetch a SVN repo via http +svn-http//%: + @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) + +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + +#################### CHECKSUM RULES #################### + +# check a given file's checksum against $(CHECKSUM_FILE) and +# error out if it mentions the file without an "OK". +# The removal of the download prefix is for legacy checksums. For newstyle +# checksums without path this is not necessary. +checksum-%: $(CHECKSUM_FILE) + @echo " ==> Running checksum on $*" + @if ggrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ + ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ + echo '(!!!) $* failed checksum test!' 1>&2; \ + false; \ + else \ + echo 'file $* passes checksum test!'; \ + $(MAKECOOKIE); \ + fi \ + else \ + echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ + false; \ + fi + +#################### CHECKNEW RULES #################### + +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) + +define files2check +$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) +endef + +check-upstream-and-mail: FILES2CHECK = $(call files2check) +check-upstream-and-mail: + @if [ -n '$(FILES2CHECK)' ]; then \ + NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ + for FILE in $(FILES2CHECK) ""; do \ + [ -n "$$FILE" ] || continue; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ + else \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ + fi; \ + $(MAKE) checknew-$$FILE >/dev/null; \ + done; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "--"; \ +# echo "Kindest regards"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ + fi + +check-upstream: FILES2CHECK = $(call files2check) +check-upstream: + @if [ -n '$(FILES2CHECK)' ]; then \ + NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ + for FILE in $(FILES2CHECK) ""; do \ + [ -n "$$FILE" ] || continue; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ + else \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ + fi; \ + $(MAKE) checknew-$$FILE >/dev/null; \ + done; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + fi; \ + fi + +checknew-%: + @$(MAKECOOKIE) + + +#################### GARCHIVE RULES #################### + +# while we're here, let's just handle how to back up our +# checksummed files + +$(GARCHIVEDIR)/%: $(GARCHIVEDIR) + @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ + gcp -Lr $(DOWNLOADDIR)/$* $@; \ + fi + + +#################### EXTRACT RULES #################### + +TAR_ARGS = --no-same-owner + +# rule to extract uncompressed tarballs +tar-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @gtar $(TAR_ARGS) -xf $(DOWNLOADDIR)/$* -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar xzf +tar-gz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @gzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar and bzip +tar-bz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# extract compressed single files +bz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @bzip2 -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +gz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @gzip -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +# extra dependency rule for git repos, that will allow the user +# to supply an alternate target at their discretion +git-extract-%: + @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" + git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with unzip +zip-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) + @$(MAKECOOKIE) + +# this is a null extract rule for files which are constant and +# unchanged (not archives) +cp-extract-%: + @echo " ==> Copying $(DOWNLOADDIR)/$*" + @cp -rp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @$(MAKECOOKIE) + +#gets the meat of a .deb into $(WORKSRC) +deb-bin-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @ar x $(DOWNLOADDIR)/$* + @rm debian-binary && \ + mv *.tar.gz $(DOWNLOADDIR) && \ + mkdir $(WORKSRC) && \ + gtar $(TAR_ARGS) -xvz -C $(WORKSRC) \ + -f $(DOWNLOADDIR)/data.tar.gz + @$(MAKECOOKIE) + +### EXTRACT FILE TYPE MAPPINGS ### +# These rules specify which of the above extract action rules to use for a +# given file extension. Often support for a given extract type can be handled +# by simply adding a rule here. + +extract-archive-%.tar: tar-extract-%.tar + @$(MAKECOOKIE) + +extract-archive-%.tar.gz: tar-gz-extract-%.tar.gz + @$(MAKECOOKIE) + +extract-archive-%.tar.Z: tar-gz-extract-%.tar.Z + @$(MAKECOOKIE) + +extract-archive-%.tgz: tar-gz-extract-%.tgz + @$(MAKECOOKIE) + +extract-archive-%.taz: tar-gz-extract-%.taz + @$(MAKECOOKIE) + +extract-archive-%.tar.bz: tar-bz-extract-%.tar.bz + @$(MAKECOOKIE) + +extract-archive-%.tar.bz2: tar-bz-extract-%.tar.bz2 + @$(MAKECOOKIE) + +extract-archive-%.tbz: tar-bz-extract-%.tbz + @$(MAKECOOKIE) + +extract-archive-%.zip: zip-extract-%.zip + @$(MAKECOOKIE) + +extract-archive-%.ZIP: zip-extract-%.ZIP + @$(MAKECOOKIE) + +extract-archive-%.deb: deb-bin-extract-%.deb + @$(MAKECOOKIE) + +extract-archive-%.bz2: bz-extract-%.bz2 + @$(MAKECOOKIE) + +extract-archive-%.gz: gz-extract-%.gz + @$(MAKECOOKIE) + +extract-archive-%.git: git-extract-%.git + @$(MAKECOOKIE) + +# anything we don't know about, we just assume is already +# uncompressed and unarchived in plain format +extract-archive-%: cp-extract-% + @$(MAKECOOKIE) + +#################### PATCH RULES #################### + +PATCHDIR ?= $(WORKSRC) +PATCHDIRLEVEL ?= 1 +PATCHDIRFUZZ ?= 2 +GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) +BASEWORKSRC = $(shell basename $(WORKSRC)) + +# apply bzipped patches +bz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @$(MAKECOOKIE) + +# apply gzipped patches +gz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @$(MAKECOOKIE) + +# apply normal patches +normal-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + $(GARPATCH) < $(DOWNLOADDIR)/$* + @$(MAKECOOKIE) + +# This is used by makepatch +%/gar-base.diff: + @echo " ==> Creating patch $@" + @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract + @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch + @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig + @( cd $(WORKDIR_FIRSTMOD); \ + if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ + cd $(CURDIR); \ + mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ + fi ) + +### PATCH FILE TYPE MAPPINGS ### +# These rules specify which of the above patch action rules to use for a given +# file extension. Often support for a given patch format can be handled by +# simply adding a rule here. + +patch-extract-%.bz: bz-patch-%.bz + @$(MAKECOOKIE) + +patch-extract-%.bz2: bz-patch-%.bz2 + @$(MAKECOOKIE) + +patch-extract-%.gz: gz-patch-%.gz + @$(MAKECOOKIE) + +patch-extract-%.Z: gz-patch-%.Z + @$(MAKECOOKIE) + +patch-extract-%.diff: normal-patch-%.diff + @$(MAKECOOKIE) + +patch-extract-%.patch: normal-patch-%.patch + @$(MAKECOOKIE) + +patch-extract-%: normal-patch-% + @$(MAKECOOKIE) + +#################### CONFIGURE RULES #################### + +TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) + +NODIRPATHS += --lispdir + +DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) + +# configure a package that has an autoconf-style configure +# script. +configure-%/configure: + @echo " ==> Running configure in $*" + cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +configure-%/autogen.sh: + @echo " ==> Running autogen.sh in $*" + @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +# configure a package that uses imake +# FIXME: untested and likely not the right way to handle the +# arguments +configure-%/Imakefile: + @echo " ==> Running xmkmf in $*" + @cd $* && $(CONFIGURE_ENV) xmkmf $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +configure-%/setup.rb: + @echo " ==> Running setup.rb config in $*" + @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +#################### BUILD RULES #################### + +# build from a standard gnu-style makefile's default rule. +build-%/Makefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/makefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/GNUmakefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/Jamfile: + @echo " ==> Running bjam in $*" + @( cd $* ; $(BUILD_ENV) bjam $(JAMFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# Ruby makefiles +build-%/Rakefile: + @echo " ==> Running rake in $*" + @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +build-%/rakefile: + @echo " ==> Running rake in $*" + @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +build-%/setup.rb: + @echo " ==> Running setup.rb setup in $*" + @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# This can be: build, build_py, build_ext, build_clib, build_scripts +# See setup.py --help-commands for details +PYBUILD_CMD ?= build +build-%/setup.py: + @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" + @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +#################### TEST RULES #################### + +TEST_TARGET ?= test + +# Run tests on pre-built sources +test-%/Makefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +test-%/makefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +test-%/GNUmakefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +# Ruby makefiles +test-%/Rakefile: + @echo " ==> Running rake $(TEST_TARGET) in $*" + @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @$(MAKECOOKIE) + +test-%/rakefile: + @echo " ==> Running rake $(TEST_TARGET) in $*" + @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @$(MAKECOOKIE) + +test-%/setup.py: + @echo " ==> Running setup.py test in $*" + @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) + @$(MAKECOOKIE) + +################# INSTALL RULES #################### + +# just run make install and hope for the best. +install-%/Makefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +install-%/makefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +install-%/GNUmakefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +# Ruby makefiles +install-%/Rakefile: + @echo " ==> Running rake install in $*" + @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +install-%/rakefile: + @echo " ==> Running rake install in $*" + @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +install-%/setup.rb: + @echo " ==> Running setup.rb install in $*" + @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) + @$(MAKECOOKIE) + +# This can be: install, install_lib, install_headers, install_scripts, +# or install_data. See setup.py --help-commands for details. +PYINSTALL_CMD ?= install +install-%/setup.py: + @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" + @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +# pkg-config scripts +install-%-config: + mkdir -p $(STAGINGDIR)/$(GARNAME) + cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ + $(MAKECOOKIE) + +###################################### +# Use a manifest file of the format: +# src:dest[:mode[:owner[:group]]] +# as in... +# ${WORKSRC}/nwall:${bindir}/nwall:2755:root:tty +# ${WORKSRC}/src/foo:${sharedstatedir}/foo +# ${WORKSRC}/yoink:${sysconfdir}/yoink:0600 + +# Okay, so for the benefit of future generations, this is how it +# works: +# +# First of all, we have this file with colon-separated lines. +# The $(shell cat foo) routine turns it into a space-separated +# list of words. The foreach iterates over this list, putting a +# colon-separated record in $(ZORCH) on each pass through. +# +# Next, we have the macro $(MANIFEST_LINE), which splits a record +# into a space-separated list, and $(MANIFEST_SIZE), which +# determines how many elements are in such a list. These are +# purely for convenience, and could be inserted inline if need +# be. +MANIFEST_LINE = $(subst :, ,$(ZORCH)) +MANIFEST_SIZE = $(words $(MANIFEST_LINE)) + +# So the install command takes a variable number of parameters, +# and our records have from two to five elements. Gmake can't do +# any sort of arithmetic, so we can't do any really intelligent +# indexing into the list of parameters. +# +# Since the last three elements of the $(MANIFEST_LINE) are what +# we're interested in, we make a parallel list with the parameter +# switch text (note the dummy elements at the beginning): +MANIFEST_FLAGS = notused notused --mode= --owner= --group= + +# The following environment variables are set before the +# installation boogaloo begins. This ensures that WORKSRC is +# available to the manifest and that all of the location +# variables are suitable for *installation* (that is, using +# DESTDIR) + +MANIFEST_ENV += WORKSRC=$(WORKSRC) +# This was part of the "implicit DESTDIR" regime. However: +# http://gar.lnx-bbc.org/wiki/ImplicitDestdirConsideredHarmful +#MANIFEST_ENV += $(foreach TTT,prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir lispdir includedir mandir,$(TTT)=$(DESTDIR)$($(TTT))) + +# ...and then we join a slice of it with the corresponding slice +# of the $(MANIFEST_LINE), starting at 3 and going to +# $(MANIFEST_SIZE). That's where all the real magic happens, +# right there! +# +# following that, we just splat elements one and two of +# $(MANIFEST_LINE) on the end, since they're the ones that are +# always there. Slap a semicolon on the end, and you've got a +# completed iteration through the foreach! Beaujolais! + +# FIXME: using -D may not be the right thing to do! +install-$(MANIFEST_FILE): + @echo " ==> Installing from $(MANIFEST_FILE)" + $(MANIFEST_ENV) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)), ginstall -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE)) $(word 2,$(MANIFEST_LINE)) ;) + @$(MAKECOOKIE) + +#################### DEPENDENCY RULES #################### + +# These two lines are here to grandfather in all the packages that use +# BUILDDEPS +IMGDEPS += build +build_DEPENDS = $(BUILDDEPS) + +# Standard deps install into the standard install dir. For the +# BBC, we set the includedir to the build tree and the libdir to +# the install tree. Most dependencies work this way. + +$(GARDIR)/%/$(COOKIEDIR)/install: + @echo ' ==> Building $* as a dependency' + @$(MAKE) -C $(GARDIR)/$* install DESTIMG=$(DESTIMG) + +# builddeps need to have everything put in the build DESTIMG +#$(GARDIR)/%/$(COOKIEROOTDIR)/build.d/install: +# @echo ' ==> Building $* as a build dependency' +# @$(MAKE) -C $(GARDIR)/$* install DESTIMG=build + +# Source Deps grab the source code for another package +# XXX: nobody uses this, but it should really be more like +# $(GARDIR)/%/cookies/patch: +srcdep-$(GARDIR)/%: + @echo ' ==> Grabbing source for $* as a dependency' + @$(MAKE) -C $(GARDIR)/$* patch-p extract-p > /dev/null 2>&1 || \ + $(MAKE) -C $(GARDIR)/$* patch + +# Image deps create dependencies on package installations in +# images other than the current package's DESTIMG. +IMGDEP_TARGETS = $(foreach TTT,$($*_DEPENDS),$(subst xyzzy,$(TTT),$(GARDIR)/xyzzy/$(COOKIEROOTDIR)/$*.d/install)) +imgdep-%: + @test -z "$(strip $(IMGDEP_TARGETS))" || $(MAKE) DESTIMG="$*" $(IMGDEP_TARGETS) + +# Igor's info and man gzipper rule +gzip-info-man: gzip-info gzip-man + +gzip-info: + gfind $(DESTDIR) -type f -iname *.info* -not -iname *.gz | \ + gxargs -r gzip --force + +gzip-man: + gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ + gxargs -r gzip --force + +compile-elisp: + @(for d in $(ELISP_DIRS); do \ + echo " ===> Compiling .el files in $$d"; \ + cd $(PKGROOT)/$$d; \ + for f in `find . -name "*el"`; do \ + bf=`basename $$f`; \ + bd=`dirname $$f`; \ + cd $$bd; \ + emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ + cd $(PKGROOT)/$$d; \ + done; \ + done) + +include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) + +# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it +# is! We mustn't have nasty little gmakeses deleting our +# precious cookieses now must we? +.PRECIOUS: $(DOWNLOADDIR)/% $(COOKIEDIR)/% $(FILEDIR)/% Deleted: csw/mgar/gar/v2-collapsed-modulations/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-09 11:59:38 UTC (rev 6808) +++ csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -1,828 +0,0 @@ - -# -# $Id$ -# -# Copyright (C) 2001 Nick Moffitt -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. - -# Comment this out to make much verbosity -#.SILENT: - -#ifeq ($(origin GARDIR), undefined) -#GARDIR := $(CURDIR)/../.. -#endif - -#GARDIR ?= ../.. -#ifeq ($(origin GARDIR), undefined) -#GARDIR := $(CURDIR)/../.. -#endif - -ifneq ($(abspath /),/) -$(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) -endif - -GARDIR ?= gar -GARBIN = $(GARDIR)/bin - -DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1)))) -ROOTFROMDEST = $(call DIRSTODOTS,$(DESTDIR)) -MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') -TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') - -# If you call this the value is only evaluated the first time -# Usage: $(call SETONCE,A,MyComplexVariableEvaluatedOnlyOnce) -SETONCE = $(eval $(1) ?= $(2)) - -#meant to take a git url and return just the $proj.git part -GITPROJ = $(lastword $(subst /, ,$(1))) - -PARALLELMFLAGS ?= $(MFLAGS) -export PARALLELMFLAGS - -DISTNAME ?= $(GARNAME)-$(GARVERSION) - -DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) - -# Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' -ALLFILES_DISTFILES ?= $(DISTFILES) -ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) -ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) -ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) - -ifeq ($(MAKE_INSTALL_DIRS),1) -INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) -else -INSTALL_DIRS = -endif - -# For rules that do nothing, display what dependencies they -# successfully completed -#DONADA = @echo " [$@] complete. Finished rules: $+" -#DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." -COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) -DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." - - -# TODO: write a stub rule to print out the name of a rule when it -# *does* do something, and handle indentation intelligently. - -# Default sequence for "all" is: fetch checksum extract patch configure build -all: build - -# include the configuration file to override any of these variables -include $(GARDIR)/gar.conf.mk -include $(GARDIR)/gar.lib.mk - -# ========================= MODULATIONS ======================== - -# The default is to modulate over ISAs -MODULATORS ?= ISA $(EXTRA_MODULATORS) $(EXTRA_MODULATORS_$(GARCH)) -MODULATIONS_ISA = $(NEEDED_ISAS) - -tolower = $(shell echo $(1) | tr '[A-Z]' '[a-z]') -expand_modulator_1 = $(addprefix $(call tolower,$(1))-,$(MODULATIONS_$(1))) -# This expands to the list of all modulators with their respective modulations -modulations = $(if $(word 2,$(1)),\ - $(foreach P,$(call expand_modulator_1,$(firstword $(1))),\ - $(addprefix $(P)-,$(call modulations,$(wordlist 2,$(words $(1)),$(1))))\ - ),\ - $(call expand_modulator_1,$(1))) - -MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) - -# _modulate(ISA STATIC,,,) -# -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) -# -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes) -# -> xxx-isa-i386-static-yes: @gmake xxx ISA=i386 STATIC=yes -# -> _modulate2(,,isa-i386-static-no,ISA STATIC,ISA=i386 STATIC=no) -# -> xxx-isa-i386-static-no: @gmake xxx ISA=i386 STATIC=no -# -> _modulate2(STATIC,isa-amd64,ISA,ISA=amd64) -# -> _modulate2(,,isa-amd64-static-yes,ISA STATIC,ISA=amd64 STATIC=yes) -# -> xxx-isa-amd64-static-yes: @gmake xxx ISA=amd64 STATIC=yes -# -> _modulate2(,,isa-amd64-static-no,ISA STATIC,ISA=amd64 STATIC=no) -# -> xxx-isa-amd64-static-no: @gmake xxx ISA=amd64 STATIC=no - -define _modulate_target -$(1)-$(2): - @$(MAKE) MODULATION=$(2) $(3) $(1)-modulated - @# This is MAKECOOKIE expanded to use the name of the rule explicily as the rule has - @# not been evaluated yet. XXX: Use function _MAKECOOKIE for both - @mkdir -p $(COOKIEDIR)/$(dir $(1)-$(2)) && date >> $(COOKIEDIR)/$(1)-$(2) - @# The next line has intentionally been left blank to explicitly terminate this make rule - -endef - -define _modulate_target_nocookie -$(1)-$(2): - @$(MAKE) -s MODULATION=$(2) $(3) $(1)-modulated - @# The next line has intentionally been left blank to explicitly terminate this make rule - -endef - -define _modulate_merge -$(foreach ASSIGNMENT,$(3), -merge-$(2): $(ASSIGNMENT) -) -merge-$(2): BUILDHOST=$$(call modulation2host) -merge-$(2): - @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" - $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ - $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ - ) - @# The next line has intentionally been left blank to explicitly terminate this make rule - -endef - -define _modulate_do -$(call _modulate_target,extract,$(2),$(4)) -$(call _modulate_target,patch,$(2),$(4)) -$(call _modulate_target,configure,$(2),$(4)) -$(call _modulate_target_nocookie,reset-configure,$(2),$(4)) -$(call _modulate_target,build,$(2),$(4)) -$(call _modulate_target_nocookie,reset-build,$(2),$(4)) -$(call _modulate_target,test,$(2),$(4)) -$(call _modulate_target,install,$(2),$(4)) -$(call _modulate_target_nocookie,reset-install,$(2),$(4)) -#$(call _modulate_target,merge,$(2),$(4)) -$(call _modulate_merge,,$(2),$(4)) -$(call _modulate_target_nocookie,reset-merge,$(2),$(4)) -$(call _modulate_target_nocookie,clean,$(2),$(4)) -$(call _modulate_target_nocookie,_modenv,$(2),$(4)) -endef - -# This evaluates to the make rules for all modulations passed as first argument -# Usage: _modulate( ) -define _modulate -$(foreach M,$(MODULATIONS_$(firstword $(1))),\ - $(call _modulate2,\ - $(wordlist 2,$(words $(1)),$(1)),\ - $(call tolower,$(firstword $(1)))-$(M),\ - $(firstword $(1)),\ - $(firstword $(1))=$(M)\ - )\ -) -endef - -# This is a helper for the recursive _modulate -define _modulate2 -$(if $(strip $(1)),\ - $(foreach M,$(MODULATIONS_$(firstword $(1))),\ - $(call _modulate2,\ - $(wordlist 2,$(words $(1)),$(1)),\ - $(addprefix $(2)-,$(call tolower,$(firstword $(1)))-$(M)),\ - $(3) $(firstword $(1)),\ - $(4) $(firstword $(1))=$(M)\ - )\ - ),\ - $(call _modulate_do,,$(strip $(2)),$(3),$(4))\ -) -endef - -define _pmod - @echo "[ $1 for modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) ]" -endef - -$(eval $(call _modulate,$(MODULATORS))) - -#################### DIRECTORY MAKERS #################### - -# This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: - @if test -d $@; then : ; else \ - ginstall -d $@; \ - echo "ginstall -d $@"; \ - fi - -# These stubs are wildcarded, so that the port maintainer can -# define something like "pre-configure" and it won't conflict, -# while the configure target can call "pre-configure" safely even -# if the port maintainer hasn't defined it. -# -# in addition to the pre- rules, the maintainer may wish -# to set a "pre-everything" rule, which runs before the first -# actual target. -pre-%: - @true - -post-%: - @true - -# Call any arbitrary rule recursively for all dependencies -deep-%: % - @for target in "" $(DEPEND_LIST) ; do \ - test -z "$$target" && continue ; \ - $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ - done - @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) - - -# ========================= MAIN RULES ========================= -# The main rules are the ones that the user can specify as a -# target on the "make" command-line. Currently, they are: -# prereq fetch-list fetch checksum makesum extract checkpatch patch -# build install reinstall uninstall package -# (some may not be complete yet). -# -# Each of these rules has dependencies that run in the following -# order: -# - run the previous main rule in the chain (e.g., install -# depends on build) -# - run the pre- rule for the target (e.g., configure would -# then run pre-configure) -# - generate a set of files to depend on. These are typically -# cookie files in $(COOKIEDIR), but in the case of fetch are -# actual downloaded files in $(DOWNLOADDIR) -# - run the post- rule for the target -# -# The main rules also run the $(DONADA) code, which prints out -# what just happened when all the dependencies are finished. - -announce: - @echo "[===== NOW BUILDING: $(DISTNAME) =====]" - -announce-modulation: - @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" - -# prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) - -# Force to be called in global modulation -prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) - $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite) - $(DONADA) - -prerequisitepkg-%: - @echo " ==> Verifying for installed package $*: \c" - @(pkginfo -q $*; if [ $$? -eq 0 ]; then echo "installed"; else echo "MISSING"; exit 1; fi) - @$(MAKECOOKIE) - -# fetch-list - Show list of files that would be retrieved by fetch. -# NOTE: DOES NOT RUN pre-everything! -fetch-list: - @echo "Distribution files: " - @$(foreach F,$(DISTFILES),echo " $F";) - @echo "Patch files: " - @$(foreach P,$(PATCHFILES),echo " $P";) - @$(foreach M,$(MODULATIONS),$(if $(PATCHFILES_$M),echo " Modulation $M only: $(PATCHFILES_$M)";)) - @echo "Dynamically generated scripts: " - @$(foreach D,$(DYNSCRIPTS),echo " $D";) - @echo "Git Repos tracked: " - @$(foreach R,$(GIT_REPOS),echo " $R";) - -# fetch - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined) -# into $(DOWNLOADDIR) as necessary. -FETCH_TARGETS = $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) - -fetch: prerequisite pre-fetch $(FETCH_TARGETS) post-fetch - @$(DONADA) - -# returns true if fetch has completed successfully, false -# otherwise -fetch-p: - @$(foreach COOKIEFILE,$(FETCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# checksum - Use $(CHECKSUMFILE) to ensure that your -# distfiles are valid. -CHECKSUM_TARGETS = $(addprefix checksum-,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) - -checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum - @$(DONADA) - -checksum-global: $(if $(filter global,$(MODULATION)),checksum) - $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global checksum) - @$(DONADA) - -# The next rule handles the dependency from the modulated context to -# the contextless checksumming. The rule is called when the cookie -# to the global checksum is requested. If the global checksum has not run, -# then run it. Otherwise it is silently accepted. -checksum-modulated: checksum-global - @$(DONADA) - -# returns true if checksum has completed successfully, false -# otherwise -checksum-p: - @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# makesum - Generate distinfo (only do this for your own ports!). -MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) - -makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) - @if test "x$(MAKESUM_TARGETS)" != "x "; then \ - (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ - echo "Checksums made for $(MAKESUM_TARGETS)" ; \ - cat $(CHECKSUM_FILE) ; \ - fi - -# I am always typing this by mistake -makesums: makesum - -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) - -garchive: checksum $(GARCHIVE_TARGETS) ; - -# extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) - -# We call an additional extract-modulated without resetting any variables so -# a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract - @$(DONADA) - -extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) - $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global extract) - @$(MAKECOOKIE) - -extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ - $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ - announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated - @$(DONADA) - -# returns true if extract has completed successfully, false -# otherwise -extract-p: - @$(foreach COOKIEFILE,$(EXTRACT_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# checkpatch - Do a "patch -C" instead of a "patch". Note -# that it may give incorrect results if multiple -# patches deal with the same file. -# TODO: actually write it! -checkpatch: extract - @echo "$@ NOT IMPLEMENTED YET" - -# patch - Apply any provided patches to the source. -PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) - -patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch - @$(DONADA) - -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated - @$(DONADA) - -# returns true if patch has completed successfully, false -# otherwise -patch-p: - @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# makepatch - Grab the upstream source and diff against $(WORKSRC). Since -# diff returns 1 if there are differences, we remove the patch -# file on "success". Goofy diff. -makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff - $(DONADA) - -# XXX: Allow patching of pristine sources separate from ISA directories -# XXX: Use makepatch on global/ - -# this takes the changes you've made to a working directory, -# distills them to a patch, updates the checksum file, and tries -# out the build (assuming you've listed the gar-base.diff in your -# PATCHFILES). This is way undocumented. -NickM -beaujolais: makepatch makesum clean build - $(DONADA) - -update: makesum garchive clean - -# configure - Runs either GNU configure, one or more local -# configure scripts or nothing, depending on -# what's available. -CONFIGURE_TARGETS = $(addprefix configure-,$(CONFIGURE_SCRIPTS)) - -# Limit dependencies to all but one category or to exclude one category -ALL_CATEGORIES = apps cpan devel gnome lang lib net server utils extra -ifneq ($(BUILD_CATEGORY),) -NOBUILD_CATEGORY = $(filter-out $(BUILD_CATEGORY),$(ALL_CATEGORIES)) -endif - -DEPEND_LIST = $(filter-out $(addsuffix /%,$(NOBUILD_CATEGORY)),$(DEPENDS) $(LIBDEPS) $(BUILDDEPS)) - -ifneq ($(SKIPDEPEND),1) -CONFIGURE_DEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEDIR)/install,$(DEPEND_LIST))) -CONFIGURE_IMGDEPS = $(addprefix imgdep-,$(filter-out $(DESTIMG),$(IMGDEPS))) -#CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) -endif - -configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure - @$(DONADA) - -configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ - $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if $(STRIP_LIBTOOL),strip-libtool) - @$(DONADA) - -strip-libtool: - @echo '[===== Stripping Libtool =====]' - fixlibtool $(WORKSRC) - @$(MAKECOOKIE) - -.PHONY: reset-configure reset-configure-modulated -reconfigure: reset-configure configure - -reset-configure: $(addprefix reset-configure-,$(MODULATIONS)) - rm -f $(COOKIEDIR)/configure - -reset-configure-modulated: - rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) - -# returns true if configure has completed successfully, false -# otherwise -configure-p: - @$(foreach COOKIEFILE,$(CONFIGURE_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -# build - Actually compile the sources. -BUILD_TARGETS = $(addprefix build-,$(BUILD_CHECK_SCRIPTS)) $(addprefix build-,$(BUILD_SCRIPTS)) - -build: pre-build $(addprefix build-,$(MODULATIONS)) post-build - $(DONADA) - -# Build for a specific architecture -build-modulated-check: - $(if $(filter ERROR,$(ARCHFLAGS_$(GARCOMPILER)_$*)), \ - $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ - ) - -build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated - @$(MAKECOOKIE) - -# returns true if build has completed successfully, false -# otherwise -build-p: - @$(foreach COOKIEFILE,$(BUILD_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - -TEST_TARGETS = $(addprefix test-,$(TEST_SCRIPTS)) - -test: pre-test $(addprefix test-,$(MODULATIONS)) post-test - $(DONADA) - -test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated - $(DONADA) - -# strip - Strip executables -ifneq ($(GARFLAVOR),DBG) -POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) -endif - -strip: - @for target in $(STRIP_DIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) ; \ - do \ - stripbin $$target ; \ - done - $(DONADA) - -# fixconfig - Remove build-time paths config files -POST_INSTALL_TARGETS := fixconfig $(POST_INSTALL_TARGETS) -FIXCONFIG_DIRS ?= $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) -FIXCONFIG_RMPATHS ?= $(DESTDIR) $(CURDIR)/$(WORKSRC) -fixconfig: - @if test "x$(FIXCONFIG_DIRS)" != "x" ; then \ - for path in $(FIXCONFIG_DIRS) ; do \ - if test -d $$path ; then \ - echo " ==> fixconfig: $$path" ; \ - replacer $$path $(FIXCONFIG_RMPATHS) ; \ - fi ; \ - done ; \ - fi - -# install - Test and install the results of a build. -INSTALL_TARGETS = $(addprefix install-,$(INSTALL_SCRIPTS)) - -install: pre-install $(addprefix install-,$(MODULATIONS)) post-install - $(DONADA) - -install-modulated: build-modulated $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test-modulated $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) pre-install-modulated pre-install-$(MODULATION) $(INSTALL_TARGETS) post-install-$(MODULATION) post-install-modulated $(POST_INSTALL_TARGETS) - @$(MAKECOOKIE) - -# returns true if install has completed successfully, false -# otherwise -install-p: - @$(foreach COOKIEFILE,$(INSTALL_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) - - - -# reinstall - Install the results of a build, ignoring -# "already installed" flag. -.PHONY: reinstall reset-install reset-install-modulated -reinstall: reset-install install - -reset-install: reset-merge $(addprefix reset-install-,$(MODULATIONS)) - @rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/install-$M) $(COOKIEDIR)/install $(COOKIEDIR)/post-install - @rm -f $(COOKIEDIR)/strip - -reset-install-modulated: - @$(call _pmod,Reset install state) - @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work - @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) - @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) - @rm -f $(COOKIEDIR)/strip - @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) - @rm -f $(COOKIEROOTDIR)/global/install-$(MODULATION) - -# merge in all isas to the package directory after installation - -# Merging in general allows the selection of parts from different ISA builds into the package -# Per default merging is done differently depending on -# (a) if the sources are build for more than one ISA -# (b) if the executables should be replaced by isaexec or not -# -# - If there is only one ISA to build for everything is copied verbatim to PKGROOT. -# - If there are builds for more than one ISA the destination differs depending on if -# the binaries should be executed by isaexec. This is usually bin, sbin and libexec. -# -# default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ -# -# Automatic merging is only possible if you have the default modulation "ISA" -# Otherwise you *must* specify merge scripts for all modulations. - -ifeq ($(DEBUG_MERGING),) -_DBG_MERGE=@ -else -_DBG_MERGE= -endif - -ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -else -ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) -endif - -# These directories get relocated into their ISA subdirectories -MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION)) - -# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper -_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config -_ISAEXEC_FILES = $(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ - $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ - ) -ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ - $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ - done)),) - -ifneq ($(ISAEXEC_FILES),) -_EXTRA_GAR_PKGS += CSWisaexec -endif - -# These merge-rules are actually processed for the current modulation -MERGE_TARGETS ?= $(addprefix merge-,$(MERGE_SCRIPTS_$(MODULATION))) $(EXTRA_MERGE_TARGETS) - -# Include only these files -ifeq ($(origin MERGE_INCLUDE_FILES_$(MODULATION)), undefined) -_MERGE_INCLUDE_FILES = $(MERGE_INCLUDE_FILES) -else -_MERGE_INCLUDE_FILES = $(MERGE_INCLUDE_FILES_$(MODULATION)) -endif -_MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) - -# This can be defined in category.mk -MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY) - -# Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) -# during the merge phase. -_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py -MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) - -MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la -MERGE_EXCLUDE_BACKUPFILES ?= .*\~ -MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a -# Exclude all other .pc-files apart from the default 32- and 64 bit versions -MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc) -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE) - -# Exclude these files -ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) -_MERGE_EXCLUDE_FILES = $(MERGE_EXCLUDE_FILES) -else -_MERGE_EXCLUDE_FILES = $(MERGE_EXCLUDE_FILES_$(MODULATION)) -endif -_MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES) $(EXTRA_MERGE_EXCLUDE_FILES_$(MODULATION)) $(MERGE_EXCLUDE_DEFAULT) - -# This variable contains parameter for pax to honor global file inclusion/exclusion -# Exclude by replacing files with the empty string -_INC_EXT_RULE = $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') -# Replace files by itself terminating on first match -_INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)$$,\1,") - -# These are used during merge phase to determine the base installation directory -MERGEBASE_$(bindir) ?= $(bindir_install) -MERGEBASE_$(sbindir) ?= $(sbindir_install) -MERGEBASE_$(libexecdir) ?= $(libexecdir_install) -MERGEBASE_$(libdir) ?= $(libdir_install) - -define mergebase -$(if $(MERGEBASE_$(1)),$(MERGEBASE_$(1)),$(1)) -endef - -# A package is compiled for the pathes defined in $(bindir), $(libdir), etc. -# These may not be the standard pathes, because specific ISA compilation -# could have appended e. g. /64 for .pc-pathes to be correct. Anyway these -# pathes may need to be rewritten e. g. from lib/64 to lib/amd64. Here, -# $(libdir) has the memorymodel-directory appended, whereas $(libdir_install) -# has not, so we use this one for appending. - - -_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS) - -define killprocandparent -cpids() { \ - P=$1 \ - PPIDS=$P \ - PP=`ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $P { print \\$1 }\"` \ - while [ -n "$PP" ]; do \ - PQ=$PP \ - PP= \ - for q in $PQ; do \ - PPIDS="$PPIDS $q" \ - PP=$PP\ `ps -eo pid,ppid | awk "BEGIN { ORS=\" \" } \\$2 == $q { print \\$1 }\"` \ - done \ - done \ - \ - echo $PPIDS \ -} -endef - - -# The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge - @$(DONADA) - -merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) - -merge-sequential: $(addprefix merge-,$(MODULATIONS)) - -merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid -merge-parallel: merge-watch - $(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\ - $(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait - $(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)`; stty sane; fi - $(_DBG_MERGE)$(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \ - echo "Build error in modulation $M. Please see"; \ - echo " $(WORKROOTDIR)/build-$M/build.log"; \ - echo "for details:"; \ - echo; \ - tail -100 $(WORKROOTDIR)/build-$M/build.log; \ - exit "Return code: `cat $(WORKROOTDIR)/build-$M/build.ret`"; \ - fi;) - -merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) -merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) - $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ - echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ - ) - - -# This merges the -merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated - @$(MAKECOOKIE) - -# Copy the whole tree verbatim -merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ - . $(PKGROOT)) - @$(MAKECOOKIE) - -# Copy only the merge directories -merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -# Copy the whole tree and relocate the directories in $(MERGE_DIRS) -merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -# Copy only the relocated directories -merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -# Copy -merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ - -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - -.PHONY: remerge reset-merge reset-merge-modulated -remerge: reset-merge merge - -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src - @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge - @rm -rf $(PKGROOT) - @$(DONADA) - -reset-merge-modulated: - @$(call _pmod,Reset merge state) - @rm -f $(COOKIEDIR)/merge-* - -# The clean rule. It must be run if you want to re-download a -# file after a successful checksum (or just remove the checksum -# cookie, but that would be lame and unportable). - -clean: $(addprefix clean-,$(MODULATIONS)) - @rm -rf $(WORKROOTDIR) $(COOKIEROOTDIR) $(DOWNLOADDIR) - -clean-modulated: - $(call _pmod,Cleaning ) - @rm -rf $(WORKSRC) $(EXTRACTDIR) \ - $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) \ - $(SCRATCHDIR)-build $(SCRATCHDIR)-$(COOKIEROOTDIR) \ - $(LOGDIR) *~ - @rm -rf $(COOKIEDIR) - - -SRC_CLEAN_TARGET ?= clean -clean-source: - @if test -d $(WORKSRC) ; then \ - ( $(MAKE) -C $(WORKSRC) $(SRC_CLEAN_TARGET) || true ) ; \ - fi - -# Remove specified files/directories -clean-dirs: - @for target in "" $(REMOVE_DIRS) ; do \ - test -z "$$target" && continue ; \ - rm -rf $$target ; \ - done ; \ - -# Clean an image -imageclean: - @echo " ==> Removing $(COOKIEDIR)" - @-rm -rf $(COOKIEDIR) - @echo " ==> Removing $(WORKDIR)" - @-rm -rf $(WORKDIR) - -spotless: imageclean - @echo " ==> Removing $(DESTDIR)" - @-rm -rf work - -# Print package dependencies -PKGDEP_LIST = $(filter-out $(BUILDDEPS),$(DEPEND_LIST)) -printdepends: - @for depend in "" $(PKGDEP_LIST) ; do \ - test -z "$$depend" && continue ; \ - echo " $$depend" ; \ - if test -n "$(DEPFILE)" ; then \ - check_pkgdb -o $(DEPFILE) $$depend ; \ - else \ - check_pkgdb $$depend ; \ - fi ; \ - done - -# Update inter-package depends -makedepend: - @for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ - pkgname=`basename $$gspec .gspec` ; \ - pkgfiles=`dirname $$gspec` ; \ - pkgdir=`dirname $$pkgfiles` ; \ - pkgbuild=`basename $$pkgdir` ; \ - pkgdep="$$pkgname.depend" ; \ - echo " ==> $$pkgbuild ($$pkgname)" ; \ - ( cd $$pkgdir ; \ - rm -f /tmp/$$pkgdep ; \ - if test -f $$pkgfiles/$$pkgdep ; then \ - cat $$pkgfiles/$$pkgdep > /tmp/$$pkgdep ; \ - fi ; \ - DEPFILE=/tmp/$$pkgdep $(MAKE) printdepends ; \ - if test -f /tmp/$$pkgdep ; then \ - sort /tmp/$$pkgdep | uniq > $$pkgfiles/$$pkgname.depend ; \ - fi ) ; \ - done - -buildstatus: - -love: - @echo "not war!" - -# these targets do not have actual corresponding files -.PHONY: all fetch-list beaujolais fetch-p checksum-p extract-p patch-p configure-p build-p install-p package-p love - -# apparently this makes all previous rules non-parallelizable, -# but the actual builds of the packages will be, according to -# jdub. -.NOTPARALLEL: Copied: csw/mgar/gar/v2-collapsed-modulations/gar.mk (from rev 6854, csw/mgar/gar/v2/gar.mk) =================================================================== --- csw/mgar/gar/v2-collapsed-modulations/gar.mk (rev 0) +++ csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:29:04 UTC (rev 6894) @@ -0,0 +1,828 @@ + +# +# $Id$ +# +# Copyright (C) 2001 Nick Moffitt +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. + +# Comment this out to make much verbosity +#.SILENT: + +#ifeq ($(origin GARDIR), undefined) +#GARDIR := $(CURDIR)/../.. +#endif + +#GARDIR ?= ../.. +#ifeq ($(origin GARDIR), undefined) +#GARDIR := $(CURDIR)/../.. +#endif + +ifneq ($(abspath /),/) +$(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) +endif + +GARDIR ?= gar +GARBIN = $(GARDIR)/bin + +DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1)))) +ROOTFROMDEST = $(call DIRSTODOTS,$(DESTDIR)) +MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') +TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') + +# If you call this the value is only evaluated the first time +# Usage: $(call SETONCE,A,MyComplexVariableEvaluatedOnlyOnce) +SETONCE = $(eval $(1) ?= $(2)) + +#meant to take a git url and return just the $proj.git part +GITPROJ = $(lastword $(subst /, ,$(1))) + +PARALLELMFLAGS ?= $(MFLAGS) +export PARALLELMFLAGS + +DISTNAME ?= $(GARNAME)-$(GARVERSION) + +DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) + +# Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' +ALLFILES_DISTFILES ?= $(DISTFILES) +ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) +ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) +ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) + +ifeq ($(MAKE_INSTALL_DIRS),1) +INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) +else +INSTALL_DIRS = +endif + +# For rules that do nothing, display what dependencies they +# successfully completed +#DONADA = @echo " [$@] complete. Finished rules: $+" +#DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." +COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) +DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." + + +# TODO: write a stub rule to print out the name of a rule when it +# *does* do something, and handle indentation intelligently. + +# Default sequence for "all" is: fetch checksum extract patch configure build +all: build + +# include the configuration file to override any of these variables +include $(GARDIR)/gar.conf.mk +include $(GARDIR)/gar.lib.mk + +# ========================= MODULATIONS ======================== + +# The default is to modulate over ISAs +MODULATORS ?= ISA $(EXTRA_MODULATORS) $(EXTRA_MODULATORS_$(GARCH)) +MODULATIONS_ISA = $(NEEDED_ISAS) + +tolower = $(shell echo $(1) | tr '[A-Z]' '[a-z]') +expand_modulator_1 = $(addprefix $(call tolower,$(1))-,$(MODULATIONS_$(1))) +# This expands to the list of all modulators with their respective modulations +modulations = $(if $(word 2,$(1)),\ + $(foreach P,$(call expand_modulator_1,$(firstword $(1))),\ + $(addprefix $(P)-,$(call modulations,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call expand_modulator_1,$(1))) + +MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) + +# _modulate(ISA STATIC,,,) +# -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) +# -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes) +# -> xxx-isa-i386-static-yes: @gmake xxx ISA=i386 STATIC=yes +# -> _modulate2(,,isa-i386-static-no,ISA STATIC,ISA=i386 STATIC=no) +# -> xxx-isa-i386-static-no: @gmake xxx ISA=i386 STATIC=no +# -> _modulate2(STATIC,isa-amd64,ISA,ISA=amd64) +# -> _modulate2(,,isa-amd64-static-yes,ISA STATIC,ISA=amd64 STATIC=yes) +# -> xxx-isa-amd64-static-yes: @gmake xxx ISA=amd64 STATIC=yes +# -> _modulate2(,,isa-amd64-static-no,ISA STATIC,ISA=amd64 STATIC=no) +# -> xxx-isa-amd64-static-no: @gmake xxx ISA=amd64 STATIC=no + +define _modulate_target +$(1)-$(2): + @$(MAKE) MODULATION=$(2) $(3) $(1)-modulated + @# This is MAKECOOKIE expanded to use the name of the rule explicily as the rule has + @# not been evaluated yet. XXX: Use function _MAKECOOKIE for both + @mkdir -p $(COOKIEDIR)/$(dir $(1)-$(2)) && date >> $(COOKIEDIR)/$(1)-$(2) + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + +define _modulate_target_nocookie +$(1)-$(2): + @$(MAKE) -s MODULATION=$(2) $(3) $(1)-modulated + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + +define _modulate_merge +$(foreach ASSIGNMENT,$(3), +merge-$(2): $(ASSIGNMENT) +) +merge-$(2): BUILDHOST=$$(call modulation2host) +merge-$(2): + @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" + $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ + ) + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + +define _modulate_do +$(call _modulate_target,extract,$(2),$(4)) +$(call _modulate_target,patch,$(2),$(4)) +$(call _modulate_target,configure,$(2),$(4)) +$(call _modulate_target_nocookie,reset-configure,$(2),$(4)) +$(call _modulate_target,build,$(2),$(4)) +$(call _modulate_target_nocookie,reset-build,$(2),$(4)) +$(call _modulate_target,test,$(2),$(4)) +$(call _modulate_target,install,$(2),$(4)) +$(call _modulate_target_nocookie,reset-install,$(2),$(4)) +#$(call _modulate_target,merge,$(2),$(4)) +$(call _modulate_merge,,$(2),$(4)) +$(call _modulate_target_nocookie,reset-merge,$(2),$(4)) +$(call _modulate_target_nocookie,clean,$(2),$(4)) +$(call _modulate_target_nocookie,_modenv,$(2),$(4)) +endef + +# This evaluates to the make rules for all modulations passed as first argument +# Usage: _modulate( ) +define _modulate +$(foreach M,$(MODULATIONS_$(firstword $(1))),\ + $(call _modulate2,\ + $(wordlist 2,$(words $(1)),$(1)),\ + $(call tolower,$(firstword $(1)))-$(M),\ + $(firstword $(1)),\ + $(firstword $(1))=$(M)\ + )\ +) +endef + +# This is a helper for the recursive _modulate +define _modulate2 +$(if $(strip $(1)),\ + $(foreach M,$(MODULATIONS_$(firstword $(1))),\ + $(call _modulate2,\ + $(wordlist 2,$(words $(1)),$(1)),\ + $(addprefix $(2)-,$(call tolower,$(firstword $(1)))-$(M)),\ + $(3) $(firstword $(1)),\ + $(4) $(firstword $(1))=$(M)\ + )\ + ),\ + $(call _modulate_do,,$(strip $(2)),$(3),$(4))\ +) +endef + +define _pmod + @echo "[ $1 for modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) ]" +endef + +$(eval $(call _modulate,$(MODULATORS))) + +#################### DIRECTORY MAKERS #################### + +# This is to make dirs as needed by the base rules +$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + ginstall -d $@; \ + echo "ginstall -d $@"; \ + fi + +# These stubs are wildcarded, so that the port maintainer can +# define something like "pre-configure" and it won't conflict, +# while the configure target can call "pre-configure" safely even +# if the port maintainer hasn't defined it. +# +# in addition to the pre- rules, the maintainer may wish +# to set a "pre-everything" rule, which runs before the first +# actual target. +pre-%: + @true + +post-%: + @true + +# Call any arbitrary rule recursively for all dependencies +deep-%: % + @for target in "" $(DEPEND_LIST) ; do \ + test -z "$$target" && continue ; \ + $(MAKE) -C ../../$$target DESTIMG=$(DESTIMG) $@ ; \ + done + @$(foreach IMG,$(filter-out $(DESTIMG),$(IMGDEPS)),for dep in "" $($(IMG)_DEPENDS); do test -z "$$dep" && continue ; $(MAKE) -C ../../$$dep DESTIMG=$(IMG) $@; done; ) + + +# ========================= MAIN RULES ========================= +# The main rules are the ones that the user can specify as a +# target on the "make" command-line. Currently, they are: +# prereq fetch-list fetch checksum makesum extract checkpatch patch +# build install reinstall uninstall package +# (some may not be complete yet). +# +# Each of these rules has dependencies that run in the following +# order: +# - run the previous main rule in the chain (e.g., install +# depends on build) +# - run the pre- rule for the target (e.g., configure would +# then run pre-configure) +# - generate a set of files to depend on. These are typically +# cookie files in $(COOKIEDIR), but in the case of fetch are +# actual downloaded files in $(DOWNLOADDIR) +# - run the post- rule for the target +# +# The main rules also run the $(DONADA) code, which prints out +# what just happened when all the dependencies are finished. + +announce: + @echo "[===== NOW BUILDING: $(DISTNAME) =====]" + +announce-modulation: + @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" + +# prerequisite - Make sure that the system is in a sane state for building the package +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) + +# Force to be called in global modulation +prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite) + $(DONADA) + +prerequisitepkg-%: + @echo " ==> Verifying for installed package $*: \c" + @(pkginfo -q $*; if [ $$? -eq 0 ]; then echo "installed"; else echo "MISSING"; exit 1; fi) + @$(MAKECOOKIE) + +# fetch-list - Show list of files that would be retrieved by fetch. +# NOTE: DOES NOT RUN pre-everything! +fetch-list: + @echo "Distribution files: " + @$(foreach F,$(DISTFILES),echo " $F";) + @echo "Patch files: " + @$(foreach P,$(PATCHFILES),echo " $P";) + @$(foreach M,$(MODULATIONS),$(if $(PATCHFILES_$M),echo " Modulation $M only: $(PATCHFILES_$M)";)) + @echo "Dynamically generated scripts: " + @$(foreach D,$(DYNSCRIPTS),echo " $D";) + @echo "Git Repos tracked: " + @$(foreach R,$(GIT_REPOS),echo " $R";) + +# fetch - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined) +# into $(DOWNLOADDIR) as necessary. +FETCH_TARGETS = $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) + +fetch: prerequisite pre-fetch $(FETCH_TARGETS) post-fetch + @$(DONADA) + +# returns true if fetch has completed successfully, false +# otherwise +fetch-p: + @$(foreach COOKIEFILE,$(FETCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# checksum - Use $(CHECKSUMFILE) to ensure that your +# distfiles are valid. +CHECKSUM_TARGETS = $(addprefix checksum-,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) + +checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum + @$(DONADA) + +checksum-global: $(if $(filter global,$(MODULATION)),checksum) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global checksum) + @$(DONADA) + +# The next rule handles the dependency from the modulated context to +# the contextless checksumming. The rule is called when the cookie +# to the global checksum is requested. If the global checksum has not run, +# then run it. Otherwise it is silently accepted. +checksum-modulated: checksum-global + @$(DONADA) + +# returns true if checksum has completed successfully, false +# otherwise +checksum-p: + @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# makesum - Generate distinfo (only do this for your own ports!). +MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) + +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) + @if test "x$(MAKESUM_TARGETS)" != "x "; then \ + (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ + echo "Checksums made for $(MAKESUM_TARGETS)" ; \ + cat $(CHECKSUM_FILE) ; \ + fi + +# I am always typing this by mistake +makesums: makesum + +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) + +garchive: checksum $(GARCHIVE_TARGETS) ; + +# extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) +EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) + +# We call an additional extract-modulated without resetting any variables so +# a complete unpacked set goes to the global dir for packaging (like gspec) +extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract + @$(DONADA) + +extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) + $(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global extract) + @$(MAKECOOKIE) + +extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ + $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ + announce-modulation \ + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated + @$(DONADA) + +# returns true if extract has completed successfully, false +# otherwise +extract-p: + @$(foreach COOKIEFILE,$(EXTRACT_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# checkpatch - Do a "patch -C" instead of a "patch". Note +# that it may give incorrect results if multiple +# patches deal with the same file. +# TODO: actually write it! +checkpatch: extract + @echo "$@ NOT IMPLEMENTED YET" + +# patch - Apply any provided patches to the source. +PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) + +patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch + @$(DONADA) + +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated + @$(DONADA) + +# returns true if patch has completed successfully, false +# otherwise +patch-p: + @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) + +# makepatch - Grab the upstream source and diff against $(WORKSRC). Since +# diff returns 1 if there are differences, we remove the patch +# file on "success". Goofy diff. +makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff + $(DONADA) + +# XXX: Allow patching of pristine sources separate from ISA directories +# XXX: Use makepatch on global/ + +# this takes the changes you've made to a working directory, +# distills them to a patch, updates the checksum file, and tries +# out the build (assuming you've listed the gar-base.diff in your +# PATCHFILES). This is way undocumented. -NickM +beaujolais: makepatch makesum clean build + $(DONADA) + +update: makesum garchive clean + +# configure - Runs either GNU configure, one or more local +# configure scripts or nothing, depending on +# what's available. @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 18 19:35:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Oct 2009 17:35:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6895] csw/mgar/gar/v2-collapsed-modulations/gar.mk Message-ID: Revision: 6895 http://gar.svn.sourceforge.net/gar/?rev=6895&view=rev Author: dmichelsen Date: 2009-10-18 17:35:15 +0000 (Sun, 18 Oct 2009) Log Message: ----------- mGAR v2-collapsed-modulations: ISA collapsing Modified Paths: -------------- csw/mgar/gar/v2-collapsed-modulations/gar.mk Modified: csw/mgar/gar/v2-collapsed-modulations/gar.mk =================================================================== --- csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:29:04 UTC (rev 6894) +++ csw/mgar/gar/v2-collapsed-modulations/gar.mk 2009-10-18 17:35:15 UTC (rev 6895) @@ -191,6 +191,48 @@ $(eval $(call _modulate,$(MODULATORS))) +# --- This next block allows you to use collapsed ISAs in modulations +# isa-default-... instead of isa-sparcv8-... and isa-i386-... +# isa-default64-... instead of isa-sparcv9-... and isa-amd64-... +# isa-extra-... instead of any other ISA (if default64 is undefined it falls back to 'extra') + +__collapsedisa = $(strip $(or $(and $(filter $(ISA_DEFAULT_sparc) $(ISA_DEFAULT_i386),$(1)),default),\ + $(and $(filter $(ISA_DEFAULT64_sparc) $(ISA_DEFAULT64_i386),$(1)),default64),\ + extra)) + +__collapsedisa64 = default64 +__collapsedisaextra = extra + +__isacollapsedmodulation_1 = $(call tolower,$(1))-$(if $(filter ISA,$(1)),$(call $(2),$(ISA)),$($(1))) +__isacollapsedmodulation = $(if $(word 2,$(1)),\ + $(foreach P,$(call __isacollapsedmodulation_1,$(firstword $(1)),$(2)),\ + $(addprefix $(P)-,$(call __isacollapsedmodulation,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call __isacollapsedmodulation_1,$(1),$(2))) + +# This is the name of the current modulation but with the ISA i386, sparcv8 and amd64, sparcv9 replaced +# with the collapsed name 'default', 'default64' and everything else as 'extra'. +MODULATION_ISACOLLAPSED = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)) + +# This is the name of the current modulation but with the ISA replaced with 'default64' +MODULATION_ISACOLLAPSED64 = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa64)) + +# This is the name of the current modulation but with the ISA replaced with 'extra' +MODULATION_ISACOLLAPSEDEXTRA = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra)) + +# $(warning Mod: $(MODULATION) ISA: $(ISA) coll: $(MODULATION_ISACOLLAPSED) 64: $(MODULATION_ISACOLLAPSED64) extra: $(MODULATION_ISACOLLAPSEDEXTRA)) + +# Call this function to get either the modulation-specific value or the default. +# Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) +define modulationvalue +$(strip $(or $($(1)_$(MODULATION)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ +)) +endef + +# --- end of collapsed ISA modulations + #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules @@ -552,10 +594,15 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) +MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) +MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) + +MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-extra ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif # These directories get relocated into their ISA subdirectories This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 18 20:00:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 18:00:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6896] csw/mgar/pkg Message-ID: Revision: 6896 http://gar.svn.sourceforge.net/gar/?rev=6896&view=rev Author: wahwah Date: 2009-10-18 18:00:53 +0000 (Sun, 18 Oct 2009) Log Message: ----------- shunit2: Initial commit Modified Paths: -------------- csw/mgar/pkg/shunit2/trunk/Makefile csw/mgar/pkg/shunit2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/shunit2/ csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch Modified: csw/mgar/pkg/shunit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/shunit2/trunk/Makefile 2009-10-18 18:00:53 UTC (rev 6896) @@ -2,181 +2,38 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = shunit2 +GARVERSION = 2.1.5 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = a xUnit unit test framework for Bourne based shell scripts define BLURB - + + shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and it + is designed to work in a similar manner to JUnit, PyUnit, etc. If you have + ever had the desire to write a unit test for a shell script, shUnit2 can do + the job. + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://code.google.com/p/shunit2/ +MASTER_SITES = $(GOOGLE_MIRROR) +PATCHFILES = 0001-fix-shlib-path-in-docbookPrep.sh.patch +PATCHFILES += 0002-abspath-instead-of-PWD.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = shunit2 +INSTALL_SCRIPTS = shunit2 +TEST_SCRIPTS = +include gar/category.mk -#include gar/category.mk +build-shunit2: + (cd $(WORKSRC) && $(BUILD_ENV) gmake) + @$(MAKECOOKIE) + +install-shunit2: + ginstall -m 755 -d $(DESTDIR)$(libdir)/shunit2 + ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/shunit2 + ginstall -m 644 $(WORKSRC)/build/shunit2 $(DESTDIR)$(libdir)/shunit2 + ginstall -m 644 $(WORKSRC)/build/shunit2.html $(DESTDIR)$(datadir)/doc/shunit2 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/shunit2/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-24 17:03:41 UTC (rev 6443) +++ csw/mgar/pkg/shunit2/trunk/checksums 2009-10-18 18:00:53 UTC (rev 6896) @@ -0,0 +1,3 @@ +b35832f18a1557c0f5d4b58dcc2c32d3 download/0001-fix-shlib-path-in-docbookPrep.sh.patch +3d422c3b03478a37280e08d98a7c14aa download/0002-abspath-instead-of-PWD.patch +f434f0095f7ca9a698ade330feae356a download/shunit2-2.1.5.tgz Added: csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch =================================================================== --- csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch (rev 0) +++ csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch 2009-10-18 18:00:53 UTC (rev 6896) @@ -0,0 +1,25 @@ +From ed54daa547e0bc6c3b69bd45c565b58142ccd49e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 18 Oct 2009 19:10:42 +0200 +Subject: [PATCH] fix shlib path in docbookPrep.sh + +--- + bin/docbookPrep.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bin/docbookPrep.sh b/bin/docbookPrep.sh +index ab3172a..0d46ba9 100755 +--- a/bin/docbookPrep.sh ++++ b/bin/docbookPrep.sh +@@ -21,7 +21,7 @@ MY_BASE=`basename "$0"` + MY_DIR=`dirname "$0"` + + # load shlib +-. "${MY_DIR}/../lib/sh/shlib" ++. "${MY_DIR}/../lib/shlib" + + BASE_DIR=`shlib_relToAbsPath "${MY_DIR}/.."` + DL_DIR="${BASE_DIR}/tmp" +-- +1.6.3.2 + Added: csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch =================================================================== --- csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch (rev 0) +++ csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch 2009-10-18 18:00:53 UTC (rev 6896) @@ -0,0 +1,37 @@ +From 5a5f760453cec85e4f3f1c6d19448c4e16020fdd Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 18 Oct 2009 19:56:54 +0200 +Subject: [PATCH] abspath instead of PWD + +--- + Makefile | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 080ba0c..0b88336 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,13 +9,13 @@ + + PROG=shunit2 + +-BIN_DIR=$(PWD)/bin +-BUILD_DIR=$(PWD)/build +-DIST_DIR=$(PWD)/dist +-LIB_DIR=$(PWD)/lib +-SHARE_DIR=$(PWD)/share +-SRC_DIR=$(PWD)/src +-TMP_DIR=$(PWD)/tmp ++BIN_DIR=$(abspath bin) ++BUILD_DIR=$(abspath build) ++DIST_DIR=$(abspath dist) ++LIB_DIR=$(abspath lib) ++SHARE_DIR=$(abspath share) ++SRC_DIR=$(abspath src) ++TMP_DIR=$(abspath tmp) + + DOCBOOK_BUILD_DIR=$(BUILD_DIR)/docbook + DOCBOOK_SHARE_DIR=$(SHARE_DIR)/docbook +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 18 21:53:50 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Oct 2009 19:53:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6897] csw/mgar/pkg/snort/trunk Message-ID: Revision: 6897 http://gar.svn.sourceforge.net/gar/?rev=6897&view=rev Author: bonivart Date: 2009-10-18 19:53:49 +0000 (Sun, 18 Oct 2009) Log Message: ----------- snort: update to 2.8.5, initial commit Modified Paths: -------------- csw/mgar/pkg/snort/trunk/Makefile csw/mgar/pkg/snort/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/snort/trunk/files/CSWsnort.depend csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec Property Changed: ---------------- csw/mgar/pkg/snort/trunk/ Property changes on: csw/mgar/pkg/snort/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,36 +1,53 @@ GARNAME = snort -GARVERSION = 2.6.0.2 +GARVERSION = 2.8.5 CATEGORIES = net DESCRIPTION = The open source Network Intrusion Detection System define BLURB -Snort\xAE is an open source network intrusion prevention and detection system utilizing a rule-driven language, which combines the benefits of signature, protocol and anomaly based inspection methods. With millions of downloads to date, Snort is the most widely deployed intrusion detection and prevention technology worldwide and has become the de facto standard for the industry. + Snort is an open source network intrusion prevention and detection + system utilizing a rule-driven language, which combines the benefits + of signature, protocol and anomaly based inspection methods. With + millions of downloads to date, Snort is the most widely deployed + intrusion detection and prevention technology worldwide and has + become the de facto standard for the industry. endef -MASTER_SITES = http://www.snort.org/dl/current/ +MASTER_SITES = http://dl.snort.org/snort-current/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsnort, depend ) +#DISTFILES += $(call admfiles,CSWsnort, depend ) +#LICENSE = COPYRIGHT + +#PACKAGES = +#CATALOGNAME_CSWx = + +#ARCHALL_CSWx = 1 + +#SPKG_DESC_CSWx = + +REQUIRED_PKGS = CSWpcre CSWlibpcap +#REQUIRED_PKGS += CSWcswclassutils CSWosslrt CSWmysql4rt CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin -TEST_SCRIPTS = +#TEST_SCRIPTS = include gar/category.mk -pre-install: - ( mkdir -p $(DESTDIR)/opt/csw/etc ) - ( cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW ) - ( cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map ) - ( cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map ) - ( cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map ) - ( cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config ) - ( cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config ) - ( cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators ) - @$(MAKECOOKIE) +#pre-install: +# ( mkdir -p $(DESTDIR)/opt/csw/etc ) +# ( cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW ) +# ( cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map ) +# ( cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map ) +# ( cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map ) +# ( cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config ) +# ( cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config ) +# ( cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators ) +# @$(MAKECOOKIE) -post-install: - ( rm -rf $(DESTDIR)/opt/csw/src ) +#post-install: +# ( rm -rf $(DESTDIR)/opt/csw/src ) Modified: csw/mgar/pkg/snort/trunk/checksums =================================================================== --- csw/mgar/pkg/snort/trunk/checksums 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/checksums 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,3 +1 @@ -5c094ff6d82db845a5f023e4a492103e download/snort-2.6.0.2.tar.gz -63d72583684146784d0aea8cb95c5686 download/CSWsnort.gspec -32c1aa45549083163a276d8cd37abcad download/CSWsnort.depend +165c38eaf7eaf95423e44e14a0738810 snort-2.8.5.tar.gz Deleted: csw/mgar/pkg/snort/trunk/files/CSWsnort.depend =================================================================== --- csw/mgar/pkg/snort/trunk/files/CSWsnort.depend 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/files/CSWsnort.depend 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,2 +0,0 @@ -P CSWlibpcap -P CSWpcre Deleted: csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec =================================================================== --- csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec 2009-10-18 18:00:53 UTC (rev 6896) +++ csw/mgar/pkg/snort/trunk/files/CSWsnort.gspec 2009-10-18 19:53:49 UTC (rev 6897) @@ -1,4 +0,0 @@ -%var bitname snort -%var pkgname CSWsnort -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 00:20:06 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Oct 2009 22:20:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6898] csw/mgar/pkg/snort/trunk/Makefile Message-ID: Revision: 6898 http://gar.svn.sourceforge.net/gar/?rev=6898&view=rev Author: bonivart Date: 2009-10-18 22:20:05 +0000 (Sun, 18 Oct 2009) Log Message: ----------- snort: now it builds with gcc4 Modified Paths: -------------- csw/mgar/pkg/snort/trunk/Makefile Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 19:53:49 UTC (rev 6897) +++ csw/mgar/pkg/snort/trunk/Makefile 2009-10-18 22:20:05 UTC (rev 6898) @@ -14,40 +14,37 @@ MASTER_SITES = http://dl.snort.org/snort-current/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWsnort, depend ) -#LICENSE = COPYRIGHT - #PACKAGES = #CATALOGNAME_CSWx = - +#SPKG_DESC_CSWx = #ARCHALL_CSWx = 1 -#SPKG_DESC_CSWx = - -REQUIRED_PKGS = CSWpcre CSWlibpcap +REQUIRED_PKGS = CSWpcrert CSWlibpcap CSWgcc4corert #REQUIRED_PKGS += CSWcswclassutils CSWosslrt CSWmysql4rt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin -#TEST_SCRIPTS = +TEST_TARGET = check include gar/category.mk -#pre-install: -# ( mkdir -p $(DESTDIR)/opt/csw/etc ) -# ( cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW ) -# ( cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map ) -# ( cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map ) -# ( cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map ) -# ( cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config ) -# ( cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config ) -# ( cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators ) -# @$(MAKECOOKIE) +post-install-modulated: + @mkdir -p $(DESTDIR)/opt/csw/etc + @cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW + @cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map + @cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map + @cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map + @cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config + @cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config +# @cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators + @$(MAKECOOKIE) #post-install: # ( rm -rf $(DESTDIR)/opt/csw/src ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 00:56:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 22:56:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6899] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6899 http://gar.svn.sourceforge.net/gar/?rev=6899&view=rev Author: wahwah Date: 2009-10-18 22:56:27 +0000 (Sun, 18 Oct 2009) Log Message: ----------- cswclassutils: adding cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-18 22:20:05 UTC (rev 6898) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-18 22:56:27 UTC (rev 6899) @@ -1,10 +1,12 @@ +# $Id$ + GARNAME = cswclassutils -GARVERSION = 1.23 +GARVERSION = 1.24 CATEGORIES = utils DESCRIPTION = CSW class action utilities -MASTER_SITES = +MASTER_SITES = DISTFILES = COPYING ARCHALL = 1 @@ -16,7 +18,9 @@ SPKG_SOURCEURL = http://www.opencsw.org -CASLIST = $(foreach F,$(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +CASFILES = $(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*) +CASLIST = $(foreach F,$(CASFILES), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +DISTFILES += $(subst $(FILEDIR)/,,$(CASFILES)) PROTOTYPE_FILTER = sed -e '/^d.*\/usr/d; /scripts/{ s/bin/sys/; }' Property changes on: csw/mgar/pkg/cswclassutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 22:20:05 UTC (rev 6898) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 22:56:27 UTC (rev 6899) @@ -1 +1,17 @@ -48a97af56d55bc90ce90303228ed8cc3 download/COPYING +48a97af56d55bc90ce90303228ed8cc3 COPYING +9f7a2603bf91ea53e70f2fe5c4a56726 CSWcswclassutils.i.cswcpsampleconf +56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices +a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd +fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf +e9c9cafdd37be6f96797740711aee85c CSWcswclassutils.i.cswmigrateconf +9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf +4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile +7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup +4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf +d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices +9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd +791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf +add04169c99570731d8766ac5c38b771 CSWcswclassutils.r.cswmigrateconf +a473d9cf739a6a33ac3a7306eb4a522c CSWcswclassutils.r.cswpreserveconf +02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile +752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup Copied: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf (from rev 5733, csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf) =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-18 22:56:27 UTC (rev 6899) @@ -0,0 +1,250 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# (c) 2009 Maciej Blizinski +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# +# http://wiki.opencsw.org/configuration-directory-migration + +# To prevent issues with a-z in regular expressions +unset LC_ALL +LANG=C + +# Print errors when trying to read from an unset variable. +set -u + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +return_code=0 + +migration_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. + +For more information, please see +http://wiki.opencsw.org/configuration-directory-migration +" +readonly migration_info +deprecated_file_ext="README.migration" +readonly deprecated_file_ext + +# Create /etc/opt/csw/cswclassutils.DEBUG to enable debugging of this script +if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then + DEBUG=1 +else + DEBUG= +fi + +give_a_chance_to_stop() { + echo + echo "*******************************************************************" + echo "* Configuration files are going to be migrated from the deprecated " + echo "* location (/opt/csw/etc) to the new location (/etc/opt/csw). " + echo "* " + echo "* Migration will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + for i in 10 9 8 7 6 5 4 3 2 1; do + printf "$i " + sleep 1 + done + echo "0." +} + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${migration_info}" > "$1.${deprecated_file_ext}" +} + +sanitize() { + echo "$1" | sed -e 's/[^a-zA-Z0-9]/_/g' +} + +expand_modifiers() { + # Emulating local variables + __per_file_variable="$1" + __per_file_modifier_value="$2" + eval echo `echo \\${${__per_file_variable}_${__per_file_modifier_value}:-}` +} + +place_signpost_for() { + __file_name="$1" + echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" +} + +debug() { + [ "${DEBUG}" ] & echo "$@" +} + +should_copy_archived_file() { + __archived_file_name="$1" + __dest_file_name="$2" + __do_copy=0 + __do_not_copy=1 + debug "should_copy_archived_file(${__archived_file_name}, ${__dest_file_name})" + if [ ! -r "${__archived_file_name}" ]; then + debug "No archived file or directory at ${__archived_file_name}" + return "${__do_not_copy}" + else + debug "Archived version found in ${__archived_file_name}" + fi + + if [ ! -r "${__dest_file_name}" -a ! -h "${__dest_file_name}" ]; then + debug "Destination file ${__dest_file_name} not readable and not a symlink." + return "${__do_copy}" + else + debug "Destination file ${__dest_file_name} is readable or a symlink." + fi + + if [ -h "${__dest_file_name}" ]; then # symlink + debug "${__dest_file_name} is a symlink" + debug `ls -l "${__dest_file_name}"` + # Okay, it's a symlink, but is it a dangling symlink? + if [ -r "${__dest_file_name}" ]; then + debug "Symlink is readable" + return "${__do_not_copy}" + else + debug "Symlink not readable. Can delete." + return "${__do_copy}" + fi + fi # end symlink + + # If there's a sample configuration file, remove the copied one. + __sample_conf="${__dest_file_name}.CSW" + if [ -r "${__sample_conf}" ]; then + if files_are_identical "${__sample_conf}" "${__dest_file_name}"; then + return "${__do_copy}" + else + return "${__do_not_copy}" + fi + fi + # If there's no sample configuration and the destination file exists, it + # shouldn't be overwritten. + return "${__do_not_copy}" +} + +is_dangling_symlink() { + [ -h "$1" -a ! -r "$1" ] +} + +run_already=0 + +while read confsrc confdst ; do + # We're not sure if the files to be migrated have already been copied or not. + + cp "$confsrc" "$confdst" + # Sourcing the file, it should contain the configuration. + if [ -r "$confsrc" ]; then + debug "Sourcing ${confsrc}" + . "$confsrc" + else + echo "${confsrc} is missing" + exit 1 + fi + + if [ -z "${MIGRATE_FILES}" ]; then + echo "ERROR! \$MIGRATE_FILES variable is empty." + exit 1 + fi + + if [ "${run_already}" -ne 0 ]; then + echo "ERROR! You can only use one configuration file." + exit 1 + else + run_already=1 + fi + + # The defaults, if not set already by the script. + SOURCE_DIR___default__="${SOURCE_DIR___default__:-opt/csw/etc}" + readonly SOURCE_DIR___default__ + ARCH_DIR___default__="${ARCH_DIR___default__:-opt/csw/etc/migration-archive}" + readonly ARCH_DIR___default__ + DEST_DIR___default__="${DEST_DIR___default__:-etc/opt/csw}" + readonly DEST_DIR___default__ + + for file_name in ${MIGRATE_FILES}; do + modifier_value=`sanitize "${file_name}"` + debug "Processing file: ${file_name}" + debug "modifier_value: ${modifier_value}" + + # Perhaps the following three segments of code could be turned into + # a function, but it would require complicated eval calls. + per_file_srcdir=`expand_modifiers SOURCE_DIR ${modifier_value}` + default_srcdir=`expand_modifiers SOURCE_DIR __default__` + srcdir="${per_file_srcdir:-${default_srcdir}}" + per_file_dstdir=`expand_modifiers DEST_DIR ${modifier_value}` + default_dstdir=`expand_modifiers DEST_DIR __default__` + dstdir="${per_file_dstdir:-${default_dstdir}}" + per_file_archdir=`expand_modifiers ARCH_DIR ${modifier_value}` + default_archdir=`expand_modifiers ARCH_DIR __default__` + archdir="${per_file_archdir:-${default_archdir}}" + srcpath="${PKG_INSTALL_ROOT}${srcdir}/${file_name}" + dstpath="${PKG_INSTALL_ROOT}${dstdir}/${file_name}" + archpath="${PKG_INSTALL_ROOT}${archdir}/${file_name}" + + # Make sure we have the environment we expect + if [ ! -d "${archdir}" ] + then + debug "Creating ${archdir}" + mkdir -m 755 -p "${archdir}" + if [ $? -ne 0 ] + then + echo "ERROR: Couldn't create '${archdir}', bailing out." + exit 1 + fi + fi + + # All variables are set, the main algorithm goes here. + + # Moving the file will only work in the global zone. The assumption is that + # the postinstall script is going to be run in the global zone first; by the + # time it gets to the non-global zones, the ${srcpath} will have been + # moved already. + if [ -r "${srcpath}" ] + then + place_signpost_for "${srcpath}" + debug "Moving '${srcpath}' to '${archpath}'" + mv "${srcpath}" "${archpath}" + if [ -r "${srcpath}" ]; then + echo "WARNING: '${srcpath}' still exists" + fi + fi + + # If the destination file is not there and the archived file is, copy it over. + if should_copy_archived_file "${archpath}" "${dstpath}"; then + echo "Copying '${archpath}' to '${dstpath}'" + + # Is it a dangling symlink? + if is_dangling_symlink "${dstpath}"; then + debug "Removing dangling symlink: '${dstpath}'" + rm "${dstpath}" + fi + + # Directories are copied in whole + if [ -d "${archpath}" ]; then + debug "(cd ${archpath}/..; tar cf - `basename ${archpath}` \ +| ( mkdir ${dstpath}; cd ${dstpath}; cd ..; tar xf -))" + (cd ${archpath}/..; tar cf - `basename ${archpath}` \ + | ( mkdir ${dstpath}; cd ${dstpath}; cd ..; tar xf -) \ + ) + elif [ -f "${archpath}" ]; then + debug cp "${archpath}" "${dstpath}" + cp "${archpath}" "${dstpath}" + else + echo "WARNING: ${archpath} is neither a file or directory." + fi + else + debug "Not copying '${archpath}' to '${dstpath}'." + fi + done +done + +exit "${return_code}" Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf 2009-10-18 22:56:27 UTC (rev 6899) @@ -0,0 +1,8 @@ +#!/bin/sh +# +# $Id$ + +while read dest ; do + echo "Removing $dest" + rm $dest +done Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswmigrateconf ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 01:12:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 23:12:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6900] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6900 http://gar.svn.sourceforge.net/gar/?rev=6900&view=rev Author: wahwah Date: 2009-10-18 23:12:05 +0000 (Sun, 18 Oct 2009) Log Message: ----------- cswclassutils: updating checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 22:56:27 UTC (rev 6899) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 23:12:05 UTC (rev 6900) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -e9c9cafdd37be6f96797740711aee85c CSWcswclassutils.i.cswmigrateconf +3e0582eaf6b75c5e79c50a805acac8cb CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup @@ -11,7 +11,7 @@ d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf -add04169c99570731d8766ac5c38b771 CSWcswclassutils.r.cswmigrateconf +f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf a473d9cf739a6a33ac3a7306eb4a522c CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 01:18:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Oct 2009 23:18:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6901] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6901 http://gar.svn.sourceforge.net/gar/?rev=6901&view=rev Author: wahwah Date: 2009-10-18 23:18:21 +0000 (Sun, 18 Oct 2009) Log Message: ----------- cswclassutils: updating checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 23:12:05 UTC (rev 6900) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-18 23:18:21 UTC (rev 6901) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -3e0582eaf6b75c5e79c50a805acac8cb CSWcswclassutils.i.cswmigrateconf +bf517d6a2e43dbd894725b9701d15cf2 CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 19 01:24:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Oct 2009 23:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6902] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6902 http://gar.svn.sourceforge.net/gar/?rev=6902&view=rev Author: bdwalton Date: 2009-10-18 23:24:00 +0000 (Sun, 18 Oct 2009) Log Message: ----------- git: add CSWpmnetsmtpssl dep (previous addition killed mistakenly) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-18 23:18:21 UTC (rev 6901) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-18 23:24:00 UTC (rev 6902) @@ -33,7 +33,7 @@ REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror -REQUIRED_PKGS_CSWgit += CSWpmtermreadkey +REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl REQUIRED_PKGS_CSWgitk = CSWgit CSWtk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 09:47:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 07:47:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6903] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswmigrateconf Message-ID: Revision: 6903 http://gar.svn.sourceforge.net/gar/?rev=6903&view=rev Author: wahwah Date: 2009-10-19 07:47:57 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswmigrateconf: Fixed a bug in which the debug messages would always get printed, added 'give a chance to stop', made PKG_INSTALL_ROOT read only Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-18 23:24:00 UTC (rev 6902) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-19 07:47:57 UTC (rev 6903) @@ -15,6 +15,7 @@ set -u PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} +readonly PKG_INSTALL_ROOT return_code=0 @@ -36,7 +37,7 @@ if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then DEBUG=1 else - DEBUG= + DEBUG=0 fi give_a_chance_to_stop() { @@ -81,7 +82,7 @@ } debug() { - [ "${DEBUG}" ] & echo "$@" + [ "${DEBUG}" = "1" ] && echo "$@" } should_copy_archived_file() { @@ -141,6 +142,10 @@ # We're not sure if the files to be migrated have already been copied or not. cp "$confsrc" "$confdst" + + cat "${confdst}" + give_a_chance_to_stop + # Sourcing the file, it should contain the configuration. if [ -r "$confsrc" ]; then debug "Sourcing ${confsrc}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 09:49:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 07:49:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6904] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6904 http://gar.svn.sourceforge.net/gar/?rev=6904&view=rev Author: wahwah Date: 2009-10-19 07:49:31 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswmigrateconf: updating the checksum (Note that because of the use of the $Id$ tag, updating the checksum needs to be a separate step now) Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 07:47:57 UTC (rev 6903) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 07:49:31 UTC (rev 6904) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -bf517d6a2e43dbd894725b9701d15cf2 CSWcswclassutils.i.cswmigrateconf +2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 11:09:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 09:09:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6905] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6905 http://gar.svn.sourceforge.net/gar/?rev=6905&view=rev Author: wahwah Date: 2009-10-19 09:09:44 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswutils: better error reporting in submitpkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-19 07:49:31 UTC (rev 6904) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-10-19 09:09:44 UTC (rev 6905) @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 90 +SVN_REV = 93 MASTER_SITES = SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-10-19 07:49:31 UTC (rev 6904) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-10-19 09:09:44 UTC (rev 6905) @@ -1,11 +1,11 @@ 091b12575ebc0e45cf8c3d8b43d8b638 COPYING 30b6598a4453e3ce0c1fabeede5eb5f8 checkpkg 6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r90 +24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r93 9a637f6546cc50974159a987302d91c0 cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 createpkg a605598f30195f9ab1b29fc3944d3b31 createpkg.8 -a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r90 +a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r93 cd4496ee27bf86d5c8bc656c9c5974be stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 -989839890af2cbdc13e6bb37f3b95ba6 submit_to_newpkgs.py-r90 +3b102386ad1d2086dbe8f3be9d173fda submit_to_newpkgs.py-r93 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 11:11:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 09:11:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6906] csw/mgar/pkg/cswutils/Makefile Message-ID: Revision: 6906 http://gar.svn.sourceforge.net/gar/?rev=6906&view=rev Author: wahwah Date: 2009-10-19 09:10:59 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswutils: adding package-level Makefile Added Paths: ----------- csw/mgar/pkg/cswutils/Makefile Added: csw/mgar/pkg/cswutils/Makefile =================================================================== --- csw/mgar/pkg/cswutils/Makefile (rev 0) +++ csw/mgar/pkg/cswutils/Makefile 2009-10-19 09:10:59 UTC (rev 6906) @@ -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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 13:04:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 19 Oct 2009 11:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6907] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6907 http://gar.svn.sourceforge.net/gar/?rev=6907&view=rev Author: bonivart Date: 2009-10-19 11:04:41 +0000 (Mon, 19 Oct 2009) Log Message: ----------- pkgutil: version 1.8 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-19 09:10:59 UTC (rev 6906) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-19 11:04:41 UTC (rev 6907) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.7 +GARVERSION = 1.8b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -24,7 +24,10 @@ PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* +PKGFILES_CSWpkgutilplus += .*pkgutilplus.* +ARCHALL_CSWpkgutilplus = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).zip @@ -57,6 +60,7 @@ @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ # @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-19 09:10:59 UTC (rev 6906) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-19 11:04:41 UTC (rev 6907) @@ -1,5 +1,5 @@ -a16c6f81bc537d6172fd65d8da1aeecc download/CSWpkgutil.gspec -e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall -2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove -951b11e347d6f3f49cc8617ecab4ad62 download/CSWpkgutil.prototype -11c02a77d18f1fc11f23679b1b06efa8 download/pkgutil-1.7.zip +a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec +e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall +2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove +951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype +55ebb20ac1a91cc6663c3fc11005c3ef pkgutil-1.8b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 19 15:02:00 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 19 Oct 2009 13:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6908] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 6908 http://gar.svn.sourceforge.net/gar/?rev=6908&view=rev Author: chninkel Date: 2009-10-19 13:02:00 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cyrus_imapd: added missing smf manifest Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-19 11:04:41 UTC (rev 6907) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-10-19 13:02:00 UTC (rev 6908) @@ -1,6 +1,6 @@ 585646739e9403c02e868900ebed892a CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall -219ba1dc6ec1593132019389064eeeff CSWcyrusimapd.prototype +940d00efcc42b92f05e92e6dd2764f61 CSWcyrusimapd.prototype 7e99e825a1d6b134b91392beec1807f4 CSWcyrusimapdutils.prototype 404a6d2b6608c26aaef4e37095200105 CSWpmcyrus.prototype d0b97b33e75ac75f89ee6236a2d53f05 README.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-19 11:04:41 UTC (rev 6907) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2009-10-19 13:02:00 UTC (rev 6908) @@ -4,6 +4,7 @@ d none /opt/csw/etc/cyrus 0755 root bin d none /opt/csw/etc/pkg/CSWcyrusimapd 0755 root bin f cswinitsmf /etc/opt/csw/init.d/cswcyrus 0755 root bin +f none /var/opt/csw/svc/manifest/network/cswcyrus.xml 0644 root sys f preserveconf /opt/csw/etc/cyrus/imapd.conf.CSW 0640 root mail f preserveconf /opt/csw/etc/cyrus/cyrus.conf.CSW 0640 root mail d none /opt/csw/var/cyrus 0755 cyrus mail This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 15:20:28 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 19 Oct 2009 13:20:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6909] csw/mgar/pkg Message-ID: Revision: 6909 http://gar.svn.sourceforge.net/gar/?rev=6909&view=rev Author: bonivart Date: 2009-10-19 13:20:28 +0000 (Mon, 19 Oct 2009) Log Message: ----------- oinkmaster: initial commit Added Paths: ----------- csw/mgar/pkg/oinkmaster/ csw/mgar/pkg/oinkmaster/branches/ csw/mgar/pkg/oinkmaster/tags/ csw/mgar/pkg/oinkmaster/trunk/ csw/mgar/pkg/oinkmaster/trunk/Makefile csw/mgar/pkg/oinkmaster/trunk/checksums csw/mgar/pkg/oinkmaster/trunk/files/ csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff Property changes on: csw/mgar/pkg/oinkmaster/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/oinkmaster/trunk/Makefile =================================================================== --- csw/mgar/pkg/oinkmaster/trunk/Makefile (rev 0) +++ csw/mgar/pkg/oinkmaster/trunk/Makefile 2009-10-19 13:20:28 UTC (rev 6909) @@ -0,0 +1,45 @@ +GARNAME = oinkmaster +GARVERSION = 2.0 +CATEGORIES = utils + +DESCRIPTION = Update and manage Snort rules +define BLURB + Update and manage Snort rules +endef + +MASTER_SITES += $(SF_MIRRORS) +SF_PROJ = oinkmaster +DISTFILES += $(GARNAME)-$(GARVERSION).tar.gz + +LICENSE = LICENSE + +REQUIRED_PKGS = CSWperl CSWwget +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PATCHFILES = patch-oinkmaster.pl.diff + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SAMPLECONF = /etc/opt/csw/oinkmaster.conf + +include gar/category.mk + +DOCLIST = ChangeLog FAQ INSTALL README README.gui README.templates UPGRADING template-examples.conf + +install-custom: + @echo "Installing $(GARNAME) (custom)" + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw + @ginstall -m 644 $(WORKSRC)/oinkmaster.conf $(DESTDIR)/etc/opt/csw + @ginstall -d -m 755 $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKSRC)/oinkmaster.pl $(DESTDIR)$(bindir) + @ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 + @ginstall -m 644 $(WORKSRC)/oinkmaster.1 $(DESTDIR)$(mandir)/man1 + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),ginstall -m 644 $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + $(MAKECOOKIE) Added: csw/mgar/pkg/oinkmaster/trunk/checksums =================================================================== --- csw/mgar/pkg/oinkmaster/trunk/checksums (rev 0) +++ csw/mgar/pkg/oinkmaster/trunk/checksums 2009-10-19 13:20:28 UTC (rev 6909) @@ -0,0 +1,2 @@ +d2a1b56f51cf40e919c63206ca4ec8f8 oinkmaster-2.0.tar.gz +bc490f53e3f43bd751b871d043494e4f patch-oinkmaster.pl.diff Added: csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff =================================================================== --- csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff (rev 0) +++ csw/mgar/pkg/oinkmaster/trunk/files/patch-oinkmaster.pl.diff 2009-10-19 13:20:28 UTC (rev 6909) @@ -0,0 +1,8 @@ +--- /oinkmaster.pl 2009-10-19 14:43:55.515734169 +0200 ++++ /oinkmaster.pl 2009-10-19 14:44:05.592041663 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + # $Id: oinkmaster.pl,v 1.406 2006/02/10 13:02:44 andreas_o Exp $ # + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 19 16:03:59 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Oct 2009 14:03:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6910] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6910 http://gar.svn.sourceforge.net/gar/?rev=6910&view=rev Author: bdwalton Date: 2009-10-19 14:03:35 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswclassutils: add /var/opt/csw/cswclassutils for use by class action scripts; use this directory from cswpycompile for the temp python code generated Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 13:20:28 UTC (rev 6909) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 14:03:35 UTC (rev 6910) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.24 +GARVERSION = 1.25 CATEGORIES = utils DESCRIPTION = CSW class action utilities @@ -34,6 +34,7 @@ @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/manifest @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method + @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/cswclassutils @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 13:20:28 UTC (rev 6909) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 14:03:35 UTC (rev 6910) @@ -5,7 +5,7 @@ fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf -4c4e668b9a8c52f1c547a91ce9971dfb CSWcswclassutils.i.cswpycompile +927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup 4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-19 13:20:28 UTC (rev 6909) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-10-19 14:03:35 UTC (rev 6910) @@ -22,7 +22,7 @@ echo PACKAGE: $PKGINST fi -TMPPY=/tmp/pycomp.$$.`date +%Y%m%d%H%M%S`.py +TMPPY=/var/opt/csw/cswclassutils/pycomp.$$.`date +%Y%m%d%H%M%S`.py cat < $TMPPY import py_compile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 19 17:17:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Oct 2009 15:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6911] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6911 http://gar.svn.sourceforge.net/gar/?rev=6911&view=rev Author: wahwah Date: 2009-10-19 15:17:41 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cups-1.4.x: Version bump to 1.4.1, added a patch for usb-unix.c Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-19 14:03:35 UTC (rev 6910) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-19 15:17:41 UTC (rev 6911) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.0 +GARVERSION = 1.4.1 CATEGORIES = net define BLURB @@ -51,6 +51,7 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch +PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-19 14:03:35 UTC (rev 6910) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-19 15:17:41 UTC (rev 6911) @@ -1,7 +1,8 @@ 1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch +193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall -bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 +587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-10-19 15:17:41 UTC (rev 6911) @@ -0,0 +1,25 @@ +From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 19 Oct 2009 13:22:37 +0100 +Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332 + +--- + backend/usb-unix.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/backend/usb-unix.c b/backend/usb-unix.c +index c749253..8ce92b9 100644 +--- a/backend/usb-unix.c ++++ b/backend/usb-unix.c +@@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ + * 'side_cb()' - Handle side-channel requests... + */ + +-static void ++static int /* O - 0 on success, -1 on error */ + side_cb(int print_fd, /* I - Print file */ + int device_fd, /* I - Device file */ + int snmp_fd, /* I - SNMP socket (unused) */ +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 19 18:23:18 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 19 Oct 2009 16:23:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6912] csw/mgar/pkg/snort/trunk/Makefile Message-ID: Revision: 6912 http://gar.svn.sourceforge.net/gar/?rev=6912&view=rev Author: bonivart Date: 2009-10-19 16:23:18 +0000 (Mon, 19 Oct 2009) Log Message: ----------- snort: some cleanup Modified Paths: -------------- csw/mgar/pkg/snort/trunk/Makefile Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2009-10-19 15:17:41 UTC (rev 6911) +++ csw/mgar/pkg/snort/trunk/Makefile 2009-10-19 16:23:18 UTC (rev 6912) @@ -13,38 +13,32 @@ endef MASTER_SITES = http://dl.snort.org/snort-current/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#PACKAGES = -#CATALOGNAME_CSWx = -#SPKG_DESC_CSWx = -#ARCHALL_CSWx = 1 - REQUIRED_PKGS = CSWpcrert CSWlibpcap CSWgcc4corert -#REQUIRED_PKGS += CSWcswclassutils CSWosslrt CSWmysql4rt CSWzlib +#REQUIRED_PKGS += CSWosslrt CSWmysql4rt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib +CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin TEST_TARGET = check +SAMPLECONF = /etc/opt/csw/snort/snort.conf + include gar/category.mk post-install-modulated: - @mkdir -p $(DESTDIR)/opt/csw/etc - @cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/opt/csw/etc/snort.conf.CSW - @cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/opt/csw/etc/unicode.map - @cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/opt/csw/etc/sid-msg.map - @cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/opt/csw/etc/gen-msg.map - @cp $(WORKSRC)/etc/classification.config $(DESTDIR)/opt/csw/etc/classification.config - @cp $(WORKSRC)/etc/reference.config $(DESTDIR)/opt/csw/etc/reference.config -# @cp $(WORKSRC)/etc/generators $(DESTDIR)/opt/csw/etc/generators + @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/snort + @cp $(WORKSRC)/etc/snort.conf $(DESTDIR)/etc/opt/csw/snort/snort.conf + @cp $(WORKSRC)/etc/unicode.map $(DESTDIR)/etc/opt/csw/snort/unicode.map + @cp $(WORKSRC)/etc/sid-msg.map $(DESTDIR)/etc/opt/csw/snort/sid-msg.map + @cp $(WORKSRC)/etc/gen-msg.map $(DESTDIR)/etc/opt/csw/snort/gen-msg.map + @cp $(WORKSRC)/etc/classification.config $(DESTDIR)/etc/opt/csw/snort/classification.config + @cp $(WORKSRC)/etc/reference.config $(DESTDIR)/etc/opt/csw/snort/reference.config +# @cp $(WORKSRC)/etc/generators $(DESTDIR)/etc/opt/csw/snort/generators @$(MAKECOOKIE) - -#post-install: -# ( rm -rf $(DESTDIR)/opt/csw/src ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 19 18:58:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Oct 2009 16:58:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6913] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6913 http://gar.svn.sourceforge.net/gar/?rev=6913&view=rev Author: bdwalton Date: 2009-10-19 16:58:08 +0000 (Mon, 19 Oct 2009) Log Message: ----------- cswclassutils: cswinetd -> use /var/opt/csw/cswclassutils Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 16:23:18 UTC (rev 6912) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-19 16:58:08 UTC (rev 6913) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.25 +GARVERSION = 1.26 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 16:23:18 UTC (rev 6912) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-19 16:58:08 UTC (rev 6913) @@ -1,7 +1,7 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING 9f7a2603bf91ea53e70f2fe5c4a56726 CSWcswclassutils.i.cswcpsampleconf 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -a958a6d8b1b81720a27306b3d2ecdabf CSWcswclassutils.i.cswinetd +0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-19 16:23:18 UTC (rev 6912) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-10-19 16:58:08 UTC (rev 6913) @@ -74,10 +74,12 @@ fi manifest=$outdir/$svcname-$proto.xml - echo "$inetdsvc" > /tmp/$svcname.$$ + TMPOUT=/var/opt/csw/cswclassutils/$svcname.$$ + echo "$inetdsvc" > $TMPOUT + # we use -f to force any in the specified inetd to take precedence - /usr/sbin/inetconv -f -i /tmp/$svcname.$$ -o $outdir || exit 2 + /usr/sbin/inetconv -f -i $TMPOUT -o $outdir || exit 2 if [ "$daemon" = "yes" ]; then /usr/sbin/inetadm -e svc:/network/$svcname/$proto:default else @@ -88,7 +90,7 @@ /usr/bin/chmod 644 $manifest /usr/bin/chown root:bin $manifest - rm /tmp/$svcname.$$ + rm $TMPOUT else [ -n "$DEBUG" ] && echo "For solaris 8 or 9" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 20 02:54:29 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 20 Oct 2009 00:54:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6914] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6914 http://gar.svn.sourceforge.net/gar/?rev=6914&view=rev Author: bdwalton Date: 2009-10-20 00:54:29 +0000 (Tue, 20 Oct 2009) Log Message: ----------- git: bump to 1.6.5.1 (all tests pass, both archs) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-10-19 16:58:08 UTC (rev 6913) +++ csw/mgar/pkg/git/trunk/Makefile 2009-10-20 00:54:29 UTC (rev 6914) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.5 +GARVERSION = 1.6.5.1 #xPATCHLEVEL = rc3 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 17:30:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 15:30:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6915] csw/mgar/gar/v2-git/ Message-ID: Revision: 6915 http://gar.svn.sourceforge.net/gar/?rev=6915&view=rev Author: wahwah Date: 2009-10-20 15:30:39 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Branching out to show the code to Dago: http://lists.opencsw.org/pipermail/maintainers/2009-October/004624.html Added Paths: ----------- csw/mgar/gar/v2-git/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 17:34:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 15:34:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6916] csw/mgar/gar/v2-git/gar.mk Message-ID: Revision: 6916 http://gar.svn.sourceforge.net/gar/?rev=6916&view=rev Author: wahwah Date: 2009-10-20 15:34:40 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Prototyping around gar-git integration. Modified Paths: -------------- csw/mgar/gar/v2-git/gar.mk Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2009-10-20 15:30:39 UTC (rev 6915) +++ csw/mgar/gar/v2-git/gar.mk 2009-10-20 15:34:40 UTC (rev 6916) @@ -345,9 +345,26 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated post-extract-git @$(DONADA) +post-extract-git: +ifeq ($(ENABLE_GIT_$(GARNAME)),1) + if [ -d "$(WORKSRC)" ];then \ + if [ -d "$(GIT_DIR)/.git" -a ! -d "$(WORKSRC)/.git" ]; then \ + echo rsync -rv "$(GIT_DIR)/$(GARNAME)-$(GARVERSION)-git/.git" $(WORKSRC); \ + git clone file://$(GIT_DIR)/$(GARNAME)-$(GARVERSION)-git $(WORKSRC)-git; \ + gmv -v $(WORKSRC)-git/.git $(WORKSRC); \ + grm -rfv $(WORKSRC)-git; \ + else \ + cd "$(WORKSRC)"; \ + git init; \ + git add .; \ + git commit -a -m "Initial import of $(GARNAME)-$(GARVERSION)."; \ + fi; \ + fi +endif + @$(DONADA) # returns true if extract has completed successfully, false # otherwise extract-p: @@ -366,9 +383,29 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated post-patch-git @$(DONADA) +post-patch-git: +ifeq ($(ENABLE_GIT_$(GARNAME)),1) + if [ -d "$(WORKSRC)" ]; then \ + cd "$(WORKSRC)"; \ + git add .; \ + git commit -a -m "GAR: automatic commit with patches for $(GARNAME)-$(GARVERSION)."; \ + echo "Patches have been submitted to git"; \ + fi + @# Only clone the repository if not already cloned. + if [ -d "$(WORKSRC)" -a -d "$(GIT_DIR)" -a ! -d "$(GIT_DIR)/$(GARNAME)-$(GARVERSION)" ]; then \ + cd "$(GIT_DIR)"; \ + git clone file://$(abspath $(WORKSRC)) $(GARNAME)-$(GARVERSION)-git; \ + cd $(GARNAME)-$(GARVERSION)-git; \ + git remote add gar-src file://$(abspath $(WORKSRC)); \ + git fetch gar-src; \ + fi + @# What if the repository has already been cloned? +endif + @$(DONADA) + # returns true if patch has completed successfully, false # otherwise patch-p: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 20 17:50:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Oct 2009 15:50:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6917] csw/mgar/pkg/tcpwrappers/trunk Message-ID: Revision: 6917 http://gar.svn.sourceforge.net/gar/?rev=6917&view=rev Author: dmichelsen Date: 2009-10-20 15:50:00 +0000 (Tue, 20 Oct 2009) Log Message: ----------- tcpwrappers: Add Phils touch Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/checksums csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch Modified: csw/mgar/pkg/tcpwrappers/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-10-20 15:34:40 UTC (rev 6916) +++ csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-10-20 15:50:00 UTC (rev 6917) @@ -1,6 +1,6 @@ -071bd69cb78b18888ea5e3da5c3127fa download/COPYING -b268880c14ab6d31140015275c82d6aa download/README -89e8f9d1ed25d8e809674af9bf3d18e6 download/man.patch -af28873e5c16c4f921237148e2507826 download/patch-cflags.diff -39ff14b0cc741a02a8427c4107c5d7d4 download/sharedlib.patch -ccbc2676977c31bbd43783abfbf2fdcf download/tcp_wrappers_7.6-ipv6.4.tar.gz +071bd69cb78b18888ea5e3da5c3127fa COPYING +b268880c14ab6d31140015275c82d6aa README +89e8f9d1ed25d8e809674af9bf3d18e6 man.patch +af28873e5c16c4f921237148e2507826 patch-cflags.diff +c82569b24080fc41c8b9bf9b25b831c2 sharedlib.patch +ccbc2676977c31bbd43783abfbf2fdcf tcp_wrappers_7.6-ipv6.4.tar.gz Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2009-10-20 15:34:40 UTC (rev 6916) +++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2009-10-20 15:50:00 UTC (rev 6917) @@ -1,6 +1,6 @@ diff -Naur tcp_wrappers_7.6-ipv6.4.orig/Makefile tcp_wrappers_7.6-ipv6.4.patched/Makefile --- tcp_wrappers_7.6-ipv6.4.orig/Makefile 2003-04-16 16:25:03.000000000 +0200 -+++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-09-11 18:58:37.916723372 +0200 ++++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-10-20 17:46:10.069122055 +0200 @@ -197,6 +197,24 @@ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ EXTRA_CFLAGS=-DUSE_STRERROR all @@ -64,10 +64,12 @@ diff -Naur tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c --- tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c 1970-01-01 01:00:00.000000000 +0100 -+++ tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c 2009-09-11 18:58:37.917838872 +0200 -@@ -0,0 +1,5 @@ ++++ tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c 2009-10-20 17:47:08.156958125 +0200 +@@ -0,0 +1,7 @@ +/* This must be compiled with Sun CC for the pragma */ +#pragma weak deny_severity +#pragma weak allow_severity ++#pragma weak hard_severity +int deny_severity=0; +int allow_severity=0; ++int hard_severity=0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 18:37:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 16:37:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6918] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswmigrateconf Message-ID: Revision: 6918 http://gar.svn.sourceforge.net/gar/?rev=6918&view=rev Author: wahwah Date: 2009-10-20 16:37:06 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cswmigrateconf: fixing an issue with the way PKG_INSTALL_ROOT is used (it doesn't have a trailing slash) Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-20 15:50:00 UTC (rev 6917) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2009-10-20 16:37:06 UTC (rev 6918) @@ -14,7 +14,9 @@ # Print errors when trying to read from an unset variable. set -u -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} +# PKG_INSTALL_ROOT does not have a trailing slash. It's for instance: /a +# http://docs.sun.com/app/docs/doc/820-4042/package-2?a=view +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-} readonly PKG_INSTALL_ROOT return_code=0 @@ -34,7 +36,7 @@ readonly deprecated_file_ext # Create /etc/opt/csw/cswclassutils.DEBUG to enable debugging of this script -if [ -r ${PKG_INSTALL_ROOT}etc/opt/csw/cswclassutils.DEBUG ]; then +if [ -r ${PKG_INSTALL_ROOT}/etc/opt/csw/cswclassutils.DEBUG ]; then DEBUG=1 else DEBUG=0 @@ -168,11 +170,11 @@ fi # The defaults, if not set already by the script. - SOURCE_DIR___default__="${SOURCE_DIR___default__:-opt/csw/etc}" + SOURCE_DIR___default__="${SOURCE_DIR___default__:-/opt/csw/etc}" readonly SOURCE_DIR___default__ - ARCH_DIR___default__="${ARCH_DIR___default__:-opt/csw/etc/migration-archive}" + ARCH_DIR___default__="${ARCH_DIR___default__:-/opt/csw/etc/migration-archive}" readonly ARCH_DIR___default__ - DEST_DIR___default__="${DEST_DIR___default__:-etc/opt/csw}" + DEST_DIR___default__="${DEST_DIR___default__:-/etc/opt/csw}" readonly DEST_DIR___default__ for file_name in ${MIGRATE_FILES}; do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 18:37:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 16:37:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6919] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 6919 http://gar.svn.sourceforge.net/gar/?rev=6919&view=rev Author: wahwah Date: 2009-10-20 16:37:41 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cswmigrateconf: updating the checksum Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-20 16:37:06 UTC (rev 6918) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-20 16:37:41 UTC (rev 6919) @@ -3,7 +3,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -2bbe577283973467c076ea11b9226b1d CSWcswclassutils.i.cswmigrateconf +42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf 9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 20 20:11:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 Oct 2009 18:11:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6920] csw/mgar/pkg/cups/branches Message-ID: Revision: 6920 http://gar.svn.sourceforge.net/gar/?rev=6920&view=rev Author: wahwah Date: 2009-10-20 18:11:20 +0000 (Tue, 20 Oct 2009) Log Message: ----------- cups-1.4.0: Created a branch for 1.4.0 specifically, added testing patches for http://www.cups.org/str.php?L3381 Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4.0/ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch Property changes on: csw/mgar/pkg/cups/branches/cups-1.4.0 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-20 00:54:29 UTC (rev 6914) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-20 18:11:20 UTC (rev 6920) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.1 +GARVERSION = 1.4.0 CATEGORIES = net define BLURB @@ -51,7 +51,9 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch -PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +# PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +PATCHFILES += 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-20 00:54:29 UTC (rev 6914) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-20 18:11:20 UTC (rev 6920) @@ -1,8 +1,9 @@ -1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch -0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch -a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch -193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall -ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall -587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 +1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch +0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch +a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch +2fd940524ebf6d6c0c22f4e52e253911 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall +ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove +dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall +bc5e777d4320cecdd1a64de8035171a8 cups-1.4.0-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-20 18:11:20 UTC (rev 6920) @@ -0,0 +1,35 @@ +From 101afaf697b8cbd8d0194febbba3ea94d99086ab Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 15:05:58 +0200 +Subject: [PATCH] Mapping GNUTLS_E_INVALID_SESSION to EIO in http_read_ssl + +--- + cups/http.c | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..47b9c0a 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,17 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int bytes; ++ bytes = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (bytes < 0) { ++ if (bytes == GNUTLS_E_INVALID_SESSION) { ++ errno = EIO; /* Not sure which value to map it to. */ ++ } else if (bytes < 0 && !errno) { ++ /* Shouldn't happen! Need a warning or an error, or something similar. */ ++ DEBUG_printf(("gnutls_record_recv() returned a negative number but errno=0.")); ++ } ++ } ++ return bytes; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-20 18:11:20 UTC (rev 6920) @@ -0,0 +1,25 @@ +From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 13:35:40 +0200 +Subject: [PATCH] Fail compilation if no SSL impl chosen + +--- + cups/http.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 8b767c9..840e3fc 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + } + + return (result); ++# else ++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set." + # endif /* HAVE_LIBSSL */ + } + #endif /* HAVE_SSL */ +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:01:33 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:01:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6921] csw/mgar/pkg/x11 Message-ID: Revision: 6921 http://gar.svn.sourceforge.net/gar/?rev=6921&view=rev Author: wbonnet Date: 2009-10-20 19:01:33 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Add lib and proto subdirs Added Paths: ----------- csw/mgar/pkg/x11/lib/ csw/mgar/pkg/x11/proto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:35:56 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:35:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6922] csw/mgar/pkg/x11 Message-ID: Revision: 6922 http://gar.svn.sourceforge.net/gar/?rev=6922&view=rev Author: wbonnet Date: 2009-10-20 19:35:51 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.5 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_applewmproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_applewmproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:39:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6923] csw/mgar/pkg/x11 Message-ID: Revision: 6923 http://gar.svn.sourceforge.net/gar/?rev=6923&view=rev Author: wbonnet Date: 2009-10-20 19:39:05 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.5 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_bigreqsproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_bigreqsproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:42:04 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6924] csw/mgar/pkg/x11 Message-ID: Revision: 6924 http://gar.svn.sourceforge.net/gar/?rev=6924&view=rev Author: wbonnet Date: 2009-10-20 19:42:04 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_compositeproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_compositeproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:43:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:43:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6925] csw/mgar/pkg/x11/proto Message-ID: Revision: 6925 http://gar.svn.sourceforge.net/gar/?rev=6925&view=rev Author: wbonnet Date: 2009-10-20 19:43:20 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-20 19:42:04 UTC (rev 6924) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-20 19:43:20 UTC (rev 6925) @@ -1,5 +1,5 @@ PROTONAME = applewmproto -GARVERSION = 1.4.1 +GARVERSION = 1.0.3 CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 19:42:04 UTC (rev 6924) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 19:43:20 UTC (rev 6925) @@ -2,7 +2,7 @@ CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) -GARVERSION = 1.1.0 +GARVERSION = 1.0.2 DESCRIPTION = Prototype headers for BigReqs extension to X11 define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:44:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6926] csw/mgar/pkg/x11 Message-ID: Revision: 6926 http://gar.svn.sourceforge.net/gar/?rev=6926&view=rev Author: wbonnet Date: 2009-10-20 19:44:53 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_damageproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_damageproto/ Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_damageproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile 2009-10-20 19:44:53 UTC (rev 6926) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = damageproto GARNAME = x11_$(PROTONAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 21:46:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 19:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6927] csw/mgar/pkg/x11 Message-ID: Revision: 6927 http://gar.svn.sourceforge.net/gar/?rev=6927&view=rev Author: wbonnet Date: 2009-10-20 19:46:08 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_dmxproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_dmxproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 22:03:15 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 20:03:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6928] csw/mgar/pkg/x11 Message-ID: Revision: 6928 http://gar.svn.sourceforge.net/gar/?rev=6928&view=rev Author: wbonnet Date: 2009-10-20 20:03:14 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_evieextproto/ csw/mgar/pkg/x11/proto/x11_fixesproto/ csw/mgar/pkg/x11/proto/x11_fontcacheproto/ csw/mgar/pkg/x11/proto/x11_fontsproto/ csw/mgar/pkg/x11/proto/x11_glproto/ csw/mgar/pkg/x11/proto/x11_inputproto/ csw/mgar/pkg/x11/proto/x11_kbproto/ csw/mgar/pkg/x11/proto/x11_randrproto/ csw/mgar/pkg/x11/proto/x11_recordproto/ csw/mgar/pkg/x11/proto/x11_renderproto/ csw/mgar/pkg/x11/proto/x11_resourceproto/ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/ csw/mgar/pkg/x11/proto/x11_trapproto/ csw/mgar/pkg/x11/proto/x11_videoproto/ csw/mgar/pkg/x11/proto/x11_windowswmproto/ csw/mgar/pkg/x11/proto/x11_xcmiscproto/ csw/mgar/pkg/x11/proto/x11_xextproto/ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/ csw/mgar/pkg/x11/proto/x11_xf86dgaproto/ csw/mgar/pkg/x11/proto/x11_xf86driproto/ csw/mgar/pkg/x11/proto/x11_xf86miscproto/ csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/ csw/mgar/pkg/x11/proto/x11_xineramaproto/ csw/mgar/pkg/x11/proto/x11_xproto/ Removed Paths: ------------- csw/mgar/pkg/x11/proto/x11_glproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_kbproto/tags/kbproto-1.0.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_recordproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_renderproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_videoproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_xextproto/tags/xextproto-7.0.5,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_xproto/tags/xproto-7.0.14,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/proto/x11_xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/ csw/mgar/pkg/x11/x11_evieextproto/ csw/mgar/pkg/x11/x11_fixesproto/ csw/mgar/pkg/x11/x11_fontcacheproto/ csw/mgar/pkg/x11/x11_fontsproto/ csw/mgar/pkg/x11/x11_glproto/ csw/mgar/pkg/x11/x11_inputproto/ csw/mgar/pkg/x11/x11_kbproto/ csw/mgar/pkg/x11/x11_randrproto/ csw/mgar/pkg/x11/x11_recordproto/ csw/mgar/pkg/x11/x11_renderproto/ csw/mgar/pkg/x11/x11_resourceproto/ csw/mgar/pkg/x11/x11_scrnsaverproto/ csw/mgar/pkg/x11/x11_trapproto/ csw/mgar/pkg/x11/x11_videoproto/ csw/mgar/pkg/x11/x11_windowswmproto/ csw/mgar/pkg/x11/x11_xcmiscproto/ csw/mgar/pkg/x11/x11_xextproto/ csw/mgar/pkg/x11/x11_xf86bigfontproto/ csw/mgar/pkg/x11/x11_xf86dgaproto/ csw/mgar/pkg/x11/x11_xf86driproto/ csw/mgar/pkg/x11/x11_xf86miscproto/ csw/mgar/pkg/x11/x11_xf86vidmodeproto/ csw/mgar/pkg/x11/x11_xineramaproto/ csw/mgar/pkg/x11/x11_xproto/ Modified: csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_evieextproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.0.2 CATEGORIES = x11 PROTONAME = evieext GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_fontsproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 2.1.0 +GARVERSION = 2.0.2 CATEGORIES = x11 PROTONAME = fontsproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_glproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.4.10 +GARVERSION = 1.4.9 CATEGORIES = x11 PROTONAME = glproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_inputproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.5.1 +GARVERSION = 1.4.4 PROTONAME = inputproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_randrproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.3.0 +GARVERSION = 1.2.1 CATEGORIES = x11 PROTONAME = randrproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_renderproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 0.11 +GARVERSION = 0.9.3 CATEGORIES = x11 PROTONAME = renderproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_resourceproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.0.2 CATEGORIES = x11 PROTONAME = resourceproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_scrnsaverproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = scrnsaverproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_videoproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 2.3.0 +GARVERSION = 2.2.2 CATEGORIES = x11 PROTONAME = videoproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xcmiscproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.2 CATEGORIES = x11 PROTONAME = xcmiscproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xextproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 7.1.1 +GARVERSION = 7.0.3 PROTONAME = xextproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86bigfontproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.0 +GARVERSION = 1.1.2 CATEGORIES = x11 PROTONAME = xf86bigfontproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86driproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 2.1.0 +GARVERSION = 2.0.4 CATEGORIES = x11 PROTONAME = xf86driproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xproto/trunk/Makefile 2009-10-20 19:01:33 UTC (rev 6921) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2009-10-20 20:03:14 UTC (rev 6928) @@ -1,4 +1,4 @@ -GARVERSION = 7.0.15 +GARVERSION = 7.0.13 CATEGORIES = x11 PROTONAME = xproto GARNAME = x11_$(PROTONAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 22:04:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 20:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6929] csw/mgar/pkg/x11/proto/Makefile Message-ID: Revision: 6929 http://gar.svn.sourceforge.net/gar/?rev=6929&view=rev Author: wbonnet Date: 2009-10-20 20:04:23 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Added Paths: ----------- csw/mgar/pkg/x11/proto/Makefile Added: csw/mgar/pkg/x11/proto/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/Makefile (rev 0) +++ csw/mgar/pkg/x11/proto/Makefile 2009-10-20 20:04:23 UTC (rev 6929) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/proto directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 22:34:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 20:34:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6930] csw/mgar/pkg/x11/proto Message-ID: Revision: 6930 http://gar.svn.sourceforge.net/gar/?rev=6930&view=rev Author: wbonnet Date: 2009-10-20 20:34:55 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Moves to package to proto subdir. Set version in coherence with release X11R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -822151ea24caf7c23ced6da7a14dfb4d download/applewmproto-1.4.1.tar.gz +774bf8e9633f0f38c49069a9ea56ae23 download/applewmproto-1.0.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -882d49cc3bb591dbdccdf9e680bd2e4b download/bigreqsproto-1.1.0.tar.gz +d43f7faa2aac2f0206ea19f031494af1 download/bigreqsproto-1.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -423516fd64e43e8671120056b0d9f597 download/damageproto-1.2.0.tar.gz +bce4477a6edd774dfca175ea46e1ba76 download/damageproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_evieextproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -68e61ce53caa495a3ad4085f66010eb8 download/evieext-1.1.0.tar.gz +cff7b68b228d255f582cb64879619a44 download/evieext-1.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -6819fc82585daac68cec17938b659bf0 download/fontsproto-2.1.0.tar.gz +6c1efa12ae50262b45c91e9a120632b7 download/fontsproto-2.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -ac89626ed6bced045d0515217bfffd4f download/glproto-1.4.10.tar.gz +216203b0fe4dd2ecb361265ac01ad348 download/glproto-1.4.9.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -2311483e8c175af3b4b5111413018dd1 download/inputproto-1.5.1.tar.gz +55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -5804ffeea0e40982258cc4618b8c6f07 download/randrproto-1.3.0.tar.gz +d6b6b024d71b689628bcaf27fd491f5b download/randrproto-1.2.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -57216f25b9a5edc561b83a7484cb17e8 download/renderproto-0.11.tar.gz +ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -587333b4995a3e11ebe4c8ba2742efaf download/resourceproto-1.1.0.tar.gz +198252b76e8082958cc2228d8dcc7c2f download/resourceproto-1.0.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -0ed88bdd6945ba207c4f734af48e7e25 download/scrnsaverproto-1.2.0.tar.gz +616ae17acad2b6033c981b8b526d5e67 download/scrnsaverproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -888543493cd69c6c78002ac59c3f077f download/videoproto-2.3.0.tar.gz +ace6f55cd4dcebf4b191c0c31755ed92 download/videoproto-2.2.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -bacfb0f3cb4d6e1a71770307bfdba129 download/xcmiscproto-1.2.0.tar.gz +3c380a728697ded97a39addfe1acf2cb download/xcmiscproto-1.1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz +6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -91b0733ff4cbe55808d96073258aa3d1 download/xf86bigfontproto-1.2.0.tar.gz +43d9fe9f92e5b8abd6e1328fdb022e7d download/xf86bigfontproto-1.1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -da848afcd5c41ac05e3aa994bdacdf1c download/xf86driproto-2.1.0.tar.gz +17a69691f2827b13ac4494f9c4af22b1 download/xf86driproto-2.0.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-20 20:04:23 UTC (rev 6929) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-20 20:34:55 UTC (rev 6930) @@ -1 +1 @@ -9186713de3ec8a9fdd6ec3f4c4534fde download/xproto-7.0.15.tar.gz +4c736a7ba52beddaea87964047adf209 download/xproto-7.0.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Oct 20 23:24:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 20 Oct 2009 21:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6931] csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/ Makefile Message-ID: Revision: 6931 http://gar.svn.sourceforge.net/gar/?rev=6931&view=rev Author: wbonnet Date: 2009-10-20 21:24:23 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Fix package name Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 20:34:55 UTC (rev 6930) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-20 21:24:23 UTC (rev 6931) @@ -15,8 +15,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWx11applewmproto -CATALOGNAME_CSWx11applewmproto = x11_applewmproto +PACKAGES = CSWx11bigreqsproto +CATALOGNAME_CSWx11bigreqsproto = x11_bigreqsproto REQUIRED_PKGS = CSWx11common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 21 04:06:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 21 Oct 2009 02:06:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6932] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 6932 http://gar.svn.sourceforge.net/gar/?rev=6932&view=rev Author: bdwalton Date: 2009-10-21 02:06:47 +0000 (Wed, 21 Oct 2009) Log Message: ----------- ruby: add suncc build support, with toggle to use gcc4 easily; bdb cleanup Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-20 21:24:23 UTC (rev 6931) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-21 02:06:47 UTC (rev 6932) @@ -4,10 +4,10 @@ GARVERSION = $(DISTVERSION) CATEGORIES = lang -# disable test scripts (all passed with 1.8.7p174) -# TEST_SCRIPTS = +TEST_SCRIPTS = +TEST_ARGS = test-all -PREREQUISITE_PKGS = CSWbdb3 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel +PREREQUISITE_PKGS = CSWbdb CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel PREREQUISITE_PKGS += CSWreadline CSWzlib PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel @@ -18,14 +18,14 @@ LICENSE = COPYING -REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv CSWgcc4corert +REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv REQUIRED_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib REQUIRED_PKGS_CSWrubydoc = CSWruby REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk -REQUIRED_PKGS_CSWrubydev = CSWruby CSWgcc4core CSWgfile +REQUIRED_PKGS_CSWrubydev = CSWruby CSWgfile REQUIRED_PKGS_CSWrubymode = CSWemacscommon @@ -76,12 +76,7 @@ # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698 PATCHFILES = rdoc_parse_order_fix.patch -GARCOMPILER = GNU -# This is for rbconfig.rb: without this, modules built may not get a proper -# setting. -EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread CONFIGURE_ARGS += --enable-shared @@ -104,6 +99,17 @@ COMPILE_ELISP = 1 +ifdef USEGCC +GARCOMPILER = GNU +REQUIRED_PKGS_CSWruby += CSWgcc4corert +REQUIRED_PKGS_CSWrubydev += CSWgcc4core +# This is for rbconfig.rb: without this, modules built may not get a proper +# setting. +EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) +else +SOS11_LD_FLAGS = +endif + include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 21 10:38:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 21 Oct 2009 08:38:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6933] csw/mgar/pkg Message-ID: Revision: 6933 http://gar.svn.sourceforge.net/gar/?rev=6933&view=rev Author: bonivart Date: 2009-10-21 08:38:41 +0000 (Wed, 21 Oct 2009) Log Message: ----------- diffuse: initial commit Added Paths: ----------- csw/mgar/pkg/diffuse/ csw/mgar/pkg/diffuse/branches/ csw/mgar/pkg/diffuse/tags/ csw/mgar/pkg/diffuse/trunk/ csw/mgar/pkg/diffuse/trunk/Makefile csw/mgar/pkg/diffuse/trunk/checksums csw/mgar/pkg/diffuse/trunk/files/ Property changes on: csw/mgar/pkg/diffuse/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/diffuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffuse/trunk/Makefile (rev 0) +++ csw/mgar/pkg/diffuse/trunk/Makefile 2009-10-21 08:38:41 UTC (rev 6933) @@ -0,0 +1,30 @@ +GARNAME = diffuse +GARVERSION = 0.4.1 +CATEGORIES = utils + +DESCRIPTION = Graphical tool for comparing and merging text files +define BLURB + Graphical tool for comparing and merging text files +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +REQUIRED_PKGS = CSWpython CSWpygtk +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @echo "Installing $(GARNAME) (custom)" + ( cd $(WORKSRC); \ + ./install.py --destdir=$(DESTDIR) --prefix=/opt/csw --sysconfdir=/etc/opt/csw --mandir=/opt/csw/share/man --files-only ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/diffuse/trunk/checksums =================================================================== --- csw/mgar/pkg/diffuse/trunk/checksums (rev 0) +++ csw/mgar/pkg/diffuse/trunk/checksums 2009-10-21 08:38:41 UTC (rev 6933) @@ -0,0 +1 @@ +dbdfc4f3ed50e66e2151dc6e2fa3e345 diffuse-0.4.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 12:29:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 10:29:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6934] csw/mgar/pkg/gnutls/Makefile Message-ID: Revision: 6934 http://gar.svn.sourceforge.net/gar/?rev=6934&view=rev Author: wahwah Date: 2009-10-21 10:29:02 +0000 (Wed, 21 Oct 2009) Log Message: ----------- gnutls: adding package-level Makefile Added Paths: ----------- csw/mgar/pkg/gnutls/Makefile Copied: csw/mgar/pkg/gnutls/Makefile (from rev 6443, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnutls/Makefile (rev 0) +++ csw/mgar/pkg/gnutls/Makefile 2009-10-21 10:29:02 UTC (rev 6934) @@ -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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 12:43:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 10:43:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6935] csw/mgar/pkg/cups/branches/cups-1.4.0 Message-ID: Revision: 6935 http://gar.svn.sourceforge.net/gar/?rev=6935&view=rev Author: wahwah Date: 2009-10-21 10:43:59 +0000 (Wed, 21 Oct 2009) Log Message: ----------- cups-1.4.0: A better patch for the cups-polld problem Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-21 10:29:02 UTC (rev 6934) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-21 10:43:59 UTC (rev 6935) @@ -21,13 +21,13 @@ # There's a problem with cups-polld going into a busy-wait loop when polling # print servers. # -# http://www.cups.org/str.php?L3257 +# http://www.cups.org/str.php?L3257 (closed) +# http://www.cups.org/str.php?L3381 (filed again) # # The problem with cups-polld seems to be going away when CUPS is compiled with # debugging symbols. The debugging options is turned on for this package, in # order to be able to debug the binary if it ever shows the problem. -# -# TODO: Check whether the issue is gone or not. + GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. @@ -52,7 +52,7 @@ PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch # PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -PATCHFILES += 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PREREQUISITE_PKGS = CSWggettext Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-21 10:29:02 UTC (rev 6934) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-21 10:43:59 UTC (rev 6935) @@ -1,7 +1,7 @@ 1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch -2fd940524ebf6d6c0c22f4e52e253911 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch +bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove Deleted: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-21 10:29:02 UTC (rev 6934) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-21 10:43:59 UTC (rev 6935) @@ -1,35 +0,0 @@ -From 101afaf697b8cbd8d0194febbba3ea94d99086ab Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Tue, 20 Oct 2009 15:05:58 +0200 -Subject: [PATCH] Mapping GNUTLS_E_INVALID_SESSION to EIO in http_read_ssl - ---- - cups/http.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -diff --git a/cups/http.c b/cups/http.c -index 840e3fc..47b9c0a 100644 ---- a/cups/http.c -+++ b/cups/http.c -@@ -2719,7 +2719,17 @@ http_read_ssl(http_t *http, /* I - Connection to server */ - return (SSL_read((SSL *)(http->tls), buf, len)); - - # elif defined(HAVE_GNUTLS) -- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); -+ int bytes; -+ bytes = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); -+ if (bytes < 0) { -+ if (bytes == GNUTLS_E_INVALID_SESSION) { -+ errno = EIO; /* Not sure which value to map it to. */ -+ } else if (bytes < 0 && !errno) { -+ /* Shouldn't happen! Need a warning or an error, or something similar. */ -+ DEBUG_printf(("gnutls_record_recv() returned a negative number but errno=0.")); -+ } -+ } -+ return bytes; - - # elif defined(HAVE_CDSASSL) - int result; /* Return value */ --- -1.6.5 - Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2009-10-21 10:43:59 UTC (rev 6935) @@ -0,0 +1,42 @@ +From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 21 Oct 2009 12:40:39 +0200 +Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno + +--- + cups/http.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..e255375 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int result; ++ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (result < 0 && !errno) { ++ switch (result) ++ { ++ case GNUTLS_E_INTERRUPTED : ++ errno = EINTR; ++ break; ++ case GNUTLS_E_AGAIN : ++ errno = EAGAIN; ++ break; ++ default : ++ errno = EPIPE; ++ break; ++ } ++ result = -1; ++ } ++ return result; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 16:46:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 14:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6936] csw/mgar/pkg/puppet/trunk/Makefile Message-ID: Revision: 6936 http://gar.svn.sourceforge.net/gar/?rev=6936&view=rev Author: wahwah Date: 2009-10-21 14:46:42 +0000 (Wed, 21 Oct 2009) Log Message: ----------- puppet: Enabling cswusergroup support Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-10-21 10:43:59 UTC (rev 6935) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-10-21 14:46:42 UTC (rev 6936) @@ -28,7 +28,7 @@ INITSMF = $(sysconfdir)/init\.d/cswpuppetd INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd -USERGROUP = $(sysconfdir)/pkg/CSWpuppet/cswusergroup +USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster # service isn't started upon the installation of CSWpuppet. @@ -57,9 +57,9 @@ include gar/category.mk install-puppet: - ginstall -d $(DESTDIR) - ginstall -d $(DESTDIR)$(sysconfdir)/puppet - ginstall -d $(DESTDIR)$(localstatedir)/puppet/run + ginstall -m 755 -d $(DESTDIR) + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet + ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d @@ -76,4 +76,7 @@ chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ fi \ done) + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 21 18:46:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Oct 2009 16:46:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6937] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6937 http://gar.svn.sourceforge.net/gar/?rev=6937&view=rev Author: wahwah Date: 2009-10-21 16:46:06 +0000 (Wed, 21 Oct 2009) Log Message: ----------- puppet: Reworked the init.d file. Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-10-21 14:46:42 UTC (rev 6936) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-10-21 16:46:06 UTC (rev 6937) @@ -1,5 +1,5 @@ -abaa404420106f9f28e9e1218b4e365b download/0001-pkgutil-support.patch -71174fc47265e5c81a0e32366563e5e4 download/cswpuppetd -fd5e49b7d2b7d288d5beb224d0cfa855 download/cswpuppetmasterd -3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup -288d46dee00acad64d0f3ecc6d8ba6fa download/puppet-0.24.8.tgz +abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch +3b7da4c98895e944262ed684e48e3b08 cswpuppetd +fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd +3ab0d4f9801075bc78b68b766b496fc7 cswusergroup +288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-10-21 14:46:42 UTC (rev 6936) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-10-21 16:46:06 UTC (rev 6937) @@ -2,66 +2,118 @@ # # $Id$ # -# This is the /etc/init.d file for puppetd -# Modified for CSW +# /etc/opt/csw/init.d/cswpuppetd # -# description: puppetd - Puppet Automation Client +# 2009-10-21 Maciej Blizinski # +# * Introduced start/stop/reload as functions +# * Distinguishing between reload and restart +# * Made the script zone-friendly +# * Supported custom pid file locations. . /lib/svc/share/smf_include.sh -prefix=/opt/csw -exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc -sbindir=/opt/csw/bin +prefix="/opt/csw" +exec_prefix="/opt/csw" +sysconfdir="/etc/csw/opt" +sbindir="/opt/csw/bin" +localstatedir="/var/opt/csw" -pidfile=/var/opt/csw/puppet/run/puppetd.pid -case "$1" in -start) - cd / - # Start daemons. +start_puppetd() { + cd / + # Start daemons. + ${sbindir}/puppetd +} - printf "Starting Puppet client services:" +reload_puppetd() { + if [ -r $pidfile ]; then + kill -HUP `cat $pidfile` + fi +} - ${sbindir}/puppetd +stop_puppetd() { + if [ -r $pidfile ]; then + pid=`cat $pidfile` + kill $pid + fi +} +get_current_pid() { + if [ -x /usr/bin/zonename ]; then + zone=`/usr/bin/zonename` + zoneopts="-z $zone" + else + zoneopts="" + fi + pgrep $zoneopts puppetd +} + +# Returns a line with certain string from a config file. +get_line_with() { + __s="$1" + __f="$2" + cat "${__f}" \ + | sed -e 's/^ *//' \ + | grep -v '^#' \ + | grep "${__s}" +} + +get_pid_file() { + # The default pid file is /var/opt/csw/puppet/run/puppetd.pid + # but a different pid file can be set in puppet.conf. + __pidfile="/var/opt/csw/puppet/run/puppetd.pid" + conffile="/etc/opt/csw/puppet/puppet.conf" + if [ -r "$conffile" ]; then + pid_line=`get_line_with pidfile ${conffile}` + if [ -n "${pid_line}" ]; then + echo "${pid_line}" | cut -d= -f2 | tr -d ' ' + return + fi + fi + echo "${__pidfile}" +} + +pidfile=`get_pid_file` + +case "$1" in + start) + printf "Starting Puppet client services:" + start_puppetd printf " puppetd" echo "" ;; -stop) + stop) printf "Stopping Puppet client services:" - kill `cat $pidfile` - + stop_puppetd printf " puppetd" echo "" ;; -restart) + restart) printf "Restarting Puppet client services:" - kill -HUP `cat $pidfile` - + stop_puppetd + start_puppetd printf " puppetd" echo "" ;; -reload) + reload) printf "Reloading Puppet client services:" - - kill -HUP `cat $pidfile` - + reload_puppetd printf " puppetd" echo "" ;; -status) + status) if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`pgrep puppetd` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi + pid=`cat $pidfile` + curpid=`get_current_pid` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi else - exit 1 + exit 1 fi + ;; esac exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Oct 21 21:05:10 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 21 Oct 2009 19:05:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6938] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 6938 http://gar.svn.sourceforge.net/gar/?rev=6938&view=rev Author: valholla Date: 2009-10-21 19:05:10 +0000 (Wed, 21 Oct 2009) Log Message: ----------- fix Makefile for new berkeley db layouts Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-10-21 16:46:06 UTC (rev 6937) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) @@ -27,12 +27,12 @@ WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn -PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn +PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn ARCHALL_CSWsvn-devel = 1 SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion -REQUIRED_PKGS_CSWsvn = CSWapache2rt CSWbdb CSWexpat CSWggettextrt +REQUIRED_PKGS_CSWsvn = CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt REQUIRED_PKGS_CSWsvn += CSWiconv CSWkrb5lib CSWlibnet CSWneon CSWoldaprt REQUIRED_PKGS_CSWsvn += CSWosslrt CSWsasl CSWzlib CSWsqlite3rt SPKG_DESC_CSWsvn-devel = Subversion Development Support @@ -44,19 +44,19 @@ SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn REQUIRED_PKGS_CSWjavasvn = CSWsvn CSWapache2rt CSWneon CSWoldaprt -REQUIRED_PKGS_CSWjavasvn += CSWbdb CSWexpat CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWjavasvn += CSWbdb47 CSWexpat CSWggettextrt CSWiconv SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion -REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl CSWapache2rt CSWbdb CSWexpat +REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl CSWapache2rt CSWbdb47 CSWexpat REQUIRED_PKGS_CSWpmsvn += CSWggettextrt CSWiconv CSWoldaprt -SPKG_DESC_CSWpysvn = Subversion Python Language Binding -CATALOGNAME_CSWpysvn = pysvn -REQUIRED_PKGS_CSWpysvn = CSWsvn CSWpython CSWapache2rt CSWbdb CSWexpat -REQUIRED_PKGS_CSWpysvn += CSWggettextrt CSWiconv CSWoldaprt +SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding +CATALOGNAME_CSWpythonsvn = pythonsvn +REQUIRED_PKGS_CSWpythonsvn = CSWsvn CSWpython CSWapache2rt CSWbdb47 CSWexpat +REQUIRED_PKGS_CSWpythonsvn += CSWggettextrt CSWiconv CSWoldaprt SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby CSWiconv CSWoldaprt -REQUIRED_PKGS_CSWrbsvn += CSWapache2rt CSWbdb CSWexpat CSWggettextrt +REQUIRED_PKGS_CSWrbsvn += CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWap2svn = $(prefix)/apache2.* @@ -64,8 +64,8 @@ PKGFILES_CSWpmsvn = $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* -PKGFILES_CSWpysvn = $(libdir)/python.* -PKGFILES_CSWpysvn += $(SVNLIB)/.*swig_py.* +PKGFILES_CSWpythonsvn = $(libdir)/python.* +PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWrbsvn = $(libdir)/ruby.* PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* @@ -90,17 +90,18 @@ NOISALIST = 1 LDFLAGS = -R/opt/csw/lib -L/opt/csw/lib -R/opt/csw/apache2/lib LDFLAGS += -L/opt/csw/apache2/lib -L$(SVNLIB) -lintl -liconv +LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib export LDFLAGS EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES_CSWpysvn = none cswpycompile -REQUIRED_PKGS_CSWpysvn += CSWcswclassutils +SPKG_CLASSES_CSWpythonsvn = none cswpycompile +REQUIRED_PKGS_CSWpythonsvn += CSWcswclassutils CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/include:/opt/csw/lib:db +CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb47/include:/opt/csw/bdb47/lib:db CONFIGURE_ARGS += --enable-javahl CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config @@ -109,6 +110,7 @@ CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-serf=$(prefix) TEST_TARGET = check # Tests take *forever* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 21 23:11:15 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 21:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6939] csw/mgar/pkg/x11 Message-ID: Revision: 6939 http://gar.svn.sourceforge.net/gar/?rev=6939&view=rev Author: wbonnet Date: 2009-10-21 21:11:14 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Move libraries to lib subdir. Change version to X11 R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile csw/mgar/pkg/x11/lib/libfs/trunk/Makefile csw/mgar/pkg/x11/lib/libice/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libdmx/ csw/mgar/pkg/x11/lib/libfontenc/ csw/mgar/pkg/x11/lib/libfs/ csw/mgar/pkg/x11/lib/libice/ csw/mgar/pkg/x11/lib/libsm/ csw/mgar/pkg/x11/lib/libx11/ csw/mgar/pkg/x11/lib/libxau/ csw/mgar/pkg/x11/lib/libxaw/ csw/mgar/pkg/x11/lib/libxcomposite/ csw/mgar/pkg/x11/lib/libxcursor/ csw/mgar/pkg/x11/lib/libxdamage/ csw/mgar/pkg/x11/lib/libxdmcp/ csw/mgar/pkg/x11/lib/libxext/ csw/mgar/pkg/x11/lib/libxfixes/ csw/mgar/pkg/x11/lib/libxfont/ csw/mgar/pkg/x11/lib/libxfontcache/ csw/mgar/pkg/x11/lib/libxft/ csw/mgar/pkg/x11/lib/libxi/ csw/mgar/pkg/x11/lib/libxinerama/ csw/mgar/pkg/x11/lib/libxmu/ csw/mgar/pkg/x11/lib/libxpm/ csw/mgar/pkg/x11/lib/libxrandr/ csw/mgar/pkg/x11/lib/libxres/ csw/mgar/pkg/x11/lib/libxscrnsaver/ csw/mgar/pkg/x11/lib/libxt/ Removed Paths: ------------- csw/mgar/pkg/x11/libdmx/ csw/mgar/pkg/x11/libfontenc/ csw/mgar/pkg/x11/libfs/ csw/mgar/pkg/x11/libice/ csw/mgar/pkg/x11/libsm/ csw/mgar/pkg/x11/libx11/ csw/mgar/pkg/x11/libxau/ csw/mgar/pkg/x11/libxaw/ csw/mgar/pkg/x11/libxcomposite/ csw/mgar/pkg/x11/libxcursor/ csw/mgar/pkg/x11/libxdamage/ csw/mgar/pkg/x11/libxdmcp/ csw/mgar/pkg/x11/libxext/ csw/mgar/pkg/x11/libxfixes/ csw/mgar/pkg/x11/libxfont/ csw/mgar/pkg/x11/libxfontcache/ csw/mgar/pkg/x11/libxft/ csw/mgar/pkg/x11/libxi/ csw/mgar/pkg/x11/libxinerama/ csw/mgar/pkg/x11/libxmu/ csw/mgar/pkg/x11/libxpm/ csw/mgar/pkg/x11/libxrandr/ csw/mgar/pkg/x11/libxres/ csw/mgar/pkg/x11/libxscrnsaver/ csw/mgar/pkg/x11/libxt/ Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfontenc/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libfontenc -GARVERSION = 1.0.5 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 font encoding library Modified: csw/mgar/pkg/x11/lib/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libfs/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libFS -GARVERSION = 1.0.2 +GARVERSION = 1.0.1 CATEGORIES = x11 DESCRIPTION = X11 Font Services library Modified: csw/mgar/pkg/x11/lib/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libice/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libICE -GARVERSION = 1.0.6 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 Inter-Client Exchange Library Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libsm -GARVERSION = 1.1.1 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = X11 Session Management library Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libx11 -GARVERSION = 1.2.2 +GARVERSION = 1.1.5 CATEGORIES = x11 DESCRIPTION = X11 client-side library Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxaw -GARVERSION = 1.0.6 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X Athena Widgets Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXcursor -GARVERSION = 1.1.10 +GARVERSION = 1.1.9 CATEGORIES = x11 DESCRIPTION = X client-side cursor loading library Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxext -GARVERSION = 1.0.5 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous extensions library1 Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfont/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXfont -GARVERSION = 1.4.0 +GARVERSION = 1.3.3 CATEGORIES = x11 DESCRIPTION = X11 font rasterisation library Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxi -GARVERSION = 1.2.1 +GARVERSION = 1.1.3 CATEGORIES = x11 DESCRIPTION = Client library for XInput Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxrandr/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXrandr -GARVERSION = 1.3.0 +GARVERSION = 1.2.3 CATEGORIES = x11 DESCRIPTION = X11 RandR extension library Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libXScrnSaver -GARVERSION = 1.2.0 +GARVERSION = 1.1.3 CATEGORIES = x11 DESCRIPTION = The XScrnSaver Library Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-10-21 21:11:14 UTC (rev 6939) @@ -1,5 +1,5 @@ GARNAME = libxt -GARVERSION = 1.0.6 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 toolkit intrinsics library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 21 23:20:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 21:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6940] csw/mgar/pkg/x11 Message-ID: Revision: 6940 http://gar.svn.sourceforge.net/gar/?rev=6940&view=rev Author: wbonnet Date: 2009-10-21 21:20:14 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Move libraries to lib subdir. Change version to X11 R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libxkbfile/ csw/mgar/pkg/x11/lib/libxtst/ csw/mgar/pkg/x11/lib/libxv/ csw/mgar/pkg/x11/lib/libxvmc/ csw/mgar/pkg/x11/lib/libxxf86dga/ csw/mgar/pkg/x11/lib/libxxf86misc/ csw/mgar/pkg/x11/lib/libxxf86vm/ csw/mgar/pkg/x11/lib/xrender/ csw/mgar/pkg/x11/lib/xtrans/ Removed Paths: ------------- csw/mgar/pkg/x11/libxkbfile/ csw/mgar/pkg/x11/libxtst/ csw/mgar/pkg/x11/libxv/ csw/mgar/pkg/x11/libxvmc/ csw/mgar/pkg/x11/libxxf86dga/ csw/mgar/pkg/x11/libxxf86misc/ csw/mgar/pkg/x11/libxxf86vm/ csw/mgar/pkg/x11/xrender/ csw/mgar/pkg/x11/xtrans/ Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-10-21 19:05:10 UTC (rev 6938) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2009-10-21 21:20:14 UTC (rev 6940) @@ -1,5 +1,5 @@ GARNAME = xtrans -GARVERSION = 1.2.3 +GARVERSION = 1.2.1 CATEGORIES = x11 DESCRIPTION = X transport library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Oct 21 23:34:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 21:34:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6941] csw/mgar/pkg/x11/lib Message-ID: Revision: 6941 http://gar.svn.sourceforge.net/gar/?rev=6941&view=rev Author: wbonnet Date: 2009-10-21 21:34:42 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfs/trunk/checksums csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums csw/mgar/pkg/x11/lib/libxtst/trunk/checksums csw/mgar/pkg/x11/lib/xtrans/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/Makefile Added: csw/mgar/pkg/x11/lib/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/Makefile (rev 0) +++ csw/mgar/pkg/x11/lib/Makefile 2009-10-21 21:34:42 UTC (rev 6941) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/lib directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + Modified: csw/mgar/pkg/x11/lib/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -ecf2d6a27da053500283e803efa2a808 download/libFS-1.0.2.tar.bz2 +81521249353fa33be7a4bb0062c2fbb9 libFS-1.0.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 +0726a845fe5a56551de2718c9f6b0e35 libxkbfile-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.3.tar.bz2 +090c1ad04e34982eada5cf3b1a0792fd libXtst-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-21 21:20:14 UTC (rev 6940) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) @@ -1 +1 @@ -9e9dcfb9555bbe4eae7ceeb33d9d710e download/xtrans-1.2.3.tar.gz +5b7f447f6fe92cbc4f17441aaee0bf55 xtrans-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Oct 22 00:12:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 21 Oct 2009 22:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6942] csw/mgar/pkg/x11/lib Message-ID: Revision: 6942 http://gar.svn.sourceforge.net/gar/?rev=6942&view=rev Author: wbonnet Date: 2009-10-21 22:12:21 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Move libraries to lib subdir. Change version to X11 R7.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile csw/mgar/pkg/x11/lib/libdmx/trunk/checksums csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums csw/mgar/pkg/x11/lib/libice/trunk/checksums csw/mgar/pkg/x11/lib/libsm/trunk/checksums csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums csw/mgar/pkg/x11/lib/libxfont/trunk/checksums csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxmu/trunk/checksums csw/mgar/pkg/x11/lib/libxpm/trunk/checksums csw/mgar/pkg/x11/lib/libxres/trunk/checksums csw/mgar/pkg/x11/lib/libxt/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-10-21 22:12:21 UTC (rev 6942) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibdmx = $(DESCRIPTION) SPKG_DESC_CSWlibdmxdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWdmxproto +PREREQUISITE_PKGS = CSWx11dmxproto REQUIRED_PKGS_CSWlibdmx = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibdmxdevel = CSWlibdmx Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 +4d866967210d06098fc9f302ed4c79b1 libdmx-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -4f0d8191819be9f2bdf9dad49a65e43b download/libfontenc-1.0.5.tar.bz2 +5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -2d39bc924af24325dae589e9a849180c download/libICE-1.0.6.tar.bz2 +4ab4e67e0b8845aa201e984153087f4a libICE-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -6889a455496aaaa65b1fa05fc518d179 download/libSM-1.1.1.tar.bz2 +05a04c2b6382fb0054f6c70494e22733 libSM-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -7dcdad1c10daea872cb3355af414b2ca download/libXcursor-1.1.10.tar.bz2 +99b7554037a92b260891091e81815a0a libXcursor-1.1.9.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 +10facf2bc7cbd5e5c1a698b8a210a582 libXdmcp-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -3a8e06b25912ef339d70a8ba003da9b5 download/libXfont-1.4.0.tar.bz2 +4f174b9613f87cf00d731da428a1b194 libXfont-1.3.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -cfb36307e8e7ffafe40848dba24e0b11 download/libXi-1.2.1.tar.bz2 +7c510abb0cad8dc20493fb27ff7859d8 libXi-1.1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -48b432e84035c664ece80a33695d5254 download/libXmu-1.0.4.tar.gz +48b432e84035c664ece80a33695d5254 libXmu-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 +cd15ee542d9f515538b4462a6f79d977 libXpm-3.5.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 +de66ffb657aba64c9d6dbdeabb757f3e libXres-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-21 21:34:42 UTC (rev 6941) +++ csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-21 22:12:21 UTC (rev 6942) @@ -1 +1 @@ -953930ddf9fdaa1405732c7f01e9e599 download/libXt-1.0.6.tar.bz2 +f3bdd67785ace8cd0b23249e9d8c9975 libXt-1.0.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 22 17:21:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 22 Oct 2009 15:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6943] csw/mgar/gar/v2 Message-ID: Revision: 6943 http://gar.svn.sourceforge.net/gar/?rev=6943&view=rev Author: dmichelsen Date: 2009-10-22 15:21:34 +0000 (Thu, 22 Oct 2009) Log Message: ----------- mGAR v2: Explicitly set umask instead of pax-arg, as it bails out on symlinks Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-21 22:12:21 UTC (rev 6942) +++ csw/mgar/gar/v2/gar.mk 2009-10-22 15:21:34 UTC (rev 6943) @@ -692,14 +692,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -707,7 +707,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -715,7 +715,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -723,7 +723,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-10-21 22:12:21 UTC (rev 6942) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-10-22 15:21:34 UTC (rev 6943) @@ -547,7 +547,7 @@ if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \ echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \ ) \ - mkdir -p $(PKGROOT)$$LICENSEDIR && \ + umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ rm -f $(PKGROOT)$$LICENSEDIR/license && \ cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ fi \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:29:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6944] csw/mgar/pkg/cswpkglogger/trunk Message-ID: Revision: 6944 http://gar.svn.sourceforge.net/gar/?rev=6944&view=rev Author: bdwalton Date: 2009-10-23 00:29:08 +0000 (Fri, 23 Oct 2009) Log Message: ----------- add license, readme, tweak scripts and gar recipe Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/Makefile csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade Modified: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-22 15:21:34 UTC (rev 6943) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:08 UTC (rev 6944) @@ -6,6 +6,8 @@ define BLURB This set of hook scripts will log package maintenance actions to syslog. It is dependent on the use of a CSW package tool that is 'hook aware.' +Install, upgrade and removal actions are logged, both on success and on +failure. Currently, the default of user.notice is used. endef MASTER_SITES = @@ -20,6 +22,9 @@ include gar/category.mk +post-extract-modulated: $(WORKSRC) + cp $(FILEDIR)/gpl-3.0.txt $(WORKSRC)/COPYING + HOOKDIR=$(DESTDIR)/etc/opt/csw/pkg-hooks POSTHOOKS = postinstall postupgrade postremove PREHOOKS = preupgrade @@ -27,7 +32,7 @@ install-custom: @echo Installing CSWcswpkglogger files... - @( ginstall -m 0755 -d $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/cswpkglogger/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ Modified: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-22 15:21:34 UTC (rev 6943) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-23 00:29:08 UTC (rev 6944) @@ -7,7 +7,7 @@ VER=$2 function logdie() { - logger -t "CSW Package Logger" "$1" + logger -t "cswpkglogger" "$1" exit 0 } @@ -33,7 +33,7 @@ if [ -d /var/sadm/pkg/${PKG} ]; then SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) - pf=/var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} + pf=/var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} if [ -f ${pf} ]; then PREVVER=$(cat ${pf} 2>/dev/null) rm -f ${pf} Modified: csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-22 15:21:34 UTC (rev 6943) +++ csw/mgar/pkg/cswpkglogger/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-23 00:29:08 UTC (rev 6944) @@ -8,4 +8,4 @@ SYSTEMVER=$(pkgparam ${PKG} VERSION) # store previous version so we can log smarter things if upgrade fails. -echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWpkglogger.upgrade.${PKG} +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:29:50 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6945] csw/mgar/pkg/cswpkglogger/trunk Message-ID: Revision: 6945 http://gar.svn.sourceforge.net/gar/?rev=6945&view=rev Author: bdwalton Date: 2009-10-23 00:29:50 +0000 (Fri, 23 Oct 2009) Log Message: ----------- actually add files; depend on bash Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswpkglogger/trunk/files/README csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt Modified: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:08 UTC (rev 6944) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:50 UTC (rev 6945) @@ -10,6 +10,8 @@ failure. Currently, the default of user.notice is used. endef +REQUIRED_PKGS = CSWbash + MASTER_SITES = DISTFILES = Added: csw/mgar/pkg/cswpkglogger/trunk/files/README =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/README (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:29:50 UTC (rev 6945) @@ -0,0 +1,11 @@ +This small package performs logging on package maintenance actions. +It logs install, upgrade and removal actions to the user.notice +facility. Successes and failures are logged. There is no 'switch' to +disable the logging, simply remove the package that provided the hook +scripts. + +If you experience problems with this package, contact: + +Ben Walton + +These scripts are licensed under the GPL v3. Added: csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt (rev 0) +++ csw/mgar/pkg/cswpkglogger/trunk/files/gpl-3.0.txt 2009-10-23 00:29:50 UTC (rev 6945) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:39:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:39:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6946] csw/mgar/pkg/cswpkglogger/trunk Message-ID: Revision: 6946 http://gar.svn.sourceforge.net/gar/?rev=6946&view=rev Author: bdwalton Date: 2009-10-23 00:39:49 +0000 (Fri, 23 Oct 2009) Log Message: ----------- tweak and install the README Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/Makefile csw/mgar/pkg/cswpkglogger/trunk/files/README Modified: csw/mgar/pkg/cswpkglogger/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:29:50 UTC (rev 6945) +++ csw/mgar/pkg/cswpkglogger/trunk/Makefile 2009-10-23 00:39:49 UTC (rev 6946) @@ -35,6 +35,7 @@ install-custom: @echo Installing CSWcswpkglogger files... @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/cswpkglogger/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)/opt/csw/share/doc/cswpkglogger/; \ ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ Modified: csw/mgar/pkg/cswpkglogger/trunk/files/README =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:29:50 UTC (rev 6945) +++ csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:39:49 UTC (rev 6946) @@ -1,8 +1,8 @@ This small package performs logging on package maintenance actions. It logs install, upgrade and removal actions to the user.notice -facility. Successes and failures are logged. There is no 'switch' to -disable the logging, simply remove the package that provided the hook -scripts. +facility. Successes and failures are logged. There are no options +for these scripts. They are always active. Remove the package to +disable them. If you experience problems with this package, contact: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 02:44:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 00:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6947] csw/mgar/pkg/cswpkglogger/trunk/files/README Message-ID: Revision: 6947 http://gar.svn.sourceforge.net/gar/?rev=6947&view=rev Author: bdwalton Date: 2009-10-23 00:44:17 +0000 (Fri, 23 Oct 2009) Log Message: ----------- tweak README Modified Paths: -------------- csw/mgar/pkg/cswpkglogger/trunk/files/README Modified: csw/mgar/pkg/cswpkglogger/trunk/files/README =================================================================== --- csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:39:49 UTC (rev 6946) +++ csw/mgar/pkg/cswpkglogger/trunk/files/README 2009-10-23 00:44:17 UTC (rev 6947) @@ -4,8 +4,13 @@ for these scripts. They are always active. Remove the package to disable them. -If you experience problems with this package, contact: +For this functionality to work, you must use a package management tool +that supports the hook functionality described at: -Ben Walton +http://wiki.opencsw.org/package-hooks +Currently, this means pkgutil v1.7 or later. + These scripts are licensed under the GPL v3. + +Ben Walton This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 12:11:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 10:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6948] csw/mgar/pkg/cups/branches/cups-1.4.0 Message-ID: Revision: 6948 http://gar.svn.sourceforge.net/gar/?rev=6948&view=rev Author: wahwah Date: 2009-10-23 10:11:21 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups-1.4.0: Solaris zone support. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-23 00:44:17 UTC (rev 6947) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-23 10:11:21 UTC (rev 6948) @@ -54,6 +54,7 @@ # PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 00:44:17 UTC (rev 6947) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 10:11:21 UTC (rev 6948) @@ -3,6 +3,7 @@ a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch 2009-10-23 10:11:21 UTC (rev 6948) @@ -0,0 +1,42 @@ +From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 23 Oct 2009 11:08:23 +0100 +Subject: [PATCH] Solaris zone support in init script + +--- + init/cups.sh.in | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/init/cups.sh.in b/init/cups.sh.in +index 2ff418c..d714b19 100755 +--- a/init/cups.sh.in ++++ b/init/cups.sh.in +@@ -148,7 +148,7 @@ case "`uname`" in + HP-UX* | AIX* | SINIX*) + pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; +- IRIX* | SunOS*) ++ IRIX*) + pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; + UnixWare*) +@@ -161,6 +161,16 @@ case "`uname`" in + Linux* | *BSD* | Darwin*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; ++ SunOS*) ++ if [ -x /usr/bin/zonename ]; then ++ zonename=`/usr/bin/zonename` ++ zoneopts="-z $zonename" ++ else ++ zoneopts= ++ fi ++ # The backslash before the ^ is important. ++ pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$` ++ ;; + *) + pid="" + ;; +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 14:22:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6949] csw/mgar/pkg/cups/branches/cups-1.4.0 Message-ID: Revision: 6949 http://gar.svn.sourceforge.net/gar/?rev=6949&view=rev Author: wahwah Date: 2009-10-23 12:22:59 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups-1.4.0: Fixed the use of PKG_INSTALL_PATH (it doesn't have a trailing slash) Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 10:11:21 UTC (rev 6948) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-23 12:22:59 UTC (rev 6949) @@ -4,7 +4,7 @@ bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch 44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch -dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove -dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall bc5e777d4320cecdd1a64de8035171a8 cups-1.4.0-source.tar.bz2 Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall 2009-10-23 10:11:21 UTC (rev 6948) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsclient.preinstall 2009-10-23 12:22:59 UTC (rev 6949) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall 2009-10-23 10:11:21 UTC (rev 6948) +++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/CSWcupsd.preinstall 2009-10-23 12:22:59 UTC (rev 6949) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 14:36:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6950] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6950 http://gar.svn.sourceforge.net/gar/?rev=6950&view=rev Author: wahwah Date: 2009-10-23 12:36:40 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups-1.4.1: Merging fixes for the cups-polld issue. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch Property Changed: ---------------- csw/mgar/pkg/cups/branches/cups-1.4/ Property changes on: csw/mgar/pkg/cups/branches/cups-1.4 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-pbuild + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/cups/branches/cups-1.4.0:6915-6949 Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-23 12:36:40 UTC (rev 6950) @@ -21,13 +21,13 @@ # There's a problem with cups-polld going into a busy-wait loop when polling # print servers. # -# http://www.cups.org/str.php?L3257 +# http://www.cups.org/str.php?L3257 (closed) +# http://www.cups.org/str.php?L3381 (filed again) # # The problem with cups-polld seems to be going away when CUPS is compiled with # debugging symbols. The debugging options is turned on for this package, in # order to be able to debug the binary if it ever shows the problem. -# -# TODO: Check whether the issue is gone or not. + GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. @@ -52,6 +52,9 @@ PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-23 12:36:40 UTC (rev 6950) @@ -2,7 +2,10 @@ 0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch 193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall +bbf0295c76cd06b5311ac3a3467fd431 download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +0dd35cc0938696577104852781ec1df6 download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 download/0007-Solaris-zone-support-in-init-script.patch +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsd.preinstall 587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2009-10-23 12:36:40 UTC (rev 6950) @@ -0,0 +1,42 @@ +From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 21 Oct 2009 12:40:39 +0200 +Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno + +--- + cups/http.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..e255375 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int result; ++ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (result < 0 && !errno) { ++ switch (result) ++ { ++ case GNUTLS_E_INTERRUPTED : ++ errno = EINTR; ++ break; ++ case GNUTLS_E_AGAIN : ++ errno = EAGAIN; ++ break; ++ default : ++ errno = EPIPE; ++ break; ++ } ++ result = -1; ++ } ++ return result; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-23 12:36:40 UTC (rev 6950) @@ -0,0 +1,25 @@ +From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 13:35:40 +0200 +Subject: [PATCH] Fail compilation if no SSL impl chosen + +--- + cups/http.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 8b767c9..840e3fc 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + } + + return (result); ++# else ++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set." + # endif /* HAVE_LIBSSL */ + } + #endif /* HAVE_SSL */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch 2009-10-23 12:36:40 UTC (rev 6950) @@ -0,0 +1,42 @@ +From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 23 Oct 2009 11:08:23 +0100 +Subject: [PATCH] Solaris zone support in init script + +--- + init/cups.sh.in | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/init/cups.sh.in b/init/cups.sh.in +index 2ff418c..d714b19 100755 +--- a/init/cups.sh.in ++++ b/init/cups.sh.in +@@ -148,7 +148,7 @@ case "`uname`" in + HP-UX* | AIX* | SINIX*) + pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; +- IRIX* | SunOS*) ++ IRIX*) + pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; + UnixWare*) +@@ -161,6 +161,16 @@ case "`uname`" in + Linux* | *BSD* | Darwin*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; ++ SunOS*) ++ if [ -x /usr/bin/zonename ]; then ++ zonename=`/usr/bin/zonename` ++ zoneopts="-z $zonename" ++ else ++ zoneopts= ++ fi ++ # The backslash before the ^ is important. ++ pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$` ++ ;; + *) + pid="" + ;; +-- +1.6.3.2 + Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-10-23 12:36:40 UTC (rev 6950) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-10-23 12:22:59 UTC (rev 6949) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-10-23 12:36:40 UTC (rev 6950) @@ -4,6 +4,11 @@ # $Id$ # +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" obsolete_dir_information=" @@ -17,7 +22,7 @@ for dirpair in ${obsolete_directories}; do obsolete_dir=`echo ${dirpair} | cut -d: -f1` new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then echo echo "*******************************************************************" echo "* The old configuration directory ${obsolete_dir} still exists. " @@ -30,7 +35,7 @@ sleep 10 # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" if touch "${fn}" 2>/dev/null; then echo "${obsolete_dir_information}" > "${fn}" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 23 14:49:49 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:49:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6951] csw/mgar/pkg/cpan/HTML-Parser/trunk Message-ID: Revision: 6951 http://gar.svn.sourceforge.net/gar/?rev=6951&view=rev Author: bonivart Date: 2009-10-23 12:49:49 +0000 (Fri, 23 Oct 2009) Log Message: ----------- html::parser: update to 3.63 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2009-10-23 12:36:40 UTC (rev 6950) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2009-10-23 12:49:49 UTC (rev 6951) @@ -1,5 +1,5 @@ GARNAME = HTML-Parser -GARVERSION = 3.61 +GARVERSION = 3.63 CATEGORIES = cpan AUTHOR = GAAS Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2009-10-23 12:36:40 UTC (rev 6950) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2009-10-23 12:49:49 UTC (rev 6951) @@ -1,2 +1,2 @@ -f130661b0b1fe17619c2b60b729ebd39 download/COPYING -098d9551721d29d55a0a4ad83a3ebef5 download/HTML-Parser-3.61.tar.gz +f130661b0b1fe17619c2b60b729ebd39 COPYING +64d1d54411ea71f89c3bab23bfd14abc HTML-Parser-3.63.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 14:50:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 12:50:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6952] csw/mgar/pkg/cups/trunk Message-ID: Revision: 6952 http://gar.svn.sourceforge.net/gar/?rev=6952&view=rev Author: wahwah Date: 2009-10-23 12:50:35 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups: Merging version 1.4.1 into trunk Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall Removed Paths: ------------- csw/mgar/pkg/cups/trunk/files/CSWcups.depend csw/mgar/pkg/cups/trunk/files/CSWcups.gspec csw/mgar/pkg/cups/trunk/files/CSWcups.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsdev.depend csw/mgar/pkg/cups/trunk/files/CSWcupsdev.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsdev.prototype csw/mgar/pkg/cups/trunk/files/CSWcupsdoc.depend csw/mgar/pkg/cups/trunk/files/CSWcupsdoc.gspec csw/mgar/pkg/cups/trunk/files/CSWcupsdoc.prototype csw/mgar/pkg/cups/trunk/files/CSWlibcups.depend csw/mgar/pkg/cups/trunk/files/CSWlibcups.gspec csw/mgar/pkg/cups/trunk/files/CSWlibcups.prototype csw/mgar/pkg/cups/trunk/files/Makedefs.in.patch csw/mgar/pkg/cups/trunk/files/checkinstall csw/mgar/pkg/cups/trunk/files/create_rc.d.sh csw/mgar/pkg/cups/trunk/files/cswcups csw/mgar/pkg/cups/trunk/files/cups.xml csw/mgar/pkg/cups/trunk/files/i.smfno csw/mgar/pkg/cups/trunk/files/i.smfyes csw/mgar/pkg/cups/trunk/files/space Property Changed: ---------------- csw/mgar/pkg/cups/trunk/ csw/mgar/pkg/cups/trunk/Makefile Property changes on: csw/mgar/pkg/cups/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/cups/branches/cups-1.4:6190-6950 /csw/mgar/pkg/cups/branches/cups-1.4.0:6915-6949 /csw/mgar/pkg/cups/branches/cups-with-classutils:5613-6189 Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +1,9 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = cups -GARVERSION = 1.3.11 +GARVERSION = 1.4.1 CATEGORIES = net define BLURB @@ -7,41 +11,159 @@ systems. It is developed and maintained by Easy Software Products to promote a standard printing solution and is the standard printing system in MacOS(R) X and most Linux(R) distributions. + + http://www.cups.org/str.php?L3324 endef +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +# There's a problem with cups-polld going into a busy-wait loop when polling +# print servers. +# +# http://www.cups.org/str.php?L3257 (closed) +# http://www.cups.org/str.php?L3381 (filed again) +# +# The problem with cups-polld seems to be going away when CUPS is compiled with +# debugging symbols. The debugging options is turned on for this package, in +# order to be able to debug the binary if it ever shows the problem. + +GARFLAVOR = DBG + # These are the source mirrors published on the CUPS home-page. -CUPS_MIRRORS = http://ftp.easysw.com/pub +CUPS_MIRRORS = http://ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp2.easysw.com/pub CUPS_MIRRORS += ftp://ftp3.easysw.com/pub CUPS_MIRRORS += http://www.nu6.org/_/mirror/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub + # Complete the mirror paths by adding /cups/x.y.z/ at the end. -FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) +FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -DISTFILES = cups-$(GARVERSION)-source.tar.bz2 -DISTFILES += $(call admfiles,CSWlibcups,depend prototype) -DISTFILES += $(call admfiles,CSWcupsd,depend prototype postinstall preremove \ - postremove) -DISTFILES += $(call admfiles,CSWcupsclient,depend prototype) -DISTFILES += $(call admfiles,CSWcupsdoc,depend prototype) -DISTFILES += $(call admfiles,CSWcupsdev,depend prototype) -DISTFILES += $(call admfiles,CSWcups,depend prototype) +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 +DISTFILES += CSWcupsclient.preinstall +DISTFILES += CSWcupsd.preinstall +DISTFILES += CSWcupsd.postremove -DISTFILES += i.smfyes i.smfno space checkinstall +PATCHFILES = 0001-cswcups-for-service-name.patch +PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch +PATCHFILES += 0003-Reference-counting-for-printers-only.patch +PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch -REQUIRED_PKGS = CSWkrb5lib CSWosslrt -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWoldapdevel +PREREQUISITE_PKGS = CSWggettext +PREREQUISITE_PKGS += CSWjpeg +PREREQUISITE_PKGS += CSWkrb5libdev +PREREQUISITE_PKGS += CSWoldapdevel +PREREQUISITE_PKGS += CSWossldevel +PREREQUISITE_PKGS += CSWtiff +PREREQUISITE_PKGS += CSWzlib +PREREQUISITE_PKGS += SUNWhea +PREREQUISITE_PKGS += SUNWlibm +PREREQUISITE_PKGS += SUNWslpu -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 +SPKG_CLASSES = none cswcpsampleconf cswinitsmf + +PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups + +ARCHALL_CSWcupsdoc = 1 +ARCHALL_CSWcupsdev = 1 + +REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient +REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 +REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc +REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt +REQUIRED_PKGS_CSWcupsdoc = CSWcswclassutils +REQUIRED_PKGS_CSWcupsdev = CSWcswclassutils +REQUIRED_PKGS_CSWlibcups = CSWcswclassutils CSWjpeg CSWpng CSWtiff CSWzlib +REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt + +PKGFILES_CSWlibcups = $(libdir)/libcups.* + +PKGFILES_CSWcupsdoc = $(datadir)/doc +PKGFILES_CSWcupsdoc += $(datadir)/doc/.* +PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* + +PKGFILES_CSWcupsdev = $(includedir)/cups/?.* +PKGFILES_CSWcupsdev += $(mandir)/man1/cups-config.1 +PKGFILES_CSWcupsdev += $(bindir)/cups-config +PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* +PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* + +PKGFILES_CSWcupsd = $(sysconfdir)/.* +PKGFILES_CSWcupsd += $(mandir)/man1m +PKGFILES_CSWcupsd += $(mandir)/man1m/cups(filter|d|-polld|-deviced|-driverd|-lpd).* +PKGFILES_CSWcupsd += $(mandir)/man7/(backend|filter).7 +PKGFILES_CSWcupsd += $(mandir)/man5/(cups-snmp.conf|subscriptions.conf).5 +PKGFILES_CSWcupsd += $(mandir)/man5/(mime.convs|classes.conf|cupsd.conf).5 +PKGFILES_CSWcupsd += $(mandir)/man5/(mime.types|printers.conf|mailto.conf).5 +PKGFILES_CSWcupsd += $(datadir)/cups +PKGFILES_CSWcupsd += $(datadir)/cups/(fonts|templates|charmaps|model).* +PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).* +PKGFILES_CSWcupsd += $(datadir)/locale/.* +PKGFILES_CSWcupsd += $(datadir)/applications/.* +PKGFILES_CSWcupsd += $(datadir)/cups/mime.* +PKGFILES_CSWcupsd += $(datadir)/icons.* +PKGFILES_CSWcupsd += $(libdir)/cups/.* +PKGFILES_CSWcupsd += $(libdir)/svc/.* +PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po) +PKGFILES_CSWcupsd += $(sbindir)/(cupsfilter|cupsd) +PKGFILES_CSWcupsd += $(localstatedir)/.* + +PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) +PKGFILES_CSWcupsclient += $(sbindir)/cups(accept|reject) +PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move)) +PKGFILES_CSWcupsclient += $(bindir)/(cancel|cupstest(dsc|ppd)) +PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat)) +PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1 +PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 +PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1 +PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1 +PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups|)(accept|reject)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(en|dis)able\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(addsmb|ctl)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/lp(admin|c|info|move)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 +PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 +PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 + +SPKG_DESC_CSWcups = Common Unix Printing System +SPKG_DESC_CSWlibcups = CUPS libraries +SPKG_DESC_CSWcupsd = CUPS daemon +SPKG_DESC_CSWcupsclient = CUPS client binaries +SPKG_DESC_CSWcupsdoc = CUPS documentation +SPKG_DESC_CSWcupsdev = CUPS header files + +# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html +SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW +INITSMF = $(sysconfdir)/init\.d/cswcups + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib -CONFIGURE_ARGS = $(DIRPATHS) --enable-pdftops +CONFIGURE_ARGS = $(DIRPATHS) --enable-pdftops +CONFIGURE_ARGS += --with-menudir=$(datadir)/applications +CONFIGURE_ARGS += --localedir=$(datadir)/locale +CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) +CONFIGURE_ARGS += --with-icondir=$(datadir)/icons +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --enable-debug-guards +CONFIGURE_ARGS_DBG += --enable-debug-printfs + +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + + # This is a hack that's needed, because configure (Makedefs) will otherwise # plase -ltiff, etc. first and -L/opt/csw/lib afterwards, thus being unable # to find any of the image libraries. @@ -56,54 +178,27 @@ export DSTROOT # Don't run tests (at least for now); there are some LD_LIBRARY_PATH issues -TEST_TARGET = +TEST_TARGET = SPKG_SOURCEURL = http://www.cups.org/ -include gar/category.mk - PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups -post-configure: - (test -d $(PRIVATE_CUPS_INC) || mkdir -p $(PRIVATE_CUPS_INC); \ - cd $(WORKSRC)/cups; \ - cp -p adminutil.h array.h cups.h dir.h file.h http.h i18n.h ipp.h \ - language.h md5.h ppd.h transcode.h $(PRIVATE_CUPS_INC); \ - cd ../filter; \ - cp -p image.h raster.h $(PRIVATE_CUPS_INC)) +# CUPS uses the 'OPTIM' variable to set the optimization flags. +OPTIM_DBG = -g -xO0 +OPTIM = $(OPTIM_$(GARFLAVOR)) +export OPTIM -post-install: - (test -d $(DESTDIR)$(prefix)/share || \ - mkdir $(DESTDIR)$(prefix)/share; \ - cd $(DESTDIR)$(prefix)/share; \ - if [ ! -d locale ]; then \ - test -d ../lib/locale && mv ../lib/locale .; \ - cd locale; \ - for i in *; do \ - echo "Processing $$i..."; \ - cd $$i; \ - mkdir LC_MESSAGES; \ - mv cups*.po LC_MESSAGES; \ - cd ..; \ - done \ - fi) - (cd $(DESTDIR); \ - if [ -d usr/share ]; then \ - cd usr/share; \ - gtar cf - * | gtar xf - -C ./$(prefix)/share; \ - cd ../..; \ - rm -rf usr/share; \ - fi) - (cd $(DESTDIR)$(prefix)/etc/cups; \ +include gar/category.mk + +post-install-modulated: + (cd $(DESTDIR)$(sysconfdir)/cups; \ + echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ for i in cupsd.conf; do \ if [ -r "$$i" ]; then \ echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ + mv "$$i" "$$i.CSW"; \ + chmod 0644 "$$i.CSW"; \ fi \ done) - files/create_rc.d.sh $(DESTDIR) - mkdir -p $(DESTDIR)$(prefix)/var/svc/manifest/application/print - cp -p files/cups.xml $(DESTDIR)$(prefix)/var/svc/manifest/application/print - mkdir -p $(DESTDIR)$(prefix)/lib/svc/method - cp -p files/cswcups \ - $(DESTDIR)$(prefix)/lib/svc/method/svc-cups + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/cups/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/checksums 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,30 +1,11 @@ -7f65bae0054cd8335824942595d867ef download/cups-1.2.3-source.tar.bz2 -528650aba3b56541f75370ef09541850 download/cups-1.2.4-source.tar.bz2 -bf44783d9b46130bee9f2995e6055470 download/cups-1.2.7-source.tar.bz2 -cf63f451c356e6cabb08972d4d11c365 download/cups-1.3.9-source.tar.bz2 -2d4c205b6bf46118e5729f297f6c86f4 download/CSWlibcups.gspec -b935020156288e961d4616b67ed6282f download/CSWlibcups.depend -8d0be59e5a223ee3f393dd7428b361f7 download/CSWlibcups.prototype -6754b7828a6689c73f88a725e530ecad download/CSWcupsd.gspec -cb99c644910343ca3a15f602207542c4 download/CSWcupsd.depend -6a2cdf81c09ebd10a5aad39007a379a9 download/CSWcupsd.prototype -983e667bd1e48083d53f1a81ac0a532b download/CSWcupsd.postinstall -088e288b9d1df2ae98a95ba8aeed0fc9 download/CSWcupsd.preremove -76fde99d51b374ae83bfafd2434654fe download/CSWcupsd.postremove -1d70187f4b8b2e9198112a4a46df8ec8 download/CSWcupsclient.gspec -887ada7324b06e36e6e85a15928a5dd2 download/CSWcupsclient.depend -cb019efac2edf3bbcb995535abc02126 download/CSWcupsclient.prototype -36fa60a8b6f50bed29e1cedcb614635a download/CSWcupsdoc.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWcupsdoc.depend -9034bf572363d3448c3a162b8412178f download/CSWcupsdoc.prototype -b48a4b028e872afd97fcbc978f475a5c download/CSWcupsdev.gspec -51ec8b485aa9cb40f94ab748cfe6e039 download/CSWcupsdev.depend -237928d30262573d3c37bebbffe6bb61 download/CSWcupsdev.prototype -a9639c24fb955bb3b56991e0e5b55fd7 download/CSWcups.gspec -c43f5fba2adc1d80c36d25e6772cd809 download/CSWcups.depend -d41d8cd98f00b204e9800998ecf8427e download/CSWcups.prototype -867f8d3ecf9dbd00e75ef2f9929ac827 download/i.smfyes -023011fb893a6c7c65a596559a3bc3e9 download/i.smfno -f49c3339aa897df97abf1baf54582fb8 download/space -fab3f277553e2df50af55dfa29109c02 download/checkinstall -fb8245ae67c27d343009536858d97a48 download/Makedefs.in.patch +1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch +0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch +a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch +193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +bbf0295c76cd06b5311ac3a3467fd431 download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +0dd35cc0938696577104852781ec1df6 download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 download/0007-Solaris-zone-support-in-init-script.patch +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsclient.preinstall +ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove +cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsd.preinstall +587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 Copied: csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,72 @@ +From 7ef5a09e7257782a5f8b4d9bcf681a399ef82996 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 16:41:17 +0100 +Subject: [PATCH 1/3] cswcups for service name + +--- + Makefile | 12 ++++++------ + locale/Makefile | 3 ++- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 91be6e5..a1ff6f8 100644 +--- a/Makefile ++++ b/Makefile +@@ -178,18 +178,18 @@ install-data: + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + for level in $(RCLEVELS); do \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ + if test `uname` = HP-UX; then \ + level=`expr $$level - 1`; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ + fi; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ + done; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +@@ -227,7 +227,7 @@ install-data: + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test "x$(MENUDIR)" != x; then \ +- echo Installing desktop menu...; \ ++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ + fi +@@ -290,7 +290,7 @@ uninstall: + -$(RMDIR) $(BINDIR) + echo Uninstalling startup script... + if test "x$(INITDIR)" != x; then \ +- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ + $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +diff --git a/locale/Makefile b/locale/Makefile +index 6241b66..f76b8bc 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -75,7 +75,8 @@ install-languages: + for loc in $(LANGUAGES) ; do \ + if test -f cups_$$loc.po; then \ + $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ +- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ ++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ ++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ + fi ; \ + done + +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0002-Adding-the-refcount-member-to-mime_type_t.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,24 @@ +From ee9340922a5a998e05b2ec123233f2bbf57a84a3 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:33:00 +0100 +Subject: [PATCH 2/3] Adding the refcount member to mime_type_t + +--- + scheduler/mime.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.h b/scheduler/mime.h +index 0194964..4bd64c2 100644 +--- a/scheduler/mime.h ++++ b/scheduler/mime.h +@@ -85,6 +85,7 @@ typedef struct _mime_magic_s /**** MIME Magic Data ****/ + + typedef struct _mime_type_s /**** MIME Type Data ****/ + { ++ int refcount; /* To allow sharing of this struct */ + mime_magic_t *rules; /* Rules used to detect this type */ + int priority; /* Priority of this type */ + char super[MIME_MAX_SUPER], /* Super-type name ("image", "application", etc.) */ +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0003-Reference-counting-for-printers-only.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,56 @@ +From b22d9f6339a2d367dd5493f8fb0e06041b26d80a Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:52:18 +0100 +Subject: [PATCH 3/3] Reference counting for printers only. + +--- + scheduler/mime.c | 7 +++++++ + scheduler/printers.c | 1 + + scheduler/type.c | 1 + + 3 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.c b/scheduler/mime.c +index 890f2ea..1cabf64 100644 +--- a/scheduler/mime.c ++++ b/scheduler/mime.c +@@ -156,6 +156,13 @@ mimeDeleteType(mime_t *mime, /* I - MIME database */ + if (!mime || !mt) + return; + ++ mt->refcount--; ++ if (mt->refcount) { ++ /* ++ * Other references to this instance exist, not removing. ++ */ ++ return; ++ } + cupsArrayRemove(mime->types, mt); + + delete_rules(mt->rules); +diff --git a/scheduler/printers.c b/scheduler/printers.c +index 1430946..629b86d 100644 +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -127,6 +127,7 @@ cupsdAddPrinter(const char *name) /* I - Name of printer */ + p->accepting = 0; + p->shared = DefaultShared; + p->filetype = mimeAddType(MimeDatabase, "printer", name); ++ p->filetype->refcount++; + + cupsdSetString(&p->job_sheets[0], "none"); + cupsdSetString(&p->job_sheets[1], "none"); +diff --git a/scheduler/type.c b/scheduler/type.c +index 6443506..faf4381 100644 +--- a/scheduler/type.c ++++ b/scheduler/type.c +@@ -124,6 +124,7 @@ mimeAddType(mime_t *mime, /* I - MIME database */ + strlen(type) + 1)) == NULL) + return (NULL); + ++ temp->refcount = 0; /* Callers are responsible for incrementing the counter */ + strlcpy(temp->super, super, sizeof(temp->super)); + strcpy(temp->type, type); /* Safe: temp->type is allocated */ + temp->priority = 100; +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,25 @@ +From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 19 Oct 2009 13:22:37 +0100 +Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332 + +--- + backend/usb-unix.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/backend/usb-unix.c b/backend/usb-unix.c +index c749253..8ce92b9 100644 +--- a/backend/usb-unix.c ++++ b/backend/usb-unix.c +@@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ + * 'side_cb()' - Handle side-channel requests... + */ + +-static void ++static int /* O - 0 on success, -1 on error */ + side_cb(int print_fd, /* I - Print file */ + int device_fd, /* I - Device file */ + int snmp_fd, /* I - SNMP socket (unused) */ +-- +1.6.3.2 + Copied: csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,42 @@ +From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 21 Oct 2009 12:40:39 +0200 +Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno + +--- + cups/http.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 840e3fc..e255375 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + return (SSL_read((SSL *)(http->tls), buf, len)); + + # elif defined(HAVE_GNUTLS) +- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ int result; ++ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); ++ if (result < 0 && !errno) { ++ switch (result) ++ { ++ case GNUTLS_E_INTERRUPTED : ++ errno = EINTR; ++ break; ++ case GNUTLS_E_AGAIN : ++ errno = EAGAIN; ++ break; ++ default : ++ errno = EPIPE; ++ break; ++ } ++ result = -1; ++ } ++ return result; + + # elif defined(HAVE_CDSASSL) + int result; /* Return value */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,25 @@ +From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 20 Oct 2009 13:35:40 +0200 +Subject: [PATCH] Fail compilation if no SSL impl chosen + +--- + cups/http.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/cups/http.c b/cups/http.c +index 8b767c9..840e3fc 100644 +--- a/cups/http.c ++++ b/cups/http.c +@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */ + } + + return (result); ++# else ++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set." + # endif /* HAVE_LIBSSL */ + } + #endif /* HAVE_SSL */ +-- +1.6.5 + Copied: csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch) =================================================================== --- csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,42 @@ +From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 23 Oct 2009 11:08:23 +0100 +Subject: [PATCH] Solaris zone support in init script + +--- + init/cups.sh.in | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/init/cups.sh.in b/init/cups.sh.in +index 2ff418c..d714b19 100755 +--- a/init/cups.sh.in ++++ b/init/cups.sh.in +@@ -148,7 +148,7 @@ case "`uname`" in + HP-UX* | AIX* | SINIX*) + pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; +- IRIX* | SunOS*) ++ IRIX*) + pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'` + ;; + UnixWare*) +@@ -161,6 +161,16 @@ case "`uname`" in + Linux* | *BSD* | Darwin*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; ++ SunOS*) ++ if [ -x /usr/bin/zonename ]; then ++ zonename=`/usr/bin/zonename` ++ zoneopts="-z $zonename" ++ else ++ zoneopts= ++ fi ++ # The backslash before the ^ is important. ++ pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$` ++ ;; + *) + pid="" + ;; +-- +1.6.3.2 + Deleted: csw/mgar/pkg/cups/trunk/files/CSWcups.depend =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcups.depend 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcups.depend 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -P CSWlibcups Libraries for the Common UNIX Printing System -P CSWcupsclient Client portion of the Common UNIX Printing System -P CSWcupsd Server portion of the Common UNIX Printing System -P CSWcupsdev Development files for the Common UNIX Printing System -P CSWcupsdoc Documentation for the Common UNIX Printing System Deleted: csw/mgar/pkg/cups/trunk/files/CSWcups.gspec =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcups.gspec 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcups.gspec 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,6 +0,0 @@ -%var bitname cups -%var pkgname CSWcups -%var arch all -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%var desc The Common UNIX Printing System -#%copyright url file://%{WORKSRC}/LICENSE.txt Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.depend 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -P CSWlibcups libcups - Libraries for the Common UNIX Printing System -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWgnutls gnutls - GNU Transport Layer Security lib and tools -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.gspec 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -%var bitname cupsclient -%var pkgname CSWcupsclient -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%var desc Client portion of the Common UNIX Printing System -%copyright url file://%{WORKSRC}/LICENSE.txt Copied: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall) =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall (rev 0) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.preinstall 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,45 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.prototype 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,52 +0,0 @@ -d none /opt/csw 0755 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/cupstestdsc 0755 root bin -f none /opt/csw/bin/lpr 0755 root bin -f none /opt/csw/bin/lpq 0755 root bin -f none /opt/csw/bin/cancel 0755 root bin -f none /opt/csw/bin/lprm 0755 root bin -f none /opt/csw/bin/lppasswd 0755 root bin -f none /opt/csw/bin/lp 0755 root bin -f none /opt/csw/bin/lpoptions 0755 root bin -f none /opt/csw/bin/cupstestppd 0755 root bin -f none /opt/csw/bin/lpstat 0755 root bin -d none /opt/csw/sbin 0755 root bin -s none /opt/csw/sbin/cupsdisable=accept -s none /opt/csw/sbin/cupsenable=accept -f none /opt/csw/sbin/cupsaddsmb 0755 root bin -s none /opt/csw/sbin/reject=accept -f none /opt/csw/sbin/lpadmin 0755 root bin -f none /opt/csw/sbin/lpinfo 0755 root bin -f none /opt/csw/sbin/cupsctl 0755 root bin -f none /opt/csw/sbin/accept 0755 root bin -f none /opt/csw/sbin/lpmove 0755 root bin -f none /opt/csw/sbin/lpc 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/lpstat.1 0644 root bin -f none /opt/csw/share/man/man1/cupstestdsc.1 0644 root bin -f none /opt/csw/share/man/man1/cancel.1 0644 root bin -f none /opt/csw/share/man/man1/lpq.1 0644 root bin -f none /opt/csw/share/man/man1/cupstestppd.1 0644 root bin -f none /opt/csw/share/man/man1/lp.1 0644 root bin -f none /opt/csw/share/man/man1/lppasswd.1 0644 root bin -f none /opt/csw/share/man/man1/lpoptions.1 0644 root bin -f none /opt/csw/share/man/man1/lpr.1 0644 root bin -f none /opt/csw/share/man/man1/lprm.1 0644 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/lpinfo.1m 0644 root bin -f none /opt/csw/share/man/man1m/accept.1m 0644 root bin -f none /opt/csw/share/man/man1m/cupsctl.1m 0644 root bin -s none /opt/csw/share/man/man1m/reject.1m=accept.1m -f none /opt/csw/share/man/man1m/cupsenable.1m 0644 root bin -f none /opt/csw/share/man/man1m/lpc.1m 0644 root bin -f none /opt/csw/share/man/man1m/cupsaddsmb.1m 0644 root bin -f none /opt/csw/share/man/man1m/lpadmin.1m 0644 root bin -s none /opt/csw/share/man/man1m/cupsdisable.1m=cupsenable.1m -f none /opt/csw/share/man/man1m/lpmove.1m 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/client.conf.5 0644 root bin -i copyright=CSWcupsclient.copyright -i depend=CSWcupsclient.depend -i pkginfo=CSWcupsclient.pkginfo Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.depend 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,7 +0,0 @@ -P CSWlibcups libcups - Libraries for the Common UNIX Printing System -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWgnutls gnutls - GNU Transport Layer Security lib and tools -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWzlib zlib - Zlib Data Compression Library -P CSWoldaprt OpenLDAP runtime libraries (oldaprt) -P CSWkrb5lib MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.gspec 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,5 +0,0 @@ -%var bitname cupsd -%var pkgname CSWcupsd -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%var desc Server portion of the Common UNIX Printing System -%copyright url file://%{WORKSRC}/LICENSE.txt Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.postinstall 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,62 +0,0 @@ -#!/sbin/sh - -CONFDIR=$BASEDIR/opt/csw/etc/cups -CONFFILES="cupsd.conf classes.conf client.conf printers.conf mime.convs \ - mime.types" -PATH=/bin:/usr/bin:"$PATH" -export PATH - -class=smfno -test -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm && class=smfyes - -# stop cups, but ONLY if we are doing a "direct" -# install, rather than a jumpstart install or something. -case "$PKG_ROOT_DIR" in - ""|"/") - if [ "$smf" = "yes" ]; then - /usr/sbin/svcadm disable -s svc:application/print/cswcups:default - /usr/sbin/svccfg delete svc:application/print/cswcups:default - else - test -x $BASEDIR/etc/init.d/cswcups && $BASEDIR/etc/init.d/cswcups stop - fi - ;; -esac - - -### Set up config-file related stuff - -for file in $CONFFILES; do - confpath="$CONFDIR/$file" - if [ -r "$confpath" ]; then - echo "Not touching existing $confpath" - else - if [ -r "$confpath.CSW" ]; then - echo "Copying $confpath.CSW to $confpath" - cp -p "$confpath.CSW" "$confpath" - else - echo "Skipping $confpath.CSW..." - fi - fi -done - -# start cups, but ONLY if we are doing a "direct" -# install, rather than a jumpstart install or something. -case "$PKG_ROOT_DIR" in - ""|"/") - if [ "$class" = "smfno" ]; then - if [ -f $BASEDIR/etc/init.d/cswcups ]; then - $BASEDIR/etc/init.d/cswcups start - echo "If you do *NOT* want to start cupsd during system-boot" - echo " rm $CONFDIR/cupsd.conf" - echo "or" - echo " mv $CONFDIR/cupsd.conf $CONFDIR/cupsd.conf.OFF" - fi - else - echo "Registering CUPS with SMF..." - /usr/sbin/svccfg import $BASEDIR/opt/csw/var/svc/manifest/application/print/cups.xml - /usr/sbin/svcadm enable svc:application/print/cswcups - fi - ;; -esac - -exit 0 Modified: csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.postremove 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,6 +1,6 @@ #!/sbin/sh -etccups=${BASEDIR}opt/csw/etc/cups +etccups=${BASEDIR}/etc/opt/csw/cups if [ -d "$etccups" ]; then echo "" Copied: csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall (from rev 6950, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall) =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall (rev 0) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall 2009-10-23 12:50:35 UTC (rev 6952) @@ -0,0 +1,45 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.preremove 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,38 +0,0 @@ -#!/sbin/sh - -CONFDIR=$BASEDIR/opt/csw/etc/cups -CONFFILES="classes.conf client.conf cupsd.conf printers.conf mime.convs \ - mime.types" - -PATH=/bin:/usr/bin:"$PATH" -export PATH - -smf=no -test -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm && smf=yes - -# stop cups, but ONLY if we are doing a "direct" -# install, rather than a jumpstart install or something. -case "$PKG_ROOT_DIR" in - ""|"/") - if [ "$smf" = "yes" ]; then - echo "Stopping and deregistering CUPS..." - /usr/sbin/svcadm disable -s svc:application/print/cswcups:default - /usr/sbin/svccfg delete svc:application/print/cswcups:default - else - echo "Stopping CUPS..." - test -x $BASEDIR/etc/init.d/cswcups && $BASEDIR/etc/init.d/cswcups stop - fi - ;; -esac - -for file in $CONFFILES; do - confpath="$CONFDIR/$file" - test -r "$confpath.CSW" || continue - diff "$confpath" "$confpath.CSW" >/dev/null 2>&1 - if [ $? != 0 ]; then - echo "Not touching modified $confpath" - else - echo "Removing unmodified $confpath" - rm -f "$confpath" - fi -done Deleted: csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype 2009-10-23 12:49:49 UTC (rev 6951) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsd.prototype 2009-10-23 12:50:35 UTC (rev 6952) @@ -1,1035 +0,0 @@ -d smfno /etc 0755 root bin -d smfno /etc/init.d 0755 root bin -f smfno /etc/init.d/cswcups 0755 root sys -d smfno /etc/rc0.d 0755 root bin -s smfno /etc/rc0.d/K00cswcups=../init.d/cswcups -d smfno /etc/rc2.d 0755 root bin -s smfno /etc/rc2.d/K00cswcups=../init.d/cswcups -d smfno /etc/rc3.d 0755 root bin -s smfno /etc/rc3.d/S99cswcups=../init.d/cswcups -d smfno /etc/rcS.d 0755 root bin -s smfno /etc/rcS.d/K00cswcups=../init.d/cswcups -d smfno /etc/rc1.d 0755 root bin -s smfno /etc/rc1.d/K00cswcups=../init.d/cswcups -d smfyes /opt/csw/lib/svc 0755 root bin -d smfyes /opt/csw/lib/svc/method 0755 root bin -f smfyes /opt/csw/lib/svc/method/svc-cups 0755 root bin -d smfyes /opt/csw/var/svc 0755 root bin -d smfyes /opt/csw/var/svc/manifest 0755 root bin -d smfyes /opt/csw/var/svc/manifest/application 0755 root bin -d smfyes /opt/csw/var/svc/manifest/application/print 0755 root bin -f smfyes /opt/csw/var/svc/manifest/application/print/cups.xml 0644 root bin -d none /opt/csw 0755 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/cups 0755 root lp -d none /opt/csw/etc/cups/ssl 0700 root sys -f none /opt/csw/etc/cups/cupsd.conf.CSW 0640 root sys -d none /opt/csw/etc/cups/ppd 0755 root lp -f none /opt/csw/etc/cups/cupsd.conf.default 0640 root sys -f none /opt/csw/etc/cups/mime.convs 0644 root sys -f none /opt/csw/etc/cups/mime.types 0644 root sys -f none /opt/csw/etc/cups/snmp.conf 0640 root sys -d none /opt/csw/etc/cups/interfaces 0755 root sys -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/cupsfilter.1m 0644 root bin -f none /opt/csw/share/man/man1m/cupsd.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-polld.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-deviced.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-driverd.1m 0644 root bin -f none /opt/csw/share/man/man1m/cups-lpd.1m 0644 root bin -d none /opt/csw/share/man/man7 0755 root bin -f none /opt/csw/share/man/man7/backend.7 0644 root bin -f none /opt/csw/share/man/man7/filter.7 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/cups-snmp.conf.5 0644 root bin -f none /opt/csw/share/man/man5/subscriptions.conf.5 0644 root bin -f none /opt/csw/share/man/man5/mime.convs.5 0644 root bin -f none /opt/csw/share/man/man5/classes.conf.5 0644 root bin -f none /opt/csw/share/man/man5/cupsd.conf.5 0644 root bin -f none /opt/csw/share/man/man5/mime.types.5 0644 root bin -f none /opt/csw/share/man/man5/printers.conf.5 0644 root bin -f none /opt/csw/share/man/man5/mailto.conf.5 0644 root bin -d none /opt/csw/share/cups 0755 root bin -d none /opt/csw/share/cups/fonts 0755 root bin -f none /opt/csw/share/cups/fonts/Courier-Bold 0644 root bin -f none /opt/csw/share/cups/fonts/Courier-BoldOblique 0644 root bin -f none /opt/csw/share/cups/fonts/Symbol 0644 root bin -f none /opt/csw/share/cups/fonts/Courier 0644 root bin -f none /opt/csw/share/cups/fonts/Courier-Oblique 0644 root bin -d none /opt/csw/share/cups/templates 0755 root bin -f none /opt/csw/share/cups/templates/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-model.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/et 0755 root bin -f none /opt/csw/share/cups/templates/et/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/et/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printers.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/pl 0755 root bin -f none /opt/csw/share/cups/templates/pl/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pl/printer-modified.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/es 0755 root bin -f none /opt/csw/share/cups/templates/es/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/es/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-device.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/he 0755 root bin -f none /opt/csw/share/cups/templates/he/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/he/test-page.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/fr 0755 root bin -f none /opt/csw/share/cups/templates/fr/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/fr/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-uri.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/zh_TW 0755 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/zh_TW/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/set-printer-options-trailer.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/de 0755 root bin -f none /opt/csw/share/cups/templates/de/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/de/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/modify-class.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/ja 0755 root bin -f none /opt/csw/share/cups/templates/ja/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/ja/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/error-op.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/sv 0755 root bin -f none /opt/csw/share/cups/templates/sv/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/sv/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/pager.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/id 0755 root bin -f none /opt/csw/share/cups/templates/id/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/subscription-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/id/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/add-rss-subscription.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-boolean.tmpl 0644 root bin -d none /opt/csw/share/cups/templates/it 0755 root bin -f none /opt/csw/share/cups/templates/it/job-restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/modify-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/jobs.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-reject.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printers-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-make.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-release.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/error-op.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-hold.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/edit-config.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-uri.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/set-printer-options-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/help-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/error.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-boolean.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/samba-exported.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/set-printer-options-trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-cancel.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/test-page.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/admin.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/modify-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/samba-export.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-purge.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-conflict.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-model.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/classes.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/add-class.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/classes-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/search.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-deleted.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-added.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/restart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/option-pickone.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/class-modified.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/help-printable.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/pager.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/norestart.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/choose-device.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/maintenance.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/add-printer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/it/printer-stop.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/users.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-default.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/trailer.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/list-available-printers.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/jobs-header.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-accept.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-moved.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/class-confirm.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-start.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printer-configured.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/subscription-canceled.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/choose-serial.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/option-pickmany.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/job-move.tmpl 0644 root bin -f none /opt/csw/share/cups/templates/printers-header.tmpl 0644 root bin -d none /opt/csw/share/cups/charmaps 0755 root bin -f none /opt/csw/share/cups/charmaps/windows-1258.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/iso-8859-16.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/windows-1251.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/windows-1256.txt 0644 root bin -f none /opt/csw/share/cups/charmaps/iso-8859-11.txt 0644 root bin @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 15:04:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:04:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6953] csw/mgar/pkg/cups/branches/cups-1.4/ Message-ID: Revision: 6953 http://gar.svn.sourceforge.net/gar/?rev=6953&view=rev Author: wahwah Date: 2009-10-23 13:04:04 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups: removing branch 1.4 Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 15:14:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6954] csw/mgar/pkg Message-ID: Revision: 6954 http://gar.svn.sourceforge.net/gar/?rev=6954&view=rev Author: bdwalton Date: 2009-10-23 13:14:58 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cswpkgsyslog: rename from cswpkglogger Added Paths: ----------- csw/mgar/pkg/cswpkgsyslog/ Removed Paths: ------------- csw/mgar/pkg/cswpkglogger/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 23 15:20:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:20:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6955] csw/mgar/pkg/cswpkgsyslog/trunk Message-ID: Revision: 6955 http://gar.svn.sourceforge.net/gar/?rev=6955&view=rev Author: bdwalton Date: 2009-10-23 13:20:00 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cswpkgsyslog: update scripts and gar recipe for new name Modified Paths: -------------- csw/mgar/pkg/cswpkgsyslog/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade Removed Paths: ------------- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade Modified: csw/mgar/pkg/cswpkgsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/Makefile 2009-10-23 13:14:58 UTC (rev 6954) +++ csw/mgar/pkg/cswpkgsyslog/trunk/Makefile 2009-10-23 13:20:00 UTC (rev 6955) @@ -1,4 +1,4 @@ -GARNAME = cswpkglogger +GARNAME = cswpkgsyslog GARVERSION = 1.0 CATEGORIES = utils @@ -33,10 +33,10 @@ HOOKS = $(PREHOOKS) $(POSTHOOKS) install-custom: - @echo Installing CSWcswpkglogger files... - @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/cswpkglogger/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ - ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)/opt/csw/share/doc/cswpkglogger/; \ - ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postupgrade.d/; \ - ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postinstall.d/01-CSWcswpkglogger-postinstall; \ - ln $(HOOKDIR)/postupgrade.d/01-CSWcswpkglogger-postupgrade $(HOOKDIR)/postremove.d/01-CSWcswpkglogger-postremove; \ - ginstall -m 0755 $(FILEDIR)/01-CSWcswpkglogger-preupgrade $(HOOKDIR)/preupgrade.d/;) + @echo Installing CSW$(GARNAME) files... + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/ $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/; \ + ginstall -m 0755 $(FILEDIR)/01-CSW$(GARNAME)-postupgrade $(HOOKDIR)/postupgrade.d/; \ + ln $(HOOKDIR)/postupgrade.d/01-CSW$(GARNAME)-postupgrade $(HOOKDIR)/postinstall.d/01-CSW$(GARNAME)-postinstall; \ + ln $(HOOKDIR)/postupgrade.d/01-CSW$(GARNAME)-postupgrade $(HOOKDIR)/postremove.d/01-CSW$(GARNAME)-postremove; \ + ginstall -m 0755 $(FILEDIR)/01-CSW$(GARNAME)-preupgrade $(HOOKDIR)/preupgrade.d/;) Deleted: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-23 13:14:58 UTC (rev 6954) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-postupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -1,62 +0,0 @@ -#!/opt/csw/bin/bash - -script=$0 - -set -- ${1/-/ } -PKG=$1 -VER=$2 - -function logdie() { - logger -t "cswpkglogger" "$1" - exit 0 -} - -function success() { - case ${script} in - *install) MSG="installed ${PKG} ${VER}";; - *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; - *remove) MSG="removed ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -function failure() { - case ${script} in - *install) MSG="Failed to install ${PKG} ${VER}";; - *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; - *remove) MSG="Failed to remove ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -if [ -d /var/sadm/pkg/${PKG} ]; then - SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) - pf=/var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} - if [ -f ${pf} ]; then - PREVVER=$(cat ${pf} 2>/dev/null) - rm -f ${pf} - fi - - case ${script} in - *remove) - failure - ;; - *install|*upgrade) - case "${VER}" in - ${SYSTEMVER}) success ${PREVVER};; - *) failure ${SYSTEMVER};; - esac - ;; - esac -else - case ${script} in - *remove) - success - ;; - *install|*upgrade) - failure - ;; - esac -fi Deleted: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-23 13:14:58 UTC (rev 6954) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkglogger-preupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -1,11 +0,0 @@ -#!/opt/csw/bin/bash - -set -- ${1/-/ } - -PKG=$1 -VER=$2 - -SYSTEMVER=$(pkgparam ${PKG} VERSION) - -# store previous version so we can log smarter things if upgrade fails. -echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkglogger.upgrade.${PKG} Added: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade (rev 0) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/bash + +script=$0 + +set -- ${1/-/ } +PKG=$1 +VER=$2 + +function logdie() { + logger -t "cswpkgsyslog" "$1" + exit 0 +} + +function success() { + case ${script} in + *install) MSG="installed ${PKG} ${VER}";; + *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; + *remove) MSG="removed ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +function failure() { + case ${script} in + *install) MSG="Failed to install ${PKG} ${VER}";; + *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; + *remove) MSG="Failed to remove ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +if [ -d /var/sadm/pkg/${PKG} ]; then + SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) + pf=/var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} + if [ -f ${pf} ]; then + PREVVER=$(cat ${pf} 2>/dev/null) + rm -f ${pf} + fi + + case ${script} in + *remove) + failure + ;; + *install|*upgrade) + case "${VER}" in + ${SYSTEMVER}) success ${PREVVER};; + *) failure ${SYSTEMVER};; + esac + ;; + esac +else + case ${script} in + *remove) + success + ;; + *install|*upgrade) + failure + ;; + esac +fi Property changes on: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-postupgrade ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade (rev 0) +++ csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade 2009-10-23 13:20:00 UTC (rev 6955) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -- ${1/-/ } + +PKG=$1 +VER=$2 + +SYSTEMVER=$(pkgparam ${PKG} VERSION) + +# store previous version so we can log smarter things if upgrade fails. +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} Property changes on: csw/mgar/pkg/cswpkgsyslog/trunk/files/01-CSWcswpkgsyslog-preupgrade ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 23 15:27:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Oct 2009 13:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6956] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 6956 http://gar.svn.sourceforge.net/gar/?rev=6956&view=rev Author: wahwah Date: 2009-10-23 13:27:44 +0000 (Fri, 23 Oct 2009) Log Message: ----------- cups: Disabling the debug mode. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 13:20:00 UTC (rev 6955) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-10-23 13:27:44 UTC (rev 6956) @@ -28,7 +28,7 @@ # debugging symbols. The debugging options is turned on for this package, in # order to be able to debug the binary if it ever shows the problem. -GARFLAVOR = DBG +# GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. CUPS_MIRRORS = http://ftp.easysw.com/pub This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 24 19:08:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 24 Oct 2009 17:08:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6958] csw/mgar/gar/v2/categories/x11/category.mk Message-ID: Revision: 6958 http://gar.svn.sourceforge.net/gar/?rev=6958&view=rev Author: wbonnet Date: 2009-10-24 17:08:46 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Change the upstream source path Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2009-10-24 13:26:32 UTC (rev 6957) +++ csw/mgar/gar/v2/categories/x11/category.mk 2009-10-24 17:08:46 UTC (rev 6958) @@ -1,6 +1,11 @@ # X11 -X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ -X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ + +# Version of X11 +X11_RELEASE_VERSION = X11R7.4 + +# Definition of the URL to access sources +X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 24 15:26:33 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Oct 2009 13:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6957] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 6957 http://gar.svn.sourceforge.net/gar/?rev=6957&view=rev Author: bdwalton Date: 2009-10-24 13:26:32 +0000 (Sat, 24 Oct 2009) Log Message: ----------- ruby: depend on CSWbdb47 explicitly and point configure at it properly Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-23 13:27:44 UTC (rev 6956) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-24 13:26:32 UTC (rev 6957) @@ -7,7 +7,7 @@ TEST_SCRIPTS = TEST_ARGS = test-all -PREREQUISITE_PKGS = CSWbdb CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel +PREREQUISITE_PKGS = CSWbdb47 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel PREREQUISITE_PKGS += CSWreadline CSWzlib PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel @@ -18,7 +18,7 @@ LICENSE = COPYING -REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv +REQUIRED_PKGS_CSWruby = CSWbdb47 CSWgdbm CSWiconv REQUIRED_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib REQUIRED_PKGS_CSWrubydoc = CSWruby @@ -82,7 +82,7 @@ CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-tcl-dir=$(prefix) CONFIGURE_ARGS += --with-tk-dir=$(prefix) -CONFIGURE_ARGS += --with-dbm-dir=$(prefix) +CONFIGURE_ARGS += --with-dbm-dir=$(prefix)/bdb47 CONFIGURE_ARGS += --with-gdbm-dir=$(prefix) CONFIGURE_ARGS += --with-iconv-dir=$(prefix) CONFIGURE_ARGS += --with-openssl-dir=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Oct 24 23:51:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 24 Oct 2009 21:51:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6959] csw/mgar/pkg/x11 Message-ID: Revision: 6959 http://gar.svn.sourceforge.net/gar/?rev=6959&view=rev Author: wbonnet Date: 2009-10-24 21:51:24 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Move to lib subdir Modified Paths: -------------- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums csw/mgar/pkg/x11/lib/libfs/trunk/checksums csw/mgar/pkg/x11/lib/libice/trunk/checksums csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/checksums csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/checksums csw/mgar/pkg/x11/lib/libxau/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/checksums csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/checksums csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/checksums csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile csw/mgar/pkg/x11/lib/libxmu/trunk/checksums csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile csw/mgar/pkg/x11/lib/libxpm/trunk/checksums csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums csw/mgar/pkg/x11/lib/libxres/trunk/checksums csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums csw/mgar/pkg/x11/lib/libxt/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/checksums csw/mgar/pkg/x11/lib/libxtst/trunk/checksums csw/mgar/pkg/x11/lib/libxv/trunk/Makefile csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/lib/xtrans/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/libpthread-stubs/ Removed Paths: ------------- csw/mgar/pkg/x11/libpthread-stubs/ Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -4d866967210d06098fc9f302ed4c79b1 libdmx-1.0.2.tar.bz2 +4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 +5cd16a2e51ca7b96a3081c7486ff98b9 download/libfontenc-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -81521249353fa33be7a4bb0062c2fbb9 libFS-1.0.1.tar.bz2 +81521249353fa33be7a4bb0062c2fbb9 download/libFS-1.0.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -4ab4e67e0b8845aa201e984153087f4a libICE-1.0.4.tar.bz2 +4ab4e67e0b8845aa201e984153087f4a download/libICE-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWlibicedevel +# PREREQUISITE_PKGS = CSWlibicedevel REQUIRED_PKGS = CSWlibice PACKAGES = CSWlibsm CSWlibsmdevel Modified: csw/mgar/pkg/x11/lib/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -05a04c2b6382fb0054f6c70494e22733 libSM-1.1.0.tar.bz2 +05a04c2b6382fb0054f6c70494e22733 download/libSM-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -12,14 +12,14 @@ MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTNAME = libX11-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = patch-stdint.diff +# PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 -PATCHFILES += patch-xlib-sentinel.diff +# PATCHFILES += patch-xlib-sentinel.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWxkbproto CSWinputproto CSWlibpthreadstubs CSWlibxcbdevel +PREREQUISITE_PKGS = CSWxcbproto CSWx11xextproto CSWxtrans CSWx11inputproto CSWlibpthreadstubs CSWlibxcbdevel PACKAGES = CSWlibx11 CSWlibx11devel Modified: csw/mgar/pkg/x11/lib/libx11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1,3 +1,3 @@ -c9b3a015e710e49303a48538149a4bd5 download/libX11-1.2.2.tar.gz +2feb39a0de6f05b25c308268691d960c download/libX11-1.1.5.tar.gz 667f63d38722e29d6fd36b6648bbb757 download/patch-stdint.diff 4e6f6f42902f849eba8d88ab15fa3697 download/patch-xlib-sentinel.diff Modified: csw/mgar/pkg/x11/lib/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -12,8 +12,8 @@ DISTNAME = libXau-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto -PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs +# PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto +# PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -15,7 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # xproto x11 xext xextproto xt xmu xpm -PREREQUISITE_PKGS = CSWlibxpmdevel +# PREREQUISITE_PKGS = CSWlibxpmdevel PACKAGES = CSWlibxaw CSWlibxawdevel Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.tar.bz2 +73671d8f1cf36fdd81395328cc3539c9 download/libXaw-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxcomposite = $(DESCRIPTION) SPKG_DESC_CSWlibxcompositedevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWcompositeproto +# PREREQUISITE_PKGS = CSWcompositeproto REQUIRED_PKGS_CSWlibxcompositedevel = CSWlibxcomposite REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -99b7554037a92b260891091e81815a0a libXcursor-1.1.9.tar.bz2 +99b7554037a92b260891091e81815a0a download/libXcursor-1.1.9.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -25,7 +25,7 @@ REQUIRED_PKGS_CSWlibxdamagedevel = CSWlibxdamage -PREREQUISITE_PKGS = CSWdamageproto +# PREREQUISITE_PKGS = CSWdamageproto PKGFILES_CSWlibxdamagedevel = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -10facf2bc7cbd5e5c1a698b8a210a582 libXdmcp-1.0.2.tar.bz2 +10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -17,7 +17,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxextproto CSWlibx11devel CSWlibxaudevel +PREREQUISITE_PKGS = CSWx11xextproto CSWlibx11devel CSWlibxaudevel PACKAGES = CSWlibxext CSWlibxextdevel Modified: csw/mgar/pkg/x11/lib/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -aa11d859cc8e9a0bad3bb55e1666547b download/libXext-1.0.5.tar.bz2 +a91f1f722ac80c597cf0b75dcb8b48c0 download/libXext-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxfixes = $(DESCRIPTION) SPKG_DESC_CSWlibxfixesdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWfixesproto +# PREREQUISITE_PKGS = CSWfixesproto REQUIRED_PKGS_CSWlibxfixes = CSWlibx11 REQUIRED_PKGS_CSWlibxfixesdevel = CSWlibxfixes Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxfont = $(DESCRIPTION) SPKG_DESC_CSWlibxfontdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWlibfontencdevel +# PREREQUISITE_PKGS = CSWlibfontencdevel REQUIRED_PKGS_CSWlibxfontdevel = CSWlibxfont REQUIRED_PKGS_CSWlibxfont = CSWftype2 CSWlibfontenc CSWzlib Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -4f174b9613f87cf00d731da428a1b194 libXfont-1.3.3.tar.bz2 +4f174b9613f87cf00d731da428a1b194 download/libXfont-1.3.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxfontcache = $(DESCRIPTION) SPKG_DESC_CSWlibxfontcachedevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWfontcacheproto +# PREREQUISITE_PKGS = CSWfontcacheproto REQUIRED_PKGS_CSWlibxfontcachedevel = CSWlibxfontcache REQUIRED_PKGS_CSWlibxfontcache = CSWlibx11 CSWlibxext Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -13,7 +13,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#PREREQUISITE_PKGS = CSWlibxpmdevel +PREREQUISITE_PKGS = CSWx11xproto CSWlibx11devel CSWx11xextproto CSWlibxextdevel CSWx11inputproto PACKAGES = CSWlibxi CSWlibxidevel Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -7c510abb0cad8dc20493fb27ff7859d8 libXi-1.1.3.tar.bz2 +7c510abb0cad8dc20493fb27ff7859d8 download/libXi-1.1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 libxkbfile-1.0.5.tar.bz2 +0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWlibxtdevel CSWlibxextdevel +# PREREQUISITE_PKGS = CSWlibxtdevel CSWlibxextdevel PACKAGES = CSWlibxmu CSWlibxmudevel Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -48b432e84035c664ece80a33695d5254 libXmu-1.0.4.tar.gz +48b432e84035c664ece80a33695d5254 download/libXmu-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -25,6 +25,8 @@ SPKG_DESC_CSWlibxpm = X11 pixmap library SPKG_DESC_CSWlibxpmdevel = X11 pixmap library development files +PREREQUISITE_PKGS = CSWx11xproto CSWlibx11devel + REQUIRED_PKGS_CSWlibxpm = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxt REQUIRED_PKGS_CSWlibxpmdevel = CSWlibxpm REQUIRED_PKGS_CSWxpm = CSWlibxpm Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -cd15ee542d9f515538b4462a6f79d977 libXpm-3.5.7.tar.bz2 +cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -25,7 +25,7 @@ REQUIRED_PKGS_CSWlibxrandrdevel = CSWlibxrandr -PREREQUISITE_PKGS = CSWrandrproto CSWlibxextdevel +# PREREQUISITE_PKGS = CSWrandrproto CSWlibxextdevel PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibxrandr = CSWlibx11 CSWlibxext CSWlibxrender Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -68eb59c3b7524db6ffd78746ee893d1d download/libXrandr-1.3.0.tar.bz2 +5cd67cc02a50c9644ba0a1846ea3b08e download/libXrandr-1.2.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -de66ffb657aba64c9d6dbdeabb757f3e libXres-1.0.3.tar.bz2 +de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxscrnsaver = $(DESCRIPTION) SPKG_DESC_CSWlibxscrnsaverdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWscrnsaverproto +# PREREQUISITE_PKGS = CSWscrnsaverproto REQUIRED_PKGS_CSWlibxscrnsaver = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibxscrnsaverdevel = CSWlibxscrnsaver Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -33e54f64b55f22d8bbe822a5b62568cb download/libXScrnSaver-1.2.0.tar.bz2 +93f84b6797f2f29cae1ce23b0355d00d download/libXScrnSaver-1.1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWlibsmdevel +# PREREQUISITE_PKGS = CSWlibsmdevel PACKAGES = CSWlibxt CSWlibxtdevel Modified: csw/mgar/pkg/x11/lib/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -f3bdd67785ace8cd0b23249e9d8c9975 libXt-1.0.5.tar.bz2 +f3bdd67785ace8cd0b23249e9d8c9975 download/libXt-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -090c1ad04e34982eada5cf3b1a0792fd libXtst-1.0.3.tar.bz2 +090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxv/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxv/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxv/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWxvideoproto +# PREREQUISITE_PKGS = CSWxvideoproto PACKAGES = CSWlibxv CSWlibxvdevel Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxvmc = $(DESCRIPTION) SPKG_DESC_CSWlibxvmcdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWlibxvdevel CSWxvideoproto +# PREREQUISITE_PKGS = CSWlibxvdevel CSWxvideoproto REQUIRED_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv REQUIRED_PKGS_CSWlibxvmcdevel = CSWlibxvmc Modified: csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxxf86dga = $(DESCRIPTION) SPKG_DESC_CSWlibxxf86dgadevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWxf86dgaproto +# PREREQUISITE_PKGS = CSWxf86dgaproto REQUIRED_PKGS_CSWlibxxf86dga = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibxxf86dgadevel = CSWlibxxf86dga Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-24 17:08:46 UTC (rev 6958) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-10-24 21:51:24 UTC (rev 6959) @@ -1 +1 @@ -5b7f447f6fe92cbc4f17441aaee0bf55 xtrans-1.2.1.tar.gz +5b7f447f6fe92cbc4f17441aaee0bf55 download/xtrans-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 25 00:57:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Oct 2009 22:57:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6960] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 6960 http://gar.svn.sourceforge.net/gar/?rev=6960&view=rev Author: bdwalton Date: 2009-10-24 22:57:35 +0000 (Sat, 24 Oct 2009) Log Message: ----------- ruby: have the -tk package explicitly depend on tcl instead of via tk Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-24 21:51:24 UTC (rev 6959) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-24 22:57:35 UTC (rev 6960) @@ -23,7 +23,7 @@ REQUIRED_PKGS_CSWrubydoc = CSWruby -REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk +REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl REQUIRED_PKGS_CSWrubydev = CSWruby CSWgfile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 25 14:43:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Oct 2009 13:43:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6961] csw/mgar/pkg Message-ID: Revision: 6961 http://gar.svn.sourceforge.net/gar/?rev=6961&view=rev Author: wahwah Date: 2009-10-25 13:43:39 +0000 (Sun, 25 Oct 2009) Log Message: ----------- pius: initial commit Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile csw/mgar/pkg/pius/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pius/ Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-10-24 22:57:35 UTC (rev 6960) +++ csw/mgar/pkg/pius/trunk/Makefile 2009-10-25 13:43:39 UTC (rev 6961) @@ -2,181 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = pius +GARVERSION = 2.0.3 +CATEGORIES = apps +DESCRIPTION = A tool for signing and email all UIDs on a set of PGP keys. define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://www.phildev.net/pius/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = pgpius +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWpython +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = pius +TEST_SCRIPTS = +include gar/category.mk -#include gar/category.mk +install-pius: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/pius $(DESTDIR)$(bindir) + ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(datadir)/doc/$(GARNAME) + ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/pius/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-10-24 22:57:35 UTC (rev 6960) +++ csw/mgar/pkg/pius/trunk/checksums 2009-10-25 13:43:39 UTC (rev 6961) @@ -0,0 +1 @@ +081aecec3d47c6e860e9cb5644e95cb3 pius-2.0.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 25 18:09:17 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 25 Oct 2009 17:09:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6962] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6962 http://gar.svn.sourceforge.net/gar/?rev=6962&view=rev Author: bonivart Date: 2009-10-25 17:09:17 +0000 (Sun, 25 Oct 2009) Log Message: ----------- pkgutil: update to 1.8 beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-25 13:43:39 UTC (rev 6961) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-25 17:09:17 UTC (rev 6962) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8b1 +GARVERSION = 1.8b2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 13:43:39 UTC (rev 6961) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 17:09:17 UTC (rev 6962) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -55ebb20ac1a91cc6663c3fc11005c3ef pkgutil-1.8b1.zip +73f84d81b59a5e6191656529eaf0562e pkgutil-1.8b2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 25 19:10:01 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 25 Oct 2009 18:10:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6963] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 6963 http://gar.svn.sourceforge.net/gar/?rev=6963&view=rev Author: bonivart Date: 2009-10-25 18:09:51 +0000 (Sun, 25 Oct 2009) Log Message: ----------- pkgutil: hook fix Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 17:09:17 UTC (rev 6962) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-25 18:09:51 UTC (rev 6963) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -73f84d81b59a5e6191656529eaf0562e pkgutil-1.8b2.zip +e32847e2c0a01549f17444426b13ff2d pkgutil-1.8b2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 19:29:08 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 18:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6964] csw/mgar/pkg/ncmpc/trunk/ Message-ID: Revision: 6964 http://gar.svn.sourceforge.net/gar/?rev=6964&view=rev Author: trygvis Date: 2009-10-25 18:29:05 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Switching to gar v2. Property Changed: ---------------- csw/mgar/pkg/ncmpc/trunk/ Property changes on: csw/mgar/pkg/ncmpc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 25 20:40:41 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 25 Oct 2009 19:40:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6965] csw/mgar/gar/v2/bin/gitproxy Message-ID: Revision: 6965 http://gar.svn.sourceforge.net/gar/?rev=6965&view=rev Author: bdwalton Date: 2009-10-25 19:40:41 +0000 (Sun, 25 Oct 2009) Log Message: ----------- gar: gitproxy should send error output to stderr Modified Paths: -------------- csw/mgar/gar/v2/bin/gitproxy Modified: csw/mgar/gar/v2/bin/gitproxy =================================================================== --- csw/mgar/gar/v2/bin/gitproxy 2009-10-25 18:29:05 UTC (rev 6964) +++ csw/mgar/gar/v2/bin/gitproxy 2009-10-25 19:40:41 UTC (rev 6965) @@ -15,6 +15,6 @@ nc ${PROXYHOST} ${PROXYPORT} | (read a; read a; cat ) else - echo Please set http_proxy in your environment. + echo Please set http_proxy in your environment. >&2 exit 1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 20:55:04 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 19:55:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6966] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6966 http://gar.svn.sourceforge.net/gar/?rev=6966&view=rev Author: trygvis Date: 2009-10-25 19:55:04 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Using my own fork of cgit. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 19:40:41 UTC (rev 6965) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 19:55:04 UTC (rev 6966) @@ -24,8 +24,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#GIT_REPOS = git://github.com/trygvis/cgit.git -GIT_REPOS = http://localhost/cgit/cgit +GIT_REPOS = git://github.com/trygvis/cgit.git #GIT_TREEISH_cgit = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) GIT_TREEISH_cgit = solaris @@ -39,7 +38,6 @@ # UPSTREAM_MASTER_SITES = PATCHFILES = 0001-cgit.conf -PATCHFILES += 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff CONFIGURE_SCRIPTS = Deleted: csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff =================================================================== --- csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff 2009-10-25 19:40:41 UTC (rev 6965) +++ csw/mgar/pkg/cgit/trunk/files/8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff 2009-10-25 19:55:04 UTC (rev 6966) @@ -1,887 +0,0 @@ -diff --git a/Makefile b/Makefile -index 60d8c58..cb7875e 100644 ---- a/Makefile -+++ b/Makefile -@@ -90,6 +90,7 @@ OBJECTS += ui-refs.o - OBJECTS += ui-repolist.o - OBJECTS += ui-shared.o - OBJECTS += ui-snapshot.o -+OBJECTS += ui-ssdiff.o - OBJECTS += ui-stats.o - OBJECTS += ui-summary.o - OBJECTS += ui-tag.o -diff --git a/cgit.c b/cgit.c -index bd37788..84f44ba 100644 ---- a/cgit.c -+++ b/cgit.c -@@ -182,6 +182,8 @@ void config_cb(const char *name, const char *value) - ctx.cfg.summary_branches = atoi(value); - else if (!strcmp(name, "summary-tags")) - ctx.cfg.summary_tags = atoi(value); -+ else if (!strcmp(name, "side-by-side-diffs")) -+ ctx.cfg.ssdiff = atoi(value); - else if (!strcmp(name, "agefile")) - ctx.cfg.agefile = xstrdup(value); - else if (!strcmp(name, "renamelimit")) -@@ -209,6 +211,8 @@ static void querystring_cb(const char *name, const char *value) - } else if (!strcmp(name, "p")) { - ctx.qry.page = xstrdup(value); - } else if (!strcmp(name, "url")) { -+ if (*value == '/') -+ value++; - ctx.qry.url = xstrdup(value); - cgit_parse_url(value); - } else if (!strcmp(name, "qt")) { -@@ -238,6 +242,8 @@ static void querystring_cb(const char *name, const char *value) - ctx.qry.showmsg = atoi(value); - } else if (!strcmp(name, "period")) { - ctx.qry.period = xstrdup(value); -+ } else if (!strcmp(name, "ss")) { -+ ctx.qry.ssdiff = atoi(value); - } - } - -@@ -279,6 +285,7 @@ static void prepare_context(struct cgit_context *ctx) - ctx->cfg.summary_branches = 10; - ctx->cfg.summary_log = 10; - ctx->cfg.summary_tags = 10; -+ ctx->cfg.ssdiff = 0; - ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); - ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); - ctx->env.https = xstrdupn(getenv("HTTPS")); -diff --git a/cgit.css b/cgit.css -index c47ebc9..3f37165 100644 ---- a/cgit.css -+++ b/cgit.css -@@ -601,3 +601,92 @@ table.hgraph div.bar { - background-color: #eee; - height: 1em; - } -+ -+table.ssdiff { -+ width: 100%; -+} -+ -+table.ssdiff td { -+ font-size: 75%; -+ font-family: monospace; -+ white-space: pre; -+ padding: 1px 4px 1px 4px; -+ border-left: solid 1px #aaa; -+ border-right: solid 1px #aaa; -+} -+ -+table.ssdiff td.add { -+ color: black; -+ background: #cfc; -+ min-width: 50%; -+} -+ -+table.ssdiff td.add_dark { -+ color: black; -+ background: #aca; -+ min-width: 50%; -+} -+ -+table.ssdiff td.del { -+ color: black; -+ background: #fcc; -+ min-width: 50%; -+} -+ -+table.ssdiff td.del_dark { -+ color: black; -+ background: #caa; -+ min-width: 50%; -+} -+ -+table.ssdiff td.changed { -+ color: black; -+ background: #ffc; -+ min-width: 50%; -+} -+ -+table.ssdiff td.changed_dark { -+ color: black; -+ background: #cca; -+ min-width: 50%; -+} -+ -+table.ssdiff td.lineno { -+ color: black; -+ background: #eee; -+ text-align: right; -+ width: 3em; -+ min-width: 3em; -+} -+ -+table.ssdiff td.hunk { -+ color: #black; -+ background: #ccf; -+ border-top: solid 1px #aaa; -+ border-bottom: solid 1px #aaa; -+} -+ -+table.ssdiff td.head { -+ border-top: solid 1px #aaa; -+ border-bottom: solid 1px #aaa; -+} -+ -+table.ssdiff td.head div.head { -+ font-weight: bold; -+ color: black; -+} -+ -+table.ssdiff td.foot { -+ border-top: solid 1px #aaa; -+ border-left: none; -+ border-right: none; -+ border-bottom: none; -+} -+ -+table.ssdiff td.space { -+ border: none; -+} -+ -+table.ssdiff td.space div { -+ min-height: 3em; -+} -\ No newline at end of file -diff --git a/cgit.h b/cgit.h -index 6c6c460..b7b0adb 100644 ---- a/cgit.h -+++ b/cgit.h -@@ -143,6 +143,7 @@ struct cgit_query { - int nohead; - char *sort; - int showmsg; -+ int ssdiff; - }; - - struct cgit_config { -@@ -194,6 +195,7 @@ struct cgit_config { - int summary_branches; - int summary_log; - int summary_tags; -+ int ssdiff; - struct string_list mimetypes; - struct cgit_filter *about_filter; - struct cgit_filter *commit_filter; -diff --git a/cgitrc.5.txt b/cgitrc.5.txt -index 0c13485..d0fd9a1 100644 ---- a/cgitrc.5.txt -+++ b/cgitrc.5.txt -@@ -241,6 +241,10 @@ section:: - after this option will inherit the current section name. Default value: - none. - -+side-by-side-diffs:: -+ If set to "1" shows side-by-side diffs instead of unidiffs per -+ default. Default value: "0". -+ - snapshots:: - Text which specifies the default set of snapshot formats generated by - cgit. The value is a space-separated list of zero or more of the -diff --git a/ui-commit.c b/ui-commit.c -index f5b0ae5..b5e3c01 100644 ---- a/ui-commit.c -+++ b/ui-commit.c -@@ -58,9 +58,14 @@ void cgit_print_commit(char *hex) - html("\n"); - html("commit"); - tmp = sha1_to_hex(commit->object.sha1); -- cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); -+ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); - html(" ("); - cgit_patch_link("patch", NULL, NULL, NULL, tmp); -+ html(") ("); -+ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) -+ cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); -+ else -+ cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); - html(")\n"); - html("tree"); - tmp = xstrdup(hex); -@@ -78,10 +83,10 @@ void cgit_print_commit(char *hex) - html("parent" - ""); - cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, -- ctx.qry.head, sha1_to_hex(p->item->object.sha1)); -+ ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); - html(" ("); - cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, -- sha1_to_hex(p->item->object.sha1), NULL); -+ sha1_to_hex(p->item->object.sha1), NULL, 0); - html(")"); - parents++; - } -diff --git a/ui-diff.c b/ui-diff.c -index 2196745..a92a768 100644 ---- a/ui-diff.c -+++ b/ui-diff.c -@@ -9,6 +9,7 @@ - #include "cgit.h" - #include "html.h" - #include "ui-shared.h" -+#include "ui-ssdiff.h" - - unsigned char old_rev_sha1[20]; - unsigned char new_rev_sha1[20]; -@@ -32,6 +33,7 @@ static struct fileinfo { - int binary:1; - } *items; - -+static int use_ssdiff = 0; - - static void print_fileinfo(struct fileinfo *info) - { -@@ -83,7 +85,7 @@ static void print_fileinfo(struct fileinfo *info) - } - htmlf("", class); - cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, -- ctx.qry.sha2, info->new_path); -+ ctx.qry.sha2, info->new_path, 0); - if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) - htmlf(" (%s from %s)", - info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", -@@ -158,7 +160,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1, - - html("
"); - cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, -- ctx.qry.sha2, NULL); -+ ctx.qry.sha2, NULL, 0); - html("
"); - html(""); - max_changes = 0; -@@ -246,26 +248,54 @@ static void header(unsigned char *sha1, char *path1, int mode1, - html(""); - } - -+static void print_ssdiff_link() -+{ -+ if (!strcmp(ctx.qry.page, "diff")) { -+ if (use_ssdiff) -+ cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, -+ ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); -+ else -+ cgit_diff_link("Side-by-side diff", NULL, NULL, -+ ctx.qry.head, ctx.qry.sha1, -+ ctx.qry.sha2, ctx.qry.path, 1); -+ } -+} -+ - static void filepair_cb(struct diff_filepair *pair) - { - unsigned long old_size = 0; - unsigned long new_size = 0; - int binary = 0; -+ linediff_fn print_line_fn = print_line; - -+ if (use_ssdiff) { -+ cgit_ssdiff_header_begin(); -+ print_line_fn = cgit_ssdiff_line_cb; -+ } - header(pair->one->sha1, pair->one->path, pair->one->mode, - pair->two->sha1, pair->two->path, pair->two->mode); -+ if (use_ssdiff) -+ cgit_ssdiff_header_end(); - if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { - if (S_ISGITLINK(pair->one->mode)) -- print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); -+ print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); - if (S_ISGITLINK(pair->two->mode)) -- print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); -+ print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); -+ if (use_ssdiff) -+ cgit_ssdiff_footer(); - return; - } -- if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, -- &new_size, &binary, print_line)) -+ if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, -+ &new_size, &binary, print_line_fn)) - cgit_print_error("Error running diff"); -- if (binary) -- html("Binary files differ"); -+ if (binary) { -+ if (use_ssdiff) -+ html(""); -+ else -+ html("Binary files differ"); -+ } -+ if (use_ssdiff) -+ cgit_ssdiff_footer(); - } - - void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) -@@ -303,11 +333,21 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi - if (!commit2 || parse_commit(commit2)) - cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); - } -+ -+ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) -+ use_ssdiff = 1; -+ -+ print_ssdiff_link(); - cgit_print_diffstat(old_rev_sha1, new_rev_sha1); - -- html("
Binary files differ
"); -- html("", - ctx.qry.showmsg ? " class='logsubject'" : ""); - cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, -- sha1_to_hex(commit->object.sha1)); -+ sha1_to_hex(commit->object.sha1), 0); - show_commit_decorations(commit); - html(""); -+ if (old_line_no > 0) -+ htmlf(""); -+ -+ if (new_line_no > 0) -+ htmlf(""); -+} -+ -+static void print_deferred_old_lines() -+{ -+ struct deferred_lines *iter_old, *tmp; -+ -+ iter_old = deferred_old; -+ while (iter_old) { -+ print_ssdiff_line("del", iter_old->line_no, -+ iter_old->line, -1, NULL); -+ tmp = iter_old->next; -+ free(iter_old); -+ iter_old = tmp; -+ } -+} -+ -+static void print_deferred_new_lines() -+{ -+ struct deferred_lines *iter_new, *tmp; -+ -+ iter_new = deferred_new; -+ while (iter_new) { -+ print_ssdiff_line("add", -1, NULL, iter_new->line_no, -+ iter_new->line); -+ tmp = iter_new->next; -+ free(iter_new); -+ iter_new = tmp; -+ } -+} -+ -+static void print_deferred_changed_lines() -+{ -+ struct deferred_lines *iter_old, *iter_new, *tmp; -+ -+ iter_old = deferred_old; -+ iter_new = deferred_new; -+ while (iter_old || iter_new) { -+ if (iter_old && iter_new) -+ print_ssdiff_line("changed", iter_old->line_no, -+ iter_old->line, -+ iter_new->line_no, iter_new->line); -+ else if (iter_old) -+ print_ssdiff_line("changed", iter_old->line_no, -+ iter_old->line, -1, NULL); -+ else if (iter_new) -+ print_ssdiff_line("changed", -1, NULL, -+ iter_new->line_no, iter_new->line); -+ -+ if (iter_old) { -+ tmp = iter_old->next; -+ free(iter_old); -+ iter_old = tmp; -+ } -+ -+ if (iter_new) { -+ tmp = iter_new->next; -+ free(iter_new); -+ iter_new = tmp; -+ } -+ } -+} -+ -+void cgit_ssdiff_print_deferred_lines() -+{ -+ if (!deferred_old && !deferred_new) -+ return; -+ -+ if (deferred_old && !deferred_new) -+ print_deferred_old_lines(); -+ else if (!deferred_old && deferred_new) -+ print_deferred_new_lines(); -+ else -+ print_deferred_changed_lines(); -+ -+ deferred_old = deferred_old_last = NULL; -+ deferred_new = deferred_new_last = NULL; -+} -+ -+/* -+ * print a single line returned from xdiff -+ */ -+void cgit_ssdiff_line_cb(char *line, int len) -+{ -+ char c = line[len - 1]; -+ -+ line[len - 1] = '\0'; -+ -+ if (line[0] == '@') { -+ current_old_line = line_from_hunk(line, '-'); -+ current_new_line = line_from_hunk(line, '+'); -+ } -+ -+ if (line[0] == ' ') { -+ if (deferred_old || deferred_new) -+ cgit_ssdiff_print_deferred_lines(); -+ print_ssdiff_line("ctx", current_old_line, line, -+ current_new_line, line); -+ current_old_line += 1; -+ current_new_line += 1; -+ } else if (line[0] == '+') { -+ deferred_new_add(line, current_new_line); -+ current_new_line += 1; -+ } else if (line[0] == '-') { -+ deferred_old_add(line, current_old_line); -+ current_old_line += 1; -+ } else if (line[0] == '@') { -+ html(""); -+ } else { -+ html(""); -+ } -+ line[len - 1] = c; -+} -+ -+void cgit_ssdiff_header_begin() -+{ -+ current_old_line = -1; -+ current_new_line = -1; -+ html(""); -+ html(""); -+} -+ -+void cgit_ssdiff_footer() -+{ -+ if (deferred_old || deferred_new) -+ cgit_ssdiff_print_deferred_lines(); -+ html(""); -+} -diff --git a/ui-ssdiff.h b/ui-ssdiff.h -new file mode 100644 -index 0000000..64b4b12 ---- /dev/null -+++ b/ui-ssdiff.h -@@ -0,0 +1,13 @@ -+#ifndef UI_SSDIFF_H -+#define UI_SSDIFF_H -+ -+extern void cgit_ssdiff_print_deferred_lines(); -+ -+extern void cgit_ssdiff_line_cb(char *line, int len); -+ -+extern void cgit_ssdiff_header_begin(); -+extern void cgit_ssdiff_header_end(); -+ -+extern void cgit_ssdiff_footer(); -+ -+#endif /* UI_SSDIFF_H */ -diff --git a/ui-tag.c b/ui-tag.c -index c2d72af..39e4cb8 100644 ---- a/ui-tag.c -+++ b/ui-tag.c -@@ -30,6 +30,14 @@ static void print_tag_content(char *buf) - } - } - -+void print_download_links(char *revname) -+{ -+ html(""); -+} -+ - void cgit_print_tag(char *revname) - { - unsigned char sha1[20]; -@@ -56,16 +64,16 @@ void cgit_print_tag(char *revname) - return; - } - html("
"); -+ if (use_ssdiff) { -+ html(""); -+ } else { -+ html("
"); -+ html(""); -+ if (!use_ssdiff) -+ html(""); - html("
"); -+ } - cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); -- html("
"); - } -diff --git a/ui-log.c b/ui-log.c -index f3132c9..0947604 100644 ---- a/ui-log.c -+++ b/ui-log.c -@@ -66,7 +66,7 @@ void show_commit_decorations(struct commit *commit) - else { - strncpy(buf, deco->name, sizeof(buf) - 1); - cgit_commit_link(buf, NULL, "deco", ctx.qry.head, -- sha1_to_hex(commit->object.sha1)); -+ sha1_to_hex(commit->object.sha1), 0); - } - deco = deco->next; - } -@@ -89,7 +89,7 @@ void print_commit(struct commit *commit) - htmlf("		"); - html_txt(info->author); -diff --git a/ui-refs.c b/ui-refs.c -index d3b4f6e..33d9bec 100644 ---- a/ui-refs.c -+++ b/ui-refs.c -@@ -74,7 +74,7 @@ static int print_branch(struct refinfo *ref) - html(""); - - if (ref->object->type == OBJ_COMMIT) { -- cgit_commit_link(info->subject, NULL, NULL, name, NULL); -+ cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0); - html(""); - html_txt(info->author); - html(""); -diff --git a/ui-repolist.c b/ui-repolist.c -index 3ef2e99..0a0b6ca 100644 ---- a/ui-repolist.c -+++ b/ui-repolist.c -@@ -94,7 +94,7 @@ int is_in_url(struct cgit_repo *repo) - - void print_sort_header(const char *title, const char *sort) - { -- htmlf(""); -+ html_txt(name); -+ html(""); - } - - void cgit_refs_link(char *name, char *title, char *class, char *head, -@@ -341,7 +357,8 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head, - } - - void cgit_diff_link(char *name, char *title, char *class, char *head, -- char *new_rev, char *old_rev, char *path) -+ char *new_rev, char *old_rev, char *path, -+ int toggle_ssdiff) - { - char *delim; - -@@ -356,6 +373,11 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, - html(delim); - html("id2="); - html_url_arg(old_rev); -+ delim = "&"; -+ } -+ if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { -+ html(delim); -+ html("ss=1"); - } - html("'>"); - html_txt(name); -@@ -383,7 +405,7 @@ void cgit_object_link(struct object *obj) - shortrev[10] = '\0'; - if (obj->type == OBJ_COMMIT) { - cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, -- ctx.qry.head, fullrev); -+ ctx.qry.head, fullrev, 0); - return; - } else if (obj->type == OBJ_TREE) - page = "tree"; -@@ -695,9 +717,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) - cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, - ctx->qry.sha1, NULL); - cgit_commit_link("commit", NULL, hc(cmd, "commit"), -- ctx->qry.head, ctx->qry.sha1); -+ ctx->qry.head, ctx->qry.sha1, 0); - cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, -- ctx->qry.sha1, ctx->qry.sha2, NULL); -+ ctx->qry.sha1, ctx->qry.sha2, NULL, 0); - if (ctx->repo->max_stats) - cgit_stats_link("stats", NULL, hc(cmd, "stats"), - ctx->qry.head, NULL); -@@ -760,13 +782,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head, - const char *hex, int snapshots) - { - const struct cgit_snapshot_format* f; -+ char *prefix; - char *filename; -+ unsigned char sha1[20]; - -+ if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && -+ (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) -+ hex++; -+ prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); - for (f = cgit_snapshot_formats; f->suffix; f++) { - if (!(snapshots & f->bit)) - continue; -- filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, -- f->suffix); -+ filename = fmt("%s%s", prefix, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); - html("
"); - } -diff --git a/ui-shared.h b/ui-shared.h -index bff4826..9ebc1f9 100644 ---- a/ui-shared.h -+++ b/ui-shared.h -@@ -3,6 +3,7 @@ - - extern char *cgit_httpscheme(); - extern char *cgit_hosturl(); -+extern char *cgit_rooturl(); - extern char *cgit_repourl(const char *reponame); - extern char *cgit_fileurl(const char *reponame, const char *pagename, - const char *filename, const char *query); -@@ -22,7 +23,7 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path, int ofs, char *grep, - char *pattern, int showmsg); - extern void cgit_commit_link(char *name, char *title, char *class, char *head, -- char *rev); -+ char *rev, int toggle_ssdiff); - extern void cgit_patch_link(char *name, char *title, char *class, char *head, - char *rev); - extern void cgit_refs_link(char *name, char *title, char *class, char *head, -@@ -30,7 +31,8 @@ extern void cgit_refs_link(char *name, char *title, char *class, char *head, - extern void cgit_snapshot_link(char *name, char *title, char *class, - char *head, char *rev, char *archivename); - extern void cgit_diff_link(char *name, char *title, char *class, char *head, -- char *new_rev, char *old_rev, char *path); -+ char *new_rev, char *old_rev, char *path, -+ int toggle_ssdiff); - extern void cgit_stats_link(char *name, char *title, char *class, char *head, - char *path); - extern void cgit_object_link(struct object *obj); -diff --git a/ui-ssdiff.c b/ui-ssdiff.c -new file mode 100644 -index 0000000..5673642 ---- /dev/null -+++ b/ui-ssdiff.c -@@ -0,0 +1,274 @@ -+#include "cgit.h" -+#include "html.h" -+#include "ui-shared.h" -+ -+extern int use_ssdiff; -+ -+static int current_old_line, current_new_line; -+ -+struct deferred_lines { -+ int line_no; -+ char *line; -+ struct deferred_lines *next; -+}; -+ -+static struct deferred_lines *deferred_old, *deferred_old_last; -+static struct deferred_lines *deferred_new, *deferred_new_last; -+ -+static int line_from_hunk(char *line, char type) -+{ -+ char *buf1, *buf2; -+ int len; -+ -+ buf1 = strchr(line, type); -+ if (buf1 == NULL) -+ return 0; -+ buf1 += 1; -+ buf2 = strchr(buf1, ','); -+ if (buf2 == NULL) -+ return 0; -+ len = buf2 - buf1; -+ buf2 = xmalloc(len + 1); -+ strncpy(buf2, buf1, len); -+ buf2[len] = '\0'; -+ int res = atoi(buf2); -+ free(buf2); -+ return res; -+} -+ -+static char *replace_tabs(char *line) -+{ -+ char *prev_buf = line; -+ char *cur_buf; -+ int linelen = strlen(line); -+ int n_tabs = 0; -+ int i; -+ char *result; -+ char *spaces = " "; -+ -+ if (linelen == 0) { -+ result = xmalloc(1); -+ result[0] = '\0'; -+ return result; -+ } -+ -+ for (i = 0; i < linelen; i++) -+ if (line[i] == '\t') -+ n_tabs += 1; -+ result = xmalloc(linelen + n_tabs * 8 + 1); -+ result[0] = '\0'; -+ -+ while (1) { -+ cur_buf = strchr(prev_buf, '\t'); -+ if (!cur_buf) { -+ strcat(result, prev_buf); -+ break; -+ } else { -+ strcat(result, " "); -+ strncat(result, spaces, 8 - (strlen(result) % 8)); -+ strncat(result, prev_buf, cur_buf - prev_buf); -+ } -+ prev_buf = cur_buf + 1; -+ } -+ return result; -+} -+ -+static void deferred_old_add(char *line, int line_no) -+{ -+ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); -+ item->line = xstrdup(line); -+ item->line_no = line_no; -+ item->next = NULL; -+ if (deferred_old) { -+ deferred_old_last->next = item; -+ deferred_old_last = item; -+ } else { -+ deferred_old = deferred_old_last = item; -+ } -+} -+ -+static void deferred_new_add(char *line, int line_no) -+{ -+ struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); -+ item->line = xstrdup(line); -+ item->line_no = line_no; -+ item->next = NULL; -+ if (deferred_new) { -+ deferred_new_last->next = item; -+ deferred_new_last = item; -+ } else { -+ deferred_new = deferred_new_last = item; -+ } -+} -+ -+static void print_ssdiff_line(char *class, int old_line_no, char *old_line, -+ int new_line_no, char *new_line) -+{ -+ html("
%d", -+ old_line_no, class); -+ else if (old_line) -+ htmlf("", class); -+ else -+ htmlf("", class); -+ -+ if (old_line) { -+ old_line = replace_tabs(old_line + 1); -+ html_txt(old_line); -+ free(old_line); -+ } -+ -+ html("%d", -+ new_line_no, class); -+ else if (new_line) -+ htmlf("", class); -+ else -+ htmlf("", class); -+ -+ if (new_line) { -+ new_line = replace_tabs(new_line + 1); -+ html_txt(new_line); -+ free(new_line); -+ } -+ -+ html("
"); -+ html_txt(line); -+ html("
"); -+ html_txt(line); -+ html("
"); -+} -+ -+void cgit_ssdiff_header_end() -+{ -+ html("
download"); -+ cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, -+ revname, ctx.repo->snapshots); -+ html("
\n"); -- htmlf("\n", sha1_to_hex(sha1)); - if (info->tagger_date > 0) { -- html("\n"); - } - if (info->tagger) { -- html("\n"); - } -- html("\n"); -+ if (ctx.repo->snapshots) -+ print_download_links(revname); - html("
Tag name"); -+ htmlf("
tag name"); - html_txt(revname); - htmlf(" (%s)
Tag date"); -+ html("
tag date"); - cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); - html("
Tagged by"); -+ html("
tagged by"); - html_txt(info->tagger); - if (info->tagger_email && !ctx.cfg.noplainemail) { - html(" "); -@@ -73,19 +81,23 @@ void cgit_print_tag(char *revname) - } - html("
Tagged object"); -+ html("
tagged object"); - cgit_object_link(tag->tagged); - html("
\n"); - print_tag_content(info->msg); - } else { - html("\n"); -- htmlf("\n"); -- html("\n"); -+ if (ctx.repo->snapshots) -+ print_download_links(revname); - html("
Tag name"); -+ htmlf("
tag name"); - html_txt(revname); - html("
Tagged object"); -+ html("
Tagged object"); - cgit_object_link(obj); - html("
\n"); - } - return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 25 21:10:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 25 Oct 2009 20:10:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6967] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 6967 http://gar.svn.sourceforge.net/gar/?rev=6967&view=rev Author: dmichelsen Date: 2009-10-25 20:10:41 +0000 (Sun, 25 Oct 2009) Log Message: ----------- sysstat: Update to 20091024 and prototype modifiers Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2009-10-25 19:55:04 UTC (rev 6966) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2009-10-25 20:10:41 UTC (rev 6967) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20090805 +GARVERSION = 20091024 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -54,7 +54,9 @@ # only done via sysstatd which uses isaexec. ISAEXEC_FILES = $(sbindir)/sysstatd -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/sysstatd$$$$/ { $$$$4 = "4755" } { print }' +PROTOTYPE_MODIFIERS = makesuid +PROTOTYPE_FILES_makesuid = .*/sysstatd +PROTOTYPE_PERMS_makesuid = 4755 include gar/category.mk Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2009-10-25 19:55:04 UTC (rev 6966) +++ csw/mgar/pkg/sysstat/trunk/checksums 2009-10-25 20:10:41 UTC (rev 6967) @@ -1,2 +1,2 @@ -7a7f0f67bb68484b56375d4a922fb63f download/patch-onlyisaexec-sysstatd.diff -a188538c719f3b1ee1e994268ee779e0 download/sysstat-20090805.tgz +7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff +747dc25cec5c888b1dacf78730d726c0 sysstat-20091024.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 25 21:18:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 25 Oct 2009 20:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6968] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 6968 http://gar.svn.sourceforge.net/gar/?rev=6968&view=rev Author: dmichelsen Date: 2009-10-25 20:18:53 +0000 (Sun, 25 Oct 2009) Log Message: ----------- msmtp: Update to 1.4.19 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2009-10-25 20:10:41 UTC (rev 6967) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2009-10-25 20:18:53 UTC (rev 6968) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.18 +GARVERSION = 1.4.19 CATEGORIES = net DESCRIPTION = SMTP client Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2009-10-25 20:10:41 UTC (rev 6967) +++ csw/mgar/pkg/msmtp/trunk/checksums 2009-10-25 20:18:53 UTC (rev 6968) @@ -1 +1 @@ -74f80b41c058a0ee34819d6bf5ff3b1a download/msmtp-1.4.18.tar.bz2 +f0afdc943bf7c8a3a3bf3fe1a73072c4 msmtp-1.4.19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 22:47:29 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 21:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6969] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6969 http://gar.svn.sourceforge.net/gar/?rev=6969&view=rev Author: trygvis Date: 2009-10-25 21:47:29 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Solaris 8 does not have setenv. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/checksums csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 20:18:53 UTC (rev 6968) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:47:29 UTC (rev 6969) @@ -1,4 +1,3 @@ -b013ec63820f1841df1cddaa35d66ed3 0001-cgit.conf -ab2c07418eec63118a2da512a99d7e34 8071e18dcbf56b98ecea4332e85884cdd91236cc-d8eb68d5d487014a16b680e7d52122d3415303da.diff +dbc9295d49d58ce0af5de283557a1ed9 0001-cgit.conf 27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW 03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW Modified: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 20:18:53 UTC (rev 6968) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 21:47:29 UTC (rev 6969) @@ -1,9 +1,7 @@ --- a/dev/null 2009-09-18 13:04:46.000000000 +0200 +++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 -@@ -0,0 +1,32 @@ +@@ -0,0 +1,31 @@ +# Sun Studio -+CC=/opt/studio/ss11/SUNWspro/bin/cc -+#CFLAGS += -v +MMFLAGS = -xM1 + +# GCC @@ -25,6 +23,7 @@ +EXTLIBS = -lsocket -lnsl -lgit -lxdiff +NEEDS_LIBICONV=1 +NO_STRCASESTR=1 ++NO_SETENV=1 + +# OpenCSW +CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 22:48:47 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 21:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6970] csw/mgar/pkg/cgit/trunk/checksums Message-ID: Revision: 6970 http://gar.svn.sourceforge.net/gar/?rev=6970&view=rev Author: trygvis Date: 2009-10-25 21:48:47 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Updating checksums. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/checksums Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:47:29 UTC (rev 6969) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:48:47 UTC (rev 6970) @@ -1,3 +1,3 @@ -dbc9295d49d58ce0af5de283557a1ed9 0001-cgit.conf +4a9a3700c36b422090feb1da68afebd2 0001-cgit.conf 27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW 03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Oct 25 23:08:57 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 25 Oct 2009 22:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6971] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 6971 http://gar.svn.sourceforge.net/gar/?rev=6971&view=rev Author: trygvis Date: 2009-10-25 22:08:57 +0000 (Sun, 25 Oct 2009) Log Message: ----------- o Getting closer. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 21:48:47 UTC (rev 6970) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-25 22:08:57 UTC (rev 6971) @@ -26,7 +26,7 @@ GIT_REPOS = git://github.com/trygvis/cgit.git #GIT_TREEISH_cgit = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) -GIT_TREEISH_cgit = solaris +GIT_TREEISH_cgit.git = solaris DISTFILES = apache.conf.CSW cgitrc.CSW Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 21:48:47 UTC (rev 6970) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-10-25 22:08:57 UTC (rev 6971) @@ -1,3 +1,3 @@ -4a9a3700c36b422090feb1da68afebd2 0001-cgit.conf +5bce8ac0de1a5e08e864c56c56906233 0001-cgit.conf 27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW 03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW Modified: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 21:48:47 UTC (rev 6970) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-10-25 22:08:57 UTC (rev 6971) @@ -2,6 +2,7 @@ +++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 @@ -0,0 +1,31 @@ +# Sun Studio ++CFLAGS += -DNO_SETENV +MMFLAGS = -xM1 + +# GCC @@ -23,7 +24,6 @@ +EXTLIBS = -lsocket -lnsl -lgit -lxdiff +NEEDS_LIBICONV=1 +NO_STRCASESTR=1 -+NO_SETENV=1 + +# OpenCSW +CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 26 02:57:14 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 26 Oct 2009 01:57:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6972] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 6972 http://gar.svn.sourceforge.net/gar/?rev=6972&view=rev Author: bdwalton Date: 2009-10-26 01:57:14 +0000 (Mon, 26 Oct 2009) Log Message: ----------- ruby: setup support for switching rbconfig.rb for alternation gem compilation settings, etc Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby/trunk/files/README.csw csw/mgar/pkg/ruby/trunk/files/cswrbconfig csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-10-25 22:08:57 UTC (rev 6971) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-10-26 01:57:14 UTC (rev 6972) @@ -114,11 +114,23 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) -PI_TARGETS = samples rbconfig rbscripts rubymode +RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.8/rbconfig.rb +PI_TARGETS = samples rbconfig rbscripts rubymode multiconfig + post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) +multiconfig: + @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" + @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 + @gcp $(FILEDIR)/rbconfig.rb.GCC4 $(DESTDIR)/$(RBCONFIG).GCC4 + @gln -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) + @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ + @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig + @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ + @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/ruby/ + rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode rubymode: @echo " ===> Installing and Compilingn ruby-mode elisp" Added: csw/mgar/pkg/ruby/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/ruby/trunk/files/README.csw (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/README.csw 2009-10-26 01:57:14 UTC (rev 6972) @@ -0,0 +1,11 @@ +It is possible to switch rbconfig.rb files in order to use alternate +compilation options or even compilers. CSWruby ships with settings +for Sun Studio 11 (what ruby was built with) and GCC4. Our +distribution of ruby sees rbconfig.rb be a symlink to +rbconfig.rb.SOS11 by default. To switch your settings, use the +cswrbconfig tool provided. Running it with no arguments will provide +more details and list available configurations. + +Please file a bug on CSWruby if you have problems using this tool. + +Ben Walton Added: csw/mgar/pkg/ruby/trunk/files/cswrbconfig =================================================================== --- csw/mgar/pkg/ruby/trunk/files/cswrbconfig (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/cswrbconfig 2009-10-26 01:57:14 UTC (rev 6972) @@ -0,0 +1,54 @@ +#!/opt/csw/bin/ruby -w + +ARCH = %x{uname -p}.chomp +CONFD = "/opt/csw/lib/ruby/1.8/#{ARCH}-solaris2.8" +RBC = File.join(CONFD, "rbconfig.rb") +CUR_RBC = File.readlink(RBC).gsub(/.*\./, '') + +CONF_OPTS = Dir.glob("#{CONFD}/rbconfig.rb.*").map! { |c| c.gsub(/.*\./, '') } + +def usage(errstr) + puts "ERROR: #{errstr}" + puts <<-"EOF" + +Usage: #{File.basename($0)} + +This tool allows you to switch rbconfig.rb between options available +on your system. The benefit of this is that you can build native gems +using options other than those used to build Ruby itself (Sun Studio +11 -> sos11), including alternate compilers. + +rbconfig.rb is found in #{CONFD}. + +Existing options are determined by the presence of rbconfig.rb.FOO +files in #{CONFD}. + +The current value is: #{CUR_RBC} + +The options present on your system are: + EOF + + puts CONF_OPTS.join("\n") + exit(1) +end + +if ARGV.size.eql?(0) + usage("No argument specified.") +else + usage("Something is wrong with your rbconfig.rb symlink setup.") unless File.symlink?(RBC) and File.exists?(RBC) + + usage("No action required.") if CUR_RBC.eql?(ARGV[0]) + + usage("Invalid rbconfig option.") unless CONF_OPTS.include?(ARGV[0]) + + opt_rbc = RBC + '.' + ARGV[0] + + usage("Selection option is valid but there's something wrong with the file it refers to (#{opt_rbc}).") unless File.exists?(opt_rbc) and File.file?(opt_rbc) + + begin + File.unlink(RBC) + File.symlink(opt_rbc, RBC) + rescue + usage("Error while switching rbconfig.rb symlink. Please inspect the situation in #{CONFD}.") + end +end Property changes on: csw/mgar/pkg/ruby/trunk/files/cswrbconfig ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 2009-10-26 01:57:14 UTC (rev 6972) @@ -0,0 +1,182 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module Config + RUBY_VERSION == "1.8.7" or + raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["EXEEXT"] = "" + CONFIG["ruby_install_name"] = "ruby" + CONFIG["RUBY_INSTALL_NAME"] = "ruby" + CONFIG["RUBY_SO_NAME"] = "ruby" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["psdir"] = "$(docdir)" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["ECHO_C"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_T"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " + CONFIG["build_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["target_alias"] = "" + CONFIG["MAJOR"] = "1" + CONFIG["MINOR"] = "8" + CONFIG["TEENY"] = "7" + CONFIG["build"] = "i386-pc-solaris2.8" + CONFIG["build_cpu"] = "i386" + CONFIG["build_vendor"] = "pc" + CONFIG["build_os"] = "solaris2.8" + CONFIG["host"] = "i386-pc-solaris2.8" + CONFIG["host_cpu"] = "i386" + CONFIG["host_vendor"] = "pc" + CONFIG["host_os"] = "solaris2.8" + CONFIG["target"] = "i386-pc-solaris2.8" + CONFIG["target_cpu"] = "i386" + CONFIG["target_vendor"] = "pc" + CONFIG["target_os"] = "solaris2.8" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC $(cflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["OBJEXT"] = "o" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GNU_LD"] = "no" + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["OUTFLAG"] = "-o " + CONFIG["YACC"] = "bison -y" + CONFIG["YFLAGS"] = "" + CONFIG["RANLIB"] = "ranlib" + CONFIG["AR"] = "ar" + CONFIG["AS"] = "as" + CONFIG["ASFLAGS"] = "" + CONFIG["NM"] = "" + CONFIG["WINDRES"] = "" + CONFIG["DLLWRAP"] = "" + CONFIG["OBJDUMP"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["SET_MAKE"] = "" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["RM"] = "rm -f" + CONFIG["CP"] = "cp" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["ALLOCA"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["STATIC"] = "" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["DLEXT"] = "so" + CONFIG["DLEXT2"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["LINK_SO"] = "" + CONFIG["LIBPATHFLAG"] = " -L%1$-s" + CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["TRY_LINK"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["EXTSTATIC"] = "" + CONFIG["setup"] = "Setup" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["EXTOUT"] = ".ext" + CONFIG["ARCHFILE"] = "" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["cflags"] = "$(optflags) $(debugflags)" + CONFIG["optflags"] = "" + CONFIG["debugflags"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" + CONFIG["rubyw_install_name"] = "" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" + CONFIG["SOLIBS"] = "$(LIBS)" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["ENABLE_SHARED"] = "yes" + CONFIG["MAINLIBS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["arch"] = "i386-solaris2.8" + CONFIG["sitearch"] = "i386-solaris2.8" + CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" + CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["MANTYPE"] = "man" + CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" + CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def Config::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + Config::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + Config::expand(val) + end +end +RbConfig = Config # compatibility for ruby-1.9 +CROSS_COMPILING = nil unless defined? CROSS_COMPILING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 26 09:36:02 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 26 Oct 2009 08:36:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6973] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 6973 http://gar.svn.sourceforge.net/gar/?rev=6973&view=rev Author: bonivart Date: 2009-10-26 08:36:02 +0000 (Mon, 26 Oct 2009) Log Message: ----------- pkgutil: updated source for beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 01:57:14 UTC (rev 6972) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 08:36:02 UTC (rev 6973) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -e32847e2c0a01549f17444426b13ff2d pkgutil-1.8b2.zip +ee8bac4ae4678a2c587051357f886d38 pkgutil-1.8b2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Mon Oct 26 14:04:55 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Mon, 26 Oct 2009 13:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6974] csw/mgar/pkg Message-ID: Revision: 6974 http://gar.svn.sourceforge.net/gar/?rev=6974&view=rev Author: aubreyli Date: 2009-10-26 13:04:55 +0000 (Mon, 26 Oct 2009) Log Message: ----------- cscope: initial commit Added Paths: ----------- csw/mgar/pkg/cscope/ csw/mgar/pkg/cscope/branches/ csw/mgar/pkg/cscope/tags/ csw/mgar/pkg/cscope/trunk/ csw/mgar/pkg/cscope/trunk/Makefile csw/mgar/pkg/cscope/trunk/checksums csw/mgar/pkg/cscope/trunk/files/ csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec Property changes on: csw/mgar/pkg/cscope/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cscope/trunk/Makefile =================================================================== --- csw/mgar/pkg/cscope/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cscope/trunk/Makefile 2009-10-26 13:04:55 UTC (rev 6974) @@ -0,0 +1,31 @@ +GARNAME = cscope +GARVERSION = 15.7a +CATEGORIES = utils + +DESCRIPTION = A text screen-based source browser +define BLURB + cscope is a developer's tool for browsing source code. It has an impeccable + Unix pedigree, having been originally developed at Bell Labs back in the days + of the PDP-11. Cscope was part of the official AT&T Unix distribution for many + years, and has been used to manage projects involving 20 million lines of code! +endef + +MASTER_SITES = http://ncu.dl.sourceforge.net/project/cscope/cscope/$(GARVERSION)/ + +DISTFILES = $(DISTNAME).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# Test suite won't run as root! +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/cscope/trunk/checksums =================================================================== --- csw/mgar/pkg/cscope/trunk/checksums (rev 0) +++ csw/mgar/pkg/cscope/trunk/checksums 2009-10-26 13:04:55 UTC (rev 6974) @@ -0,0 +1 @@ +da43987622ace8c36bbf14c15a350ec1 cscope-15.7a.tar.bz2 Added: csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec =================================================================== --- csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec (rev 0) +++ csw/mgar/pkg/cscope/trunk/files/CSWcscope.gspec 2009-10-26 13:04:55 UTC (rev 6974) @@ -0,0 +1,4 @@ +%var bitname cscope +%var pkgname CSWcscope +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Mon Oct 26 14:13:55 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Mon, 26 Oct 2009 13:13:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6975] csw/mgar/pkg/cscope/Makefile Message-ID: Revision: 6975 http://gar.svn.sourceforge.net/gar/?rev=6975&view=rev Author: aubreyli Date: 2009-10-26 13:13:55 +0000 (Mon, 26 Oct 2009) Log Message: ----------- add package-level Makefile Added Paths: ----------- csw/mgar/pkg/cscope/Makefile Added: csw/mgar/pkg/cscope/Makefile =================================================================== --- csw/mgar/pkg/cscope/Makefile (rev 0) +++ csw/mgar/pkg/cscope/Makefile 2009-10-26 13:13:55 UTC (rev 6975) @@ -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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 26 15:50:09 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 26 Oct 2009 14:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6976] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6976 http://gar.svn.sourceforge.net/gar/?rev=6976&view=rev Author: bonivart Date: 2009-10-26 14:50:09 +0000 (Mon, 26 Oct 2009) Log Message: ----------- pkgutil: add logging hook Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-26 13:13:55 UTC (rev 6975) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-26 14:50:09 UTC (rev 6976) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8b2 +GARVERSION = 1.8b3 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -45,29 +45,30 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(sysconfdir) - @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)plus - @ginstall -d $(DESTDIR)$(mandir)/man1 -# @ginstall -d $(DESTDIR)/usr/sadm/install/scripts - @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages - @ginstall -d $(DESTDIR)/etc/opt/csw - @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @cp $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log + @ginstall -m 755 -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)$(sysconfdir) + @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ - @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ -# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil -# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil - @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW - @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages + @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW +# @ginstall -m 755 -d $(DESTDIR)/usr/sadm/install/scripts +# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil +# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 13:13:55 UTC (rev 6975) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-26 14:50:09 UTC (rev 6976) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -ee8bac4ae4678a2c587051357f886d38 pkgutil-1.8b2.zip +9641cba108ea4aad1e2608263ec48fb2 pkgutil-1.8b3.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Oct 26 15:51:51 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Oct 2009 14:51:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6977] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 6977 http://gar.svn.sourceforge.net/gar/?rev=6977&view=rev Author: d_pocock Date: 2009-10-26 14:51:49 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Update for testing 3.1.4 Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums Removed Paths: ------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-17 11:39:21 UTC (rev 6330) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) @@ -1,160 +0,0 @@ -GARNAME = ganglia -GARVERSION = 3.1.3 -CATEGORIES = utils - -# How should we set this? -# There is a release number in configure.in, maybe use that? -# RELVER = - -USER_GMOND = nobody -# nobody shouldn't really be allowed to own any files -# maybe we should add a ganglia user to own the RRD files? -USER_GMETAD = nobody - -DESCRIPTION = A scalable distributed monitoring system -define BLURB - Ganglia is a scalable distributed monitoring system for high-performance computing - systems such as clusters and Grids. It is based on a hierarchical design targeted - at federations of clusters. -endef - -SF_PROJ = ganglia -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad - -PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython - -CATALOGNAME_CSWganglia = ganglia -CATALOGNAME_CSWgangliart = ganglia_rt -CATALOGNAME_CSWgangliaagent = ganglia_agent -CATALOGNAME_CSWgangliamodpython = ganglia_modpython -CATALOGNAME_CSWgangliadevel = ganglia_devel -CATALOGNAME_CSWgangliagmetad = ganglia_gmetad -CATALOGNAME_CSWgangliaweb = ganglia_web - -SPKG_DESC_CSWganglia = Dummy package -SPKG_DESC_CSWgangliart = Ganglia runtime libraries -SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond -SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics -SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development -SPKG_DESC_CSWgangliagmetad = Ganglia gmetad -SPKG_DESC_CSWgangliaweb = Ganglia web - -PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd - -REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent += CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent -REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd -REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad -REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -# This is attachment #45 from Ganglia bug -# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 -#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch - -CONFIGURE_ARGS = $(DIRPATHS) - -# Don't build gmetad (not tested yet on Solaris, more deps required to build) -#CONFIGURE_ARGS += --without-gmetad -CONFIGURE_ARGS += --with-gmetad - -# Reduce dependencies, no gettext: -CONFIGURE_ARGS += --disable-nls - -# Use apr from CSWapache2rt -CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config - -# Include the status module -CONFIGURE_ARGS += --with-status - -# When we enable this, modpython will have to go in a separate package, -# otherwise CSWgangliaagent will have lots of dependencies -# TODO: define a CSWgangliamodpython package -# Depends: some issues exist getting the Python support working on Solaris, -# Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --disable-python -#CONFIGURE_ARGS += --with-python=/opt/csw - -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(GARVERSION),3.1.3) -TEST_SCRIPTS = -endif - -INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom - -WWWROOT = /opt/csw/share/www -WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /etc/opt/csw/ganglia - -PKGFILES_CSWganglia = -PKGFILES_CSWgangliart = $(libdir)/libganglia.* -PKGFILES_CSWgangliamodpython = .*python.* -PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* - -PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - -# For gmond -INITSMF = /etc/opt/csw/init.d/cswgmond -# For gmetad -INITSMF += /etc/opt/csw/init.d/cswgmetad - -PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ -$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ -{ print }' - - -#ARCHALL_CSWgangliadevel = 1 -#ARCHALL_CSWgangliaweb = 1 - -include gar/category.mk - -install-custom: - @ginstall -D $(DOWNLOADDIR)/cswgmond \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmond - @ginstall -D $(DOWNLOADDIR)/cswgmetad \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmetad - @ginstall -d $(DESTDIR)$(WWWGANGLIA) - @cd $(WORKSRC)/web; \ - cp -R * $(DESTDIR)$(WWWGANGLIA) - @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php - @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in - @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ - $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d - @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf -# @ginstall -D $(FILEDIR)/gmond.conf \ -# $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf - @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf -ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf -endif - @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds - - - Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile (from rev 6435, csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) @@ -0,0 +1,161 @@ +GARNAME = ganglia +GARVERSION = 3.1.4 +CATEGORIES = utils + +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + +DESCRIPTION = A scalable distributed monitoring system +define BLURB + Ganglia is a scalable distributed monitoring system for high-performance computing + systems such as clusters and Grids. It is based on a hierarchical design targeted + at federations of clusters. +endef + +SF_PROJ = ganglia +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad + +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython + +CATALOGNAME_CSWganglia = ganglia +CATALOGNAME_CSWgangliart = ganglia_rt +CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web + +SPKG_DESC_CSWganglia = Dummy package +SPKG_DESC_CSWgangliart = Ganglia runtime libraries +SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web + +PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd + +REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent += CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent +REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad +REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# This is attachment #45 from Ganglia bug +# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 +#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +# Don't build gmetad (not tested yet on Solaris, more deps required to build) +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad + +# Reduce dependencies, no gettext: +CONFIGURE_ARGS += --disable-nls + +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --disable-python +#CONFIGURE_ARGS += --with-python=/opt/csw + +# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, +# so we skip it. This should be re-assessed with each new release +# from upstream. Proposed fixes for the test suite to be submitted +# upstream. +ifeq ($(GARVERSION),3.1.3) +TEST_SCRIPTS = +endif + +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) + +PKGFILES_CSWganglia = +PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* + +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + +include gar/category.mk + +install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + @cd $(WORKSRC)/gmond/modules/conf.d; \ + cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-17 11:39:21 UTC (rev 6330) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums 2009-10-26 14:51:49 UTC (rev 6977) @@ -1,6 +0,0 @@ -f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall -c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove -25d302948e25837bf17757d5e23e4955 download/cswgmetad -c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -cd502229ea934b433fa2ddc6fd3a2706 download/ganglia-3.1.3.tar.gz -2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums (from rev 6424, csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums 2009-10-26 14:51:49 UTC (rev 6977) @@ -0,0 +1,6 @@ +f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 download/cswgmetad +c6bb96c949dbb989d06ebb36b6af885d download/cswgmond +b040c8b8efe3fd3973e4b1e5f687133a download/ganglia-3.1.4.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Oct 26 16:06:34 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Oct 2009 15:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6978] csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/ Makefile Message-ID: Revision: 6978 http://gar.svn.sourceforge.net/gar/?rev=6978&view=rev Author: d_pocock Date: 2009-10-26 15:06:31 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Extend test-exemption to 3.1.4 package Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 15:06:31 UTC (rev 6978) @@ -94,6 +94,9 @@ ifeq ($(GARVERSION),3.1.3) TEST_SCRIPTS = endif +ifeq ($(GARVERSION),3.1.4) +TEST_SCRIPTS = +endif INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 26 16:06:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 26 Oct 2009 15:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6979] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 6979 http://gar.svn.sourceforge.net/gar/?rev=6979&view=rev Author: bdwalton Date: 2009-10-26 15:06:49 +0000 (Mon, 26 Oct 2009) Log Message: ----------- asciidoc: force /opt/csw/bin into path for a2x via patch Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/checksums csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2009-10-26 15:06:31 UTC (rev 6978) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2009-10-26 15:06:49 UTC (rev 6979) @@ -1,3 +1,3 @@ -4f81539ae1a7796a55770bfb977e063a download/add-csw-gnu-path-to-a2x.patch -9f21d6e352b3ab668f9def3eb7497da2 download/asciidoc-8.4.5.tar.gz -ec48eeea1eafdaa7e507bc11327f6eae download/handle-csw-etc-paths.patch +62c15a6f036ca40ad0dffb0b14ad6630 add-csw-gnu-path-to-a2x.patch +9f21d6e352b3ab668f9def3eb7497da2 asciidoc-8.4.5.tar.gz +ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch Modified: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2009-10-26 15:06:31 UTC (rev 6978) +++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2009-10-26 15:06:49 UTC (rev 6979) @@ -5,7 +5,7 @@ # under the terms of the GNU General Public License (GPL). # -+PATH=/opt/csw/gnu:$PATH ++PATH=/opt/csw/gnu:/opt/csw/bin:$PATH +export PATH + VERSION=1.0.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Oct 26 17:32:37 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Oct 2009 16:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6980] csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/ Makefile Message-ID: Revision: 6980 http://gar.svn.sourceforge.net/gar/?rev=6980&view=rev Author: d_pocock Date: 2009-10-26 16:32:37 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Use PRESERVECONF for all config files Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 15:06:49 UTC (rev 6979) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 16:32:37 UTC (rev 6980) @@ -113,6 +113,11 @@ PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW +PRESERVECONF += $(WWWGANGLIA)/conf.php # For gmond INITSMF = /etc/opt/csw/init.d/cswgmond @@ -138,25 +143,26 @@ @cd $(WORKSRC)/web; \ cp -R * $(DESTDIR)$(WWWGANGLIA) @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW # @ginstall -D $(FILEDIR)/gmond.conf \ # $(DESTDIR)$(ETCGANGLIA)/gmond.conf @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW endif @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 26 17:56:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Oct 2009 16:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6981] csw/mgar/pkg/shared-mime-info Message-ID: Revision: 6981 http://gar.svn.sourceforge.net/gar/?rev=6981&view=rev Author: dmichelsen Date: 2009-10-26 16:56:04 +0000 (Mon, 26 Oct 2009) Log Message: ----------- shared-mime-info: Convert to mGAR Added Paths: ----------- csw/mgar/pkg/shared-mime-info/Makefile csw/mgar/pkg/shared-mime-info/branches/ csw/mgar/pkg/shared-mime-info/tags/ csw/mgar/pkg/shared-mime-info/tags/legacy/ csw/mgar/pkg/shared-mime-info/trunk/Makefile csw/mgar/pkg/shared-mime-info/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/shared-mime-info/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/shared-mime-info/trunk/ Copied: csw/mgar/pkg/shared-mime-info/Makefile (from rev 6855, csw/mgar/pkg/automake/Makefile) =================================================================== --- csw/mgar/pkg/shared-mime-info/Makefile (rev 0) +++ csw/mgar/pkg/shared-mime-info/Makefile 2009-10-26 16:56:04 UTC (rev 6981) @@ -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) Property changes on: csw/mgar/pkg/shared-mime-info/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/shared-mime-info/trunk/Makefile (from rev 6855, csw/mgar/pkg/gperf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile (rev 0) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2009-10-26 16:56:04 UTC (rev 6981) @@ -0,0 +1,27 @@ +GARNAME = shared-mime-info +GARVERSION = 0.70 +CATEGORIES = lib + +DESCRIPTION = Freedesktop.org common MIME database +define BLURB + The shared-mime-info package contains the core database of common types and + the *update-mime-database* command used to extend it. It requires glib2 to be + installed for building the update command. Additionally, it uses intltool for + translations, though this is only a dependency for the maintainers. This + database is translated at Transifex. +endef + +MASTER_SITES = http://freedesktop.org/~hadess/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + Added: csw/mgar/pkg/shared-mime-info/trunk/checksums =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/checksums (rev 0) +++ csw/mgar/pkg/shared-mime-info/trunk/checksums 2009-10-26 16:56:04 UTC (rev 6981) @@ -0,0 +1 @@ +9032d98f14b8e13e0fea4bf45ca23401 shared-mime-info-0.70.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 26 18:19:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Oct 2009 17:19:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6982] csw/mgar/pkg/shared-mime-info/trunk/Makefile Message-ID: Revision: 6982 http://gar.svn.sourceforge.net/gar/?rev=6982&view=rev Author: dmichelsen Date: 2009-10-26 17:19:01 +0000 (Mon, 26 Oct 2009) Log Message: ----------- shared-mime-info: Adjust package parameters Modified Paths: -------------- csw/mgar/pkg/shared-mime-info/trunk/Makefile Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile 2009-10-26 16:56:04 UTC (rev 6981) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) @@ -17,11 +17,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PREREQUISITE_PKGS = CSWgnulinks + +PACKAGES = CSWsharedmimeinfo +CATALOGNAME = shared_mime_info + SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibxml2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 26 21:31:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Oct 2009 20:31:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6983] csw/mgar/pkg/x11 Message-ID: Revision: 6983 http://gar.svn.sourceforge.net/gar/?rev=6983&view=rev Author: wbonnet Date: 2009-10-26 20:31:50 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Swtich to version 7.5 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/checksums csw/mgar/pkg/x11/libxcb/trunk/Makefile csw/mgar/pkg/x11/libxcb/trunk/checksums csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_dri2proto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_dri2proto/ Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -19,7 +19,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxcbproto CSWx11xextproto CSWxtrans CSWx11inputproto CSWlibpthreadstubs CSWlibxcbdevel +PREREQUISITE_PKGS = CSWx11xextproto CSWxtrans CSWx11inputproto CSWlibpthreadstubs CSWlibxcbdevel PACKAGES = CSWlibx11 CSWlibx11devel Modified: csw/mgar/pkg/x11/lib/libx11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,3 +1 @@ -2feb39a0de6f05b25c308268691d960c download/libX11-1.1.5.tar.gz -667f63d38722e29d6fd36b6648bbb757 download/patch-stdint.diff -4e6f6f42902f849eba8d88ab15fa3697 download/patch-xlib-sentinel.diff +2feb39a0de6f05b25c308268691d960c libX11-1.1.5.tar.gz Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,5 +1,5 @@ GARNAME = libxcb -GARVERSION = 1.3 +GARVERSION = 1.2 CATEGORIES = x11 DESCRIPTION = The XCB library Modified: csw/mgar/pkg/x11/libxcb/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/libxcb/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) @@ -1 +1 @@ -0c61161743e42bf5d26d4618125f069c download/libxcb-1.3.tar.gz +f55c731d32ec1a555c77ebbbc8f386aa libxcb-1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,5 +1,5 @@ PROTONAME = applewmproto -GARVERSION = 1.0.3 +GARVERSION = 1.4.1 CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -2,7 +2,7 @@ CATEGORIES = x11 GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 DESCRIPTION = Prototype headers for BigReqs extension to X11 define BLURB Modified: csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 0.4 +GARVERSION = 0.4.1 CATEGORIES = x11 PROTONAME = compositeproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = damageproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.2.2 +GARVERSION = 2.3 CATEGORIES = x11 PROTONAME = dmxproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 4.0 +GARVERSION = 4.1.1 CATEGORIES = x11 PROTONAME = fixesproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.0.2 +GARVERSION = 2.1.0 CATEGORIES = x11 PROTONAME = fontsproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.4.9 +GARVERSION = 1.4.10 CATEGORIES = x11 PROTONAME = glproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.4.4 +GARVERSION = 2.0 PROTONAME = inputproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 PROTONAME = kbproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.2.1 +GARVERSION = 1.3.1 CATEGORIES = x11 PROTONAME = randrproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.13.2 +GARVERSION = 1.14 CATEGORIES = x11 PROTONAME = recordproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 0.9.3 +GARVERSION = 0.11 CATEGORIES = x11 PROTONAME = renderproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = resourceproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.0 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = scrnsaverproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,5 +1,5 @@ -GARVERSION = 2.2.2 -CATEGORIES = x11 +GARVERSION = 2.3 +CATEGORIES = x11.0 PROTONAME = videoproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = x11 PROTONAME = windowswmproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.2 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = xcmiscproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 7.0.3 +GARVERSION = 7.1.1 PROTONAME = xextproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.2 +GARVERSION = 1.2.0 CATEGORIES = x11 PROTONAME = xf86bigfontproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.0.3 +GARVERSION = 2.1 CATEGORIES = x11 PROTONAME = xf86dgaproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.0.4 +GARVERSION = 2.1.0 CATEGORIES = x11 PROTONAME = xf86driproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 2.2.2 +GARVERSION = 2.3 CATEGORIES = x11 PROTONAME = xf86vidmodeproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 1.1.2 +GARVERSION = 1.2 CATEGORIES = x11 PROTONAME = xineramaproto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2009-10-26 20:31:50 UTC (rev 6983) @@ -1,4 +1,4 @@ -GARVERSION = 7.0.13 +GARVERSION = 7.0.16 CATEGORIES = x11 PROTONAME = xproto GARNAME = x11_$(PROTONAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 26 21:59:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Oct 2009 20:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6984] csw/mgar/pkg/x11 Message-ID: Revision: 6984 http://gar.svn.sourceforge.net/gar/?rev=6984&view=rev Author: wbonnet Date: 2009-10-26 20:59:06 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Swtich to version 7.5 Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/individual/ csw/mgar/pkg/x11/individual/Makefile csw/mgar/pkg/x11/individual/x11_evieextproto/ csw/mgar/pkg/x11/individual/x11_fontcacheproto/ csw/mgar/pkg/x11/individual/x11_trapproto/ csw/mgar/pkg/x11/individual/x11_xf86miscproto/ csw/mgar/pkg/x11/xcb/ csw/mgar/pkg/x11/xcb/Makefile Removed Paths: ------------- csw/mgar/pkg/x11/proto/x11_evieextproto/ csw/mgar/pkg/x11/proto/x11_fontcacheproto/ csw/mgar/pkg/x11/proto/x11_trapproto/ csw/mgar/pkg/x11/proto/x11_xf86miscproto/ Added: csw/mgar/pkg/x11/individual/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/Makefile (rev 0) +++ csw/mgar/pkg/x11/individual/Makefile 2009-10-26 20:59:06 UTC (rev 6984) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/individual directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + Modified: csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -774bf8e9633f0f38c49069a9ea56ae23 download/applewmproto-1.0.3.tar.gz +822151ea24caf7c23ced6da7a14dfb4d applewmproto-1.4.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -d43f7faa2aac2f0206ea19f031494af1 download/bigreqsproto-1.0.2.tar.gz +882d49cc3bb591dbdccdf9e680bd2e4b bigreqsproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -33a79f6ba950bc5b41e077c951871bd5 download/compositeproto-0.4.tar.gz +6994a209774fe7877fd8e0c9fafe2466 compositeproto-0.4.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_damageproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -bce4477a6edd774dfca175ea46e1ba76 download/damageproto-1.1.0.tar.gz +423516fd64e43e8671120056b0d9f597 damageproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -c76b374240fdb37af3ff62cbd484ec72 download/dmxproto-2.2.2.tar.gz +595b6a86540497b3ccadfb597df10546 dmxproto-2.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -4815a9ac0682528aba50759b6f611acb download/dri2proto-2.1.tar.gz +4815a9ac0682528aba50759b6f611acb dri2proto-2.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -ed4af7fbf04a51aca684c259784520f3 download/fixesproto-4.0.tar.gz +95806b9b648639d4c3e5b226d10927c0 fixesproto-4.1.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -6c1efa12ae50262b45c91e9a120632b7 download/fontsproto-2.0.2.tar.gz +6819fc82585daac68cec17938b659bf0 fontsproto-2.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_glproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -216203b0fe4dd2ecb361265ac01ad348 download/glproto-1.4.9.tar.gz +ac89626ed6bced045d0515217bfffd4f glproto-1.4.10.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_inputproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz +13d91739cf70a781f1db24d8d3677574 inputproto-2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_kbproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz +4deef518a03bc94a7a25902bb7c98dd6 kbproto-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_randrproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -d6b6b024d71b689628bcaf27fd491f5b download/randrproto-1.2.1.tar.gz +15266124b9e2dfcfb25ce6cba24cdd66 randrproto-1.3.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_recordproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -a184f8939a7ecae064857e7932a929b2 download/recordproto-1.13.2.tar.gz +60038c2ef058ee5ac04a645a37c072ce recordproto-1.14.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_renderproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +57216f25b9a5edc561b83a7484cb17e8 renderproto-0.11.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -198252b76e8082958cc2228d8dcc7c2f download/resourceproto-1.0.2.tar.gz +587333b4995a3e11ebe4c8ba2742efaf resourceproto-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -616ae17acad2b6033c981b8b526d5e67 download/scrnsaverproto-1.1.0.tar.gz +0ed88bdd6945ba207c4f734af48e7e25 scrnsaverproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -a306fcd4afa9c5f981b8c1b45c725dec download/windowswmproto-1.0.3.tar.gz +558db92a8e4e1b07e9c62eca3f04dd8d windowswmproto-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -3c380a728697ded97a39addfe1acf2cb download/xcmiscproto-1.1.2.tar.gz +bacfb0f3cb4d6e1a71770307bfdba129 xcmiscproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xextproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz +6c55283718dbeb826bcf899b9e89faba xextproto-7.1.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -43d9fe9f92e5b8abd6e1328fdb022e7d download/xf86bigfontproto-1.1.2.tar.gz +91b0733ff4cbe55808d96073258aa3d1 xf86bigfontproto-1.2.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -f73c1d99b557249662bc75b9b872b61b download/xf86dgaproto-2.0.3.tar.gz +1fe79dc07857ad3e1fb8b8f2bdd70d1b xf86dgaproto-2.1.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -17a69691f2827b13ac4494f9c4af22b1 download/xf86driproto-2.0.4.tar.gz +da848afcd5c41ac05e3aa994bdacdf1c xf86driproto-2.1.0.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -67c93ee2c2c4941e866d96d63329a471 download/xf86vidmodeproto-2.2.2.tar.gz +934b400f2f8d1bcab20bb056e0910291 xf86vidmodeproto-2.3.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -1ad90ffc98d49c0dc5abb11e78b8d1aa download/xineramaproto-1.1.2.tar.gz +1e98484ffa9b0eb6ab9d00cd53bfe74f xineramaproto-1.2.tar.gz Modified: csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-26 20:31:50 UTC (rev 6983) +++ csw/mgar/pkg/x11/proto/x11_xproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) @@ -1 +1 @@ -4c736a7ba52beddaea87964047adf209 download/xproto-7.0.13.tar.gz +6e6b6510ccd568f82093ebd7ae58700b xproto-7.0.16.tar.gz Added: csw/mgar/pkg/x11/xcb/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcb/Makefile 2009-10-26 20:59:06 UTC (rev 6984) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/xcb directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Oct 26 22:14:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Oct 2009 21:14:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6985] csw/mgar/pkg/x11 Message-ID: Revision: 6985 http://gar.svn.sourceforge.net/gar/?rev=6985&view=rev Author: wbonnet Date: 2009-10-26 21:14:05 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Swtich to version 7.5 Modified Paths: -------------- csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_printproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/individual/x11_printproto/ csw/mgar/pkg/x11/individual/x11_xf86rushproto/ csw/mgar/pkg/x11/xcb/libxcb/ csw/mgar/pkg/x11/xcb/x11_xcbproto/ csw/mgar/pkg/x11/xcb/xcb-util/ Removed Paths: ------------- csw/mgar/pkg/x11/libxcb/ csw/mgar/pkg/x11/x11_printproto/ csw/mgar/pkg/x11/x11_xcbproto/ csw/mgar/pkg/x11/x11_xf86rushproto/ csw/mgar/pkg/x11/xcb-util/ Modified: csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -1,4 +1,4 @@ -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 PROTONAME = evieext GARNAME = x11_$(PROTONAME) @@ -9,7 +9,7 @@ EvIE protocol headers from modular X.org X11 endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -cff7b68b228d255f582cb64879619a44 download/evieext-1.0.2.tar.gz +68e61ce53caa495a3ad4085f66010eb8 evieext-1.1.0.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -1,4 +1,4 @@ -GARVERSION = 0.1.2 +GARVERSION = 0.1.3 CATEGORIES = x11 PROTONAME = fontcacheproto GARNAME = x11_$(PROTONAME) @@ -9,7 +9,7 @@ Prototype headers for the Fontcache library from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -dc8c34a8c3559bf3b008bcdf7ba5a743 download/fontcacheproto-0.1.2.tar.gz +5a91ab914ffbfbc856e6fcde52e6f3e3 fontcacheproto-0.1.3.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_printproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -9,7 +9,7 @@ X11 print extension wire protocol Headers endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_printproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/x11_printproto/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_printproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -9726f053b3d4cbd245766de70408c30b download/printproto-1.0.4.tar.gz +9726f053b3d4cbd245766de70408c30b printproto-1.0.4.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -9,7 +9,7 @@ Trap protocol headers from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_trapproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -1344759ae8d7d923e64f5eec078a679b download/trapproto-3.4.3.tar.gz +1344759ae8d7d923e64f5eec078a679b trapproto-3.4.3.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -1,4 +1,4 @@ -GARVERSION = 0.9.2 +GARVERSION = 0.9.3 CATEGORIES = x11 PROTONAME = xf86miscproto GARNAME = x11_$(PROTONAME) @@ -9,7 +9,7 @@ X.Org XF86Misc protocol headers from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums 2009-10-26 20:59:06 UTC (rev 6984) +++ csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -c4f03f37e2afd9c7f1b1f33db1e9c75a download/xf86miscproto-0.9.2.tar.gz +c6432f04f84929c94fa05b3a466c489d xf86miscproto-0.9.3.tar.gz Modified: csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11_xf86rushproto/trunk/Makefile 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) @@ -9,7 +9,7 @@ X.Org XF86Rush protocol headers from modular X.org endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +MASTER_SITES = $(X11_INDIVIDUAL_PROTO_MASTER_SITE) DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/x11_xf86rushproto/trunk/checksums 2009-10-26 17:19:01 UTC (rev 6982) +++ csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/checksums 2009-10-26 21:14:05 UTC (rev 6985) @@ -1 +1 @@ -6a6389473332ace01146cccfef228576 download/xf86rushproto-1.1.2.tar.gz +6a6389473332ace01146cccfef228576 xf86rushproto-1.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Mon Oct 26 23:27:01 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Mon, 26 Oct 2009 22:27:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6986] csw/mgar/pkg/cgit/trunk/Makefile Message-ID: Revision: 6986 http://gar.svn.sourceforge.net/gar/?rev=6986&view=rev Author: trygvis Date: 2009-10-26 22:27:01 +0000 (Mon, 26 Oct 2009) Log Message: ----------- o Adding documentation to cgit. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-10-26 21:14:05 UTC (rev 6985) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-10-26 22:27:01 UTC (rev 6986) @@ -44,6 +44,9 @@ # Disable tests for now, need a round GNU'ism removal there too TEST_SCRIPTS = +# pdf-doc does not work yet +INSTALL_ARGS += man-doc html-doc + PRESERVECONF = /etc/opt/csw/cgit/apache.conf.CSW PRESERVECONF += /etc/opt/csw/cgit/cgitrc.CSW @@ -51,10 +54,16 @@ pre-extract-modulated: git-extract-cgit post-install-modulated: - @mkdir -p $(DESTDIR)/etc/opt/csw/cgit/ + @mkdir -p $(DESTDIR)/etc/opt/csw/cgit + @mkdir -p $(DESTDIR)/opt/csw/share/man/man5 + @mkdir -p $(DESTDIR)/opt/csw/share/doc/cgit @cp $(FILEDIR)/apache.conf.CSW \ $(FILEDIR)/cgitrc.CSW \ $(DESTDIR)/etc/opt/csw/cgit/ -# @$(MAKECOOKIE) + @cp $(WORKSRC)/cgitrc.5 $(DESTDIR)/opt/csw/share/man/man5 + @cp $(WORKSRC)/cgitrc.5.txt $(DESTDIR)/opt/csw/share/doc/cgit + @cp $(WORKSRC)/cgitrc.5.html $(DESTDIR)/opt/csw/share/doc/cgit +# @cp $(WORKSRC)/cgitrc.5.pdf $(DESTDIR)/opt/csw/share/doc/cgit + @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Tue Oct 27 06:06:40 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Tue, 27 Oct 2009 05:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6987] csw/mgar/pkg/cscope/trunk/files/ Message-ID: Revision: 6987 http://gar.svn.sourceforge.net/gar/?rev=6987&view=rev Author: aubreyli Date: 2009-10-27 05:06:40 +0000 (Tue, 27 Oct 2009) Log Message: ----------- remove deprecated gspec file Removed Paths: ------------- csw/mgar/pkg/cscope/trunk/files/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 08:55:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 07:55:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6988] csw/mgar/pkg Message-ID: Revision: 6988 http://gar.svn.sourceforge.net/gar/?rev=6988&view=rev Author: dmichelsen Date: 2009-10-27 07:55:30 +0000 (Tue, 27 Oct 2009) Log Message: ----------- xjobs: Initial commit Added Paths: ----------- csw/mgar/pkg/xjobs/ csw/mgar/pkg/xjobs/branches/ csw/mgar/pkg/xjobs/tags/ csw/mgar/pkg/xjobs/trunk/ csw/mgar/pkg/xjobs/trunk/Makefile csw/mgar/pkg/xjobs/trunk/checksums csw/mgar/pkg/xjobs/trunk/files/ Property changes on: csw/mgar/pkg/xjobs/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2009-10-27 07:55:30 UTC (rev 6988) @@ -0,0 +1,28 @@ +GARNAME = xjobs +GARVERSION = 20091012 +CATEGORIES = utils + +DESCRIPTION = Executes jobs in parallel similar to xargs +define BLURB + xjobs reads job descriptions line by line and executes them in parallel. + It limits the number of parallel executing jobs and starts new jobs when + jobs finish. Therefore, it combines the arguments from every input line + with the utility and arguments given on the command line. If no utility + is given as an argument to xjobs, then the first argument on every job + line will be used as utility. To execute utility xjobs searches the + directories given in the PATH environment variable and uses the first + file found in these directories. +endef + +MASTER_SITES = http://www.maier-komor.de/xjobs/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +CONFIGURE_ARGS = $(DIRPATHS) + +# No tests available +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/xjobs/trunk/checksums =================================================================== --- csw/mgar/pkg/xjobs/trunk/checksums (rev 0) +++ csw/mgar/pkg/xjobs/trunk/checksums 2009-10-27 07:55:30 UTC (rev 6988) @@ -0,0 +1 @@ +276bd941a1fc178d2a4d79a0870e533a xjobs-20091012.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 10:13:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 09:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6989] csw/mgar/pkg/xjobs/trunk/Makefile Message-ID: Revision: 6989 http://gar.svn.sourceforge.net/gar/?rev=6989&view=rev Author: dmichelsen Date: 2009-10-27 09:13:32 +0000 (Tue, 27 Oct 2009) Log Message: ----------- xjobs: Adjust sourceurl Modified Paths: -------------- csw/mgar/pkg/xjobs/trunk/Makefile Modified: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile 2009-10-27 07:55:30 UTC (rev 6988) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2009-10-27 09:13:32 UTC (rev 6989) @@ -17,6 +17,8 @@ MASTER_SITES = http://www.maier-komor.de/xjobs/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SPKG_SOURCEURL = http://www.maier-komor.de/xjobs.html + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aubreyli at users.sourceforge.net Tue Oct 27 12:42:59 2009 From: aubreyli at users.sourceforge.net (aubreyli at users.sourceforge.net) Date: Tue, 27 Oct 2009 11:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6990] csw/mgar/pkg/cscope/trunk/Makefile Message-ID: Revision: 6990 http://gar.svn.sourceforge.net/gar/?rev=6990&view=rev Author: aubreyli Date: 2009-10-27 11:42:59 +0000 (Tue, 27 Oct 2009) Log Message: ----------- change to use predefined SF mirrors Modified Paths: -------------- csw/mgar/pkg/cscope/trunk/Makefile Modified: csw/mgar/pkg/cscope/trunk/Makefile =================================================================== --- csw/mgar/pkg/cscope/trunk/Makefile 2009-10-27 09:13:32 UTC (rev 6989) +++ csw/mgar/pkg/cscope/trunk/Makefile 2009-10-27 11:42:59 UTC (rev 6990) @@ -10,7 +10,8 @@ years, and has been used to manage projects involving 20 million lines of code! endef -MASTER_SITES = http://ncu.dl.sourceforge.net/project/cscope/cscope/$(GARVERSION)/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = cscope DISTFILES = $(DISTNAME).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Oct 27 16:44:39 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 27 Oct 2009 15:44:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6991] csw/mgar/pkg/libconfuse/trunk/Makefile Message-ID: Revision: 6991 http://gar.svn.sourceforge.net/gar/?rev=6991&view=rev Author: d_pocock Date: 2009-10-27 15:44:39 +0000 (Tue, 27 Oct 2009) Log Message: ----------- Enable 64 bit libraries Modified Paths: -------------- csw/mgar/pkg/libconfuse/trunk/Makefile Modified: csw/mgar/pkg/libconfuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/libconfuse/trunk/Makefile 2009-10-27 11:42:59 UTC (rev 6990) +++ csw/mgar/pkg/libconfuse/trunk/Makefile 2009-10-27 15:44:39 UTC (rev 6991) @@ -37,6 +37,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-nls This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 17:08:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 16:08:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6992] csw/mgar/pkg/cpan/Log-Log4perl/trunk Message-ID: Revision: 6992 http://gar.svn.sourceforge.net/gar/?rev=6992&view=rev Author: dmichelsen Date: 2009-10-27 16:08:30 +0000 (Tue, 27 Oct 2009) Log Message: ----------- cpan/Log-Log4perl: Update to 1.25 Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2009-10-27 15:44:39 UTC (rev 6991) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2009-10-27 16:08:30 UTC (rev 6992) @@ -1,5 +1,5 @@ GARNAME = Log-Log4perl -GARVERSION = 1.21 +GARVERSION = 1.25 CATEGORIES = cpan AUTHOR = MSCHILLI Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2009-10-27 15:44:39 UTC (rev 6991) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2009-10-27 16:08:30 UTC (rev 6992) @@ -1 +1 @@ -66bfe59ecb3741e9f271750198c3196e download/Log-Log4perl-1.21.tar.gz +d189f9c74b6811b2bc9d0c508041cd7a Log-Log4perl-1.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 27 17:13:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Oct 2009 16:13:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6993] csw/mgar/pkg/cpan/Log-Dispatch/trunk Message-ID: Revision: 6993 http://gar.svn.sourceforge.net/gar/?rev=6993&view=rev Author: dmichelsen Date: 2009-10-27 16:13:53 +0000 (Tue, 27 Oct 2009) Log Message: ----------- cpan/Log-Dispatch: Update to mGAR v2 and 2.26 Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/ Property changes on: csw/mgar/pkg/cpan/Log-Dispatch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2009-10-27 16:08:30 UTC (rev 6992) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2009-10-27 16:13:53 UTC (rev 6993) @@ -1,19 +1,21 @@ GARNAME = Log-Dispatch -GARVERSION = 2.16 +GARVERSION = 2.26 CATEGORIES = cpan AUTHOR = DROLSKY -DESCRIPTION = dispatches messages to one or more outputs +DESCRIPTION = Dispatch messages to noe or more outputs define BLURB This module manages a set of Log::Dispatch::* objects, allowing you to add and remove output objects as desired. endef -DISTFILES += $(call admfiles,CSWpmlogdispatch,depend prototype) +REQUIRED_PKGS = CSWpmprmsvldt CSWpmunivrequire -DEPENDS += cpan/Module-Build -DEPENDS += cpan/Params-Validate +PACKAGES = CSWpmlogdispatch +CATALOGNAME = pm_logdispatch -CONFIGURE_ARGS = destdir=$(DESTDIR) +LICENSE = LICENSE +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums 2009-10-27 16:08:30 UTC (rev 6992) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums 2009-10-27 16:13:53 UTC (rev 6993) @@ -1,4 +1 @@ -bb8029dae2684ba7f5ca49541fb1c968 download/CSWpmlogdispatch.gspec -66c00b9c919ee28412f1fe211fca754d download/CSWpmlogdispatch.depend -5f724cc582bdb0087b361fede9cb0003 download/CSWpmlogdispatch.prototype -2ae53fb2d5bc71ab6f7da8a7e520e9e2 download/Log-Dispatch-2.16.tar.gz +d15559297f7c73a311ede78f97174d2a Log-Dispatch-2.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 28 10:14:04 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 28 Oct 2009 09:14:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6994] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6994 http://gar.svn.sourceforge.net/gar/?rev=6994&view=rev Author: bonivart Date: 2009-10-28 09:14:03 +0000 (Wed, 28 Oct 2009) Log Message: ----------- cswclassutils: fix for #3959 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-10-28 09:14:03 UTC (rev 6994) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.26 +GARVERSION = 1.27 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-28 09:14:03 UTC (rev 6994) @@ -1,10 +1,10 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING -9f7a2603bf91ea53e70f2fe5c4a56726 CSWcswclassutils.i.cswcpsampleconf +b98588da7f4feff19c3d5c0d365ae0a9 CSWcswclassutils.i.cswcpsampleconf 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf -9f34d51156032e6e08e87fd686723e33 CSWcswclassutils.i.cswpreserveconf +9f125ebe17392ffa9a244e49a187206d CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup 4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-28 09:14:03 UTC (rev 6994) @@ -31,6 +31,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-27 16:13:53 UTC (rev 6993) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-28 09:14:03 UTC (rev 6994) @@ -39,6 +39,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 13:40:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 12:40:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6995] csw/mgar/pkg/libmhash/trunk Message-ID: Revision: 6995 http://gar.svn.sourceforge.net/gar/?rev=6995&view=rev Author: dmichelsen Date: 2009-10-28 12:40:19 +0000 (Wed, 28 Oct 2009) Log Message: ----------- libmhash: Fix optimization bug Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile csw/mgar/pkg/libmhash/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmhash/trunk/files/README Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 09:14:03 UTC (rev 6994) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 12:40:19 UTC (rev 6995) @@ -18,8 +18,17 @@ BUILD64 = 1 NOISALIST = 1 + +# sparcv9 compile fails with optimization beyond -xO1 at HAVAL256: FAIL: frag_test +# Please see files/README for details. + +ifeq ($(ISA),sparcv9) +OPT_FLAGS_SOS = -xO1 +endif + CONFIGURE_ARGS = $(DIRPATHS) +# Always run testsuite as the code is prone to optimization errors TEST_TARGET = check PACKAGES = CSWlibmhash Modified: csw/mgar/pkg/libmhash/trunk/checksums =================================================================== --- csw/mgar/pkg/libmhash/trunk/checksums 2009-10-28 09:14:03 UTC (rev 6994) +++ csw/mgar/pkg/libmhash/trunk/checksums 2009-10-28 12:40:19 UTC (rev 6995) @@ -1 +1 @@ -f91c74f9ccab2b574a98be5bc31eb280 download/mhash-0.9.9.9.tar.bz2 +f91c74f9ccab2b574a98be5bc31eb280 mhash-0.9.9.9.tar.bz2 Added: csw/mgar/pkg/libmhash/trunk/files/README =================================================================== --- csw/mgar/pkg/libmhash/trunk/files/README (rev 0) +++ csw/mgar/pkg/libmhash/trunk/files/README 2009-10-28 12:40:19 UTC (rev 6995) @@ -0,0 +1,107 @@ +Optimization error when compiling on sparcv9 with -xO2 or greater +----------------------------------------------------------------- + +The cause is unclear and the code is in general picky about alignment +and not written in a robust way. There are several bugs reported against +differnet versions of libmhash regarding alignment which may or may not +lead to this problem. Details follow: + + +Checking fragmentation capabilities of HAVAL256: FAIL: frag_test + +build8s% cd work/build-isa-sparcv9/mhash-0.9.9.9/src/ +build8s% mdb .libs/ +driver frag_test hmac_test keygen_test rest_test +build8s% mdb .libs/frag_test core +mdb: warning: core file is from SunOS 5.10 Generic_138888-07; shared text mappings may not match installed libraries +Loading modules: [ ] +> ::stack +libmhash.so.2`mutils_word32nswap+0xb8(100104990, 20, 1f, 6c24cc00, 1, 20754a1616aa27a) +libmhash.so.2`havalTransform3+0xc(1001047d4, ffffffff7fffefcd, 100104880, 143367, a19b3906, 1f3213955f32139) +libmhash.so.2`havalUpdate+0x130(1001047d0, ffffffff7fffefcc, 81, ffffffffffffffff, 1001047f4, 408) +libmhash.so.2`mhash+0x14(100101fd0, ffffffff7fffefcc, 81, fffffffffffffffd, 0, 7ffeff021eb8) +frag_test+0x98(100, 81, 1, 958, ffffffff7fffefcc, 80) +main+0x8c(1c, 7ffeff1329ce, 1, 100101620, 100001038, 100101588) +_start+0x17c(0, ffffffff7ffff238, 0, 1, 7ffeffe0d6cc, 7ffefff10000) +> ::dis mutils_word32nswap +libmhash.so.2`mutils_word32nswap: save %sp, -0xb0, %sp +libmhash.so.2`mutils_word32nswap+4: btst 0xff, %i2 +libmhash.so.2`mutils_word32nswap+8: bne,pn %icc,+0x24 +libmhash.so.2`mutils_word32nswap+0xc: mov %i0, %l4 +libmhash.so.2`mutils_word32nswap+0x10: sll %i1, 2, %l6 +libmhash.so.2`mutils_word32nswap+0x14: call +0x12d494 <0x7ffeff131aa0> +libmhash.so.2`mutils_word32nswap+0x18: srl %l6, 0, %o0 +libmhash.so.2`mutils_word32nswap+0x1c: brnz,pn %o0, +0x14 +libmhash.so.2`mutils_word32nswap+0x20: mov %o0, %i0 +libmhash.so.2`mutils_word32nswap+0x24: ret +libmhash.so.2`mutils_word32nswap+0x28: restore %g0, 0, %o0 +libmhash.so.2`mutils_word32nswap+0x2c: mov %l4, %i0 +libmhash.so.2`mutils_word32nswap+0x30: cmp %i1, 0 +libmhash.so.2`mutils_word32nswap+0x34: bleu,pn %icc,+0x264 +libmhash.so.2`mutils_word32nswap+0x38: cmp %i1, 4 +libmhash.so.2`mutils_word32nswap+0x3c: bl,pn %icc,+0x200 +libmhash.so.2`mutils_word32nswap+0x40: mov %i0, %l6 +libmhash.so.2`mutils_word32nswap+0x44: sra %i1, 0, %o0 +libmhash.so.2`mutils_word32nswap+0x48: sub %i0, %l4, %l7 +libmhash.so.2`mutils_word32nswap+0x4c: srax %l7, 0x3f, %g4 +libmhash.so.2`mutils_word32nswap+0x50: sethi %hi(0x7ffffc00), %l1 +libmhash.so.2`mutils_word32nswap+0x54: srl %i1, 0, %l2 +libmhash.so.2`mutils_word32nswap+0x58: xor %l7, %g4, %g5 +libmhash.so.2`mutils_word32nswap+0x5c: sllx %o0, 2, %g3 +libmhash.so.2`mutils_word32nswap+0x60: add %l1, 0x3fe, %l0 +libmhash.so.2`mutils_word32nswap+0x64: sub %g5, %g4, %g2 +libmhash.so.2`mutils_word32nswap+0x68: sub %l2, %l0, %o2 +libmhash.so.2`mutils_word32nswap+0x6c: srlx %o2, 0x3f, %o1 +libmhash.so.2`mutils_word32nswap+0x70: cmp %g2, %g3 +libmhash.so.2`mutils_word32nswap+0x74: clr %g1 +libmhash.so.2`mutils_word32nswap+0x78: and %o1, 1, %i4 +libmhash.so.2`mutils_word32nswap+0x7c: movge %xcc,1, %g1 +libmhash.so.2`mutils_word32nswap+0x80: btst %g1, %i4 +libmhash.so.2`mutils_word32nswap+0x84: be,a,pn %icc,+0x1bc +libmhash.so.2`mutils_word32nswap+0x88: clr %l2 +libmhash.so.2`mutils_word32nswap+0x8c: sethi %hi(0xfc00), %l5 +libmhash.so.2`mutils_word32nswap+0x90: add %i1, 0, %g4 +libmhash.so.2`mutils_word32nswap+0x94: add %l5, 0x300, %l3 +libmhash.so.2`mutils_word32nswap+0x98: add %i1, -1, %i2 +libmhash.so.2`mutils_word32nswap+0x9c: clr %l1 +libmhash.so.2`mutils_word32nswap+0xa0: sethi %hi(0xff000000), %l2 +libmhash.so.2`mutils_word32nswap+0xa4: sethi %hi(0xff0000), %l5 +libmhash.so.2`mutils_word32nswap+0xa8: cmp %g4, 5 +libmhash.so.2`mutils_word32nswap+0xac: bl,pn %icc,+0x13c +libmhash.so.2`mutils_word32nswap+0xb0: sub %i2, 3, %o7 +libmhash.so.2`mutils_word32nswap+0xb4: add %l1, 1, %l1 +libmhash.so.2`mutils_word32nswap+0xb8: ld [%l4], %g5 +libmhash.so.2`mutils_word32nswap+0xbc: add %l4, 4, %l4 +libmhash.so.2`mutils_word32nswap+0xc0: and %g5, %l5, %o1 + + +> ::regs +%g0 = 0x0000000000000000 %l0 = 0x000000007ffffffe +%g1 = 0x0000000000000001 %l1 = 0x0000000000000001 +%g2 = 0x00000001801059c3 %l2 = 0x00000000ff000000 +%g3 = 0x0000000000000080 %l3 = 0x000000000000ff00 +%g4 = 0x0000000000000020 %l4 = 0xffffffff7fffefcd +%g5 = 0x00000001801059c3 %l5 = 0x0000000000ff0000 +%g6 = 0x0000000000000000 %l6 = 0x0000000100104990 +%g7 = 0x0000000000000000 %l7 = 0x00000001801059c3 + +%o0 = 0x0000000000000020 %i0 = 0x0000000100104990 +%o1 = 0x0000000000000001 %i1 = 0x0000000000000020 +%o2 = 0xffffffff80000022 %i2 = 0x000000000000001f +%o3 = 0x000000007f7e7e7e %i3 = 0x000000006c24cc00 +%o4 = 0x00000000007e0000 %i4 = 0x0000000000000001 +%o5 = 0x0000000100104990 %i5 = 0x020754a1616aa27a +%o6 = 0xffffffff7fffe151 %i6 = 0xffffffff7fffe201 +%o7 = 0x000000000000001c %i7 = 0x00007ffeff0190ec libmhash.so.2`havalTransform3+0xc + + %ccr = 0x00 xcc=nzvc icc=nzvc + %y = 0x0000000000000000 + %pc = 0x00007ffeff0046b0 libmhash.so.2`mutils_word32nswap+0xb8 + %npc = 0x00007ffeff0046b4 libmhash.so.2`mutils_word32nswap+0xbc + %sp = 0xffffffff7fffe151 + %fp = 0xffffffff7fffe201 + + %asi = 0x82 +%fprs = 0x07 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 15:39:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 14:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6996] csw/mgar/pkg/libmhash/trunk/Makefile Message-ID: Revision: 6996 http://gar.svn.sourceforge.net/gar/?rev=6996&view=rev Author: dmichelsen Date: 2009-10-28 14:39:56 +0000 (Wed, 28 Oct 2009) Log Message: ----------- libmhash: Comment out clashing defines with including software Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 12:40:19 UTC (rev 6995) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-28 14:39:56 UTC (rev 6996) @@ -34,3 +34,12 @@ PACKAGES = CSWlibmhash include gar/category.mk + +# Don't include the most common defines. In general it is a bad idea to include +# the config file as it may collide with the config file from the main package +# using libmhash. +post-install-modulated: + perl -pi -e 's,^(#define (?:PACKAGE|PACKAGE_BUGREPORT|PACKAGE_NAME|PACKAGE_STRING|PACKAGE_TARNAME|PACKAGE_VERSION|VERSION) .*),/* \1 */,' \ + $(DESTDIR)$(includedir)/mutils/mhash_config.h + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 16:17:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 15:17:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6997] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ Message-ID: Revision: 6997 http://gar.svn.sourceforge.net/gar/?rev=6997&view=rev Author: dmichelsen Date: 2009-10-28 15:17:27 +0000 (Wed, 28 Oct 2009) Log Message: ----------- sasl: Make branch for mGAR v2 migration Added Paths: ----------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 16:21:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 15:21:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6998] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 Message-ID: Revision: 6998 http://gar.svn.sourceforge.net/gar/?rev=6998&view=rev Author: dmichelsen Date: 2009-10-28 15:21:45 +0000 (Wed, 28 Oct 2009) Log Message: ----------- sasl-2.1.23-mGARv2: Pull in dynamic gspecs Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums Added Paths: ----------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2009-10-28 15:17:27 UTC (rev 6997) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2009-10-28 15:21:45 UTC (rev 6998) @@ -1,5 +1,5 @@ GARNAME = sasl -GARVERSION = 2.1.22 +GARVERSION = 2.1.23 CATEGORIES = lib DESCRIPTION = Simple Authentication and Security Layer @@ -12,7 +12,7 @@ endef # Source location -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ # Visitor information SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ @@ -21,34 +21,52 @@ DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -BUILD_ENV = _REENTRANT=1 - -TEST_TARGET = check - -SED=/usr/bin/sed -EGREP=/usr/bin/egrep -max_cmd_line=65535 - # SASL libraries and utilities -DISTFILES += $(call admfiles,CSWsasl,$(ADMSTANDARD) $(ADMISCRIPTS)) +DISTFILES += CSWsasl.preinstall CSWsasl.postinstall # SASL authentication server -DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) +#DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) # SASL sql plugin -DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) +#DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) # SASL gssapi plugin -DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) +#DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) +DISTFILES += cswusergroup + # Init files for SASLAUTHD DISTFILES += cswsaslauthd.init saslauthd.init.CSW PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff -#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql -EXTRA_LIBS += /opt/csw/bdb4/lib +CATALOGNAME_CSWsasl = sasl +CATALOGNAME_CSWsaslauthd = saslauthd +CATALOGNAME_CSWsaslgssapi = sasl_gssapi +CATALOGNAME_CSWsaslsql = sasl_sql + +REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb4 +REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib +REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib +REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite + +SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer +SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon +SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding +SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 + +# Do not use LD_OPTIONS as it breaks tests by using the installed libraries +# before the newly built ones. +EXTRA_LDFLAGS = $(RUNPATH_LINKER_FLAGS) +LD_OPTIONS = + +BUILD_ENV = _REENTRANT=1 + +EXTRA_LIBS += /opt/csw/bdb47/lib EXTRA_LIBS += /opt/csw/mysql4/lib EXTRA_LIBS += /opt/csw/postgresql/lib @@ -56,8 +74,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql -CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb4/lib -CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb4/include/ +CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb47/lib +CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd CONFIGURE_ARGS += --with-ipctype=unix CONFIGURE_ARGS += --with-ldap=/opt/csw @@ -68,13 +86,18 @@ CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 CONFIGURE_ARGS += --enable-login +SED=/usr/bin/sed +EGREP=/usr/bin/egrep +max_cmd_line=65535 -all: .DEFAULT -.DEFAULT: - @true +TEST_TARGET = check -post-install: testsaslauthd install-testsaslauthd install-doc +#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +include gar/category.mk + +post-install-modulated: testsaslauthd install-testsaslauthd install-doc + DOC_FILES = rfc1321.txt \ rfc1939.txt \ rfc2104.txt \ @@ -139,5 +162,3 @@ cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW - -include gar/category.mk Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2009-10-28 15:17:27 UTC (rev 6997) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2009-10-28 15:21:45 UTC (rev 6998) @@ -1,22 +1,8 @@ -45dde9d19193ae9dd388eb68b2027bc9 download/cyrus-sasl-2.1.22.tar.gz -f4a742f252ee3b840ffe062d4288e4d4 download/CSWsasl.gspec -b8dd69fab29e6e9706536229572dbca5 download/CSWsasl.prototype -773caf5b10e823266e785ec1ac5ea20e download/CSWsasl.depend -2762eafea57ec2e5e28e5a5a95937fa7 download/CSWsasl.preinstall -614bb55932ed32486c1fd57a0059059a download/CSWsasl.postinstall -b9b51f830b9524f2d6f35fe428cbce5a download/CSWsaslauthd.gspec -8974319c29e07c5b44470c85d91859c8 download/CSWsaslauthd.prototype -1114b8288fe48e24922fca60ef00da79 download/CSWsaslauthd.depend -ab89fa9937d1337e30de070bb8b0174b download/CSWsaslauthd.postinstall -177c98fa0d192eafe569a3c379388652 download/CSWsaslauthd.preremove -e2962c2cfefee8bada31b15af8817b52 download/CSWsaslsql.gspec -5936c0208fc18f2a47f716013171cdf2 download/CSWsaslsql.prototype -1dbe229bbe3c1f944f95a1ecef65fa49 download/CSWsaslsql.depend -033ca04bd0d1d5467495af765a890df2 download/CSWsaslgssapi.gspec -486fb367a3d53ad5125f7678065bfd8d download/CSWsaslgssapi.prototype -4c009a25ddbe4325f515a8d605a62ec6 download/CSWsaslgssapi.depend -b2491dcfbb2be4a4a09f3003cffb1bc7 download/cswsaslauthd.init -b190992e18cc7add35a6934d896a1130 download/saslauthd.init.CSW -40b526754554c46d5b134f5ca21fe371 download/saslauthd-doc.diff -21cbef68d9f2dc2447326cbda8bf842e download/saslauthd-groff.diff -48af784184961368ce250c7b33d207b8 download/ltmain.diff +614bb55932ed32486c1fd57a0059059a CSWsasl.postinstall +2762eafea57ec2e5e28e5a5a95937fa7 CSWsasl.preinstall +b2491dcfbb2be4a4a09f3003cffb1bc7 cswsaslauthd.init +2eb0e48106f0e9cd8001e654f267ecbc cyrus-sasl-2.1.23.tar.gz +48af784184961368ce250c7b33d207b8 ltmain.diff +40b526754554c46d5b134f5ca21fe371 saslauthd-doc.diff +21cbef68d9f2dc2447326cbda8bf842e saslauthd-groff.diff +b190992e18cc7add35a6934d896a1130 saslauthd.init.CSW Added: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup (rev 0) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup 2009-10-28 15:21:45 UTC (rev 6998) @@ -0,0 +1 @@ +:sasl:::::: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 28 16:46:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 28 Oct 2009 15:46:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6999] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 6999 http://gar.svn.sourceforge.net/gar/?rev=6999&view=rev Author: bonivart Date: 2009-10-28 15:46:40 +0000 (Wed, 28 Oct 2009) Log Message: ----------- cswclassutils: minor fixes #3959 and #3873 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-10-28 15:46:40 UTC (rev 6999) @@ -1,17 +1,17 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING -b98588da7f4feff19c3d5c0d365ae0a9 CSWcswclassutils.i.cswcpsampleconf +fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf -9f125ebe17392ffa9a244e49a187206d CSWcswclassutils.i.cswpreserveconf +c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup -4f926d97a780f9c116083e5e729c705c CSWcswclassutils.r.cswcpsampleconf +d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf -a473d9cf739a6a33ac3a7306eb4a522c CSWcswclassutils.r.cswpreserveconf +96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -31,7 +31,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest - [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -39,7 +39,7 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest - [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1 + [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 contents=`grep "^$dest" /var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -23,7 +23,7 @@ if cmp $confdest $dest >/dev/null ; then echo $confdest is identical to sample config file $dest echo Removing $confdest - rm $confdest + rm -f $confdest fi - rm $dest + rm -f $dest done Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf 2009-10-28 15:21:45 UTC (rev 6998) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf 2009-10-28 15:46:40 UTC (rev 6999) @@ -28,7 +28,7 @@ if cmp $confdest $dest >/dev/null ; then echo $confdest is identical to sample config file $dest echo Removing $confdest - rm $confdest + rm -f $confdest else echo "preserving $confdest to $preservedconf" mkdir -p $preservedir @@ -37,5 +37,5 @@ fi # Any way it shakes out, we always remove the "sample conf" - rm $dest + rm -f $dest done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 28 17:51:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Oct 2009 16:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7000] csw/mgar/pkg Message-ID: Revision: 7000 http://gar.svn.sourceforge.net/gar/?rev=7000&view=rev Author: dmichelsen Date: 2009-10-28 16:51:57 +0000 (Wed, 28 Oct 2009) Log Message: ----------- aide: Initial commit Added Paths: ----------- csw/mgar/pkg/aide/ csw/mgar/pkg/aide/branches/ csw/mgar/pkg/aide/tags/ csw/mgar/pkg/aide/trunk/ csw/mgar/pkg/aide/trunk/Makefile csw/mgar/pkg/aide/trunk/checksums csw/mgar/pkg/aide/trunk/files/ csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch Property changes on: csw/mgar/pkg/aide/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile (rev 0) +++ csw/mgar/pkg/aide/trunk/Makefile 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,50 @@ +GARNAME = aide +GARVERSION = 0.13.1 +CATEGORIES = utils + +DESCRIPTION = Advanced Intrusion Detection Environment +define BLURB + AIDE (Advanced Intrusion Detection Environment) is a free + replacement for Tripwire. It does the same things as the + semi-free Tripwire and more. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Disable Sun ACLs for now until bug #2887984 is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 +#PATCHFILES = 0001-Fix-ACL-ifdef-logic.patch + +# Add patch until bug #2888035 is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=2888035&group_id=86976&atid=581579 +PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq +REQUIRED_PKGS += CSWoldaprt CSWosslrt CSWzlib + +EXTRA_LIB = $(prefix)/postgresql/lib +EXTRA_INC = $(prefix)/postgresql/include + +EXTRA_CPPFLAGS = -D__const=const + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-curl + +# Disable Sun ACLs for now until bug #2887984 is fixed (see above) +#CONFIGURE_ARGS += --with-sun-acl + +CONFIGURE_ARGS += --with-psql +# Add extra libraries until bug #2888028 is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=2888028&group_id=86976&atid=581579 +EXTRA_LINKER_FLAGS = -lgcrypt -lgpg-error + +# Disable tests until bug #2888084 is fixed +# http://sourceforge.net/tracker/?func=detail&aid=2888084&group_id=86976&atid=581579 +#TEST_TARGET = check +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums (rev 0) +++ csw/mgar/pkg/aide/trunk/checksums 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,2 @@ +c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch +27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz Added: csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch =================================================================== --- csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch (rev 0) +++ csw/mgar/pkg/aide/trunk/files/0001-Fix-ACL-ifdef-logic.patch 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,30 @@ +From 18d19087b6f54812b5b3c363231e81a79456bf2a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 28 Oct 2009 14:31:38 +0100 +Subject: [PATCH 1/2] Fix ACL ifdef logic + +--- + include/db_config.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/db_config.h b/include/db_config.h +index 3ba0973..3b9c82a 100644 +--- a/include/db_config.h ++++ b/include/db_config.h +@@ -52,12 +52,12 @@ typedef struct acl_type{ + #ifndef WITH_ACL + # error "No ACL support ... but POSIX ACL support." + #endif +-#endif + + typedef struct acl_type { + char *acl_a; /* ACCESS */ + char *acl_d; /* DEFAULT, directories only */ + } acl_type; ++#endif + + #ifdef WITH_XATTR /* Do generic user Xattrs. */ + #include +-- +1.6.5 + Added: csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch =================================================================== --- csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch (rev 0) +++ csw/mgar/pkg/aide/trunk/files/0002-Add-missing-prototypes-for-db_sql.patch 2009-10-28 16:51:57 UTC (rev 7000) @@ -0,0 +1,33 @@ +From f072fece494256e6f7cc6ff06f79c059f18c9be9 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 28 Oct 2009 15:35:37 +0100 +Subject: [PATCH 2/2] Add missing prototypes for db_sql + +--- + include/db_sql.h | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/include/db_sql.h b/include/db_sql.h +index 0907393..ecb1c41 100644 +--- a/include/db_sql.h ++++ b/include/db_sql.h +@@ -22,7 +22,7 @@ + #define _DB_SQL_H_INCLUDED + + +-static __attribute__ ((used)) const char* db_sql_types[] = { ++static const char* db_sql_types[] = { + "text unique primary key",/* "name", */ + "text", /* "lname", */ + "int", /* "perm", */ +@@ -51,5 +51,7 @@ static __attribute__ ((used)) const char* db_sql_types[] = { + + int db_close_sql(void*); + db_line* db_readline_sql(int db, db_config* conf); ++int db_writeline_sql(db_line* line,db_config* conf); ++int db_writespec_sql(db_config* conf); + + #endif +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 09:11:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 08:11:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7001] csw/mgar/pkg/libpopt/trunk Message-ID: Revision: 7001 http://gar.svn.sourceforge.net/gar/?rev=7001&view=rev Author: dmichelsen Date: 2009-10-29 08:11:46 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libpopt: Fix failing test Modified Paths: -------------- csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libpopt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch Modified: csw/mgar/pkg/libpopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-28 16:51:57 UTC (rev 7000) +++ csw/mgar/pkg/libpopt/trunk/Makefile 2009-10-29 08:11:46 UTC (rev 7001) @@ -17,6 +17,10 @@ MASTER_SITES = http://rpm5.org/files/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# This fixes a minor failing check. See for details +# http://www.mail-archive.com/popt-devel at rpm5.org/msg00155.html +PATCHFILES = 0001-Fix-failing-tests.patch + PACKAGES = CSWlibpopt UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libpopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libpopt/trunk/checksums 2009-10-28 16:51:57 UTC (rev 7000) +++ csw/mgar/pkg/libpopt/trunk/checksums 2009-10-29 08:11:46 UTC (rev 7001) @@ -1 +1,2 @@ -c61ef795fa450eb692602a661ec8d7f1 download/popt-1.15.tar.gz +4999ab4e862297b281b78f2a0ac6ebd5 0001-Fix-failing-tests.patch +c61ef795fa450eb692602a661ec8d7f1 popt-1.15.tar.gz Added: csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch =================================================================== --- csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch (rev 0) +++ csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch 2009-10-29 08:11:46 UTC (rev 7001) @@ -0,0 +1,34 @@ +From 47be5f0af0829a29d86ad7025648a0309b49ea21 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 09:04:42 +0100 +Subject: [PATCH] Fix failing tests + +--- + testit.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testit.sh b/testit.sh +index 0a0ba09..4b667b5 100755 +--- a/testit.sh ++++ b/testit.sh +@@ -111,7 +111,7 @@ run test1 "test1 - 53" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset + run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr + + run test1 "test1 - 55" "\ +-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] ++Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] + [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] + [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG] + [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT] +@@ -120,7 +120,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] + [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage + + run test1 "test1 - 56" "\ +-Usage: lt-test1 [OPTION...] ++Usage: test1 [OPTION...] + --arg1 First argument with a really long + description. After all, we have to test + argument help wrapping somehow, right? +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 29 09:40:04 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Oct 2009 08:40:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7002] csw/mgar/pkg/nicstat/trunk Message-ID: Revision: 7002 http://gar.svn.sourceforge.net/gar/?rev=7002&view=rev Author: bonivart Date: 2009-10-29 08:40:04 +0000 (Thu, 29 Oct 2009) Log Message: ----------- nicstat: update to 1.21 Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-29 08:11:46 UTC (rev 7001) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2009-10-29 08:40:04 UTC (rev 7002) @@ -1,5 +1,5 @@ GARNAME = nicstat -GARVERSION = 1.20 +GARVERSION = 1.21 CATEGORIES = net DESCRIPTION = Network monitoring tool @@ -43,8 +43,10 @@ install-custom: @echo " ==> Install $(GARNAME) (custom)" - @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d -m 755 $(DESTDIR)$(bindir) @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(mandir)/man1 + @ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/README.txt $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums 2009-10-29 08:11:46 UTC (rev 7001) +++ csw/mgar/pkg/nicstat/trunk/checksums 2009-10-29 08:40:04 UTC (rev 7002) @@ -1 +1 @@ -9cf3090944d01d6ad3c7cc9762207fea download/nicstat-1.20.tar.gz +14b7411916fa317920803d82346098dc nicstat-1.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 10:04:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 09:04:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7003] csw/mgar/pkg/orca/trunk Message-ID: Revision: 7003 http://gar.svn.sourceforge.net/gar/?rev=7003&view=rev Author: dmichelsen Date: 2009-10-29 09:04:27 +0000 (Thu, 29 Oct 2009) Log Message: ----------- orca: Move to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/orca/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype csw/mgar/pkg/orca/trunk/files/CSWorca.depend csw/mgar/pkg/orca/trunk/files/CSWorca.gspec csw/mgar/pkg/orca/trunk/files/CSWorca.prototype Property Changed: ---------------- csw/mgar/pkg/orca/trunk/ Property changes on: csw/mgar/pkg/orca/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 09:04:27 UTC (rev 7003) @@ -28,33 +28,58 @@ MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWorca,depend prototype) +DISTFILES += CSWorca-web.postinstall CSWorca-web.preremove DISTFILES += csworcallator.init csworcallator.xml svc-csworcallator DISTFILES += csworca_services -DISTFILES += $(call admfiles,CSWorca-web,depend prototype postinstall preremove) +PACKAGES = CSWorca CSWorca-web + +CATALOGNAME_CSWorca = orca +CATALOGNAME_CSWorca-web = orca_web + PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch +SPKG_SOURCEURL = http://www.orcaware.com/orca + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit +REQUIRED_PKGS_CSWorca = CSWcswclassutils CSWsetoolkit CSWperl CSWpmtimedate +REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 +REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 + #libdir = $(exec_prefix)/lib/$(GARNAME) localstatedir = /var/opt/csw COMMON_EXPORTS += perlcswlib CONFIGURE_ARGS = $(DIRPATHS) \ - --with-html-dir=$(prefix)/apache2/share/htdocs/orca \ + --with-html-dir=$(sharedstatedir)/www/orca \ --disable-librrdtool SPKG_CLASSES = none cswinitsmf +PKGFILES_CSWorca-web = $(prefix)/apache2/.* +PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.* +PKGFILES_CSWorca-web += $(bindir)/orca +PKGFILES_CSWorca-web += $(sysconfdir)/.*\.cfg +PKGFILES_CSWorca-web += $(libdir)/perl/.* +PKGFILES_CSWorca-web += $(mandir)/man1/orca\.1 +PKGFILES_CSWorca-web += /var/opt/csw/.* + include gar/category.mk -post-install: +post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d @ginstall $(WORKDIR)/csworcallator.init $(DESTDIR)$(sysconfdir)/init.d/csworcallator @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) + +post-merge: + @ginstall -d $(PKGROOT)/var/opt/csw/orca/rrd/orcallator + @ginstall -d $(PKGROOT)$(prefix)/share/www/orca/orcallator + @ginstall -d $(PKGROOT)$(prefix)/apache2/share/htdocs + @ln -s $(prefix)/share/www/orca $(PKGROOT)$(prefix)/apache2/share/htdocs/orca + @$(MAKECOOKIE) Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/checksums 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,14 +1,8 @@ ba8e48e429008f53037e85fef2fcfe36 download/orca-snapshot-r535.tar.bz2 -1f3d702565394052096bf75229d656d5 download/CSWorca.gspec -6958db760831c504e21947338d0cac33 download/CSWorca.depend -9cef0b5c1675ebd7a5f4d1427b5cce27 download/CSWorca.prototype +401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall +03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove 72c1eaa8d3f1ab48363e7ed5792e2855 download/csworcallator.init a99644ffcc9164d9d0f4df2b44c61917 download/csworcallator.xml 23a2b76456b96c5fcff4a1d92c02e140 download/svc-csworcallator 4c74f4f1449fabd0838d0cd71678144c download/csworca_services -029c3cdd385c06b30aed79ea7e6f553f download/CSWorca-web.gspec -0390894875ef40b9b40b42bab9f9fdab download/CSWorca-web.depend -7ea5b03e8ae1c4f017a2c775a0c10f98 download/CSWorca-web.prototype -401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall -03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove ce08f37aa52f7b27bc82cc9c976d56b4 download/orca-snapshot-r535-se-3.5.0.patch Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,5 +0,0 @@ -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpmtimedate pm_timedate - Parse date strings into time values -P CSWpmmathinterpolate pm_mathinterpolate - Useful routines for interpolating data sets -P CSWrrd rrdtool - Round Robin Database graphing tool -P CSWapache2 apache2 - Apache 2.2 web server Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,4 +0,0 @@ -%var bitname orca_web -%var pkgname CSWorca-web -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,36 +0,0 @@ -d none /opt/csw/apache2/share/htdocs/orca 0755 root bin -d none /opt/csw/apache2/share/htdocs/orca/orcallator 0755 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/orca 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/orca_services.cfg.CSW=/opt/csw/etc/orca_services.cfg 0644 root bin -f none /opt/csw/etc/orcallator.cfg.CSW=/opt/csw/etc/orcallator.cfg 0644 root bin -f none /opt/csw/etc/procallator.cfg.CSW=/opt/csw/etc/procallator.cfg 0644 root bin -f none /opt/csw/etc/winallator.cfg.CSW=/opt/csw/etc/winallator.cfg 0644 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Orca 0755 root bin -f none /opt/csw/lib/perl/csw/Orca/Config.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/Constants.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/DataFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/HTMLFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/ImageFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/NewState.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/OldState.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/OpenFileHash.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/RRDFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/SourceFile.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/SourceFileIDs.pm 0644 root bin -f none /opt/csw/lib/perl/csw/Orca/Utils.pm 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/orca.1 0644 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/orca 0755 root bin -d none /var/opt/csw/orca/rrd 0755 root bin -d none /var/opt/csw/orca/rrd/orcallator 0755 root bin -i copyright=CSWorca-web.copyright -i depend=CSWorca-web.depend -i pkginfo=CSWorca-web.pkginfo Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.depend =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca.depend 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca.depend 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,8 +0,0 @@ -P CSWcswclassutils cswclassutils - CSW class action utilities -P CSWsetoolkit setoolkit - A system performance monitoring tool -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpmtimedate pm_timedate - Parse date strings into time values -P CSWpmmathinterpolate pm_mathinterpolate - Useful routines for interpolating data sets -P CSWrrd rrdtool - Round Robin Database graphing tool -P CSWgawk gawk - GNU AWK -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.gspec =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca.gspec 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca.gspec 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,9 +0,0 @@ -%var bitname orca -%var pkgname CSWorca -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING -%prototype:merge -f cswinitsmf /opt/csw/etc/init.d/csworcallator 0755 root bin -f cswinitsmf /opt/csw/etc/init.d/csworca_services 0755 root bin -%depend:merge -P CSWcswclassutils cswclassutils - CSW class action utilities Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.prototype =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca.prototype 2009-10-29 08:40:04 UTC (rev 7002) +++ csw/mgar/pkg/orca/trunk/files/CSWorca.prototype 2009-10-29 09:04:27 UTC (rev 7003) @@ -1,26 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/orca_services_running 0755 root bin -f none /opt/csw/bin/orcallator_column 0755 root bin -f none /opt/csw/bin/orcallator_running 0755 root bin -f none /opt/csw/bin/procallator 0755 root bin -f none /opt/csw/bin/restart_orca_services 0755 root bin -f none /opt/csw/bin/restart_orcallator 0755 root bin -f none /opt/csw/bin/start_orca_services 0755 root bin -f none /opt/csw/bin/start_orcallator 0755 root bin -f none /opt/csw/bin/stop_orca_services 0755 root bin -f none /opt/csw/bin/stop_orcallator 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/orca_services.cfg 0644 root bin -d none /opt/csw/etc/init.d 0755 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/orca 0755 root bin -f none /opt/csw/lib/orca/orcallator.se 0644 root bin -d none /opt/csw/libexec 0755 root bin -f none /opt/csw/libexec/orca_services 0755 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/orca 0755 root bin -d none /var/opt/csw/orca/orcallator 0755 root bin -d none /var/opt/csw/orca/orca_services 0755 root bin -i copyright=CSWorca.copyright -i depend=CSWorca.depend -i pkginfo=CSWorca.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 29 10:14:58 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Oct 2009 09:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7004] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 7004 http://gar.svn.sourceforge.net/gar/?rev=7004&view=rev Author: bonivart Date: 2009-10-29 09:14:57 +0000 (Thu, 29 Oct 2009) Log Message: ----------- clamav: update to 0.95.3 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/Makefile 2009-10-29 09:14:57 UTC (rev 7004) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.95.2 +GARVERSION = 0.95.3 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -33,6 +33,9 @@ # add usergroup class SPKG_CLASSES_CSWclamav = none cswusergroup ugfiles cswcpsampleconf cswinitsmf +PATCHFILES = CSWclamav.freshclam.conf.p +PATCHFILES += CSWclamav.clamd.conf.p + OPT_FLAGS_SOS = -xO2 CONFIGURE_ARGS = $(DIRPATHS) @@ -63,7 +66,7 @@ TEST_TARGET = check # can not run checkpkg due to libs in separate package -ENABLE_CHECK=0 +#ENABLE_CHECK=0 include gar/category.mk @@ -81,11 +84,7 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter - @( cd $(DESTDIR)$(sysconfdir) ; \ - gpatch < ../../../../../$(FILEDIR)/CSWclamav.clamd.conf.p ) @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW - @( cd $(DESTDIR)$(sysconfdir) ; \ - gpatch < ../../../../../$(FILEDIR)/CSWclamav.freshclam.conf.p ) @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @mv $(DESTDIR)$(sysconfdir)/clamav-milter.conf $(DESTDIR)$(sysconfdir)/clamav-milter.conf.CSW @ginstall -d $(DESTDIR)$(sysconfdir)/CSWclamav Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/checksums 2009-10-29 09:14:57 UTC (rev 7004) @@ -1 +1,3 @@ -930362397d30e01ba81b5f24c1046d48 download/clamav-0.95.2.tar.gz +83ab77147b8ff549a371e1042526102c CSWclamav.clamd.conf.p +6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p +eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2009-10-29 09:14:57 UTC (rev 7004) @@ -1,5 +1,5 @@ ---- clamd.conf 2008-12-18 10:50:45.033181389 +0100 -+++ clamd.conf 2008-12-18 10:46:07.995146244 +0100 +--- /etc/clamd.conf 2008-12-18 10:50:45.033181389 +0100 ++++ /etc/clamd.conf 2008-12-18 10:46:07.995146244 +0100 @@ -5,7 +5,7 @@ Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p 2009-10-29 09:04:27 UTC (rev 7003) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p 2009-10-29 09:14:57 UTC (rev 7004) @@ -1,5 +1,5 @@ ---- freshclam.conf 2008-12-18 10:50:48.949505178 +0100 -+++ freshclam.conf 2008-12-18 10:46:14.856162590 +0100 +--- /etc/freshclam.conf 2008-12-18 10:50:48.949505178 +0100 ++++ /etc/freshclam.conf 2008-12-18 10:46:14.856162590 +0100 @@ -5,7 +5,7 @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 11:18:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 10:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7005] csw/mgar/pkg Message-ID: Revision: 7005 http://gar.svn.sourceforge.net/gar/?rev=7005&view=rev Author: dmichelsen Date: 2009-10-29 10:18:42 +0000 (Thu, 29 Oct 2009) Log Message: ----------- jack: Initial commit Added Paths: ----------- csw/mgar/pkg/jack/ csw/mgar/pkg/jack/branches/ csw/mgar/pkg/jack/tags/ csw/mgar/pkg/jack/trunk/ csw/mgar/pkg/jack/trunk/Makefile csw/mgar/pkg/jack/trunk/checksums csw/mgar/pkg/jack/trunk/files/ Property changes on: csw/mgar/pkg/jack/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/jack/trunk/Makefile =================================================================== --- csw/mgar/pkg/jack/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jack/trunk/Makefile 2009-10-29 10:18:42 UTC (rev 7005) @@ -0,0 +1,34 @@ +GARNAME = jack +GARVERSION = 1.9.3 +CATEGORIES = lib + +DESCRIPTION = A system for handling real-time, low latency audio and MIDI +define BLURB + JACK is system for handling real-time, low latency audio (and MIDI). It runs + on GNU/Linux, Solaris, FreeBSD, OS X and Windows (and can be ported to other + POSIX-conformant platforms). It can connect a number of different applications + to an audio device, as well as allowing them to share audio between themselves. + Its clients can run in their own processes (ie. as normal applications), or can + they can run within the JACK server (ie. as a "plugin"). JACK also has support + for distributing audio processing across a network, both fast & reliable LANs + as well as slower, less reliable WANs. +endef + +MASTER_SITES = http://www.grame.fr/~letz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/waf +CONFIGURE_ARGS = configure --prefix=$(prefix) + +BUILD_SCRIPTS = $(WORKSRC)/waf +BUILD_ARGS = build + +INSTALL_SCRIPTS = $(WORKSRC)/waf +INSTALL_ARGS = install --destdir=$(DESTDIR) + +include gar/category.mk Added: csw/mgar/pkg/jack/trunk/checksums =================================================================== --- csw/mgar/pkg/jack/trunk/checksums (rev 0) +++ csw/mgar/pkg/jack/trunk/checksums 2009-10-29 10:18:42 UTC (rev 7005) @@ -0,0 +1 @@ +b83e6c48345410d693550cec90a89f4e jack-1.9.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 11:19:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 10:19:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7006] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 7006 http://gar.svn.sourceforge.net/gar/?rev=7006&view=rev Author: dmichelsen Date: 2009-10-29 10:19:17 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Add rudimentary WAF support Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-10-29 10:18:42 UTC (rev 7005) +++ csw/mgar/gar/v2/gar.lib.mk 2009-10-29 10:19:17 UTC (rev 7006) @@ -498,6 +498,12 @@ @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +configure-%/waf: + @echo " ==> Running waf configure in $*" + cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + #################### BUILD RULES #################### # build from a standard gnu-style makefile's default rule. @@ -537,6 +543,12 @@ @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +build-%/waf: + @echo " ==> Running waf build in $*" + @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) + @$(MAKECOOKIE) + # This can be: build, build_py, build_ext, build_clib, build_scripts # See setup.py --help-commands for details PYBUILD_CMD ?= build @@ -615,6 +627,12 @@ @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +install-%/waf: + @echo " ==> Running waf install in $*" + @$(cd $* ; (INSTALL_ENV) ./waf install $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + # This can be: install, install_lib, install_headers, install_scripts, # or install_data. See setup.py --help-commands for details. PYINSTALL_CMD ?= install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Oct 29 11:48:38 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 29 Oct 2009 10:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7007] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7007 http://gar.svn.sourceforge.net/gar/?rev=7007&view=rev Author: d_pocock Date: 2009-10-29 10:48:38 +0000 (Thu, 29 Oct 2009) Log Message: ----------- apr: Changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/apr/trunk/ Property changes on: csw/mgar/pkg/apr/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 10:19:17 UTC (rev 7006) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 10:48:38 UTC (rev 7007) @@ -1,5 +1,5 @@ GARNAME = apr -GARVERSION = 1.2.2 +GARVERSION = 1.3.8 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime @@ -18,12 +18,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --enable-layout=csw CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -# Tests verified: 1.2.2 +# Tests verified: 1.3.8 TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 12:18:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 11:18:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7008] csw/mgar/pkg/orca/trunk Message-ID: Revision: 7008 http://gar.svn.sourceforge.net/gar/?rev=7008&view=rev Author: dmichelsen Date: 2009-10-29 11:18:23 +0000 (Thu, 29 Oct 2009) Log Message: ----------- orca: Move to cswutils gar integration Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/orca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/orca/trunk/files/csworcallator Removed Paths: ------------- csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove csw/mgar/pkg/orca/trunk/files/csworcallator.init Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:18:23 UTC (rev 7008) @@ -28,8 +28,7 @@ MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += CSWorca-web.postinstall CSWorca-web.preremove -DISTFILES += csworcallator.init csworcallator.xml svc-csworcallator +DISTFILES += csworcallator csworcallator.xml svc-csworcallator DISTFILES += csworca_services PACKAGES = CSWorca CSWorca-web @@ -37,6 +36,9 @@ CATALOGNAME_CSWorca = orca CATALOGNAME_CSWorca-web = orca_web +SPKG_DESC_CSWorca = Performance Data Collector +SPKG_DESC_CSWorcs-web = Performance Data Viewer + PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch SPKG_SOURCEURL = http://www.orcaware.com/orca @@ -50,7 +52,7 @@ REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 -#libdir = $(exec_prefix)/lib/$(GARNAME) +sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw COMMON_EXPORTS += perlcswlib @@ -59,8 +61,19 @@ --with-html-dir=$(sharedstatedir)/www/orca \ --disable-librrdtool -SPKG_CLASSES = none cswinitsmf +# Exclude se-libraries for old SE Toolkit versions. We depend on 3.5.0 which +# includes all needed se-libraries. +EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/SE/.* +PRESERVECONF = /etc/opt/csw/orcallator.cfg +PRESERVECONF += /etc/opt/csw/winallator.cfg +PRESERVECONF += /etc/opt/csw/procallator.cfg +PRESERVECONF += /etc/opt/csw/orca_services.cfg + +INITSMF = /etc/opt/csw/init.d/csworcallator + +ARCHALL = 1 + PKGFILES_CSWorca-web = $(prefix)/apache2/.* PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.* PKGFILES_CSWorca-web += $(bindir)/orca @@ -73,8 +86,9 @@ post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d - @ginstall $(WORKDIR)/csworcallator.init $(DESTDIR)$(sysconfdir)/init.d/csworcallator - @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services + @# TBD: Use custom manifest for Solaris 10 SMF support + @#ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator + @#ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) post-merge: Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/checksums 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,8 +1,6 @@ -ba8e48e429008f53037e85fef2fcfe36 download/orca-snapshot-r535.tar.bz2 -401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall -03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove -72c1eaa8d3f1ab48363e7ed5792e2855 download/csworcallator.init -a99644ffcc9164d9d0f4df2b44c61917 download/csworcallator.xml -23a2b76456b96c5fcff4a1d92c02e140 download/svc-csworcallator -4c74f4f1449fabd0838d0cd71678144c download/csworca_services -ce08f37aa52f7b27bc82cc9c976d56b4 download/orca-snapshot-r535-se-3.5.0.patch +4c74f4f1449fabd0838d0cd71678144c csworca_services +72c1eaa8d3f1ab48363e7ed5792e2855 csworcallator +a99644ffcc9164d9d0f4df2b44c61917 csworcallator.xml +ce08f37aa52f7b27bc82cc9c976d56b4 orca-snapshot-r535-se-3.5.0.patch +ba8e48e429008f53037e85fef2fcfe36 orca-snapshot-r535.tar.bz2 +23a2b76456b96c5fcff4a1d92c02e140 svc-csworcallator Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,25 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -ORCA_ETCDIR=${CSW_PREFIX}/etc - -# Copy templates -template_list="\ - orcallator.cfg \ - winallator.cfg \ - procallator.cfg \ - orca_services.cfg" - -echo Copying CSW templates: -for file in $template_list -do - filepath=${ORCA_ETCDIR}/$file - if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then - echo " creating $filepath" - cp $filepath.CSW $filepath - else - echo " preserving $filepath" - fi -done - -exit 0 Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove =================================================================== --- csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,25 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -ORCA_ETCDIR=${CSW_PREFIX}/etc - -# Copy templates -template_list="\ - orcallator.cfg \ - winallator.cfg \ - procallator.cfg \ - orca_services.cfg" - -echo Removing unmodified CSW templates: -for file in $template_list -do - filepath=${ORCA_ETCDIR}/$file - if [ -f "${filepath}" ] && [ -f "${filepath}.CSW" ] && cmp -s "${filepath}" "${filepath}.CSW"; then - echo " removing $filepath" - rm -f "${filepath}" - else - echo " preserving $filepath" - fi -done - -exit 0 Copied: csw/mgar/pkg/orca/trunk/files/csworcallator (from rev 6981, csw/mgar/pkg/orca/trunk/files/csworcallator.init) =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworcallator (rev 0) +++ csw/mgar/pkg/orca/trunk/files/csworcallator 2009-10-29 11:18:23 UTC (rev 7008) @@ -0,0 +1,39 @@ +#!/bin/sh + +# $HeadURL: file:///var/www/svn/repositories-public/orcaware-public/orca/trunk/data_gatherers/orcallator/S99orcallator.sh.in $ +# $LastChangedRevision: 495 $ +# $LastChangedDate: 2005-09-15 21:11:11 -0700 (Thu, 15 Sep 2005) $ +# $LastChangedBy: blair at orcaware.com $ + +prefix=/opt/csw +exec_prefix=/opt/csw +bindir=/opt/csw/bin + +start_orcallator="$bindir/start_orcallator" +stop_orcallator="$bindir/stop_orcallator" + +case "$1" in + start) + if test -x $start_orcallator; then + umask 022 + $start_orcallator + else + echo "$0: $start_orcallator does not exist or is not executable." + fi + ;; + + stop) + if test -x $stop_orcallator; then + $stop_orcallator + else + echo "$0: $stop_orcallator does not exist or is not executable." + fi + ;; + + *) + echo "usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 Deleted: csw/mgar/pkg/orca/trunk/files/csworcallator.init =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworcallator.init 2009-10-29 10:48:38 UTC (rev 7007) +++ csw/mgar/pkg/orca/trunk/files/csworcallator.init 2009-10-29 11:18:23 UTC (rev 7008) @@ -1,39 +0,0 @@ -#!/bin/sh - -# $HeadURL: file:///var/www/svn/repositories-public/orcaware-public/orca/trunk/data_gatherers/orcallator/S99orcallator.sh.in $ -# $LastChangedRevision: 495 $ -# $LastChangedDate: 2005-09-15 21:11:11 -0700 (Thu, 15 Sep 2005) $ -# $LastChangedBy: blair at orcaware.com $ - -prefix=/opt/csw -exec_prefix=/opt/csw -bindir=/opt/csw/bin - -start_orcallator="$bindir/start_orcallator" -stop_orcallator="$bindir/stop_orcallator" - -case "$1" in - start) - if test -x $start_orcallator; then - umask 022 - $start_orcallator - else - echo "$0: $start_orcallator does not exist or is not executable." - fi - ;; - - stop) - if test -x $stop_orcallator; then - $stop_orcallator - else - echo "$0: $stop_orcallator does not exist or is not executable." - fi - ;; - - *) - echo "usage: $0 {start|stop}" - exit 1 - ;; -esac - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 12:20:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 11:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7009] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 7009 http://gar.svn.sourceforge.net/gar/?rev=7009&view=rev Author: dmichelsen Date: 2009-10-29 11:20:10 +0000 (Thu, 29 Oct 2009) Log Message: ----------- orca: Remove manual dependency to CSWcswclassutils Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:18:23 UTC (rev 7008) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:20:10 UTC (rev 7009) @@ -48,7 +48,7 @@ PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit -REQUIRED_PKGS_CSWorca = CSWcswclassutils CSWsetoolkit CSWperl CSWpmtimedate +REQUIRED_PKGS_CSWorca = CSWsetoolkit CSWperl CSWpmtimedate REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Oct 29 12:45:25 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 29 Oct 2009 11:45:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7010] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7010 http://gar.svn.sourceforge.net/gar/?rev=7010&view=rev Author: d_pocock Date: 2009-10-29 11:45:24 +0000 (Thu, 29 Oct 2009) Log Message: ----------- apr: Update for 1.3.8 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 11:20:10 UTC (rev 7009) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 11:45:24 UTC (rev 7010) @@ -11,8 +11,8 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWapr,depend prototype) -DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) +#DISTFILES += $(call admfiles,CSWapr,depend prototype) +#DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) DISTFILES += config.layout # We define upstream file regex so we can be notifed of new upstream software release @@ -30,9 +30,11 @@ include gar/category.mk -pre-configure: +pre-configure-modulated: install-layout + +install-layout: @sed -e s,INSTALL_PREFIX,$(prefix),g \ - $(WORKDIR)/config.layout > $(WORKSRC)/config.layout + $(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout @$(MAKECOOKIE) post-install: create-link fix-libtool Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2009-10-29 11:20:10 UTC (rev 7009) +++ csw/mgar/pkg/apr/trunk/checksums 2009-10-29 11:45:24 UTC (rev 7010) @@ -1,8 +1,2 @@ -f96e3b04ccf86ed28a0734d7efc5bb65 download/apr-1.2.2.tar.gz -efb208c380eaad52f811f5acfc2240d5 download/CSWapr.gspec -eb66075bd809a52ede5c72017f4a37db download/CSWapr.depend -40788f50594b61f91d919572b946bfd5 download/CSWapr.prototype -b0eba1bbbc7d6e6f5e7609c3eb8fd6d0 download/CSWapr-devel.gspec -ee102496e024ae19e83998586140d43e download/CSWapr-devel.depend -352fb2c88c0fd659803bad284a6061b8 download/CSWapr-devel.prototype -263cd22b83bd6593398013792c2a3ce4 download/config.layout +310fac12285d94a162c488f4b8f1aabc apr-1.3.8.tar.gz +263cd22b83bd6593398013792c2a3ce4 config.layout This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:31:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:31:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7011] csw/mgar/gar Message-ID: Revision: 7011 http://gar.svn.sourceforge.net/gar/?rev=7011&view=rev Author: dmichelsen Date: 2009-10-29 13:31:06 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Merge in collapsed modulations Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Removed Paths: ------------- csw/mgar/gar/v2-collapsed-modulations/ Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-29 11:45:24 UTC (rev 7010) +++ csw/mgar/gar/v2/gar.mk 2009-10-29 13:31:06 UTC (rev 7011) @@ -191,6 +191,48 @@ $(eval $(call _modulate,$(MODULATORS))) +# --- This next block allows you to use collapsed ISAs in modulations +# isa-default-... instead of isa-sparcv8-... and isa-i386-... +# isa-default64-... instead of isa-sparcv9-... and isa-amd64-... +# isa-extra-... instead of any other ISA (if default64 is undefined it falls back to 'extra') + +__collapsedisa = $(strip $(or $(and $(filter $(ISA_DEFAULT_sparc) $(ISA_DEFAULT_i386),$(1)),default),\ + $(and $(filter $(ISA_DEFAULT64_sparc) $(ISA_DEFAULT64_i386),$(1)),default64),\ + extra)) + +__collapsedisa64 = default64 +__collapsedisaextra = extra + +__isacollapsedmodulation_1 = $(call tolower,$(1))-$(if $(filter ISA,$(1)),$(call $(2),$(ISA)),$($(1))) +__isacollapsedmodulation = $(if $(word 2,$(1)),\ + $(foreach P,$(call __isacollapsedmodulation_1,$(firstword $(1)),$(2)),\ + $(addprefix $(P)-,$(call __isacollapsedmodulation,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call __isacollapsedmodulation_1,$(1),$(2))) + +# This is the name of the current modulation but with the ISA i386, sparcv8 and amd64, sparcv9 replaced +# with the collapsed name 'default', 'default64' and everything else as 'extra'. +MODULATION_ISACOLLAPSED = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)) + +# This is the name of the current modulation but with the ISA replaced with 'default64' +MODULATION_ISACOLLAPSED64 = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa64)) + +# This is the name of the current modulation but with the ISA replaced with 'extra' +MODULATION_ISACOLLAPSEDEXTRA = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra)) + +# $(warning Mod: $(MODULATION) ISA: $(ISA) coll: $(MODULATION_ISACOLLAPSED) 64: $(MODULATION_ISACOLLAPSED64) extra: $(MODULATION_ISACOLLAPSEDEXTRA)) + +# Call this function to get either the modulation-specific value or the default. +# Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) +define modulationvalue +$(strip $(or $($(1)_$(MODULATION)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ +)) +endef + +# --- end of collapsed ISA modulations + #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules @@ -553,10 +595,15 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) +MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) +MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) + +MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-extra ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif # These directories get relocated into their ISA subdirectories This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:32:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:32:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7012] csw/mgar/pkg/octave Message-ID: Revision: 7012 http://gar.svn.sourceforge.net/gar/?rev=7012&view=rev Author: dmichelsen Date: 2009-10-29 13:32:44 +0000 (Thu, 29 Oct 2009) Log Message: ----------- octave: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/octave/branches/ csw/mgar/pkg/octave/tags/ csw/mgar/pkg/octave/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/octave/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:39:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:39:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7013] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 7013 http://gar.svn.sourceforge.net/gar/?rev=7013&view=rev Author: dmichelsen Date: 2009-10-29 13:39:34 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libsndfile: Add a bunch of patches and fixes Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsndfile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2009-10-29 13:32:44 UTC (rev 7012) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2009-10-29 13:39:34 UTC (rev 7013) @@ -33,18 +33,31 @@ MASTER_SITES = http://www.mega-nerd.com/libsndfile/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch +PATCHFILES += 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch +PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch +PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch -REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg +REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) SPKG_SOURCEURL = http://www.mega-nerd.com/libsndfile/ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -TEST_SCRIPTS = +# EXTRA_CFLAGS = -features=extensions +# EXTRA_CXXFLAGS = -features=extensions + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_CFLAGS = -features=extensions -EXTRA_CXXFLAGS = -features=extensions +TEST_TARGET = check +# We want only 64 bit libs, no 64 bit executables +MERGE_DIRS_isa-extra = $(libdir) + +# Relocate docs to standard location +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(BUILD_PREFIX)/share/doc/$(GARNAME),' + include gar/category.mk Modified: csw/mgar/pkg/libsndfile/trunk/checksums =================================================================== --- csw/mgar/pkg/libsndfile/trunk/checksums 2009-10-29 13:32:44 UTC (rev 7012) +++ csw/mgar/pkg/libsndfile/trunk/checksums 2009-10-29 13:39:34 UTC (rev 7013) @@ -1 +1,5 @@ -e0553e12c7a467af44693e95e2eac668 download/libsndfile-1.0.20.tar.gz +5a1c6c4bfb8b8426d8ebc8d67814a7c8 0001-Add-lrintf-workaround-to-regtest.patch +ab0c6ea20d4bda60f6f6dd4fa4c26871 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch +599bd5f64872bbddf993ce0815d28417 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch +732c648739e94cb5fd2e70d983390318 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch +e0553e12c7a467af44693e95e2eac668 libsndfile-1.0.20.tar.gz Added: csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,25 @@ +From 5c8520d2cf626fbdc8aecbf20e2e97eeb4bc56ee Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 13:09:13 +0100 +Subject: [PATCH 1/3] Add lrintf workaround to regtest + +--- + regtest/checksum.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/regtest/checksum.c b/regtest/checksum.c +index 863fbed..9e638d1 100644 +--- a/regtest/checksum.c ++++ b/regtest/checksum.c +@@ -35,6 +35,8 @@ + + #define ARRAY_LEN(x) ((int) (sizeof (x)) / (sizeof ((x) [0]))) + ++#define lrintf(f) ((int32_t)rint(f)) ++ + static int short_checksum (SNDFILE * file, int start) ; + static int int_checksum (SNDFILE * file, int start) ; + static int float_checksum (SNDFILE * file, int start) ; +-- +1.6.5 + Added: csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,28 @@ +From 4f81962de709e59c180ed95e3a7ed4e49af38b95 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 12:41:49 +0100 +Subject: [PATCH] Add workaround for missing libm function lrint and lrintf + +--- + src/common.h | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/src/common.h b/src/common.h +index f41f96a..f4ba69a 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -839,5 +839,11 @@ int sf_dither_float (const SF_DITHER_INFO *dither, const float *in, float *out, + int sf_dither_double (const SF_DITHER_INFO *dither, const double *in, double *out, int count) ; + #endif + ++/* Taken from http://www.mail-archive.com/qemu-devel at nongnu.org/msg00314.html */ ++#define lrint(d) ((int32_t)rint(d)) ++#define llrint(d) ((int64_t)rint(d)) ++#define lrintf(f) ((int32_t)rint(f)) ++#define llrintf(f) ((int64_t)rint(f)) ++ + #endif /* SNDFILE_COMMON_H */ + +-- +1.6.5 + Added: csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,35 @@ +From a21ce86ac37888255ad9a4018c27f866e3ff1ebf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 13:22:02 +0100 +Subject: [PATCH 2/3] Workaround mising stdint.h and Sun Studio shortcoming + +--- + tests/utils.h | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/tests/utils.h b/tests/utils.h +index ee70e2c..9a108cd 100644 +--- a/tests/utils.h ++++ b/tests/utils.h +@@ -29,7 +29,17 @@ + extern "C" { + #endif /* __cplusplus */ + +-#include ++#include ++#define lrint(d) ((int32_t)rint(d)) ++#define lrintf(f) ((int32_t)rint(f)) ++ ++# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \ ++ (defined(__SUNPRO_C) && defined(__C99FEATURES__)) ++# define __func__ __func__ ++# else ++# define __func__ "" ++# endif ++ + #include + + #define SF_COUNT_TO_LONG(x) ((long) (x)) +-- +1.6.5 + Added: csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch 2009-10-29 13:39:34 UTC (rev 7013) @@ -0,0 +1,25 @@ +From a1350cd6d86051e18b4513f1e7babce8fd5d00e0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 29 Oct 2009 14:00:09 +0100 +Subject: [PATCH 3/3] Disable stop-on-error until cpp_test refcount error is fixed + +--- + tests/test_wrapper.sh.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/test_wrapper.sh.in b/tests/test_wrapper.sh.in +index 7fb2d8e..8a0557d 100755 +--- a/tests/test_wrapper.sh.in ++++ b/tests/test_wrapper.sh.in +@@ -12,7 +12,7 @@ if [ ! -f sfversion ]; then + sfversion=`./sfversion` + + # Force exit on errors. +-set -e ++# set -e + + # generic-tests + uname -a +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:47:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:47:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7014] csw/mgar/gar/v2/category.mk Message-ID: Revision: 7014 http://gar.svn.sourceforge.net/gar/?rev=7014&view=rev Author: dmichelsen Date: 2009-10-29 13:47:23 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Fix error message on unknown categories Modified Paths: -------------- csw/mgar/gar/v2/category.mk Modified: csw/mgar/gar/v2/category.mk =================================================================== --- csw/mgar/gar/v2/category.mk 2009-10-29 13:39:34 UTC (rev 7013) +++ csw/mgar/gar/v2/category.mk 2009-10-29 13:47:23 UTC (rev 7014) @@ -2,8 +2,8 @@ # This makefile is to be included from Makefiles in each category # directory. -ifeq (,$(CATEGORIES)) - $(error Please set CATEGORIES to one of $(wildcard categories/*)) +ifeq (,$(wildcard gar/categories/$(CATEGORIES)/category.mk)) + $(error The category '$(CATEGORIES)' is invalid. Valid categories are $(patsubst gar/categories/%,%,$(wildcard gar/categories/*))) endif include gar/categories/$(CATEGORIES)/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 14:59:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 13:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7015] csw/mgar/pkg Message-ID: Revision: 7015 http://gar.svn.sourceforge.net/gar/?rev=7015&view=rev Author: dmichelsen Date: 2009-10-29 13:59:22 +0000 (Thu, 29 Oct 2009) Log Message: ----------- disktype: Initial commit Added Paths: ----------- csw/mgar/pkg/disktype/ csw/mgar/pkg/disktype/branches/ csw/mgar/pkg/disktype/tags/ csw/mgar/pkg/disktype/trunk/ csw/mgar/pkg/disktype/trunk/Makefile csw/mgar/pkg/disktype/trunk/checksums csw/mgar/pkg/disktype/trunk/files/ Property changes on: csw/mgar/pkg/disktype/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/disktype/trunk/Makefile =================================================================== --- csw/mgar/pkg/disktype/trunk/Makefile (rev 0) +++ csw/mgar/pkg/disktype/trunk/Makefile 2009-10-29 13:59:22 UTC (rev 7015) @@ -0,0 +1,33 @@ +GARNAME = disktype +GARVERSION = 9 +CATEGORIES = utils + +DESCRIPTION = Detection of content format of a disk or disk image +define BLURB + The purpose of disktype is to detect the content format of a disk or + disk image. It knows about common file systems, partition tables, and boot codes. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +SPKG_SOURCEURL = http://disktype.sourceforge.net/ + +CONFIGURE_SCRIPTS = +BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/disktype $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/disktype.1 $(DESTDIR)$(mandir)/man1/ + @$(MAKECOOKIE) Added: csw/mgar/pkg/disktype/trunk/checksums =================================================================== --- csw/mgar/pkg/disktype/trunk/checksums (rev 0) +++ csw/mgar/pkg/disktype/trunk/checksums 2009-10-29 13:59:22 UTC (rev 7015) @@ -0,0 +1 @@ +25a673f162b9c01cd565109202559489 disktype-9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 15:48:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 14:48:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7016] csw/mgar/pkg/sqlite3 Message-ID: Revision: 7016 http://gar.svn.sourceforge.net/gar/?rev=7016&view=rev Author: dmichelsen Date: 2009-10-29 14:48:41 +0000 (Thu, 29 Oct 2009) Log Message: ----------- sqlite3: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/sqlite3/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 15:49:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 14:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7017] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7017 http://gar.svn.sourceforge.net/gar/?rev=7017&view=rev Author: dmichelsen Date: 2009-10-29 14:49:36 +0000 (Thu, 29 Oct 2009) Log Message: ----------- sqlite: Update to dynamic gspec and other modern GAR features Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sqlite3/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,67 +1,49 @@ GARNAME = sqlite3 -GARVERSION = 3.6.16 +GARVERSION = 3.6.19 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library define BLURB -SQLite is a in-process library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. + SQLite is a in-process library that implements a self-contained, serverless, + zero-configuration, transactional SQL database engine. endef # Download informations -MASTER_SITES = http://sqlite.org/ -DISTFILES = sqlite-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles, CSWsqlite3, ) -DISTFILES += $(call admfiles, CSWsqlite3devel, ) -DISTFILES += $(call admfiles, CSWsqlite3rt, ) -DISTFILES += copyright.html +MASTER_SITES = http://sqlite.org/ +DISTNAME = sqlite-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING +PATCHFILES = gar-base.diff +PATCHFILES += shell.c.diff + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz -# Package description -SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) +PACKAGES = CSWsqlite3 CSWsqlite3rt CSWsqlite3devel + +CATALOGNAME_CSWsqlite3 = sqlite3 +CATALOGNAME_CSWsqlite3rt = sqlite3_rt +CATALOGNAME_CSWsqlite3devel = sqlite3_devel + +SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) +SPKG_DESC_CSWsqlite3rt = $(SPKG_DESC_CSWsqlite3) runtime SPKG_DESC_CSWsqlite3devel = $(SPKG_DESC_CSWsqlite3) development package -SPKG_DESC_CSWsqlite3rt = $(SPKG_DESC_CSWsqlite3) runtime -# Dynamic prototype -PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -PKGFILES_CSWsqlite3devel += /opt/csw/share/doc/sqlite3devel/copyright.html -PKGFILES_CSWsqlite3 = /opt/csw/share/doc/sqlite3/copyright.html -PKGFILES_CSWsqlite3 += /opt/csw/bin/.* +PKGFILES_CSWsqlite3 = $(bindir)/.* +PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -# Dependencies -REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt +REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt REQUIRED_PKGS_CSWsqlite3devel = CSWsqlite3 -# Build the 64 bits binaries -NO_ISAEXEC = 1 -EXTRA_BUILD_ISAS_sparc = sparcv9 +BUILD64 = 1 +NO_ISAEXEC = 1 -# Add some patches to the sources -PATCHFILES = gar-base.diff -PATCHFILES += shell.c.diff - -# Do not execute make test step -TEST_SCRIPTS = none - # Make configure options -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threadsafe --disable-debug -test-none: - @$(MAKECOOKIE) +TEST_SCRIPTS = -post-extract: - ( cd $(WORKROOTDIR) ; for i in build-isa-* ; do mv $$i/sqlite-$(GARVERSION) $$i/$(GARNAME)-$(GARVERSION) ; done ) - @$(MAKECOOKIE) - -pre-install: - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)devel - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)rt - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)devel - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)rt - include gar/category.mk Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,7 +1,4 @@ -796042e754828aa346facd2214deff95 download/CSWsqlite3.gspec -b6cc9c2a8d9135f74f8bc2dcd486056f download/CSWsqlite3devel.gspec -e331063f1e79a20e465ed63bfcea15a8 download/CSWsqlite3rt.gspec -a0e12a72a1f5b972624c712532dc27d7 download/copyright.html -80d638505872be7ffa238d43f0e268b2 download/gar-base.diff -1a2be927ceacfa534501b9f4675bce83 download/shell.c.diff -d7c57e91fbeb630c19f82eec3ef73dae download/sqlite-3.6.16.tar.gz +22bb7b924e2ecb13997abcf15966f674 COPYING +80d638505872be7ffa238d43f0e268b2 gar-base.diff +1a2be927ceacfa534501b9f4675bce83 shell.c.diff +aa03cc24a52851bb204fc1e489e195e8 sqlite-3.6.19.tar.gz Added: csw/mgar/pkg/sqlite3/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/sqlite3/trunk/files/COPYING 2009-10-29 14:49:36 UTC (rev 7017) @@ -0,0 +1,188 @@ + + +SQLite Copyright + + + + + +
+ + + +
+
Small. Fast. Reliable.
Choose any three.
+ +
+
+
+ About + Sitemap + Documentation + Download + License + News + Developers + Support +
+
+ + + +

SQLite Copyright

+ + + +
+
+SQLite is in the
+Public Domain +
+ +

+All of the deliverable code in SQLite has been dedicated to the +public domain +by the authors. +All code authors, and representatives of the companies they work for, +have signed affidavits dedicating their contributions to +the public domain and originals of +those signed affidavits are stored in a firesafe at the main offices +of Hwaci. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute +the original SQLite code, either in source code form or as a compiled binary, +for any purpose, commercial or non-commercial, and by any means. +

+ +

+The previous paragraph applies to the deliverable code in SQLite - +those parts of the SQLite library that you actually bundle and +ship with a larger application. Portions of the documentation and +some code used as part of the build process might fall under +other licenses. The details here are unclear. We do not worry +about the licensing of the documentation and build code so much +because none of these things are part of the core deliverable +SQLite library. +

+ +

+All of the deliverable code in SQLite has been written from scratch. +No code has been taken from other projects or from the open +internet. Every line of code can be traced back to its original +author, and all of those authors have public domain dedications +on file. So the SQLite code base is clean and is +uncontaminated with licensed code from other projects. +

+ +

Obtaining An Explicit License To Use SQLite

+ +

+Even though SQLite is in the public domain and does not require +a license, some users want to obtain a license anyway. Some reasons +for obtaining a license include: +

+ +
    +
  • You are using SQLite in a jurisdiction that does not recognize + the public domain.
    • +
  • You are using SQLite in a jurisdiction that does not recognize + the right of an author to dedicate their work to the public + domain.
    • +
  • You want to hold a tangible legal document + as evidence that you have the legal right to use and distribute + SQLite.
    • +
  • Your legal department tells you that you have to purchase a license. +
    • +
+ +

+If you feel like you really have to purchase a license for SQLite, +Hwaci, the company that employs +the architect and principal developers of SQLite, will +sell you +one. +

+ +

Contributed Code

+ +

+In order to keep SQLite completely free and unencumbered by copyright, +all new contributors to the SQLite code base are asked to dedicate +their contributions to the public domain. +If you want to send a patch or enhancement for possible inclusion in the +SQLite source tree, please accompany the patch with the following statement: +

+ +
+The author or authors of this code dedicate any and all copyright interest +in this code to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and successors. +We intend this dedication to be an overt act of relinquishment in +perpetuity of all present and future rights to this code under copyright law. +
+ +

+We are not able to accept patches or changes to +SQLite that are not accompanied by a statement such as the above. +In addition, if you make +changes or enhancements as an employee, then a simple statement such as the +above is insufficient. You must also send by surface mail a copyright release +signed by a company officer. +A signed original of the copyright release should be mailed to:

+ +
+Hwaci
+6200 Maple Cove Lane
+Charlotte, NC 28269
+USA +
+ +

+A template copyright release is available +in PDF or +HTML. +You can use this release to make future changes. +

+ Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,9 +0,0 @@ -%var bitname sqlite3 -%var pkgname CSWsqlite3 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - - -Please see /opt/csw/share/doc/%{GARNAME} for license information - - Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,8 +0,0 @@ -%var bitname sqlite3_devel -%var pkgname CSWsqlite3devel -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME} for license information - Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec 2009-10-29 14:48:41 UTC (rev 7016) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3rt.gspec 2009-10-29 14:49:36 UTC (rev 7017) @@ -1,9 +0,0 @@ -%var bitname sqlite3_rt -%var pkgname CSWsqlite3rt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - - -Please see /opt/csw/share/doc/%{GARNAME} for license information - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 15:56:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 14:56:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7018] csw/mgar/pkg/libmad Message-ID: Revision: 7018 http://gar.svn.sourceforge.net/gar/?rev=7018&view=rev Author: dmichelsen Date: 2009-10-29 14:56:26 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libmad: Initial commit Modified Paths: -------------- csw/mgar/pkg/libmad/trunk/Makefile csw/mgar/pkg/libmad/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmad/Makefile csw/mgar/pkg/libmad/branches/ csw/mgar/pkg/libmad/trunk/ csw/mgar/pkg/libmad/trunk/files/mad-32.pc csw/mgar/pkg/libmad/trunk/files/mad-64.pc Copied: csw/mgar/pkg/libmad/Makefile (from rev 6625, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libmad/Makefile (rev 0) +++ csw/mgar/pkg/libmad/Makefile 2009-10-29 14:56:26 UTC (rev 7018) @@ -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/libmad/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/libmad/trunk/Makefile 2009-10-29 14:56:26 UTC (rev 7018) @@ -1,182 +1,33 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = libmad +GARVERSION = 0.15.1b CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. + +DESCRIPTION = MPEG Audio Decoder define BLURB - + MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the + MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG 2.5 + format. All three audio layers - Layer I, Layer II, and Layer III (i.e. MP3) - + are fully implemented. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release + +SF_PROJ = mad +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += mad-32.pc mad-64.pc + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +SPKG_SOURCEURL = http://www.underbit.com/products/mad/ + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 + +TEST_TARGET = check + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(libdir)/pkgconfig + ginstall $(WORKDIR)/mad-$(MEMORYMODEL).pc $(DESTDIR)$(libdir)/pkgconfig/mad.pc + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libmad/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/libmad/trunk/checksums 2009-10-29 14:56:26 UTC (rev 7018) @@ -0,0 +1,3 @@ +1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz +eae4572422d62cf508f2525bc48068cf mad-32.pc +55173875569f2f723a74950299264711 mad-64.pc Added: csw/mgar/pkg/libmad/trunk/files/mad-32.pc =================================================================== --- csw/mgar/pkg/libmad/trunk/files/mad-32.pc (rev 0) +++ csw/mgar/pkg/libmad/trunk/files/mad-32.pc 2009-10-29 14:56:26 UTC (rev 7018) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: mad +Description: MPEG Audio Decoder +Requires: +Version: 0.15.1b +Libs: -L${libdir} -lmad -lm +Cflags: -I${includedir} Added: csw/mgar/pkg/libmad/trunk/files/mad-64.pc =================================================================== --- csw/mgar/pkg/libmad/trunk/files/mad-64.pc (rev 0) +++ csw/mgar/pkg/libmad/trunk/files/mad-64.pc 2009-10-29 14:56:26 UTC (rev 7018) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib/64 +includedir=${prefix}/include + +Name: mad +Description: MPEG Audio Decoder +Requires: +Version: 0.15.1b +Libs: -L${libdir} -lmad -lm +Cflags: -I${includedir} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 16:07:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 15:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7019] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7019 http://gar.svn.sourceforge.net/gar/?rev=7019&view=rev Author: dmichelsen Date: 2009-10-29 15:07:06 +0000 (Thu, 29 Oct 2009) Log Message: ----------- mGAR v2: Fix stupid typo in umask application Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-10-29 14:56:26 UTC (rev 7018) +++ csw/mgar/gar/v2/gar.mk 2009-10-29 15:07:06 UTC (rev 7019) @@ -746,7 +746,7 @@ # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -754,7 +754,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -762,7 +762,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -770,7 +770,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 16:47:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 15:47:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7020] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7020 http://gar.svn.sourceforge.net/gar/?rev=7020&view=rev Author: dmichelsen Date: 2009-10-29 15:47:27 +0000 (Thu, 29 Oct 2009) Log Message: ----------- apr: Adjust install destinations for 64 bit Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype csw/mgar/pkg/apr/trunk/files/CSWapr.depend csw/mgar/pkg/apr/trunk/files/CSWapr.gspec csw/mgar/pkg/apr/trunk/files/CSWapr.prototype Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 15:47:27 UTC (rev 7020) @@ -11,9 +11,6 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWapr,depend prototype) -#DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) -DISTFILES += config.layout # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -25,26 +22,30 @@ CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -# Tests verified: 1.3.8 -TEST_SCRIPTS = +TEST_TARGET = check include gar/category.mk -pre-configure-modulated: install-layout - -install-layout: - @sed -e s,INSTALL_PREFIX,$(prefix),g \ - $(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout +post-extract-modulated: + ginstall -d $(WORKSRC) + (echo "# csw layout";\ + echo "";\ + echo " prefix: $(prefix)";\ + echo " exec_prefix: $(exec_prefix)";\ + echo " bindir: $(bindir)";\ + echo " sbindir: $(sbindir)";\ + echo " libdir: $(libdir)";\ + echo " libexecdir: $(libdir)/apr/modules";\ + echo " mandir: $(mandir)";\ + echo " datadir: $(datadir)/apr";\ + echo " includedir: $(includedir)/apr-$${APR_MAJOR_VERSION}";\ + echo " localstatedir: /var/run";\ + echo " runtimedir: /var/run";\ + echo " infodir: $(infodir)";\ + echo " libsuffix: -$${APR_MAJOR_VERSION}";\ + echo "") >$(WORKSRC)/config.layout @$(MAKECOOKIE) -post-install: create-link fix-libtool - -create-link: - @( cd $(DESTDIR)$(bindir) ; ln -s apr-1-config apr-config ) +post-install-modulated: + gln -s apr-1-config $(DESTDIR)$(bindir)/apr-config @$(MAKECOOKIE) - -fix-libtool: - @sed -i -e s,/export/home/comand/bin/sed,$(bindir)/gsed,g \ - $(DESTDIR)$(datadir)/apr/build-1/libtool - @$(MAKECOOKIE) - Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend 2009-10-29 15:47:27 UTC (rev 7020) @@ -1 +0,0 @@ -P CSWapr apr - Apache Portable Runtime Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,5 +0,0 @@ -%var bitname apr_devel -%var pkgname CSWapr-devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache Portable Runtime -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,52 +0,0 @@ -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/apr-1 0755 root bin -f none /opt/csw/include/apr-1/apr.h 0644 root bin -f none /opt/csw/include/apr-1/apr_allocator.h 0644 root bin -f none /opt/csw/include/apr-1/apr_atomic.h 0644 root bin -f none /opt/csw/include/apr-1/apr_dso.h 0644 root bin -f none /opt/csw/include/apr-1/apr_env.h 0644 root bin -f none /opt/csw/include/apr-1/apr_errno.h 0644 root bin -f none /opt/csw/include/apr-1/apr_file_info.h 0644 root bin -f none /opt/csw/include/apr-1/apr_file_io.h 0644 root bin -f none /opt/csw/include/apr-1/apr_fnmatch.h 0644 root bin -f none /opt/csw/include/apr-1/apr_general.h 0644 root bin -f none /opt/csw/include/apr-1/apr_getopt.h 0644 root bin -f none /opt/csw/include/apr-1/apr_global_mutex.h 0644 root bin -f none /opt/csw/include/apr-1/apr_hash.h 0644 root bin -f none /opt/csw/include/apr-1/apr_inherit.h 0644 root bin -f none /opt/csw/include/apr-1/apr_lib.h 0644 root bin -f none /opt/csw/include/apr-1/apr_mmap.h 0644 root bin -f none /opt/csw/include/apr-1/apr_network_io.h 0644 root bin -f none /opt/csw/include/apr-1/apr_poll.h 0644 root bin -f none /opt/csw/include/apr-1/apr_pools.h 0644 root bin -f none /opt/csw/include/apr-1/apr_portable.h 0644 root bin -f none /opt/csw/include/apr-1/apr_proc_mutex.h 0644 root bin -f none /opt/csw/include/apr-1/apr_random.h 0644 root bin -f none /opt/csw/include/apr-1/apr_ring.h 0644 root bin -f none /opt/csw/include/apr-1/apr_shm.h 0644 root bin -f none /opt/csw/include/apr-1/apr_signal.h 0644 root bin -f none /opt/csw/include/apr-1/apr_strings.h 0644 root bin -f none /opt/csw/include/apr-1/apr_support.h 0644 root bin -f none /opt/csw/include/apr-1/apr_tables.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_cond.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_mutex.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_proc.h 0644 root bin -f none /opt/csw/include/apr-1/apr_thread_rwlock.h 0644 root bin -f none /opt/csw/include/apr-1/apr_time.h 0644 root bin -f none /opt/csw/include/apr-1/apr_user.h 0644 root bin -f none /opt/csw/include/apr-1/apr_version.h 0644 root bin -f none /opt/csw/include/apr-1/apr_want.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/apr.exp 0644 root bin -f none /opt/csw/lib/libapr-1.a 0644 root bin -f none /opt/csw/lib/libapr-1.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/apr-1.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/apr 0755 root bin -d none /opt/csw/share/apr/build-1 0755 root bin -f none /opt/csw/share/apr/build-1/apr_rules.mk 0644 root bin -f none /opt/csw/share/apr/build-1/libtool 0755 root bin -f none /opt/csw/share/apr/build-1/make_exports.awk 0644 root bin -f none /opt/csw/share/apr/build-1/make_var_export.awk 0644 root bin -f none /opt/csw/share/apr/build-1/mkdir.sh 0755 root bin Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.depend =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr.depend 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr.depend 2009-10-29 15:47:27 UTC (rev 7020) @@ -1 +0,0 @@ -I CSWapache2rt Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.gspec =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr.gspec 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr.gspec 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,4 +0,0 @@ -%var bitname apr -%var pkgname CSWapr -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.prototype =================================================================== --- csw/mgar/pkg/apr/trunk/files/CSWapr.prototype 2009-10-29 15:07:06 UTC (rev 7019) +++ csw/mgar/pkg/apr/trunk/files/CSWapr.prototype 2009-10-29 15:47:27 UTC (rev 7020) @@ -1,7 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/apr-1-config 0755 root bin -s none /opt/csw/bin/apr-config=apr-1-config root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libapr-1.so.0.2.2 0755 root bin -s none /opt/csw/lib/libapr-1.so.0=libapr-1.so.0.2.2 root bin -s none /opt/csw/lib/libapr-1.so=libapr-1.so.0.2.2 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:07:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7021] csw/mgar/pkg Message-ID: Revision: 7021 http://gar.svn.sourceforge.net/gar/?rev=7021&view=rev Author: dmichelsen Date: 2009-10-29 16:07:00 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cswcommon: Initial commit of stub package Added Paths: ----------- csw/mgar/pkg/cswcommon/ csw/mgar/pkg/cswcommon/branches/ csw/mgar/pkg/cswcommon/tags/ csw/mgar/pkg/cswcommon/trunk/ csw/mgar/pkg/cswcommon/trunk/Makefile csw/mgar/pkg/cswcommon/trunk/files/ csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg csw/mgar/pkg/cswcommon/trunk/files/map2dirlist csw/mgar/pkg/cswcommon/trunk/files/pkgmap Property changes on: csw/mgar/pkg/cswcommon/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cswcommon/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswcommon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/Makefile 2009-10-29 16:07:00 UTC (rev 7021) @@ -0,0 +1,24 @@ +GARNAME = cswcommon +GARVERSION = 1.4.6 +CATEGORIES = utils + +DESCRIPTION = Installs some useful standard CSW filesystem symlinks and files +define BLURB +endef + +#MASTER_SITES = http://mirror.opencsw.org/opencsw/current/$(shell uname -p)/5.8 +MASTER_SITES = http://mirror.opencsw.org/opencsw/current/sparc/5.8/ +DISTFILES = common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg + +PACKAGES = common + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/cswcommon/trunk/files/map2dirlist =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/map2dirlist (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/files/map2dirlist 2009-10-29 16:07:00 UTC (rev 7021) @@ -0,0 +1,8 @@ +#!/usr/bin/perl + +open F, "pkgmap"; +while( ) { + chomp; + my @l = split /\s+/; + +} Added: csw/mgar/pkg/cswcommon/trunk/files/pkgmap =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/pkgmap (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/files/pkgmap 2009-10-29 16:07:00 UTC (rev 7021) @@ -0,0 +1,150 @@ +: 1 164 +1 d none /etc/opt/csw 0755 root bin +1 d none /opt/csw 0755 root bin +1 d none /opt/csw/bin 0755 root bin +1 s none /opt/csw/bin/sparc=sparcv8 +1 d none /opt/csw/bin/sparcv8 0755 root bin +1 d none /opt/csw/bin/sparcv8plus 0755 root bin +1 d none /opt/csw/bin/sparcv8plus+vis 0755 root bin +1 d none /opt/csw/bin/sparcv9 0755 root bin +1 s none /opt/csw/doc=share/doc +1 d none /opt/csw/etc 0755 root bin +1 d none /opt/csw/include 0755 root bin +1 s none /opt/csw/info=share/info +1 d none /opt/csw/lib 0755 root bin +1 s none /opt/csw/lib/32=. +1 s none /opt/csw/lib/64=sparcv9 +1 d none /opt/csw/lib/X11 0755 root bin +1 d none /opt/csw/lib/X11/app-defaults 0755 root bin +1 s none /opt/csw/lib/locale=../share/locale +1 s none /opt/csw/lib/sparc=. +1 s none /opt/csw/lib/sparcv8=. +1 d none /opt/csw/lib/sparcv8plus 0755 root bin +1 d none /opt/csw/lib/sparcv8plus+vis 0755 root bin +1 d none /opt/csw/lib/sparcv9 0755 root bin +1 s none /opt/csw/man=share/man +1 d none /opt/csw/sbin 0755 root bin +1 d none /opt/csw/share 0755 root bin +1 d none /opt/csw/share/doc 0755 root bin +1 d none /opt/csw/share/info 0755 root bin +1 d none /opt/csw/share/locale 0755 root bin +1 d none /opt/csw/share/locale/az 0755 root bin +1 d none /opt/csw/share/locale/az/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/be 0755 root bin +1 d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/bg 0755 root bin +1 d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/bg/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ca 0755 root bin +1 d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/cs 0755 root bin +1 d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/cs/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/da 0755 root bin +1 d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/da/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/de 0755 root bin +1 d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/de/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/el 0755 root bin +1 d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/el/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/en at boldquot 0755 root bin +1 d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/en at quot 0755 root bin +1 d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/es 0755 root bin +1 d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/es/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/et 0755 root bin +1 d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/eu 0755 root bin +1 d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/fi 0755 root bin +1 d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/fr 0755 root bin +1 d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/fr/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ga 0755 root bin +1 d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/gl 0755 root bin +1 d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/gl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/he 0755 root bin +1 d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/hr 0755 root bin +1 d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/hu 0755 root bin +1 d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/id 0755 root bin +1 d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/it 0755 root bin +1 d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/it/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ja 0755 root bin +1 d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/ja/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ko 0755 root bin +1 d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/ko/LC_TIME=LC_MESSAGES +1 f none /opt/csw/share/locale/locale.alias 0644 root bin 2676 12726 1083469567 +1 d none /opt/csw/share/locale/lt 0755 root bin +1 d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/nl 0755 root bin +1 d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/nl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/nn 0755 root bin +1 d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/no 0755 root bin +1 d none /opt/csw/share/locale/no/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/no/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/pl 0755 root bin +1 d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/pl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/pt 0755 root bin +1 d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/pt/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/pt_BR 0755 root bin +1 d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/pt_BR/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/ro 0755 root bin +1 d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/ru 0755 root bin +1 d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/ru/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/sk 0755 root bin +1 d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/sk/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/sl 0755 root bin +1 d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/sl/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/sp 0755 root bin +1 d none /opt/csw/share/locale/sp/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/sr 0755 root bin +1 d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/sv 0755 root bin +1 d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/sv/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/tr 0755 root bin +1 d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/uk 0755 root bin +1 d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/vi 0755 root bin +1 d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/wa 0755 root bin +1 d none /opt/csw/share/locale/wa/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/zh 0755 root bin +1 d none /opt/csw/share/locale/zh/LC_MESSAGES 0755 root bin +1 s none /opt/csw/share/locale/zh/LC_TIME=LC_MESSAGES +1 d none /opt/csw/share/locale/zh_CN 0755 root bin +1 d none /opt/csw/share/locale/zh_CN.GB2312 0755 root bin +1 d none /opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/zh_TW 0755 root bin +1 d none /opt/csw/share/locale/zh_TW.Big5 0755 root bin +1 d none /opt/csw/share/locale/zh_TW.Big5/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin +1 d none /opt/csw/share/man 0755 root bin +1 d none /opt/csw/var 0755 root bin +1 d none /var/opt/csw 0755 root bin +1 i checkinstall 2162 37599 1137116436 +1 i pkginfo 382 32403 1224265997 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:08:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:08:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7022] csw/mgar/pkg/lsof/trunk Message-ID: Revision: 7022 http://gar.svn.sourceforge.net/gar/?rev=7022&view=rev Author: dmichelsen Date: 2009-10-29 16:08:48 +0000 (Thu, 29 Oct 2009) Log Message: ----------- lsof: Initial commit Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lsof/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lsof/trunk/files/ csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec Property Changed: ---------------- csw/mgar/pkg/lsof/trunk/ Property changes on: csw/mgar/pkg/lsof/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2009-10-29 16:07:00 UTC (rev 7021) +++ csw/mgar/pkg/lsof/trunk/Makefile 2009-10-29 16:08:48 UTC (rev 7022) @@ -1,5 +1,5 @@ GARNAME = lsof -GARVERSION = 4.77 +GARVERSION = 4.81 CATEGORIES = utils DESCRIPTION = List open files @@ -11,36 +11,57 @@ endef MASTER_SITES = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ - TOPDIST = $(GARNAME)_$(GARVERSION) SRCDIST = $(TOPDIST)_src -#DISTFILES = $(TOPDIST).tar.bz2 +DISTFILES = $(TOPDIST).tar.bz2 WORKSRC = $(WORKDIR)/$(TOPDIST)/$(SRCDIST) +SPKG_SOURCEURL = http://people.freebsd.org/~abe/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.bz2 +BUILD64 = 1 + CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = -n solariscc TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom +# Environment variables affecting Solaris builds: +# SOLARIS_23P101318 If this environment variable has a non-NULL value, the +# SOLARIS_24P101945 If this environment variable has a non-NULL value, the +# SOLARIS_24P102303 If this environment variable has a non-NULL value, the +# SOLARIS_26PR_GWINDOWS If this environment variable has a value of "Y" or "y", +# SOLARIS_26PR_LDT If this environment variable has a value of "Y" or "y", +# SOLARIS_CCDIR specifies the path to the Sun C compiler -- i.e., when +# SOLARIS_INSTR specifies the Sun C compiler target instruction set +# SOLARIS_KERNBITS specifies the number of bits in the Solaris 7, 8, 9 or +# SOLARIS_VSOCK If this environment variable has a value of "Y" or "y", +# SOLARIS_VXFSINCL This environment variable defines the path to the +# SOLARIS_VXFSLIB This environment variable defines the path to the + +CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS +SOLARIS_CCDIR = $(CC_HOME) +SOLARIS_INSTR = $(ISA) +SOLARIS_KERNBITS = $(MEMORYMODEL) + include gar/category.mk -post-extract: +post-extract-modulated: @echo " ==> Extracting source distribution" @( cd $(WORKDIR)/$(TOPDIST) ; tar xf $(SRCDIST).tar ) configure-custom: @echo " ==> Configuring in $(WORKSRC)" - @( cd $(WORKSRC) ; ./Configure $(CONFIGURE_ARGS) ) + ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) ) -test-custom: +test-custom-modulated: @echo " ==> Testing in $(WORKSRC)/tests" @$(MAKE) -C $(WORKSRC)/tests -install-custom: +install-custom-modulated: @echo " ==> Installing $(GARNAME) $(GARVERSION)" @( cd $(WORKSRC) ; \ install -m 2755 -g sys lsof $(DESTDIR)$(bindir) ; \ Modified: csw/mgar/pkg/lsof/trunk/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2009-10-29 16:07:00 UTC (rev 7021) +++ csw/mgar/pkg/lsof/trunk/checksums 2009-10-29 16:08:48 UTC (rev 7022) @@ -1 +1 @@ -42921 1370 download/lsof_4.71.tar.bz2 +c482bda0764a8e618f87682347b22a87 download/lsof_4.81.tar.bz2 Copied: csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec (from rev 2905, csw/mgar/pkg/top/trunk/files/CSWtop.gspec) =================================================================== --- csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec (rev 0) +++ csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec 2009-10-29 16:08:48 UTC (rev 7022) @@ -0,0 +1,4 @@ +%var bitname lsof +%var pkgname CSWlsof +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:24:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:24:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7023] csw/mgar/pkg Message-ID: Revision: 7023 http://gar.svn.sourceforge.net/gar/?rev=7023&view=rev Author: dmichelsen Date: 2009-10-29 16:24:58 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libstlport: Initial commit, doesn't work yet Added Paths: ----------- csw/mgar/pkg/libstlport/ csw/mgar/pkg/libstlport/branches/ csw/mgar/pkg/libstlport/tags/ csw/mgar/pkg/libstlport/trunk/ csw/mgar/pkg/libstlport/trunk/Makefile csw/mgar/pkg/libstlport/trunk/checksums csw/mgar/pkg/libstlport/trunk/files/ Property changes on: csw/mgar/pkg/libstlport/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libstlport/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstlport/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libstlport/trunk/Makefile 2009-10-29 16:24:58 UTC (rev 7023) @@ -0,0 +1,21 @@ +GARNAME = libstlport +GARVERSION = 5.2.1 +CATEGORIES = lib + +DESCRIPTION = A multiplatform C++ standard library implementation +define BLURB + STLport is a multiplatform C++ Standard Library implementation. +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = stlport +DISTNAME = STLport-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libstlport/trunk/checksums =================================================================== --- csw/mgar/pkg/libstlport/trunk/checksums (rev 0) +++ csw/mgar/pkg/libstlport/trunk/checksums 2009-10-29 16:24:58 UTC (rev 7023) @@ -0,0 +1 @@ +b20ace9f4a487b2614dfbb205bee112c download/STLport-5.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:26:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7024] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7024 http://gar.svn.sourceforge.net/gar/?rev=7024&view=rev Author: dmichelsen Date: 2009-10-29 16:26:32 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libmcrypt: Update configure options, tests still don't work Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-10-29 16:24:58 UTC (rev 7023) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-10-29 16:26:32 UTC (rev 7024) @@ -14,12 +14,13 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes TEST_TARGET = check Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-10-29 16:24:58 UTC (rev 7023) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-10-29 16:26:32 UTC (rev 7024) @@ -1 +1 @@ -c4f491dd411a09e9de3b8702ea6f73eb download/libmcrypt-2.5.8.tar.bz2 +c4f491dd411a09e9de3b8702ea6f73eb libmcrypt-2.5.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:27:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:27:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7025] csw/mgar/pkg/ntop/trunk Message-ID: Revision: 7025 http://gar.svn.sourceforge.net/gar/?rev=7025&view=rev Author: dmichelsen Date: 2009-10-29 16:27:39 +0000 (Thu, 29 Oct 2009) Log Message: ----------- ntop: Update to 3.3.9 Modified Paths: -------------- csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ntop/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec Property Changed: ---------------- csw/mgar/pkg/ntop/trunk/ Property changes on: csw/mgar/pkg/ntop/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2009-10-29 16:26:32 UTC (rev 7024) +++ csw/mgar/pkg/ntop/trunk/Makefile 2009-10-29 16:27:39 UTC (rev 7025) @@ -1,5 +1,5 @@ GARNAME = ntop -GARVERSION = 2.2 +GARVERSION = 3.3.9 CATEGORIES = net DESCRIPTION = A network traffic usage monitor. @@ -12,17 +12,16 @@ and RRD for persistently storing traffic statistics. endef -MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += $(call admfiles,CSWntop,) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# PATCHFILES = intdef.diff + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -LIBDEPS += utils/rrdtool - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/ntop/trunk/checksums =================================================================== --- csw/mgar/pkg/ntop/trunk/checksums 2009-10-29 16:26:32 UTC (rev 7024) +++ csw/mgar/pkg/ntop/trunk/checksums 2009-10-29 16:27:39 UTC (rev 7025) @@ -1,2 +1 @@ -4586e4173fcab64d2394502603fc73aa download/ntop-2.2.tgz -6ce544627c6cea03d09d0710fb223035 download/CSWntop.gspec +0c22038e0f2aa003110437b5a5d5a6a5 download/ntop-3.3.9.tar.gz Deleted: csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec =================================================================== --- csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec 2009-10-29 16:26:32 UTC (rev 7024) +++ csw/mgar/pkg/ntop/trunk/files/CSWntop.gspec 2009-10-29 16:27:39 UTC (rev 7025) @@ -1,4 +0,0 @@ -%var bitname ntop -%var pkgname CSWntop -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:28:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:28:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7026] csw/mgar/pkg Message-ID: Revision: 7026 http://gar.svn.sourceforge.net/gar/?rev=7026&view=rev Author: dmichelsen Date: 2009-10-29 16:28:17 +0000 (Thu, 29 Oct 2009) Log Message: ----------- libdatrie: Initial commit Added Paths: ----------- csw/mgar/pkg/libdatrie/ csw/mgar/pkg/libdatrie/branches/ csw/mgar/pkg/libdatrie/tags/ csw/mgar/pkg/libdatrie/trunk/ csw/mgar/pkg/libdatrie/trunk/Makefile csw/mgar/pkg/libdatrie/trunk/checksums csw/mgar/pkg/libdatrie/trunk/files/ Property changes on: csw/mgar/pkg/libdatrie/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libdatrie/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdatrie/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libdatrie/trunk/Makefile 2009-10-29 16:28:17 UTC (rev 7026) @@ -0,0 +1,25 @@ +GARNAME = libdatrie +GARVERSION = 0.2.2 +CATEGORIES = lib + +DESCRIPTION = Double array tree library +define BLURB +endef + +MASTER_SITES = ftp://linux.thai.net/pub/ThaiLinux/software/libthai/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://linux.thai.net/~thep/datrie/datrie.html + +REQUIRED_PKGS = CSWiconv + +EXTRA_LINKER_FLAGS = -liconv +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libdatrie/trunk/checksums =================================================================== --- csw/mgar/pkg/libdatrie/trunk/checksums (rev 0) +++ csw/mgar/pkg/libdatrie/trunk/checksums 2009-10-29 16:28:17 UTC (rev 7026) @@ -0,0 +1 @@ +d1c93faf0c0d63e620c525c561940fdd libdatrie-0.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:29:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:29:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7027] csw/mgar/pkg/tcl/trunk Message-ID: Revision: 7027 http://gar.svn.sourceforge.net/gar/?rev=7027&view=rev Author: dmichelsen Date: 2009-10-29 16:29:58 +0000 (Thu, 29 Oct 2009) Log Message: ----------- tcp: Add patch for 64 bit compilcation, may need more work Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2009-10-29 16:28:17 UTC (rev 7026) +++ csw/mgar/pkg/tcl/trunk/Makefile 2009-10-29 16:29:58 UTC (rev 7027) @@ -12,6 +12,11 @@ DISTNAME = $(GARNAME)$(GARVERSION) DISTFILES = $(DISTNAME)-src.tar.gz +# Patch to use libsunmath on x86 from +# http://sourceforge.net/tracker/index.php?func=detail&aid=1839067&group_id=10894&atid=110894 +PATCHFILES = patch-libsunmath-amd64.diff +PATCHDIR = $(WORKDIR)/$(DISTNAME) + SPKG_SOURCEURL = http://www.tcl.tk/ # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/tcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2009-10-29 16:28:17 UTC (rev 7026) +++ csw/mgar/pkg/tcl/trunk/checksums 2009-10-29 16:29:58 UTC (rev 7027) @@ -1 +1,2 @@ +8c1bdbe43c9337c01287d074803d9767 download/patch-libsunmath-amd64.diff f70ad8f78b5e4a9f792fe101f22b125f download/tcl8.5.7-src.tar.gz Added: csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff =================================================================== --- csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff (rev 0) +++ csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff 2009-10-29 16:29:58 UTC (rev 7027) @@ -0,0 +1,60 @@ +diff -Naur tcl8.5.7.orig/unix/configure tcl8.5.7.patched/unix/configure +--- tcl8.5.7.orig/unix/configure 2009-04-15 21:30:05.000000000 +0200 ++++ tcl8.5.7.patched/unix/configure 2009-08-19 17:28:51.563281904 +0200 +@@ -8424,7 +8424,7 @@ + + + else +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64"; then + + if test "$GCC" = yes; then + +@@ -8475,7 +8475,7 @@ + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64" -o "$arch" = "i386"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +@@ -8658,7 +8658,7 @@ + #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" + + else +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64"; then + + SHLIB_LD="$SHLIB_LD -m64 -static-libgcc" + +diff -Naur tcl8.5.7.orig/unix/tcl.m4 tcl8.5.7.patched/unix/tcl.m4 +--- tcl8.5.7.orig/unix/tcl.m4 2009-04-15 21:30:05.000000000 +0200 ++++ tcl8.5.7.patched/unix/tcl.m4 2009-08-19 17:30:12.073868365 +0200 +@@ -1920,7 +1920,7 @@ + # Solaris 64 uses this as well + #LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64" + ]) +- ], [AS_IF([test "$arch" = "amd64 i386"], [ ++ ], [AS_IF([test "$arch" = "amd64"], [ + AS_IF([test "$GCC" = yes], [ + case $system in + SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) +@@ -1951,7 +1951,7 @@ + AS_IF([test "$GCC" = yes],[use_sunmath=no],[ + arch=`isainfo` + AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) +- AS_IF([test "$arch" = "amd64 i386"], [ ++ AS_IF([test "$arch" = "amd64" -o "$arch" = "i386"], [ + AC_MSG_RESULT([yes]) + MATH_LIBS="-lsunmath $MATH_LIBS" + AC_CHECK_HEADER(sunmath.h) +@@ -1982,7 +1982,7 @@ + # path, remove so name and append 'sparcv9' + #v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..." + #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" +- ], [AS_IF([test "$arch" = "amd64 i386"], [ ++ ], [AS_IF([test "$arch" = "amd64"], [ + SHLIB_LD="$SHLIB_LD -m64 -static-libgcc" + ])]) + ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:39:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7028] csw/mgar/pkg Message-ID: Revision: 7028 http://gar.svn.sourceforge.net/gar/?rev=7028&view=rev Author: dmichelsen Date: 2009-10-29 16:39:55 +0000 (Thu, 29 Oct 2009) Log Message: ----------- enscript: Initial commit, more work needed Added Paths: ----------- csw/mgar/pkg/enscript/ csw/mgar/pkg/enscript/branches/ csw/mgar/pkg/enscript/tags/ csw/mgar/pkg/enscript/trunk/ csw/mgar/pkg/enscript/trunk/Makefile csw/mgar/pkg/enscript/trunk/checksums csw/mgar/pkg/enscript/trunk/files/ Property changes on: csw/mgar/pkg/enscript/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/enscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/enscript/trunk/Makefile (rev 0) +++ csw/mgar/pkg/enscript/trunk/Makefile 2009-10-29 16:39:55 UTC (rev 7028) @@ -0,0 +1,24 @@ +GARNAME = enscript +GARVERSION = 1.6.4 +CATEGORIES = utils + +DESCRIPTION = GNU enscript converts ASCII files to PostScript +define BLURB + GNU enscript is a free replacement for the Adobe's enscript program. + Enscript converts ASCII files to PostScript and spools generated PostScript + output to the specified printer or leaves it to file. Enscript can be easily + extended to handle different output media and it has many options that can + be used to customize printouts. +endef + +MASTER_SITES = http://www.iki.fi/mtr/genscript/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.codento.com/people/mtr/genscript/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/enscript/trunk/checksums =================================================================== --- csw/mgar/pkg/enscript/trunk/checksums (rev 0) +++ csw/mgar/pkg/enscript/trunk/checksums 2009-10-29 16:39:55 UTC (rev 7028) @@ -0,0 +1 @@ +b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:44:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7029] csw/mgar/pkg/cpan/MIME-Types/trunk Message-ID: Revision: 7029 http://gar.svn.sourceforge.net/gar/?rev=7029&view=rev Author: dmichelsen Date: 2009-10-29 16:44:53 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/MIME-Types: Update to 1.27 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile csw/mgar/pkg/cpan/MIME-Types/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/MIME-Types/trunk/ Property changes on: csw/mgar/pkg/cpan/MIME-Types/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2009-10-29 16:39:55 UTC (rev 7028) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2009-10-29 16:44:53 UTC (rev 7029) @@ -1,9 +1,9 @@ GARNAME = MIME-Types -GARVERSION = 1.18 +GARVERSION = 1.27 CATEGORIES = cpan AUTHOR = MARKOV -DESCRIPTION = definition of MIME types +DESCRIPTION = Perl MIME::Types module define BLURB This module maintains a set of MIME::Type objects, which each describe one known mime type. There are many types defined by RFCs and vendors, so the @@ -11,6 +11,9 @@ additional information. endef -DISTFILES += CSWpmmimetypes.gspec +PACKAGES = CSWpmmimetypes +CATALOGNAME = pm_mimetypes +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2009-10-29 16:39:55 UTC (rev 7028) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2009-10-29 16:44:53 UTC (rev 7029) @@ -1,2 +1 @@ -033d1ea7b50ff868b8e3de42b76bb48f download/CSWpmmimetypes.gspec -fec1a57dfc4a0d7177b98fd75844685b download/MIME-Types-1.18.tar.gz +9407dfdd3a5adb7bf569ed2a184f1640 download/MIME-Types-1.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:49:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:49:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7030] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk Message-ID: Revision: 7030 http://gar.svn.sourceforge.net/gar/?rev=7030&view=rev Author: dmichelsen Date: 2009-10-29 16:49:44 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-Random: Update to 0.04 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.depend csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:44:53 UTC (rev 7029) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:49:44 UTC (rev 7030) @@ -1,16 +1,17 @@ GARNAME = Crypt-OpenSSL-Random -GARVERSION = 0.03 +GARVERSION = 0.04 CATEGORIES = cpan AUTHOR = IROBERTS -DESCRIPTION = routines for accessing the OpenSSL pseudo-random number generator +DESCRIPTION = Perl Crypt::OpenSSL::Random module define BLURB Crypt::OpenSSL::Random provides the ability to seed and query the OpenSSL library's pseudo-random number generator endef -DISTFILES += CSWpmcryptosslrand.gspec CSWpmcryptosslrand.depend +PACKAGES = CSWpmcryptosslrand +CATALOGNAME = pm_cryptosslrand -DEPENDS += lib/openssl +REQUIRED_PKGS = CSWosslrt include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums 2009-10-29 16:44:53 UTC (rev 7029) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums 2009-10-29 16:49:44 UTC (rev 7030) @@ -1,3 +1 @@ -013f7b0465d767679e216f82fc97b164 download/CSWpmcryptosslrand.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmcryptosslrand.depend -c6bae9c3ced1e08ffcd57120bf247a7a download/Crypt-OpenSSL-Random-0.03.tar.gz +c56ac5dbdd46122eb9b8da59613b7b0a Crypt-OpenSSL-Random-0.04.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec 2009-10-29 16:44:53 UTC (rev 7029) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/files/CSWpmcryptosslrand.gspec 2009-10-29 16:49:44 UTC (rev 7030) @@ -1,3 +0,0 @@ -%var bitname pm_cryptosslrand -%var pkgname CSWpmcryptosslrand -%include url file://%{PKGLIB}/csw_cpan.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:54:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7031] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Makefile Message-ID: Revision: 7031 http://gar.svn.sourceforge.net/gar/?rev=7031&view=rev Author: dmichelsen Date: 2009-10-29 16:54:04 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-Random: Fix package name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:49:44 UTC (rev 7030) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:54:04 UTC (rev 7031) @@ -9,7 +9,7 @@ library's pseudo-random number generator endef -PACKAGES = CSWpmcryptosslrand +PACKAGES = CSWpmcryptosslrandom CATALOGNAME = pm_cryptosslrand REQUIRED_PKGS = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:55:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:55:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7032] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk Message-ID: Revision: 7032 http://gar.svn.sourceforge.net/gar/?rev=7032&view=rev Author: dmichelsen Date: 2009-10-29 16:55:37 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-RSA: Update to mGAR v2 and 0.25 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:55:37 UTC (rev 7032) @@ -1,5 +1,5 @@ GARNAME = Crypt-OpenSSL-RSA -GARVERSION = 0.24 +GARVERSION = 0.25 CATEGORIES = cpan AUTHOR = IROBERTS @@ -10,9 +10,9 @@ decryption, signatures and signature verification. endef -DISTFILES += CSWpmcryptosslrsa.gspec CSWpmcryptosslrsa.depend +PACKAGES = CSWpmcryptosslrsa +CATALOGNAME = pm_cryptosslrsa -DEPENDS += lib/openssl -DEPENDS += cpan/Crypt-OpenSSL-Random +REQUIRED_PKGS = CSWpmcryptosslrandom include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums 2009-10-29 16:55:37 UTC (rev 7032) @@ -1,3 +1 @@ -7e98cda84fa7101190074dfa8cafc502 download/CSWpmcryptosslrsa.gspec -aca262f7c659e3e83c4644ff585d5f9d download/CSWpmcryptosslrsa.depend -5760e2678cd9e1aa33b40d5d216899c8 download/Crypt-OpenSSL-RSA-0.24.tar.gz +fdf19c9093f47cffb851ae937d053c14 Crypt-OpenSSL-RSA-0.25.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.depend 2009-10-29 16:55:37 UTC (rev 7032) @@ -1 +0,0 @@ -P CSWpmcryptosslrand pm_cryptosslrand - routines for accessing the OpenSSL pseudo-random number generator Deleted: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec 2009-10-29 16:54:04 UTC (rev 7031) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/files/CSWpmcryptosslrsa.gspec 2009-10-29 16:55:37 UTC (rev 7032) @@ -1,7 +0,0 @@ -%var bitname pm_cryptosslrsa -%var pkgname CSWpmcryptosslrsa -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001-2004 Ian Robertson. Crypt::OpenSSL::RSA is free -software; you may redistribute it and/or modify it under the same -terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:57:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:57:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7033] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Makefile Message-ID: Revision: 7033 http://gar.svn.sourceforge.net/gar/?rev=7033&view=rev Author: dmichelsen Date: 2009-10-29 16:57:00 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-Random: Adjust catalog to conform to released package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:55:37 UTC (rev 7032) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2009-10-29 16:57:00 UTC (rev 7033) @@ -10,7 +10,7 @@ endef PACKAGES = CSWpmcryptosslrandom -CATALOGNAME = pm_cryptosslrand +CATALOGNAME = pm_osslrandom REQUIRED_PKGS = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 17:58:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 16:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7034] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Message-ID: Revision: 7034 http://gar.svn.sourceforge.net/gar/?rev=7034&view=rev Author: dmichelsen Date: 2009-10-29 16:58:10 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Crypt-OpenSSL-RSA: Adjust catalog name to conform to released package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:57:00 UTC (rev 7033) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2009-10-29 16:58:10 UTC (rev 7034) @@ -11,7 +11,7 @@ endef PACKAGES = CSWpmcryptosslrsa -CATALOGNAME = pm_cryptosslrsa +CATALOGNAME = pm_osslrsa REQUIRED_PKGS = CSWpmcryptosslrandom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:08:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:08:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7035] csw/mgar/pkg/cpan Message-ID: Revision: 7035 http://gar.svn.sourceforge.net/gar/?rev=7035&view=rev Author: dmichelsen Date: 2009-10-29 17:08:25 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Text-CSV: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Text-CSV/ csw/mgar/pkg/cpan/Text-CSV/branches/ csw/mgar/pkg/cpan/Text-CSV/tags/ csw/mgar/pkg/cpan/Text-CSV/trunk/ csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV/trunk/checksums csw/mgar/pkg/cpan/Text-CSV/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Text-CSV/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile 2009-10-29 17:08:25 UTC (rev 7035) @@ -0,0 +1,18 @@ +GARNAME = Text-CSV +GARVERSION = 1.15 +CATEGORIES = cpan +AUTHOR = MAKAMAKA + +DESCRIPTION = Perl Text::CSV module +define BLURB + Text::CSV provides facilities for the composition and decomposition of + comma-separated values. An instance of the Text::CSV class can combine + fields into a CSV string and parse a CSV string into fields. +endef + +PACKAGES = CSWpmtextcsv +CATALOGNAME = pm_textcsv + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Text-CSV/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-CSV/trunk/checksums 2009-10-29 17:08:25 UTC (rev 7035) @@ -0,0 +1 @@ +26f636d041ef941b19e3de62cb141c01 Text-CSV-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:15:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:15:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7036] csw/mgar/pkg/cpan/Text-CSV_XS/trunk Message-ID: Revision: 7036 http://gar.svn.sourceforge.net/gar/?rev=7036&view=rev Author: dmichelsen Date: 2009-10-29 17:15:00 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Text-CSV_XS: Update to 0.69 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-CSV_XS/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-29 17:08:25 UTC (rev 7035) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-29 17:15:00 UTC (rev 7036) @@ -1,15 +1,19 @@ GARNAME = Text-CSV_XS -GARVERSION = 0.23 +GARVERSION = 0.69 CATEGORIES = cpan -AUTHOR = JWIED +AUTHOR = HMBRAND -DESCRIPTION = comma-separated values manipulation routines +DESCRIPTION = Comma-separated values manipulation routines define BLURB Text::CSV_XS provides facilities for the composition and decomposition of comma-separated values. An instance of the Text::CSV_XS class can combine fields into a CSV string and parse a CSV string into fields. endef -DISTFILES += CSWpmtextcsvxs.gspec +PACKAGES = CSWpmtextcsvxs +CATALOGNAME = pm_textcsvxs +# This module uses .tgz instead of .tar.gz :-( +MODDIST = $(GARNAME)-$(GARVERSION).tgz + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2009-10-29 17:08:25 UTC (rev 7035) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2009-10-29 17:15:00 UTC (rev 7036) @@ -1,2 +1 @@ -9a78bc23ae87e940d4e196d6f1a1664a download/CSWpmtextcsvxs.gspec -936eca163a09e92353565ad37ee7a4fa download/Text-CSV_XS-0.23.tar.gz +8788c57a50704265e35171746473b404 Text-CSV_XS-0.69.tgz Deleted: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec 2009-10-29 17:08:25 UTC (rev 7035) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/files/CSWpmtextcsvxs.gspec 2009-10-29 17:15:00 UTC (rev 7036) @@ -1,9 +0,0 @@ -%var bitname pm_textcsvxs -%var pkgname CSWpmtextcsvxs -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1998 Jochen Wiedmann. All rights reserved. -Portions Copyright (c) 1997 Alan Citterman. All rights reserved. - -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:21:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7037] csw/mgar/pkg/cpan/Spiffy/trunk Message-ID: Revision: 7037 http://gar.svn.sourceforge.net/gar/?rev=7037&view=rev Author: dmichelsen Date: 2009-10-29 17:21:03 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Spiffy: Update to mGAR v2 and dynamic gspec Modified Paths: -------------- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile csw/mgar/pkg/cpan/Spiffy/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Spiffy/trunk/ Property changes on: csw/mgar/pkg/cpan/Spiffy/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Spiffy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2009-10-29 17:15:00 UTC (rev 7036) +++ csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2009-10-29 17:21:03 UTC (rev 7037) @@ -12,6 +12,9 @@ and (perhaps someday) standard way. endef -DISTFILES += CSWpmspiffy.gspec +PACKAGES = CSWpmspiffy +CATALOGNAME = pm_spiffy +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Spiffy/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/checksums 2009-10-29 17:15:00 UTC (rev 7036) +++ csw/mgar/pkg/cpan/Spiffy/trunk/checksums 2009-10-29 17:21:03 UTC (rev 7037) @@ -1,2 +1 @@ -db405e1b83f57a1292cbba47088f90c7 download/CSWpmspiffy.gspec -49860ccf2127c6d2af3d98560ffae644 download/Spiffy-0.30.tar.gz +49860ccf2127c6d2af3d98560ffae644 Spiffy-0.30.tar.gz Deleted: csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec 2009-10-29 17:15:00 UTC (rev 7036) +++ csw/mgar/pkg/cpan/Spiffy/trunk/files/CSWpmspiffy.gspec 2009-10-29 17:21:03 UTC (rev 7037) @@ -1,11 +0,0 @@ -%var bitname pm_spiffy -%var pkgname CSWpmspiffy -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2004. Brian Ingerson. All rights reserved. - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -See This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:25:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:25:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7038] csw/mgar/pkg/cpan/Unicode-String/trunk Message-ID: Revision: 7038 http://gar.svn.sourceforge.net/gar/?rev=7038&view=rev Author: dmichelsen Date: 2009-10-29 17:25:24 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Unicode-String: Update to mGAR v2 and 2.09 Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile csw/mgar/pkg/cpan/Unicode-String/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/Unicode-String/trunk/ Property changes on: csw/mgar/pkg/cpan/Unicode-String/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile 2009-10-29 17:21:03 UTC (rev 7037) +++ csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile 2009-10-29 17:25:24 UTC (rev 7038) @@ -13,6 +13,7 @@ character set, but uses a 16-bit encoding to support full multilingual text. endef -DISTFILES += CSWpmunistr.gspec +PACKAGES = CSWpmunicodestring +CATALOGNAME = pm_unicodestring include gar/category.mk Modified: csw/mgar/pkg/cpan/Unicode-String/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unicode-String/trunk/checksums 2009-10-29 17:21:03 UTC (rev 7037) +++ csw/mgar/pkg/cpan/Unicode-String/trunk/checksums 2009-10-29 17:25:24 UTC (rev 7038) @@ -1,2 +1 @@ -6f4d5c8b3941384567ce5cd17c8a1eaf download/CSWpmunistr.gspec -553e68e603723bf7c631f8701ab0d678 download/Unicode-String-2.09.tar.gz +553e68e603723bf7c631f8701ab0d678 Unicode-String-2.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:28:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:28:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7039] csw/mgar/pkg/cpan/Unicode-Map/trunk Message-ID: Revision: 7039 http://gar.svn.sourceforge.net/gar/?rev=7039&view=rev Author: dmichelsen Date: 2009-10-29 17:28:53 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/Unicode-Map: Update to mGAR v2 and 0.112 Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/ Property changes on: csw/mgar/pkg/cpan/Unicode-Map/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2009-10-29 17:25:24 UTC (rev 7038) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2009-10-29 17:28:53 UTC (rev 7039) @@ -3,13 +3,14 @@ CATEGORIES = cpan AUTHOR = MSCHWARTZ -DESCRIPTION = maps charsets from and to utf16 unicode +DESCRIPTION = Maps charsets from and to utf16 unicode define BLURB This module converts strings from and to 2-byte Unicode UCS2 format. All mappings happen via 2 byte UTF16 encodings, not via 1 byte UTF8 encoding. To transform these use Unicode::String. endef -DISTFILES += CSWpmunimap.gspec +PACKAGES = CSWpmunicodemap +CATALOGNAME = pm_unicodemap include gar/category.mk Modified: csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums 2009-10-29 17:25:24 UTC (rev 7038) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/checksums 2009-10-29 17:28:53 UTC (rev 7039) @@ -1,2 +1 @@ -8115666ca2b4dbf98516981538af0be4 download/CSWpmunimap.gspec -edaa8fc5ddf0e5d805e274283dd0625d download/Unicode-Map-0.112.tar.gz +edaa8fc5ddf0e5d805e274283dd0625d Unicode-Map-0.112.tar.gz Deleted: csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec 2009-10-29 17:25:24 UTC (rev 7038) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/files/CSWpmunimap.gspec 2009-10-29 17:28:53 UTC (rev 7039) @@ -1,4 +0,0 @@ -%var bitname pm_unicodemap -%var pkgname CSWpmunimap -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 29 18:34:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Oct 2009 17:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7040] csw/mgar/pkg/cpan/XML-Simple/trunk Message-ID: Revision: 7040 http://gar.svn.sourceforge.net/gar/?rev=7040&view=rev Author: dmichelsen Date: 2009-10-29 17:34:17 +0000 (Thu, 29 Oct 2009) Log Message: ----------- cpan/XML-Simple: Update to 2.18 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile csw/mgar/pkg/cpan/XML-Simple/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/XML-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,5 +1,5 @@ GARNAME = XML-Simple -GARVERSION = 2.16 +GARVERSION = 2.18 CATEGORIES = cpan AUTHOR = GRANTM @@ -10,8 +10,11 @@ Two functions are exported: XMLin() and XMLout(). endef -DISTFILES += CSWpmxmlsimple.gspec CSWpmxmlsimple.depend +PACKAGES = CSWpmxmlsimple +CATALOGNAME = pm_xmlsimple -DEPENDS += cpan/XML-Parser cpan/XML-SAX +REQUIRED_PKGS = CSWpmxmlparser CSWpmxmlsax +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/checksums 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/checksums 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,3 +1 @@ -6cf9cdc28f032cb32b214e05818073d2 download/CSWpmxmlsimple.gspec -8b69c4c06401dc54f306758f42ab8bb1 download/CSWpmxmlsimple.depend -80c0980ff63d77b871de41acc7175df7 download/XML-Simple-2.16.tar.gz +593aa8001e5c301cdcdb4bb3b63abc33 XML-Simple-2.18.tar.gz Deleted: csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.depend 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,2 +0,0 @@ -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents -P CSWpmxmlsax pm_xmlsax - Simple API for XML Deleted: csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec 2009-10-29 17:28:53 UTC (rev 7039) +++ csw/mgar/pkg/cpan/XML-Simple/trunk/files/CSWpmxmlsimple.gspec 2009-10-29 17:34:17 UTC (rev 7040) @@ -1,9 +0,0 @@ -%var bitname pm_xmlsimple -%var pkgname CSWpmxmlsimple -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1999-2004 Grant McLean - -This library is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 08:37:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 07:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7041] csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Message-ID: Revision: 7041 http://gar.svn.sourceforge.net/gar/?rev=7041&view=rev Author: dmichelsen Date: 2009-10-30 07:37:24 +0000 (Fri, 30 Oct 2009) Log Message: ----------- cpan/Text-CSV_XS: Fix package name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-29 17:34:17 UTC (rev 7040) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-10-30 07:37:24 UTC (rev 7041) @@ -10,7 +10,9 @@ fields into a CSV string and parse a CSV string into fields. endef -PACKAGES = CSWpmtextcsvxs +# XXX: This package name contains a type, it was released this way a long time +# ago and should be renamed sometime. +PACKAGES = CSWpmttextcsvxs CATALOGNAME = pm_textcsvxs # This module uses .tgz instead of .tar.gz :-( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 08:48:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 07:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7042] csw/mgar/pkg/libmhash/trunk/Makefile Message-ID: Revision: 7042 http://gar.svn.sourceforge.net/gar/?rev=7042&view=rev Author: dmichelsen Date: 2009-10-30 07:48:58 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libmhash: Fix sourceurl Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-30 07:37:24 UTC (rev 7041) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2009-10-30 07:48:58 UTC (rev 7042) @@ -14,6 +14,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +SPKG_SOURCEURL = http://mhash.sourceforge.net/ + EXTRA_CPPFLAGS = -D__const=const BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 08:58:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 07:58:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7043] csw/mgar/pkg/mantis/trunk/Makefile Message-ID: Revision: 7043 http://gar.svn.sourceforge.net/gar/?rev=7043&view=rev Author: dmichelsen Date: 2009-10-30 07:58:54 +0000 (Fri, 30 Oct 2009) Log Message: ----------- mantis: Add dependency to CSWphp5session Modified Paths: -------------- csw/mgar/pkg/mantis/trunk/Makefile Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2009-10-30 07:48:58 UTC (rev 7042) +++ csw/mgar/pkg/mantis/trunk/Makefile 2009-10-30 07:58:54 UTC (rev 7043) @@ -22,7 +22,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = doc/LICENSE -REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5mysql +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5mysql CSWphp5session ARCHALL = 1 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 09:52:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 08:52:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7044] csw/mgar/pkg Message-ID: Revision: 7044 http://gar.svn.sourceforge.net/gar/?rev=7044&view=rev Author: dmichelsen Date: 2009-10-30 08:52:56 +0000 (Fri, 30 Oct 2009) Log Message: ----------- xearth: Initial commit Added Paths: ----------- csw/mgar/pkg/xearth/ csw/mgar/pkg/xearth/branches/ csw/mgar/pkg/xearth/tags/ csw/mgar/pkg/xearth/trunk/ csw/mgar/pkg/xearth/trunk/Makefile csw/mgar/pkg/xearth/trunk/checksums csw/mgar/pkg/xearth/trunk/files/ Property changes on: csw/mgar/pkg/xearth/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xearth/trunk/Makefile =================================================================== --- csw/mgar/pkg/xearth/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xearth/trunk/Makefile 2009-10-30 08:52:56 UTC (rev 7044) @@ -0,0 +1,39 @@ +GARNAME = xearth +GARVERSION = 1.1 +CATEGORIES = apps + +DESCRIPTION = X11 earth backdrop +define BLURB + Xearth sets the X root window to an image of the Earth, as seen from + your favorite vantage point in space, correctly shaded for the current + position of the Sun. By default, xearth updates the displayed image every + five minutes. The time between updates can be changed using either X resource + or a command-line option. Xearth can also be configured to either create + and render into its own top-level X window or render directly into PPM or + GIF files; see the man page for details. +endef + +MASTER_SITES = http://groups.csail.mit.edu/cag/pub/tuna/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://hewgill.com/xearth/original/ + +LICENSE = README + +NORUNPATH = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/xearth $(DESTDIR)$(bindir)/xearth + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/xearth.man $(DESTDIR)$(mandir)/man1/xearth.1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/xearth/trunk/checksums =================================================================== --- csw/mgar/pkg/xearth/trunk/checksums (rev 0) +++ csw/mgar/pkg/xearth/trunk/checksums 2009-10-30 08:52:56 UTC (rev 7044) @@ -0,0 +1 @@ +6e409dffaa8dc5fae1064e38935ab61f xearth-1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 10:39:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 09:39:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7045] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 7045 http://gar.svn.sourceforge.net/gar/?rev=7045&view=rev Author: dmichelsen Date: 2009-10-30 09:39:35 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libsdl: Update to 1.2.14 and new X11 Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libsdl/trunk/checksums Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 08:52:56 UTC (rev 7044) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 09:39:35 UTC (rev 7045) @@ -1,5 +1,5 @@ GARNAME = SDL -GARVERSION = 1.2.13 +GARVERSION = 1.2.14 CATEGORIES = lib DESCRIPTION = Simple DirectMedia Layer library @@ -12,12 +12,13 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -REQUIRED_PKGS = CSWiconv - SPKG_SOURCEURL = http://www.libsdl.org/ PACKAGES = CSWlibsdl CSWlibsdldevel +REQUIRED_PKGS_CSWlibsdl = CSWiconv CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibsdldevel = CSWlibsdl + CATALOGNAME_CSWlibsdl = libsdl CATALOGNAME_CSWlibsdldevel = libsdl_devel @@ -32,6 +33,8 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) PKGFILES_CSWlibsdldevel = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/libsdl/trunk/checksums =================================================================== --- csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 08:52:56 UTC (rev 7044) +++ csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 09:39:35 UTC (rev 7045) @@ -1,3 +1 @@ -c6660feea2a6834de10bc71b2f8e4d88 download/SDL-1.2.13.tar.gz -60483a03ebdc960fc70c67cebc151245 download/CSWlibsdl.gspec -4f601b50d7651c90d045ded68e990967 download/CSWlibsdl.prototype +e52086d1b508fa0b76c52ee30b55bec4 SDL-1.2.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 11:25:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 10:25:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7046] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 7046 http://gar.svn.sourceforge.net/gar/?rev=7046&view=rev Author: dmichelsen Date: 2009-10-30 10:25:13 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libsdl: Patch for 64 bit x86 assembly Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libsdl/trunk/checksums Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 09:39:35 UTC (rev 7045) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-10-30 10:25:13 UTC (rev 7046) @@ -11,6 +11,7 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-nasm-options.patch SPKG_SOURCEURL = http://www.libsdl.org/ Modified: csw/mgar/pkg/libsdl/trunk/checksums =================================================================== --- csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 09:39:35 UTC (rev 7045) +++ csw/mgar/pkg/libsdl/trunk/checksums 2009-10-30 10:25:13 UTC (rev 7046) @@ -1 +1,2 @@ +0d8f5ca93aa0c6d035e4f516393fc89a 0001-Fix-nasm-options.patch e52086d1b508fa0b76c52ee30b55bec4 SDL-1.2.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 12:29:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 11:29:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7047] csw/mgar/pkg/libsdl/trunk/files/ 0001-Fix-nasm-options.patch Message-ID: Revision: 7047 http://gar.svn.sourceforge.net/gar/?rev=7047&view=rev Author: dmichelsen Date: 2009-10-30 11:29:51 +0000 (Fri, 30 Oct 2009) Log Message: ----------- libsdl: Patch for 64 bit x86 assembly Added Paths: ----------- csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch Added: csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch (rev 0) +++ csw/mgar/pkg/libsdl/trunk/files/0001-Fix-nasm-options.patch 2009-10-30 11:29:51 UTC (rev 7047) @@ -0,0 +1,25 @@ +From 735a89c8e05c6fa0684deb6e7019192959abb869 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 30 Oct 2009 11:09:15 +0100 +Subject: [PATCH] Fix nasm options + +--- + build-scripts/strip_fPIC.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build-scripts/strip_fPIC.sh b/build-scripts/strip_fPIC.sh +index 45d34ba..5953112 100755 +--- a/build-scripts/strip_fPIC.sh ++++ b/build-scripts/strip_fPIC.sh +@@ -5,7 +5,7 @@ + command="" + while [ $# -gt 0 ]; do + case "$1" in +- -fPIC) ++ -fPIC|-KPIC) + # Ignore -fPIC option + ;; + -fno-common) +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 12:48:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 11:48:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7048] csw/mgar/pkg/disktype/trunk Message-ID: Revision: 7048 http://gar.svn.sourceforge.net/gar/?rev=7048&view=rev Author: dmichelsen Date: 2009-10-30 11:48:36 +0000 (Fri, 30 Oct 2009) Log Message: ----------- disktype: Fix manpage reported in bug #1055 Modified Paths: -------------- csw/mgar/pkg/disktype/trunk/Makefile csw/mgar/pkg/disktype/trunk/checksums Added Paths: ----------- csw/mgar/pkg/disktype/trunk/files/disktype.1 Modified: csw/mgar/pkg/disktype/trunk/Makefile =================================================================== --- csw/mgar/pkg/disktype/trunk/Makefile 2009-10-30 11:29:51 UTC (rev 7047) +++ csw/mgar/pkg/disktype/trunk/Makefile 2009-10-30 11:48:36 UTC (rev 7048) @@ -11,6 +11,11 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# The provided manpage doesn't work with Solaris nroff. +# See for details bug #1055: +# http://www.opencsw.org/mantis/view.php?id=1055 +DISTFILES += disktype.1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,5 +34,5 @@ ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/disktype $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(mandir)/man1 - ginstall $(WORKSRC)/disktype.1 $(DESTDIR)$(mandir)/man1/ + ginstall $(WORKDIR)/disktype.1 $(DESTDIR)$(mandir)/man1/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/disktype/trunk/checksums =================================================================== --- csw/mgar/pkg/disktype/trunk/checksums 2009-10-30 11:29:51 UTC (rev 7047) +++ csw/mgar/pkg/disktype/trunk/checksums 2009-10-30 11:48:36 UTC (rev 7048) @@ -1 +1,2 @@ 25a673f162b9c01cd565109202559489 disktype-9.tar.gz +12fd51f4b22d7ca8d3517bbfdc7a163b disktype.1 Added: csw/mgar/pkg/disktype/trunk/files/disktype.1 =================================================================== --- csw/mgar/pkg/disktype/trunk/files/disktype.1 (rev 0) +++ csw/mgar/pkg/disktype/trunk/files/disktype.1 2009-10-30 11:48:36 UTC (rev 7048) @@ -0,0 +1,79 @@ +.TH DISKTYPE 1 "Feb 21, 2005" +.SH NAME +disktype - disk format detector +.\" +.SH SYNOPSIS +disktype file... +.\" +.SH DESCRIPTION +The purpose of +disktype +is to detect the content format of a disk or +disk image. It knows about common file systems, partition tables, and +boot codes. +.\" +.SH USAGE +disktype +can be run with any number of regular files or +device special files as arguments. They will be analyzed in the order +given, and the results printed to standard output. There are no +switches in this version. Note that running disktype on device files +like your hard disk will likely require root rights. +.PP +See the online documentation at +for some example command lines. +.\" +.SH RECOGNIZED FORMATS +The following formats are recognized by this version of +disktype +.TP 4 +.I File systems: +FAT12/FAT16/FAT32, NTFS, HPFS, MFS, HFS, HFS Plus, +ISO9660, ext2/ext3, Minix, ReiserFS, Reiser4, Linux romfs, Linux +cramfs, Linux squashfs, UFS (some variations), SysV FS (some +variations), JFS, XFS, Amiga FS/FFS, BeOS BFS, QNX4 FS, UDF, 3DO +CD-ROM file system, Veritas VxFS, Xbox DVD file system. +.TP 4 +.I Partitioning: +DOS/PC style, Apple, Amiga "Rigid Disk", ATARI ST (AHDI3), +BSD disklabel, Linux RAID physical disks, Linux LVM1 physical volumes, +Linux LVM2 physical volumes, Solaris x86 disklabel (vtoc), +Solaris SPARC disklabel. +.TP 4 +.I Other structures: +Debian split floppy header, Linux swap. +.TP 4 +.I Disk images: +Raw CD image (.bin), Virtual PC hard disk image, +Apple UDIF disk image (limited). +.TP 4 +.I Boot codes: +LILO, GRUB, SYSLINUX, ISOLINUX, Linux kernel, FreeBSD loader, +Sega Dreamcast (?). +.TP 4 +.I Compression formats: +gzip, compress, bzip2. +.TP 4 +.I Archive formats: +tar, cpio, bar, dump/restore. +.PP +Compressed files (gzip, compress, bzip2 formats) will also have their +contents analyzed using transparent decompression. The appropriate +compression program must be installed on the system, i.e. gzip(1) +for the gzip and compress formats, bzip2(1) for the bzip2 format. +.PP +Disk images in general will also have their contents analyzed using +the proper mapping, with the exception of the Apple UDIF format. +.PP +See the online documentation at +for more details on the supported formats and their quirks. +.\" +.SH HOMEPAGE +http://disktype.sourceforge.net/ +.\" +.SH AUTHOR +Christoph Pfisterer +.\" +.SH "SEE ALSO" +.BR file(1), +.BR gpart(8) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 30 13:04:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Oct 2009 12:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7049] csw/mgar/pkg/pca/trunk Message-ID: Revision: 7049 http://gar.svn.sourceforge.net/gar/?rev=7049&view=rev Author: dmichelsen Date: 2009-10-30 12:04:51 +0000 (Fri, 30 Oct 2009) Log Message: ----------- pca: Update to 20091030-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-10-30 11:48:36 UTC (rev 7048) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-10-30 12:04:51 UTC (rev 7049) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20090827-01 +GARVERSION = 20091030-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-10-30 11:48:36 UTC (rev 7048) +++ csw/mgar/pkg/pca/trunk/checksums 2009-10-30 12:04:51 UTC (rev 7049) @@ -1,4 +1,4 @@ -4376789925fa9002d0567d739f717748 download/0001-prefer-opencsw-perl.diff -6f2f2376eba0a788795dd43d68ad32d1 download/COPYING -89e45905df6a36cf740a886fec2fafc9 download/pca-20090827-01 -12de68ff8f67b4bb8b095e5646402208 download/pca.conf +4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff +6f2f2376eba0a788795dd43d68ad32d1 COPYING +d915e06b37750db9e6d9806f1114a9b8 pca-20091030-01 +12de68ff8f67b4bb8b095e5646402208 pca.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 30 16:11:56 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 30 Oct 2009 15:11:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7050] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7050 http://gar.svn.sourceforge.net/gar/?rev=7050&view=rev Author: bonivart Date: 2009-10-30 15:11:29 +0000 (Fri, 30 Oct 2009) Log Message: ----------- pkgutil: update to 1.8 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-30 12:04:51 UTC (rev 7049) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-10-30 15:11:29 UTC (rev 7050) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8b3 +GARVERSION = 1.8 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-30 12:04:51 UTC (rev 7049) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-10-30 15:11:29 UTC (rev 7050) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove 951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -9641cba108ea4aad1e2608263ec48fb2 pkgutil-1.8b3.zip +f65b4c116cb03bc95c148a8488472515 pkgutil-1.8.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.