From maciej at opencsw.org Thu Mar 1 00:55:47 2012
From: maciej at opencsw.org (Maciej Blizinski)
Date: Thu, 1 Mar 2012 00:55:47 +0100
Subject: [csw-devel] [PATCH 0/2] 'gmake check' on Solaris 10
Message-ID: <1330559749-23883-1-git-send-email-maciej@opencsw.org>
These two patches make 'gmake check' pass in Solaris 10. There are two cases
where CONFIG_SHELL needs to be used, and one place where libcompat is
necessary because of asprintf().
Maciej Blizinski (2):
Use libcompat in tests
Invoke check_headers with $(SHELL)
lib/Makefile.am | 2 +-
src/Makefile.am | 2 +-
src/test/Makefile.am | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
--
1.7.9
From maciej at opencsw.org Thu Mar 1 00:55:48 2012
From: maciej at opencsw.org (Maciej Blizinski)
Date: Thu, 1 Mar 2012 00:55:48 +0100
Subject: [csw-devel] [PATCH 1/2] Use libcompat in tests
In-Reply-To: <1330559749-23883-1-git-send-email-maciej@opencsw.org>
References: <1330559749-23883-1-git-send-email-maciej@opencsw.org>
Message-ID: <1330559749-23883-2-git-send-email-maciej@opencsw.org>
Otherwise:
Undefined first referenced
symbol in file
asprintf url.o
ld: fatal: Symbol referencing errors. No output written to test_url
---
src/test/Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 71f6768..128aecd 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -15,7 +15,8 @@ TESTS = $(check_PROGRAMS)
AM_CFLAGS = $(CFLAGS_libvlccore)
AM_LDFLAGS = -no-install
-LDADD = ../libvlccore.la
+LDADD = ../libvlccore.la \
+ ../../compat/libcompat.la
test_block_SOURCES = block_test.c ../misc/block.c
test_block_LDADD = $(LDADD) $(LIBS_libvlccore)
--
1.7.9
From maciej at opencsw.org Thu Mar 1 00:55:49 2012
From: maciej at opencsw.org (Maciej Blizinski)
Date: Thu, 1 Mar 2012 00:55:49 +0100
Subject: [csw-devel] [PATCH 2/2] Invoke check_headers with $(SHELL)
In-Reply-To: <1330559749-23883-1-git-send-email-maciej@opencsw.org>
References: <1330559749-23883-1-git-send-email-maciej@opencsw.org>
Message-ID: <1330559749-23883-3-git-send-email-maciej@opencsw.org>
Otherwise, it gets executed with /bin/sh which on Solaris does not support the
$(...) construct. This causes 'gmake check' to fail. For example:
../src/check_headers: $(dirname ../src/check_headers): does not exist
Calling check_headers with $(SHELL) explicitly makes use of CONFIG_SHELL.
---
lib/Makefile.am | 2 +-
src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 339d3b4..4ad0e21 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -75,4 +75,4 @@ pkgconfig_DATA = libvlc.pc
$(SHELL) ./config.status --file="lib/$@"
check-local:
- $(top_srcdir)/src/check_headers $(pkginclude_HEADERS)
+ $(SHELL) $(top_srcdir)/src/check_headers $(pkginclude_HEADERS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 492dcde..059b90c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -530,7 +530,7 @@ check-local:
exit 1; \
fi ; \
done
- $(srcdir)/check_headers $(pluginsinclude_HEADERS)
+ $(SHELL) $(srcdir)/check_headers $(pluginsinclude_HEADERS)
FORCE:
@echo "Generated source cannot be phony. Go away." >&2
--
1.7.9
From maciej at opencsw.org Thu Mar 1 09:37:48 2012
From: maciej at opencsw.org (Maciej Blizinski)
Date: Thu, 1 Mar 2012 09:37:48 +0100
Subject: [csw-devel] [PATCH 1/2] Use libcompat in tests
In-Reply-To: <1330559749-23883-2-git-send-email-maciej@opencsw.org>
References: <1330559749-23883-2-git-send-email-maciej@opencsw.org>
Message-ID: <1330591068-20300-1-git-send-email-maciej@opencsw.org>
Otherwise:
Undefined first referenced
symbol in file
asprintf url.o
ld: fatal: Symbol referencing errors. No output written to test_url
This patch uses a mix of tabs and spaces to match the existing convention.
---
src/test/Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 71f6768..25e5d50 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -15,7 +15,8 @@ TESTS = $(check_PROGRAMS)
AM_CFLAGS = $(CFLAGS_libvlccore)
AM_LDFLAGS = -no-install
-LDADD = ../libvlccore.la
+LDADD = ../libvlccore.la \
+ ../../compat/libcompat.la
test_block_SOURCES = block_test.c ../misc/block.c
test_block_LDADD = $(LDADD) $(LIBS_libvlccore)
--
1.7.5.4
From dmichelsen at users.sourceforge.net Thu Mar 1 11:40:12 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Mar 2012 10:40:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[17253] csw/mgar/pkg/cpan
Message-ID:
Revision: 17253
http://gar.svn.sourceforge.net/gar/?rev=17253&view=rev
Author: dmichelsen
Date: 2012-03-01 10:40:12 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
cpan/Mouse/trunk: Initial commit
Added Paths:
-----------
csw/mgar/pkg/cpan/Mouse/
csw/mgar/pkg/cpan/Mouse/branches/
csw/mgar/pkg/cpan/Mouse/tags/
csw/mgar/pkg/cpan/Mouse/trunk/
csw/mgar/pkg/cpan/Mouse/trunk/Makefile
csw/mgar/pkg/cpan/Mouse/trunk/checksums
csw/mgar/pkg/cpan/Mouse/trunk/files/
Property changes on: csw/mgar/pkg/cpan/Mouse/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/cpan/Mouse/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mouse/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/cpan/Mouse/trunk/Makefile 2012-03-01 10:40:12 UTC (rev 17253)
@@ -0,0 +1,19 @@
+NAME = Mouse
+VERSION = 0.97
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = GFUJI
+
+DESCRIPTION = Moose minus the antlers
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE = README
+
+PACKAGES += CSWpm-mouse
+CATALOGNAME_CSWpm-mouse = pm_mouse
+SPKG_DESC_CSWpm-mouse = Moose minus the antlers
+
+include gar/category.mk
Added: csw/mgar/pkg/cpan/Mouse/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Mouse/trunk/checksums (rev 0)
+++ csw/mgar/pkg/cpan/Mouse/trunk/checksums 2012-03-01 10:40:12 UTC (rev 17253)
@@ -0,0 +1 @@
+92a8b387f9619d32bce6685c1dd370e5 Mouse-0.97.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 Mar 1 14:40:51 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Mar 2012 13:40:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[17254] csw/mgar/pkg
Message-ID:
Revision: 17254
http://gar.svn.sourceforge.net/gar/?rev=17254&view=rev
Author: dmichelsen
Date: 2012-03-01 13:40:51 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
pupnp/trunk: Initial commit, does not compile yet
Added Paths:
-----------
csw/mgar/pkg/pupnp/
csw/mgar/pkg/pupnp/Makefile
csw/mgar/pkg/pupnp/branches/
csw/mgar/pkg/pupnp/tags/
csw/mgar/pkg/pupnp/trunk/
csw/mgar/pkg/pupnp/trunk/Makefile
csw/mgar/pkg/pupnp/trunk/checksums
csw/mgar/pkg/pupnp/trunk/files/
csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch
csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch
csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec
Added: csw/mgar/pkg/pupnp/Makefile
===================================================================
--- csw/mgar/pkg/pupnp/Makefile (rev 0)
+++ csw/mgar/pkg/pupnp/Makefile 2012-03-01 13:40:51 UTC (rev 17254)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/pupnp/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/pupnp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pupnp/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/pupnp/trunk/Makefile 2012-03-01 13:40:51 UTC (rev 17254)
@@ -0,0 +1,45 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libupnp
+VERSION = 1.6.15
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = Portable UPnP SDK
+define BLURB
+endef
+
+SF_PROJ = pupnp
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tar.bz2
+
+# Add patch from SFE originally to be found at
+# http://pkgbuild.svn.sourceforge.net/svnroot/pkgbuild/spec-files-extra/trunk/patches/libupnp-01-solaris.spec
+# PATCHFILES += libupnp-01-solaris.spec
+
+PATCHFILES += 0001-Add-includes-for-Solaris.patch
+PATCHFILES += 0002-Use-inttypes.h-if-stdint.h-is-not-available.patch
+
+PACKAGES += CSWmypkg
+SPKG_DESC_CSWmypkg = My package
+PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1)
+PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec)
+PKGFILES_CSWmypkg += $(sysconfdir)/myconf
+
+# "VERSION\" | sed " configure
+REINPLACEMENTS += gsed
+REINPLACE_MATCH_gsed = VERSION\"\ \|\ sed
+REINPLACE_WITH_gsed = VERSION\" | gsed
+REINPLACE_FILES_gsed += configure
+
+
+BUILD64_LIBS_ONLY = 1
+
+# From README
+EXTRA_CFLAGS += -D__sun
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+
Property changes on: csw/mgar/pkg/pupnp/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/pupnp/trunk/checksums
===================================================================
--- csw/mgar/pkg/pupnp/trunk/checksums (rev 0)
+++ csw/mgar/pkg/pupnp/trunk/checksums 2012-03-01 13:40:51 UTC (rev 17254)
@@ -0,0 +1 @@
+1b21e5b5fb6185101c467aefd19f0bf7 libupnp-1.6.15.tar.bz2
Added: csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch (rev 0)
+++ csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch 2012-03-01 13:40:51 UTC (rev 17254)
@@ -0,0 +1,25 @@
+From b2d7dc97a2498339e01cc2799e6e27640f83cca2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen
+Date: Thu, 1 Mar 2012 13:43:07 +0100
+Subject: [PATCH] Add includes for Solaris
+
+---
+ upnp/inc/UpnpInet.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/upnp/inc/UpnpInet.h b/upnp/inc/UpnpInet.h
+index 6269c4a..a51cdc5 100644
+--- a/upnp/inc/UpnpInet.h
++++ b/upnp/inc/UpnpInet.h
+@@ -30,6 +30,8 @@
+ #if defined(__sun)
+ #include
+ #include
++ #include
++ #include
+ #elif (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
+ #include
+ /* Do not move or remove the include below for "sys/socket"!
+--
+1.7.9
+
Added: csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch
===================================================================
--- csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch (rev 0)
+++ csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch 2012-03-01 13:40:51 UTC (rev 17254)
@@ -0,0 +1,28 @@
+From b32cacc18632995c2ac265eb323b30e2c2ee1b56 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen
+Date: Thu, 1 Mar 2012 14:09:24 +0100
+Subject: [PATCH] Use inttypes.h if stdint.h is not available
+
+---
+ upnp/inc/UpnpStdInt.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/upnp/inc/UpnpStdInt.h b/upnp/inc/UpnpStdInt.h
+index 9256f57..f87c095 100644
+--- a/upnp/inc/UpnpStdInt.h
++++ b/upnp/inc/UpnpStdInt.h
+@@ -4,7 +4,11 @@
+ #if !defined(UPNP_USE_BCBPP)
+
+ /* Sized integer types. */
++#if defined( HAVE_STDINT_H )
+ #include
++#elsif defined( HAVE_INTTYPES_H )
++#include
++#endif
+
+ #ifdef UPNP_USE_MSVCPP
+ /* no ssize_t defined for VC */
+--
+1.7.9
+
Added: csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec
===================================================================
--- csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec (rev 0)
+++ csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec 2012-03-01 13:40:51 UTC (rev 17254)
@@ -0,0 +1,42 @@
+--- libupnp-1.6.0/README.orig 2007-07-15 15:19:30.541726415 +0700
++++ libupnp-1.6.0/README 2007-07-15 15:20:12.555440132 +0700
+@@ -111,7 +111,7 @@
+ options enabled (see below for options available at configure time).
+
+ % cd $(LIBUPNP)
+-% ./configure CFLAGS="-DSPARC_SOLARIS -mtune= -mcpu="
++% ./configure CFLAGS="-DSOLARIS -mtune= -mcpu="
+ % make
+
+ will build a Sparc Solaris version of the binaries without debug support
+@@ -247,7 +247,7 @@
+ described above. Only the call to ./configure has to be done using an
+ additional parameter:
+
+-./configure CFLAGS="-mcpu= -mtune= -DSPARC_SOLARIS"
++./configure CFLAGS="-mcpu= -mtune= -DSOLARIS"
+
+ where has to be replaced by the appropriate CPU tuning flag (e.g.
+ "supersparc"). Afterwards
+--- libupnp-1.6.6/upnp/src/genlib/net/uri/uri.c.orig 2008-11-13 13:58:53.675111848 +0800
++++ libupnp-1.6.6/upnp/src/genlib/net/uri/uri.c 2008-11-13 14:36:42.044847654 +0800
+@@ -627,7 +627,7 @@
+ // platform-specific stuff below
+ #if defined(WIN32) || defined(__CYGWIN__)
+ h = gethostbyname(temp_host_name);
+-#elif defined(SPARC_SOLARIS)
++#elif defined(SOLARIS)
+ errCode = gethostbyname_r(
+ temp_host_name,
+ &h,
+--- libupnp-1.6.6/upnp/src/api/upnpapi.c.orig 2008-11-13 14:51:07.131616887 +0800
++++ libupnp-1.6.6/upnp/src/api/upnpapi.c 2008-11-13 14:51:52.992915327 +0800
+@@ -56,7 +56,7 @@
+ #include
+
+
+- #if defined(_sun)
++ #if defined(SOLARIS)
+ #include
+ #include
+ #elif defined(BSD) && BSD >= 199306
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 Mar 1 14:46:48 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Mar 2012 13:46:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[17255] csw/mgar/pkg/cpan/makemake
Message-ID:
Revision: 17255
http://gar.svn.sourceforge.net/gar/?rev=17255&view=rev
Author: dmichelsen
Date: 2012-03-01 13:46:48 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
makemake: General rewort
Modified Paths:
--------------
csw/mgar/pkg/cpan/makemake
Modified: csw/mgar/pkg/cpan/makemake
===================================================================
--- csw/mgar/pkg/cpan/makemake 2012-03-01 13:40:51 UTC (rev 17254)
+++ csw/mgar/pkg/cpan/makemake 2012-03-01 13:46:48 UTC (rev 17255)
@@ -1,5 +1,11 @@
#!/opt/csw/bin/perl
+# This is a tool to make Makefiles for CPAN modules
+# Usage:
+# makemake My::Module
+# It generate My-Module/trunk/Makefile and modified it accordingly. If the Makefile is already there it
+# it overwritten and can be inspected with "svn diff".
+
use strict;
use warnings;
use feature ':5.10';
@@ -16,21 +22,11 @@
use Parallel::ForkManager;
use JSON;
-# TBD:
-# [10:14] El_Che: no fix for require, but it gives you filenames of the source
-# [10:16] Dagobert: Ahhhh.... sorry, I missed that
-# [10:16] Dagobert: How does it work? Does it access a static copy of the CPAN database?
-# [10:17] El_Che: I guess it looks locally looking at the deployed modules
-# [10:17] El_Che: looks looking
-# [10:17] El_Che: goodmorning
-# [10:18] El_Che: there is also a path option
-
# These three routines are used to capture the output of sub processes and
# perl routines (such as CPAN::Module::get) into a log file. If the command
# completes successfuly, the log file is thrown away. If the command fails,
# the log file is printed along with an error message by calling fail.
-
### Variables ###
my ( $verbose, $logfile, $pgm );
my $cpandir = getcwd;
@@ -115,11 +111,12 @@
@runtime_dep_pkgs = dep_pkgs($req);
}
-$description //= $mod->description; # Changed to defined from false or
+$description //= $mod->description; # Changed to defined from false or
$description //= $mod->manpage_headline;
$description //= $mod->distribution->as_glimpse;
$description //= "";
$description = ucfirst($description);
+$description =~ s/\.$//; # Strip trailing .
chomp($description);
# Come back from cpan module build directory to GAR cpan/
@@ -153,13 +150,6 @@
}
say {$mf_fh} "" if ($upstreaminfo);
-if (@build_dep_pkgs) {
- foreach my $p (@build_dep_pkgs) {
- say {$mf_fh} "BUILD_DEP_PKGS += $p";
- }
- say {$mf_fh} "";
-}
-
say {$mf_fh} "CATALOG_RELEASE = unstable";
say {$mf_fh} "";
@@ -170,6 +160,13 @@
}
}
+if (@build_dep_pkgs) {
+ foreach my $p (@build_dep_pkgs) {
+ say {$mf_fh} "BUILD_DEP_PKGS += $p";
+ }
+ say {$mf_fh} "";
+}
+
say {$mf_fh} "PACKAGES += $cswpkg";
say {$mf_fh} "CATALOGNAME_$cswpkg = $cswcatalog";
say {$mf_fh} "SPKG_DESC_$cswpkg = $description";
@@ -191,33 +188,19 @@
if ( @oldpkgs > 1 ) {
say STDERR "ERROR: More than one package for module '$modname' found: @oldpkgs";
}
-my $oldpkg = shift @oldpkgs;
-if ( $oldpkg ne $cswpkg ) {
+foreach my $oldpkg (@oldpkgs) {
+ if( $cswpkg eq $oldpkg ) {
+ say STDERR "A previous version of this package $cswpkg has been released";
+ next;
+ }
+ say STDERR "A previous version of this package $cswpkg was released, but was named $oldpkg then";
+
say {$mf_fh} "OBSOLETED_BY_$cswpkg += $oldpkg";
- my $ua = LWP::UserAgent->new;
- $ua->timeout(300);
- $ua->proxy( [ 'http', 'ftp' ], 'http://proxy:3128' );
-
- my $catalog = "unstable";
- my $arch = "sparc";
- my $rel = "SunOS5.10";
-
- my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$oldpkg/";
-
- my $response = $ua->get($url);
-
- if ( $response->is_success ) {
- my $json_string = $response->decoded_content; # or whatever
- if ( $json_string eq "null" ) {
- say "Couldn't find package $oldpkg in $catalog:$arch:$rel";
- } else {
- my $data = decode_json $json_string;
- my $cname = $data->{catalogname};
- say {$mf_fh} "CATALOGNAME_$oldpkg = ${cname}_stub";
- }
- } else {
- print "Error getting $url\n" . $response->status_line;
+ my $data = getpkgdata( $oldpkg );
+ if( $data ) {
+ my $cname = $data->{catalogname};
+ say {$mf_fh} "CATALOGNAME_$oldpkg = ${cname}_stub";
}
}
@@ -236,7 +219,7 @@
sub dep_pkgs {
my $req = shift @_;
- my @result;
+ my %result;
foreach my $modname ( keys %$req ) {
my $version = version->parse( $req->{$modname} );
if ( $modname eq "perl" ) {
@@ -245,19 +228,34 @@
}
next;
}
- if ( $version > version->parse( get_version($modname) ) ) {
- print STDERR "Version of $modname is too old. Required is $version, installed is ",
- ( get_version($modname) or "nothing" ), "\n";
+
+ if( get_version( $modname ) ) {
+ if ( $version > version->parse( get_version($modname) ) ) {
+ say STDERR "Version of $modname is too old. Required is $version, installed is ",
+ get_version($modname);
+ # XXX: Is there something newer in the catalog?
+ # XXX: If not, recommend updating the recipe with makemake
+ }
+ } else {
+ # The module is not installed
+ # XXX: Compare against package version in the catalog
}
my @pkgs = mod2pkg($modname);
if ( @pkgs > 1 ) {
print STDERR "ERROR: More than one package for module '$modname' found: @pkgs\n";
}
- my $pkg = shift @pkgs;
+ my $pkg = $pkgs[0];
if ($pkg) {
- print STDERR "Packages for module '$modname': $pkg\n";
+ say STDERR "Packages for module '$modname': ", join( ", ", @pkgs );
next if ( $pkg eq 'CSWperl' );
+
+ my ( $guessedpkg, $dirname ) = guess_name_from_module($modname);
+
+ if( $pkg ne $guessedpkg ) {
+ print STDERR "ERROR: Found package name '$pkg' is not consistent to the " .
+ "canonical '$guessedpkg', please invoke makemake $modname\n";
+ }
} else {
print STDERR "MISSING package for '$modname'\n";
@@ -272,10 +270,10 @@
}
}
}
- push @result, $pkg if ($pkg);
+ $result{$pkg} = 1 if ($pkg);
}
- return @result;
+ return keys %result;
}
sub endlog {
@@ -377,9 +375,10 @@
$pm->wait_all_children;
- print "Matched packages: ", join( ", ", keys %pkgs ), "\n";
+ # print "Matched packages: ", join( ", ", keys %pkgs ), "\n";
- return keys %pkgs;
+ # Perl may provide the functionality itself, although there is a more up-to-date module
+ return ( exists $pkgs{CSWperl} ? "CSWperl" : keys %pkgs );
}
@@ -399,3 +398,35 @@
return %pkgs;
}
+
+sub getpkgdata {
+ my ($pkg) = @_;
+
+ my $ua = LWP::UserAgent->new;
+ $ua->timeout(300);
+ $ua->proxy( [ 'http', 'ftp' ], 'http://proxy:3128' );
+
+ my $catalog = "unstable";
+ my $arch = "sparc";
+ my $rel = "SunOS5.10";
+
+ my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$pkg/";
+
+ my $response = $ua->get($url);
+
+ # version is "version": "1.6.4,REV=2011.11.24"
+
+ my $data;
+ if ( $response->is_success ) {
+ my $json_string = $response->decoded_content; # or whatever
+ if ( $json_string eq "null" ) {
+ say STDERR "Couldn't find package $pkg in $catalog:$arch:$rel";
+ } else {
+ $data = decode_json $json_string;
+ }
+ } else {
+ print STDERR "Error getting $url\n" . $response->status_line;
+ }
+
+ return $data;
+}
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 Mar 1 17:02:11 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Mar 2012 16:02:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[17256] csw/mgar/pkg/varnish/trunk
Message-ID:
Revision: 17256
http://gar.svn.sourceforge.net/gar/?rev=17256&view=rev
Author: dmichelsen
Date: 2012-03-01 16:02:10 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
varnish/trunk: Update to 3.0.2, testsuite still has problems
Modified Paths:
--------------
csw/mgar/pkg/varnish/trunk/Makefile
csw/mgar/pkg/varnish/trunk/checksums
Modified: csw/mgar/pkg/varnish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/varnish/trunk/Makefile 2012-03-01 13:46:48 UTC (rev 17255)
+++ csw/mgar/pkg/varnish/trunk/Makefile 2012-03-01 16:02:10 UTC (rev 17256)
@@ -1,36 +1,42 @@
# $Id$
NAME = varnish
-VERSION = 2.1.3
+VERSION = 3.0.2
CATEGORIES = apps
GARTYPE = v2
DESCRIPTION = Varnish Web Cache
define BLURB
- Long description
endef
-MASTER_SITES = http://www.varnish-software.com/sites/default/files/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+MASTER_SITES = http://repo.varnish-cache.org/source/
+DISTFILES += $(DISTNAME).tar.gz
# From http://www.varnish-cache.org/trac/ticket/663
-PATCHFILES = varnish_autoconf_pthread.patch
+#PATCHFILES = varnish_autoconf_pthread.patch
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
VENDOR_URL = http://www.varnish-cache.org
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+LICENSE = LICENSE
+
+BUILD_DEP_PKGS += CSWlibpcre-dev
+
+# TBD: http://www.gossamer-threads.com/lists/varnish/bugs/2283
+
# Otherwise testsuite is failing
LD_OPTIONS =
EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-BUILD64_LIBS_ONLY = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
+EXTRA_CPPFLAGS = -D__inline=
+
+EXTRA_CONFIGURE_EXPORTS = VCC_CC
+VCC_CC = $(CC) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) -o %o %s
+
include gar/category.mk
-pre-configure-modulated:
- -cd $(WORKSRC) && autoreconf -fi
- @$(MAKECOOKIE)
+#pre-configure-modulated:
+# -cd $(WORKSRC) && autoreconf -fi
+# @$(MAKECOOKIE)
Modified: csw/mgar/pkg/varnish/trunk/checksums
===================================================================
--- csw/mgar/pkg/varnish/trunk/checksums 2012-03-01 13:46:48 UTC (rev 17255)
+++ csw/mgar/pkg/varnish/trunk/checksums 2012-03-01 16:02:10 UTC (rev 17256)
@@ -1 +1 @@
-357d99a760de173d841ac37bf2052be8 varnish-2.1.3.tar.gz
+c8eae0aabbe66b6daabdf3a1f58cd47a varnish-3.0.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 Mar 1 17:05:30 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Mar 2012 16:05:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[17257] csw/mgar/pkg
Message-ID:
Revision: 17257
http://gar.svn.sourceforge.net/gar/?rev=17257&view=rev
Author: dmichelsen
Date: 2012-03-01 16:05:30 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
libedit/trunk: Initial commit, not finished
Added Paths:
-----------
csw/mgar/pkg/libedit/
csw/mgar/pkg/libedit/Makefile
csw/mgar/pkg/libedit/branches/
csw/mgar/pkg/libedit/tags/
csw/mgar/pkg/libedit/trunk/
csw/mgar/pkg/libedit/trunk/Makefile
csw/mgar/pkg/libedit/trunk/checksums
csw/mgar/pkg/libedit/trunk/files/
csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch
Added: csw/mgar/pkg/libedit/Makefile
===================================================================
--- csw/mgar/pkg/libedit/Makefile (rev 0)
+++ csw/mgar/pkg/libedit/Makefile 2012-03-01 16:05:30 UTC (rev 17257)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/libedit/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/libedit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libedit/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/libedit/trunk/Makefile 2012-03-01 16:05:30 UTC (rev 17257)
@@ -0,0 +1,37 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+# ! Installation needs to be relocated to DESTDIR by using INSTALL_OVERRIDE_VARS
+# ! Linkage of libedit.so needs a SONAME, probably libedit.so.1
+# ! Package creation is missing
+
+NAME = libedit
+VERSION = 0.3
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = Non-GPL replacement for readline library
+define BLURB
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTNAME = libedit
+DISTFILES = $(NAME)-$(VERSION).tar.gz
+
+PATCHFILES += 0001-Add-definition-for-sig_t.patch
+
+BUILD64_LIBS_ONLY = 1
+
+# The vis.h is completely different what libedit expects
+EXTRA_CONFIGURE_ENV += ac_cv_header_vis_h=no
+
+EXTRA_CFLAGS += $(CPPFLAGS)
+EXTRA_INC += $(includedir)/ncurses
+
+CONFIGURE_ARGS += $(DIRPATHS)
+
+TEST_TARGET = TEST
+TEST_OVERRIDE_VARS = LDADD
+TEST_OVERRIDE_VAR_LDADD = $(LDFLAGS)
+
+include gar/category.mk
+
Property changes on: csw/mgar/pkg/libedit/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/libedit/trunk/checksums
===================================================================
--- csw/mgar/pkg/libedit/trunk/checksums (rev 0)
+++ csw/mgar/pkg/libedit/trunk/checksums 2012-03-01 16:05:30 UTC (rev 17257)
@@ -0,0 +1 @@
+252fbaa3812f0034715f7e78203897ec libedit-0.3.tar.gz
Added: csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch
===================================================================
--- csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch (rev 0)
+++ csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch 2012-03-01 16:05:30 UTC (rev 17257)
@@ -0,0 +1,24 @@
+From 0c52ba0a8b12b1eccbe87a7c03591b28d8c23a6f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen
+Date: Thu, 1 Mar 2012 16:53:53 +0100
+Subject: [PATCH] Add definition for sig_t
+
+---
+ sig.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/sig.h b/sig.h
+index e7231b6..5a68e8a 100644
+--- a/sig.h
++++ b/sig.h
+@@ -62,6 +62,7 @@
+ _DO(SIGCONT) \
+ _DO(SIGWINCH)
+
++typedef int sig_t;
+ typedef sig_t *el_signal_t;
+
+ protected void sig_end(EditLine*);
+--
+1.7.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 Fri Mar 2 01:56:55 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 02 Mar 2012 00:56:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[17258] csw/mgar/pkg/php5/trunk/Makefile
Message-ID:
Revision: 17258
http://gar.svn.sourceforge.net/gar/?rev=17258&view=rev
Author: bdwalton
Date: 2012-03-02 00:56:55 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
php5/trunk: ensure that the default php.ini file has extension=session.so; mantis 4905,4911
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2012-03-01 16:05:30 UTC (rev 17257)
+++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 00:56:55 UTC (rev 17258)
@@ -365,5 +365,9 @@
@$(MAKECOOKIE)
post-merge:
+ @echo " ==> Killing phar"
@(rm $(PKGROOT)/opt/csw/php5/extensions/phar)
+ @echo " ==> Fixing php.ini: adding loadable session.so support"
+ @( cd $(PKGROOT)/$(sysconfdir)/$(NAME); \
+ perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini; )
@$(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 Fri Mar 2 02:10:33 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 02 Mar 2012 01:10:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[17259] csw/mgar/pkg/php5/trunk/Makefile
Message-ID:
Revision: 17259
http://gar.svn.sourceforge.net/gar/?rev=17259&view=rev
Author: bdwalton
Date: 2012-03-02 01:10:33 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
php5/trunk: sysconfdir already includes NAME (fix post-merge)
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 00:56:55 UTC (rev 17258)
+++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 01:10:33 UTC (rev 17259)
@@ -368,6 +368,6 @@
@echo " ==> Killing phar"
@(rm $(PKGROOT)/opt/csw/php5/extensions/phar)
@echo " ==> Fixing php.ini: adding loadable session.so support"
- @( cd $(PKGROOT)/$(sysconfdir)/$(NAME); \
+ @( cd $(PKGROOT)/$(sysconfdir)/; \
perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini; )
@$(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 Fri Mar 2 02:20:08 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 02 Mar 2012 01:20:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[17260] csw/mgar/pkg/php5/trunk/Makefile
Message-ID:
Revision: 17260
http://gar.svn.sourceforge.net/gar/?rev=17260&view=rev
Author: bdwalton
Date: 2012-03-02 01:20:08 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
php5/trunk: the ini file is already moved into template position after merge; fix the post-merge fixup
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 01:10:33 UTC (rev 17259)
+++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 01:20:08 UTC (rev 17260)
@@ -369,5 +369,5 @@
@(rm $(PKGROOT)/opt/csw/php5/extensions/phar)
@echo " ==> Fixing php.ini: adding loadable session.so support"
@( cd $(PKGROOT)/$(sysconfdir)/; \
- perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini; )
+ perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; )
@$(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 Mar 2 16:04:39 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 15:04:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[17261]
csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile
Message-ID:
Revision: 17261
http://gar.svn.sourceforge.net/gar/?rev=17261&view=rev
Author: dmichelsen
Date: 2012-03-02 15:04:39 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/Test-use-ok/trunk: Update to sane naming
Modified Paths:
--------------
csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile
Modified: csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile 2012-03-02 01:20:08 UTC (rev 17260)
+++ csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile 2012-03-02 15:04:39 UTC (rev 17261)
@@ -8,11 +8,15 @@
define BLURB
endef
-DISTFILES = COPYING
+DISTFILES += COPYING
-PACKAGES = CSWpmtestuseok
-CATALOGNAME = pm_testuseok
+CATALOG_RELEASE = unstable
-ARCHALL = 1
+PACKAGES += CSWpm-ok
+CATALOGNAME_CSWpm-ok = pm_ok
+SPKG_DESC_CSWpm-ok = Alternative to Test::More::use_ok
+ARCHALL_CSWpm-ok = 1
+OBSOLETED_BY_CSWpm-ok += CSWpmtestuseok
+CATALOGNAME_CSWpmtestuseok = pm_testuseok_stub
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 Mar 2 16:06:15 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 15:06:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[17262]
csw/mgar/pkg/cpan/Params-Util/trunk
Message-ID:
Revision: 17262
http://gar.svn.sourceforge.net/gar/?rev=17262&view=rev
Author: dmichelsen
Date: 2012-03-02 15:06:15 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/Params-Util/trunk: Update to 1.06 and sane package naming
Modified Paths:
--------------
csw/mgar/pkg/cpan/Params-Util/trunk/Makefile
csw/mgar/pkg/cpan/Params-Util/trunk/checksums
Modified: csw/mgar/pkg/cpan/Params-Util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Params-Util/trunk/Makefile 2012-03-02 15:04:39 UTC (rev 17261)
+++ csw/mgar/pkg/cpan/Params-Util/trunk/Makefile 2012-03-02 15:06:15 UTC (rev 17262)
@@ -1,16 +1,21 @@
NAME = Params-Util
-VERSION = 1.00
+VERSION = 1.06
CATEGORIES = cpan
GARTYPE = v2
AUTHOR = ADAMK
DESCRIPTION = Simple, compact and correct param-checking functions
define BLURB
- "Params::Util" provides a basic set of importable functions that makes
- checking parameters a hell of a lot easier
endef
-PACKAGES = CSWpmparamsutil
-CATALOGNAME = pm_paramsutil
+CATALOG_RELEASE = unstable
+LICENSE = LICENSE
+
+PACKAGES += CSWpm-params-util
+CATALOGNAME_CSWpm-params-util = pm_params_util
+SPKG_DESC_CSWpm-params-util = Simple, compact and correct param-checking functions
+OBSOLETED_BY_CSWpm-params-util += CSWpmparamsutil
+CATALOGNAME_CSWpmparamsutil = pm_paramsutil_stub
+
include gar/category.mk
Modified: csw/mgar/pkg/cpan/Params-Util/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Params-Util/trunk/checksums 2012-03-02 15:04:39 UTC (rev 17261)
+++ csw/mgar/pkg/cpan/Params-Util/trunk/checksums 2012-03-02 15:06:15 UTC (rev 17262)
@@ -1 +1 @@
-827ba4b8bed00e718cea60321129be41 download/Params-Util-1.00.tar.gz
+e2d155ad4f1b4b32c22b215cfdf49b8c Params-Util-1.06.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 Mar 2 16:08:38 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 15:08:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[17263]
csw/mgar/pkg/cpan/Sub-Install/trunk
Message-ID:
Revision: 17263
http://gar.svn.sourceforge.net/gar/?rev=17263&view=rev
Author: dmichelsen
Date: 2012-03-02 15:08:38 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/Sub-Install/trunk: Update to 0.926 and sanitize package naming
Modified Paths:
--------------
csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile
csw/mgar/pkg/cpan/Sub-Install/trunk/checksums
Modified: csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile 2012-03-02 15:06:15 UTC (rev 17262)
+++ csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile 2012-03-02 15:08:38 UTC (rev 17263)
@@ -1,5 +1,5 @@
NAME = Sub-Install
-VERSION = 0.925
+VERSION = 0.926
CATEGORIES = cpan
GARTYPE = v2
AUTHOR = RJBS
@@ -8,11 +8,16 @@
define BLURB
endef
-PACKAGES = CSWpmsubinstall
-CATALOGNAME = pm_subinstall
+CATALOG_RELEASE = unstable
LICENSE = LICENSE
-ARCHALL = 1
+PACKAGES += CSWpm-sub-install
+CATALOGNAME_CSWpm-sub-install = pm_sub_install
+SPKG_DESC_CSWpm-sub-install = Install subroutines into packages easily
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-sub-install = 1
+OBSOLETED_BY_CSWpm-sub-install += CSWpmsubinstall
+CATALOGNAME_CSWpmsubinstall = pm_subinstall_stub
include gar/category.mk
Modified: csw/mgar/pkg/cpan/Sub-Install/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Sub-Install/trunk/checksums 2012-03-02 15:06:15 UTC (rev 17262)
+++ csw/mgar/pkg/cpan/Sub-Install/trunk/checksums 2012-03-02 15:08:38 UTC (rev 17263)
@@ -1 +1 @@
-694aaec771c42280746a9a6279683263 Sub-Install-0.925.tar.gz
+89a7f82dd840bc2401f281b5f24732b9 Sub-Install-0.926.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 Mar 2 16:25:24 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 15:25:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[17264] csw/mgar/pkg/cpan
Message-ID:
Revision: 17264
http://gar.svn.sourceforge.net/gar/?rev=17264&view=rev
Author: dmichelsen
Date: 2012-03-02 15:25:23 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/MouseX-Traits/trunk: Initial commit
Added Paths:
-----------
csw/mgar/pkg/cpan/MouseX-Traits/
csw/mgar/pkg/cpan/MouseX-Traits/branches/
csw/mgar/pkg/cpan/MouseX-Traits/tags/
csw/mgar/pkg/cpan/MouseX-Traits/trunk/
csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile
csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums
csw/mgar/pkg/cpan/MouseX-Traits/trunk/files/
Property changes on: csw/mgar/pkg/cpan/MouseX-Traits/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile 2012-03-02 15:25:23 UTC (rev 17264)
@@ -0,0 +1,26 @@
+NAME = MouseX-Traits
+VERSION = 0.1102
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = GFUJI
+
+DESCRIPTION = Automatically apply roles at object creation time
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+BUILD_DEP_PKGS += CSWpm-ok
+BUILD_DEP_PKGS += CSWpm-test-exception
+
+# Really no license
+CHECKPKG_OVERRIDES_CSWpm-mousex-traits += license-missing|/opt/csw/share/doc/pm_mousex_traits/license
+
+PACKAGES += CSWpm-mousex-traits
+CATALOGNAME_CSWpm-mousex-traits = pm_mousex_traits
+SPKG_DESC_CSWpm-mousex-traits = Automatically apply roles at object creation time
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-mousex-traits = 1
+RUNTIME_DEP_PKGS_CSWpm-mousex-traits += CSWpm-mouse
+
+include gar/category.mk
Added: csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums (rev 0)
+++ csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums 2012-03-02 15:25:23 UTC (rev 17264)
@@ -0,0 +1 @@
+47763484e2298c20fc1d0e779abe5c2c MouseX-Traits-0.1102.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 Mar 2 17:52:17 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 16:52:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[17265]
csw/mgar/pkg/cpan/Data-OptList/trunk
Message-ID:
Revision: 17265
http://gar.svn.sourceforge.net/gar/?rev=17265&view=rev
Author: dmichelsen
Date: 2012-03-02 16:52:16 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/Data-OptList/trunk: Update to 0.107, sanitize package name and update dependencies
Modified Paths:
--------------
csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile
csw/mgar/pkg/cpan/Data-OptList/trunk/checksums
Modified: csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile 2012-03-02 15:25:23 UTC (rev 17264)
+++ csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile 2012-03-02 16:52:16 UTC (rev 17265)
@@ -1,5 +1,5 @@
NAME = Data-OptList
-VERSION = 0.106
+VERSION = 0.107
CATEGORIES = cpan
GARTYPE = v2
AUTHOR = RJBS
@@ -8,13 +8,17 @@
define BLURB
endef
-PACKAGES = CSWpmdataoptlist
-CATALOGNAME = pm_dataoptlist
+CATALOG_RELEASE = unstable
-DEP_PKGS = CSWpmsubinstall
-
LICENSE = LICENSE
-ARCHALL = 1
+PACKAGES += CSWpm-data-optlist
+CATALOGNAME_CSWpm-data-optlist = pm_data_optlist
+SPKG_DESC_CSWpm-data-optlist = Parse and validate simple name/value option pairs
+ARCHALL_CSWpm-data-optlist = 1
+RUNTIME_DEP_PKGS_CSWpm-data-optlist += CSWpm-params-util
+RUNTIME_DEP_PKGS_CSWpm-data-optlist += CSWpm-sub-install
+OBSOLETED_BY_CSWpm-data-optlist += CSWpmdataoptlist
+CATALOGNAME_CSWpmdataoptlist = pm_dataoptlist_stub
include gar/category.mk
Modified: csw/mgar/pkg/cpan/Data-OptList/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Data-OptList/trunk/checksums 2012-03-02 15:25:23 UTC (rev 17264)
+++ csw/mgar/pkg/cpan/Data-OptList/trunk/checksums 2012-03-02 16:52:16 UTC (rev 17265)
@@ -1 +1 @@
-d2e2e74540f9a388a7d180849d63d03a Data-OptList-0.106.tar.gz
+17177b3cfb8941780a8736f9b9b30421 Data-OptList-0.107.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Fri Mar 2 20:10:47 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:10:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[17266]
csw/mgar/pkg/cmake/trunk/Makefile
Message-ID:
Revision: 17266
http://gar.svn.sourceforge.net/gar/?rev=17266&view=rev
Author: rthurner
Date: 2012-03-02 19:10:46 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cmake, checkpackage correction
Modified Paths:
--------------
csw/mgar/pkg/cmake/trunk/Makefile
Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile 2012-03-02 16:52:16 UTC (rev 17265)
+++ csw/mgar/pkg/cmake/trunk/Makefile 2012-03-02 19:10:46 UTC (rev 17266)
@@ -25,10 +25,7 @@
CATALOGNAME_CSWcmake = cmake
SPKG_DESC_CSWcmake = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWcmake += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWcmake += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1
-RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt
+RUNTIME_DEP_PKGS_CSWcmake += CSWlibidn11
datadir = /share/$(NAME)-$(VERSION)
sharedstatedir = /share
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Fri Mar 2 20:11:45 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:11:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[17267] csw/mgar/pkg/libserf/trunk
Message-ID:
Revision: 17267
http://gar.svn.sourceforge.net/gar/?rev=17267&view=rev
Author: rthurner
Date: 2012-03-02 19:11:44 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
libserf, upgrade to serf-1.0.1
Modified Paths:
--------------
csw/mgar/pkg/libserf/trunk/Makefile
csw/mgar/pkg/libserf/trunk/checksums
Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:10:46 UTC (rev 17266)
+++ csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:11:44 UTC (rev 17267)
@@ -1,5 +1,5 @@
NAME = libserf
-VERSION = 1.0.0
+VERSION = 1.0.1
DISTNAME = serf-$(VERSION)
CATEGORIES = lib
GARTYPE = v2
Modified: csw/mgar/pkg/libserf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libserf/trunk/checksums 2012-03-02 19:10:46 UTC (rev 17266)
+++ csw/mgar/pkg/libserf/trunk/checksums 2012-03-02 19:11:44 UTC (rev 17267)
@@ -1 +1 @@
-3b179ed18f65c43141528aa6d2440db4 serf-1.0.0.tar.bz2
+01ade77ba0502687aa42551db31316f1 serf-1.0.1.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Fri Mar 2 20:19:45 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:19:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[17268] csw/mgar/pkg/mercurial/trunk
Message-ID:
Revision: 17268
http://gar.svn.sourceforge.net/gar/?rev=17268&view=rev
Author: rthurner
Date: 2012-03-02 19:19:45 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
mercurial, upgrade to hg-2.1.1
Modified Paths:
--------------
csw/mgar/pkg/mercurial/trunk/Makefile
csw/mgar/pkg/mercurial/trunk/checksums
Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mercurial/trunk/Makefile 2012-03-02 19:11:44 UTC (rev 17267)
+++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-03-02 19:19:45 UTC (rev 17268)
@@ -1,5 +1,5 @@
NAME = mercurial
-VERSION = 2.1
+VERSION = 2.1.1
CATEGORIES = python
GARTYPE = v2
Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums 2012-03-02 19:11:44 UTC (rev 17267)
+++ csw/mgar/pkg/mercurial/trunk/checksums 2012-03-02 19:19:45 UTC (rev 17268)
@@ -1 +1 @@
-d2ca44f8d0129ab50639143af99d9363 mercurial-2.1.tar.gz
+368fab4705ebd4d1296fdd6bd2fe6272 mercurial-2.1.1.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Fri Mar 2 20:25:45 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:25:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[17269]
csw/mgar/pkg/libserf/trunk/Makefile
Message-ID:
Revision: 17269
http://gar.svn.sourceforge.net/gar/?rev=17269&view=rev
Author: rthurner
Date: 2012-03-02 19:25:45 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
libserf, upgrade checkpkg
Modified Paths:
--------------
csw/mgar/pkg/libserf/trunk/Makefile
Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:19:45 UTC (rev 17268)
+++ csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:25:45 UTC (rev 17269)
@@ -21,14 +21,14 @@
PACKAGES += CSWlibserf1-0
CATALOGNAME_CSWlibserf1-0 = libserf1_0
SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr-util
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWaprutil1-0
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWbdb48
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibz1
PACKAGES += CSWlibserf-dev
CATALOGNAME_CSWlibserf-dev = libserf_dev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Fri Mar 2 20:28:40 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:28:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[17270]
csw/mgar/pkg/libserf/trunk/Makefile
Message-ID:
Revision: 17270
http://gar.svn.sourceforge.net/gar/?rev=17270&view=rev
Author: rthurner
Date: 2012-03-02 19:28:40 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
libserf, upgrade checkpkg
Modified Paths:
--------------
csw/mgar/pkg/libserf/trunk/Makefile
Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:25:45 UTC (rev 17269)
+++ csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:28:40 UTC (rev 17270)
@@ -21,11 +21,12 @@
PACKAGES += CSWlibserf1-0
CATALOGNAME_CSWlibserf1-0 = libserf1_0
SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWaprutil1-0
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWbdb48
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWliblber2-4-2
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibldap2-4-2
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl0-9-8
RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibz1
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 Mar 2 20:55:34 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:55:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[17271] csw/mgar/pkg/cpan/TimeDate/trunk
Message-ID:
Revision: 17271
http://gar.svn.sourceforge.net/gar/?rev=17271&view=rev
Author: dmichelsen
Date: 2012-03-02 19:55:34 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/TimeDate/trunk: Sanitize package naming
Modified Paths:
--------------
csw/mgar/pkg/cpan/TimeDate/trunk/Makefile
csw/mgar/pkg/cpan/TimeDate/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING
Modified: csw/mgar/pkg/cpan/TimeDate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/TimeDate/trunk/Makefile 2012-03-02 19:28:40 UTC (rev 17270)
+++ csw/mgar/pkg/cpan/TimeDate/trunk/Makefile 2012-03-02 19:55:34 UTC (rev 17271)
@@ -4,16 +4,24 @@
GARTYPE = v2
AUTHOR = GBARR
-DESCRIPTION = parse date strings into time values
+DESCRIPTION = ASCII Date parser using regexps
define BLURB
- Date::Parse provides two routines for parsing date strings into time values.
endef
-DISTFILES = COPYING
+CATALOG_RELEASE = unstable
-PACKAGES = CSWpmtimedate
-CATALOGNAME = pm_timedate
+LICENSE = README
-ARCHALL = 1
+PACKAGES += CSWpm-date-parse
+CATALOGNAME_CSWpm-date-parse = pm_date_parse
+SPKG_DESC_CSWpm-date-parse = ASCII Date parser using regexps
+ARCHALL_CSWpm-date-parse = 1
+OBSOLETED_BY_CSWpm-date-parse += CSWpmtimedate
+CATALOGNAME_CSWpmtimedate = pm_timedate_stub
+# This is for a config file location we don't have at all, maybe we need
+# to provide one later:
+# /usr/share/lib/locale/LC_TIME/default
+CHECKPKG_OVERRIDES_CSWpm-date-parse += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Date/Format.pm
+
include gar/category.mk
Modified: csw/mgar/pkg/cpan/TimeDate/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/TimeDate/trunk/checksums 2012-03-02 19:28:40 UTC (rev 17270)
+++ csw/mgar/pkg/cpan/TimeDate/trunk/checksums 2012-03-02 19:55:34 UTC (rev 17271)
@@ -1,2 +1 @@
-548ae818969b549bf703fbea7d667c07 COPYING
7da7452bce4c684e4238e6d09b390200 TimeDate-1.20.tar.gz
Deleted: csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING 2012-03-02 19:28:40 UTC (rev 17270)
+++ csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING 2012-03-02 19:55:34 UTC (rev 17271)
@@ -1,4 +0,0 @@
-Copyright 1996-2000 Graham Barr. All rights reserved.
-
-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 Mar 2 20:59:49 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 19:59:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[17272]
csw/mgar/pkg/cpan/Math-Interpolate/trunk
Message-ID:
Revision: 17272
http://gar.svn.sourceforge.net/gar/?rev=17272&view=rev
Author: dmichelsen
Date: 2012-03-02 19:59:49 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
cpan/Math-Interpolate/trunk: Sanitize package name
Modified Paths:
--------------
csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile
csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec
csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype
Modified: csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile 2012-03-02 19:55:34 UTC (rev 17271)
+++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile 2012-03-02 19:59:49 UTC (rev 17272)
@@ -4,13 +4,24 @@
GARTYPE = v2
AUTHOR = BZAJAC
-DESCRIPTION = Useful routines for interpolating data sets
+DESCRIPTION = Interpolate the value Y from X using a list of pairs
define BLURB
- This is the Math::Interpolate package. This module contains several
- useful routines for interpolating data sets and finding where a given
- value lies in a sorted list.
endef
-DISTFILES += $(call admfiles,CSWpmmathinterpolate,prototype)
+CATALOG_RELEASE = unstable
+PACKAGES += CSWpm-math-interpolate
+CATALOGNAME_CSWpm-math-interpolate = pm_math_interpolate
+SPKG_DESC_CSWpm-math-interpolate = Interpolate the value Y from X using a list of pairs
+ARCHALL_CSWpm-math-interpolate = 1
+OBSOLETED_BY_CSWpm-math-interpolate += CSWpmmathinterpolate
+CATALOGNAME_CSWpmmathinterpolate = pm_mathinterpolate_stub
+
+# There is really no license
+CHECKPKG_OVERRIDES_CSWpm-math-interpolate += license-missing
+CHECKPKG_OVERRIDES_CSWpmmathinterpolate += license-missing
+
+# This is a problem in checkpkg, override for now
+CHECKPKG_OVERRIDES_CSWpmmathinterpolate += action-class-only-in-pkginfo|none
+
include gar/category.mk
Modified: csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums 2012-03-02 19:55:34 UTC (rev 17271)
+++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums 2012-03-02 19:59:49 UTC (rev 17272)
@@ -1,3 +1 @@
-dd2b50d8ad466ea56ea9217aea8b9558 download/CSWpmmathinterpolate.gspec
-e26501ffae36e5a4afc882109de179b7 download/CSWpmmathinterpolate.prototype
-1826c6c24b75a2a27964c3dac198adac download/Math-Interpolate-1.05.tar.gz
+1826c6c24b75a2a27964c3dac198adac Math-Interpolate-1.05.tar.gz
Deleted: csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec
===================================================================
--- csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec 2012-03-02 19:55:34 UTC (rev 17271)
+++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec 2012-03-02 19:59:49 UTC (rev 17272)
@@ -1,8 +0,0 @@
-%var bitname pm_mathinterpolate
-%var pkgname CSWpmmathinterpolate
-%var arch all
-%include url file://%{PKGLIB}/csw_cpan.gspec
-%copyright
-Copyright 1999, Blair Zajac
-
-This code is distributed under the same copyright terms as Perl itself.
Deleted: csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype
===================================================================
--- csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype 2012-03-02 19:55:34 UTC (rev 17271)
+++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype 2012-03-02 19:59:49 UTC (rev 17272)
@@ -1,20 +0,0 @@
-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/auto 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/Math 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/Math/Interpolate 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/Math/Interpolate/.packlist 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/man3 0755 root bin
-f none /opt/csw/share/man/man3/Math::Interpolate.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Math::IntervalSearch.3perl 0444 root bin
-d none /opt/csw/share/perl 0755 root bin
-d none /opt/csw/share/perl/csw 0755 root bin
-d none /opt/csw/share/perl/csw/Math 0755 root bin
-f none /opt/csw/share/perl/csw/Math/Interpolate.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Math/IntervalSearch.pm 0444 root bin
-i copyright=CSWpmmathinterpolate.copyright
-i depend=CSWpmmathinterpolate.depend
-i pkginfo=CSWpmmathinterpolate.pkginfo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From jake_goerzen at users.sourceforge.net Fri Mar 2 22:04:42 2012
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Fri, 02 Mar 2012 21:04:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[17273] csw/mgar/pkg
Message-ID:
Revision: 17273
http://gar.svn.sourceforge.net/gar/?rev=17273&view=rev
Author: jake_goerzen
Date: 2012-03-02 21:04:42 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
dnsmasq: Initial commit
Added Paths:
-----------
csw/mgar/pkg/dnsmasq/
csw/mgar/pkg/dnsmasq/Makefile
csw/mgar/pkg/dnsmasq/branches/
csw/mgar/pkg/dnsmasq/tags/
csw/mgar/pkg/dnsmasq/trunk/
csw/mgar/pkg/dnsmasq/trunk/Makefile
csw/mgar/pkg/dnsmasq/trunk/checksums
csw/mgar/pkg/dnsmasq/trunk/files/
Added: csw/mgar/pkg/dnsmasq/Makefile
===================================================================
--- csw/mgar/pkg/dnsmasq/Makefile (rev 0)
+++ csw/mgar/pkg/dnsmasq/Makefile 2012-03-02 21:04:42 UTC (rev 17273)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/dnsmasq/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/dnsmasq/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dnsmasq/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/dnsmasq/trunk/Makefile 2012-03-02 21:04:42 UTC (rev 17273)
@@ -0,0 +1,26 @@
+NAME = dnsmasq
+VERSION = 2.59
+GARTYPE = v2
+CATEGORIES = net
+
+DESCRIPTION = Lightweight DNS forwarder and DHCP server
+define BLURB
+ Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server. It is designed to provide DNS and, optionally, DHCP, to a small network. It can serve the names of local machines which are not in the global DNS. The DHCP server integrates with the DNS server and allows machines with DHCP-allocated addresses to appear in the DNS with names configured either in each host or in a central configuration file. Dnsmasq supports static and dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines.
+endef
+
+MASTER_SITES = http://www.thekelleys.org.uk/dnsmasq/
+DISTFILES = $(DISTNAME).tar.gz
+
+CONFIGURE_SCRIPTS =
+GARCOMPILER = GNU
+SKIPTEST = 1
+INSTALL_ARGS = PREFIX=/opt/csw MAKE=gmake INSTALL=ginstall
+
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+include gar/category.mk
+
+post-install-modulated:
+
+ perl -pi -e 's|/usr/local|/opt/csw|' \
+ $(DESTDIR)/opt/csw/share/man/man8/dnsmasq.8
Property changes on: csw/mgar/pkg/dnsmasq/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/dnsmasq/trunk/checksums
===================================================================
--- csw/mgar/pkg/dnsmasq/trunk/checksums (rev 0)
+++ csw/mgar/pkg/dnsmasq/trunk/checksums 2012-03-02 21:04:42 UTC (rev 17273)
@@ -0,0 +1 @@
+b5757ef2d7b651748eeebb88af29d7d6 dnsmasq-2.59.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 Mar 2 22:45:51 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 02 Mar 2012 21:45:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[17274] csw/mgar/pkg/vlc/trunk
Message-ID:
Revision: 17274
http://gar.svn.sourceforge.net/gar/?rev=17274&view=rev
Author: wahwah
Date: 2012-03-02 21:45:51 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
vlc/trunk: Building from a git snapshot
Modified Paths:
--------------
csw/mgar/pkg/vlc/trunk/Makefile
csw/mgar/pkg/vlc/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch
Removed Paths:
-------------
csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch
csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch
csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch
csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch
Modified: csw/mgar/pkg/vlc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 21:45:51 UTC (rev 17274)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = vlc
-VERSION = 1.2-git
+VERSION = 2.1-git
GARTYPE = v2
CATEGORIES = apps
@@ -13,20 +13,16 @@
# MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/
# DISTFILES = $(DISTNAME).tar.bz2
-# Solaris port
+# Building from the git master which has patches submitted by Maciej
MASTER_SITES = http://repo.or.cz/w/vlc/solaris.git/snapshot/
-DISTFILES = 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz
+DISTFILES = d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz
+NOTGITPATCH = 1
+
DISTNAME = solaris
-# WORKSRC = $(WORKDIR)/solaris
+PATCHFILES += 0006-Define-Encoding-in-vlc.desktop.patch
-# PATCHFILES += 0001-Disable-strange-check-this-may-be-dangerous.patch
-# PATCHFILES += 0002-Hack-around-missing-packed-pragma.patch
-# PATCHFILES += 0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch
-PATCHFILES += 0004-Bootstrap-on-Solaris.patch
-PATCHFILES += 0005-Work-around-the-lack-of-dirfd.patch
-
# We need e.g. stdbool.h
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -39,9 +35,9 @@
BUILD_DEP_PKGS += CSWlibx11devel
# This is for libxcb
-EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include
-EXTRA_LIB = /opt/csw/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+# EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include
+# EXTRA_LIB = /opt/csw/X11/lib
+# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
# Sun Studio implements packed attributes differently and compilations bails out:
# "include/vlc_codecs.h", line 36: #error: FIXME
@@ -65,18 +61,20 @@
CONFIGURE_ARGS += $(DIRPATHS)
# Not there yet, part of ffmpeg
-CONFIGURE_ARGS += --disable-avcodec
+# CONFIGURE_ARGS += --disable-avcodec
-# x264.c:431:9: error: 'x264_open_gop_names' undeclared (first use in this
-# function)
-CONFIGURE_ARGS += --disable-x264
+# No QT4 yet
+CONFIGURE_ARGS += --disable-qt4
+CONFIGURE_ARGS += --disable-skins2
-# No libpostproc yet
-#CONFIGURE_ARGS += --disable-postproc
+CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse"
+CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse"
-# No QT4 yet
-CONFIGURE_ARGS += --disable-qt4 --disable-skins2
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
+CONFIGURE_ARGS += --disable-mmx
+CONFIGURE_ARGS += --disable-sse
+
# Taken from http://wiki.videolan.org/Solaris
# CONFIGURE_ARGS += --disable-libgcrypt
# CONFIGURE_ARGS += --disable-remoteosd
@@ -88,7 +86,7 @@
# CONFIGURE_ARGS += --disable-a52
# CONFIGURE_ARGS += --disable-fribidi
# CONFIGURE_ARGS += --with-gnu-ld=no
-# CONFIGURE_ARGS += --disable-xcb
+CONFIGURE_ARGS += --disable-xcb
SKIPTEST = 1
@@ -96,40 +94,59 @@
# The catch-all package
SPKG_DESC_CSWvlc = $(DESCRIPTION)
RUNTIME_DEP_PKGS_CSWvlc += CSWfconfig
+RUNTIME_DEP_PKGS_CSWvlc += CSWfribidi
+RUNTIME_DEP_PKGS_CSWvlc += CSWliba52
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibavcodec53
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibavformat53
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibavutil51
RUNTIME_DEP_PKGS_CSWvlc += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWvlc += CSWlibdvdread
RUNTIME_DEP_PKGS_CSWvlc += CSWlibflac8
RUNTIME_DEP_PKGS_CSWvlc += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcrypt11
RUNTIME_DEP_PKGS_CSWvlc += CSWlibgdk-pixbuf2-0-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibgnutls26
RUNTIME_DEP_PKGS_CSWvlc += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibgpg-error0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWvlc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWvlc += CSWlibkate1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibmad0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibogg0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibpostproc52
RUNTIME_DEP_PKGS_CSWvlc += CSWlibproxy
RUNTIME_DEP_PKGS_CSWvlc += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibsamplerate0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibsmbclient0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeexdsp1
RUNTIME_DEP_PKGS_CSWvlc += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibswscale2
RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheora0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoraenc1
RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlc5
RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlccore5
RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbis0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibx264-120
RUNTIME_DEP_PKGS_CSWvlc += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWvlc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlua
RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage
+
CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/audio-vlc-default.sh
CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/video-vlc-default.sh
CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vlc/intf-vcd.txt
+CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vlc/vlc-thumb.c
PACKAGES += CSWvlc-dev
CATALOGNAME_CSWvlc-dev = vlc_dev
@@ -155,9 +172,18 @@
RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibiconv2
+# Doesn't work...?
+# CONFIG_SHELL = /opt/csw/bin/bash
+# EXTRA_EXPORTS += CONFIG_SHELL
+
include gar/category.mk
pre-configure-modulated:
# bootstrap defines #!/bin/sh and $(dirname ...)
- (cd $(WORKSRC) && $(CONFIGURE_ENV) bash ./bootstrap)
+ (cd $(WORKSRC) && $(CONFIGURE_ENV) \
+ CONFIG_SHELL=/opt/csw/bin/bash \
+ /opt/csw/bin/bash \
+ ./bootstrap)
@$(MAKECOOKIE)
+
+PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/vlc/trunk/checksums
===================================================================
--- csw/mgar/pkg/vlc/trunk/checksums 2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/checksums 2012-03-02 21:45:51 UTC (rev 17274)
@@ -1 +1,2 @@
-5dfeae611f841bf29549f0f2619b1c35 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz
+bd09bc490ecb8d19f1561a438c48043b 0006-Work-around-the-lack-of-dirfd.patch
+3857b512a3f1683178adef7e3c56e059 d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz
Deleted: csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch 2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch 2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,25 +0,0 @@
-From 3d21a9253d711ada5c766a9968009073791ee4eb Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen
-Date: Wed, 9 Nov 2011 13:22:04 +0100
-Subject: [PATCH] Disable strange check, this may be dangerous!
-
----
- src/misc/threads.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/misc/threads.c b/src/misc/threads.c
-index bbbb483..1eb612e 100644
---- a/src/misc/threads.c
-+++ b/src/misc/threads.c
-@@ -250,6 +250,6 @@ void vlc_global_mutex (unsigned n, bool acquire)
- vlc_mutex_unlock (lock);
-
- /* Compile-time assertion ;-) */
-- char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX];
-- (void) enough_locks;
-+ /* char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX];
-+ (void) enough_locks; */
- }
---
-1.7.6.1
-
Deleted: csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch 2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch 2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,25 +0,0 @@
-From 7e4ffba8e64b9f1906d6a20ddca31e65bdd227c9 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen
-Date: Wed, 9 Nov 2011 14:59:05 +0100
-Subject: [PATCH] Hack around missing packed pragma
-
----
- include/vlc_codecs.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
-index d97dcda..151f76c 100644
---- a/include/vlc_codecs.h
-+++ b/include/vlc_codecs.h
-@@ -33,7 +33,7 @@
- #ifdef HAVE_ATTRIBUTE_PACKED
- # define ATTR_PACKED __attribute__((__packed__))
- #else
--# error FIXME
-+# define ATTR_PACKED
- #endif
-
- /* Structures exported to the demuxers and decoders */
---
-1.7.6.1
-
Deleted: csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch 2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch 2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,39 +0,0 @@
-From f49471683d319bc45d4af3d6b9f4799520ff1264 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen
-Date: Wed, 9 Nov 2011 15:21:40 +0100
-Subject: [PATCH] Do not propagate vlc CFLAGS to linking
-
----
- bin/Makefile.am | 2 +-
- bin/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/Makefile.am b/bin/Makefile.am
-index 19dfb57..117568a 100644
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -8,7 +8,7 @@ EXTRA_DIST = vlc_win32_rc.rc.in
-
- SUFFIXES = .rc.in .rc
-
--AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-+AM_CFLAGS =
-
-
- if !HAVE_WIN32
-diff --git a/bin/Makefile.in b/bin/Makefile.in
-index 056bb04..d0acbf8 100644
---- a/bin/Makefile.in
-+++ b/bin/Makefile.in
-@@ -646,7 +646,7 @@ vlcdatadir = @vlcdatadir@
- vlclibdir = @vlclibdir@
- EXTRA_DIST = vlc_win32_rc.rc.in
- SUFFIXES = .rc.in .rc
--AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-+AM_CFLAGS =
- @HAVE_WIN32_FALSE@@HAVE_WINCE_FALSE at vlc_SOURCES = vlc.c override.c
- @HAVE_WIN32_TRUE at vlc_SOURCES = winvlc.c
- @HAVE_WINCE_TRUE at vlc_SOURCES = winvlc.c
---
-1.7.6.1
-
Deleted: csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch 2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch 2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,71 +0,0 @@
-From 5d5c633d80070ec43f7780e89fe15602dbc0b078 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski
-Date: Sun, 19 Feb 2012 09:47:31 +0100
-Subject: [PATCH 1/2] Bootstrap on Solaris
-
-Solaris /bin/sh does not support "$( ... )" nor "if ! test ..."
-
-Tested on Solaris 10.
----
- bootstrap | 14 +++++++++++---
- modules/genmf | 6 ++++--
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/bootstrap b/bootstrap
-index d315be2..1f478e2 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -22,7 +22,7 @@ export CYGWIN
- set -e
- set -x
-
--cd "$(dirname "$0")"
-+cd "`dirname "$0"`"
-
- ##
- ## Check for various tools
-@@ -66,8 +66,16 @@ fi
-
- # Check for autopoint (GNU gettext)
- export AUTOPOINT
--test "$AUTOPOINT" || AUTOPOINT=autopoint
--if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
-+if test "$AUTOPOINT"; then
-+ :
-+else
-+ AUTOPOINT=autopoint
-+fi
-+if "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
-+ # Solaris /bin/sh does not support "if ! test ...", we have to invert the
-+ # expression and use the "else" statement.
-+ :
-+else
- AUTOPOINT=true
- echo > ABOUT-NLS
- fi
-diff --git a/modules/genmf b/modules/genmf
-index d7b2887..11cd702 100755
---- a/modules/genmf
-+++ b/modules/genmf
-@@ -7,14 +7,16 @@
- ## Authors: Sam Hocevar
- ## R?mi Denis-Courmont
-
--cd $(dirname "$0")/.. || exit 1
-+cd `dirname "$0"`/.. || exit 1
-
- while test "$1"
- do
- printf "."
- dir="$1"
- modf="modules/${dir}/Modules.am"
-- if ! test -f "$modf"; then
-+ if test -f "$modf"; then
-+ :
-+ else
- echo "$modf does not exist!" >&2
- exit 1
- fi
---
-1.7.5.4
-
Added: csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch (rev 0)
+++ csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch 2012-03-02 21:45:51 UTC (rev 17274)
@@ -0,0 +1,26 @@
+From 5d548d76d99791231058e1650bb608aa454a2d0d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski
+Date: Tue, 28 Feb 2012 09:04:51 +0100
+Subject: [PATCH] Define "Encoding" in vlc.desktop
+
+"Encoding" is an obsolete key, but on Solaris 10 it seems to be necessary for
+VLC to build.
+---
+ share/vlc.desktop.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
+index 741e983..141686e 100644
+--- a/share/vlc.desktop.in
++++ b/share/vlc.desktop.in
+@@ -3,6 +3,7 @@ Version=1.0
+ Name=VLC media player
+ GenericName=Media player
+ Comment=Read, capture, broadcast your multimedia streams
++Encoding=UTF-8
+ Name[bn]=VLC ?????? ???????
+ Comment[bn]=????? ???????????? ??????? ????, ??? ????? ??? ????? ???
+ Name[br]=VLC lenner mediao?
+--
+1.7.9
+
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 Mar 2 23:04:35 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 02 Mar 2012 22:04:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[17275] csw/mgar/pkg/vlc/trunk/Makefile
Message-ID:
Revision: 17275
http://gar.svn.sourceforge.net/gar/?rev=17275&view=rev
Author: wahwah
Date: 2012-03-02 22:04:35 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
vlc/trunk: the sse flags make no sense, but it at least buids on x86
Modified Paths:
--------------
csw/mgar/pkg/vlc/trunk/Makefile
Modified: csw/mgar/pkg/vlc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 21:45:51 UTC (rev 17274)
+++ csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 22:04:35 UTC (rev 17275)
@@ -67,11 +67,10 @@
CONFIGURE_ARGS += --disable-qt4
CONFIGURE_ARGS += --disable-skins2
-CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse"
-CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse"
+EXTRA_CFLAGS_i386 += -mfpmath=sse -msse
+EXTRA_CXXFLAGS_i386 += -mfpmath=sse -msse
+EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH))
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
-
CONFIGURE_ARGS += --disable-mmx
CONFIGURE_ARGS += --disable-sse
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 Mar 2 23:57:07 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 02 Mar 2012 22:57:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[17276]
csw/mgar/pkg/lang-python/python/trunk/Makefile
Message-ID:
Revision: 17276
http://gar.svn.sourceforge.net/gar/?rev=17276&view=rev
Author: wahwah
Date: 2012-03-02 22:57:07 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
lang-python/python/trunk: Build for Solaris 10 separately
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/trunk/Makefile
Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-03-02 22:04:35 UTC (rev 17275)
+++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-03-02 22:57:07 UTC (rev 17276)
@@ -43,8 +43,12 @@
# http://bugs.python.org/issue3770
# However, this bug is about better detection of SEM_VALUE_MAX in Solaris
# http://bugs.python.org/issue3110
-# PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# There are header differences between Solaris 9 and 10. Programs that include
+# pyconfig.h from Solaris 9 installed on Solaris 10 can get wrong settings,
+# e.g. wrt _X_OPEN_SOURCE.
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
# Patches
PATCHFILES += faqwiz.diff
PATCHFILES += makesetup.diff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Sat Mar 3 01:20:37 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 03 Mar 2012 00:20:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[17277] csw/mgar/pkg/apr/trunk
Message-ID:
Revision: 17277
http://gar.svn.sourceforge.net/gar/?rev=17277&view=rev
Author: rthurner
Date: 2012-03-03 00:20:37 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
apr, upgrade to apr-1.4.6
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 2012-03-02 22:57:07 UTC (rev 17276)
+++ csw/mgar/pkg/apr/trunk/Makefile 2012-03-03 00:20:37 UTC (rev 17277)
@@ -1,5 +1,5 @@
NAME = apr
-VERSION = 1.4.5
+VERSION = 1.4.6
CATEGORIES = lib
GARTYPE = v2
Modified: csw/mgar/pkg/apr/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr/trunk/checksums 2012-03-02 22:57:07 UTC (rev 17276)
+++ csw/mgar/pkg/apr/trunk/checksums 2012-03-03 00:20:37 UTC (rev 17277)
@@ -1 +1 @@
-97262fe54dddaf583eaaee3497a426e1 apr-1.4.5.tar.gz
+76cc4457fbb71eefdafa27dba8f511fb apr-1.4.6.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 Sat Mar 3 02:53:52 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 03 Mar 2012 01:53:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[17278] csw/mgar/gar/v2/gar.lib.mk
Message-ID:
Revision: 17278
http://gar.svn.sourceforge.net/gar/?rev=17278&view=rev
Author: bdwalton
Date: 2012-03-03 01:53:42 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
gar/v2: no longer forcibly add the origin remote since git sets this up properly by default now
Modified Paths:
--------------
csw/mgar/gar/v2/gar.lib.mk
Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk 2012-03-03 00:20:37 UTC (rev 17277)
+++ csw/mgar/gar/v2/gar.lib.mk 2012-03-03 01:53:42 UTC (rev 17278)
@@ -78,25 +78,21 @@
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)); )
git-file//%:
@git clone --bare file:///$* $(PARTIALDIR)/$(call GITPROJ,$*)
@( cd $(PARTIALDIR)/$(call GITPROJ,$*); \
- git remote add origin file://$*; \
git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); )
git-ssh//%:
@git clone --bare ssh://$* $(PARTIALDIR)/$(call GITPROJ,$*)
@( cd $(PARTIALDIR)/$(call GITPROJ,$*); \
- git remote add origin ssh://$*; \
git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); )
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 Mar 3 10:26:59 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Mar 2012 09:26:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[17279] csw/mgar/pkg/vlc/trunk/Makefile
Message-ID:
Revision: 17279
http://gar.svn.sourceforge.net/gar/?rev=17279&view=rev
Author: wahwah
Date: 2012-03-03 09:26:59 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
vlc/trunk: Two dependencies only on sparc (not sure why).
Modified Paths:
--------------
csw/mgar/pkg/vlc/trunk/Makefile
Modified: csw/mgar/pkg/vlc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vlc/trunk/Makefile 2012-03-03 01:53:42 UTC (rev 17278)
+++ csw/mgar/pkg/vlc/trunk/Makefile 2012-03-03 09:26:59 UTC (rev 17279)
@@ -86,6 +86,8 @@
# CONFIGURE_ARGS += --disable-fribidi
# CONFIGURE_ARGS += --with-gnu-ld=no
CONFIGURE_ARGS += --disable-xcb
+CONFIGURE_ARGS += --enable-theora
+CONFIGURE_ARGS += --enable-sqlite
SKIPTEST = 1
@@ -126,10 +128,8 @@
RUNTIME_DEP_PKGS_CSWvlc += CSWlibsmbclient0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeex1
RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeexdsp1
-RUNTIME_DEP_PKGS_CSWvlc += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWvlc += CSWlibswscale2
-RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheora0
RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoradec1
RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoraenc1
RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlc5
@@ -142,6 +142,11 @@
RUNTIME_DEP_PKGS_CSWvlc += CSWlua
RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage
+# Only needed on Sparc. Not sure why, to be investigated.
+RUNTIME_DEP_PKGS_CSWvlc_sparc += CSWlibtheora0
+RUNTIME_DEP_PKGS_CSWvlc_sparc += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWvlc += $(RUNTIME_DEP_PKGS_CSWvlc_$(GARCH))
+
CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/audio-vlc-default.sh
CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/video-vlc-default.sh
CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vlc/intf-vcd.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Sat Mar 3 11:21:14 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 03 Mar 2012 10:21:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[17280] csw/mgar/pkg/subversion/trunk
Message-ID:
Revision: 17280
http://gar.svn.sourceforge.net/gar/?rev=17280&view=rev
Author: rthurner
Date: 2012-03-03 10:21:13 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
subversion, upgrade to svn-1.7.3. put libraries in /opt/csw/lib instead /opt/csw/lib/svn
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
csw/mgar/pkg/subversion/trunk/checksums
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 09:26:59 UTC (rev 17279)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 10:21:13 UTC (rev 17280)
@@ -25,7 +25,7 @@
# http://subversion.apache.org/mailing-lists.html
NAME = subversion
-VERSION = 1.7.2
+VERSION = 1.7.3
CATEGORIES = utils
GARTYPE = v2
@@ -217,7 +217,7 @@
# Relocate locations of foreign language bindings
PATCHFILES += 0002-Fix-location-of-bindings.patch
-SVNLIB = $(prefix)/lib/svn
+SVNLIB = $(prefix)/lib
JAVA_HOME = /usr/jdk1.6.0_20
#EXTRA_INC += $(prefix)/apache2/include
Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums 2012-03-03 09:26:59 UTC (rev 17279)
+++ csw/mgar/pkg/subversion/trunk/checksums 2012-03-03 10:21:13 UTC (rev 17280)
@@ -1 +1 @@
-1e5dfffd27be080672e5a042564368a8 subversion-1.7.2.tar.bz2
+867fb0a5db00710cf8dce0bdfa094b3b subversion-1.7.3.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
From rthurner at users.sourceforge.net Sat Mar 3 13:08:00 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 03 Mar 2012 12:08:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[17281]
csw/mgar/pkg/subversion/trunk/Makefile
Message-ID:
Revision: 17281
http://gar.svn.sourceforge.net/gar/?rev=17281&view=rev
Author: rthurner
Date: 2012-03-03 12:08:00 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
subversion, this still does not work ... undo again ...
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 10:21:13 UTC (rev 17280)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 12:08:00 UTC (rev 17281)
@@ -217,7 +217,7 @@
# Relocate locations of foreign language bindings
PATCHFILES += 0002-Fix-location-of-bindings.patch
-SVNLIB = $(prefix)/lib
+SVNLIB = $(prefix)/lib/svn
JAVA_HOME = /usr/jdk1.6.0_20
#EXTRA_INC += $(prefix)/apache2/include
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 Mar 4 00:23:38 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Mar 2012 23:23:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[17282]
csw/mgar/gar/v2/lib/python/integrate_catalogs.py
Message-ID:
Revision: 17282
http://gar.svn.sourceforge.net/gar/?rev=17282&view=rev
Author: wahwah
Date: 2012-03-03 23:23:38 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
integrate-catalogs: Prep work for parallel fetch
The multiprocessing module is broken at the moment, a fix is underway.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/integrate_catalogs.py
Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py
===================================================================
--- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-03 12:08:00 UTC (rev 17281)
+++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-03 23:23:38 UTC (rev 17282)
@@ -101,12 +101,25 @@
def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades):
rest_client = rest.RestClient()
diffs_by_catalogname = {}
+ def GetCatalog(rest_client, r_catrel, r_arch, r_osrel):
+ catalog = rest_client.GetCatalog(r_catrel, r_arch, r_osrel)
+ return ((r_catrel, r_arch, r_osrel), catalog)
+ # TODO(maciej): Enable this once the multiprocessing module is fixed.
+ # https://www.opencsw.org/mantis/view.php?id=4894
+ # proc_pool = multiprocessing.Pool(20)
+ catalogs_to_fetch_args = []
for arch in common_constants.PHYSICAL_ARCHITECTURES:
+ for osrel in common_constants.OS_RELS:
+ for catrel in (catrel_from, catrel_to):
+ catalogs_to_fetch_args.append((rest_client, catrel, arch, osrel))
+ # Convert this to pool.map when multiprocessing if fixed.
+ catalogs = dict(map(lambda x: GetCatalog(*x), catalogs_to_fetch_args))
+ for arch in common_constants.PHYSICAL_ARCHITECTURES:
logging.debug("Architecture: %s", arch)
for osrel in common_constants.OS_RELS:
logging.debug("OS release: %s", osrel)
- cat_from = rest_client.GetCatalog(catrel_from, arch, osrel)
- cat_to = rest_client.GetCatalog(catrel_to, arch, osrel)
+ cat_from = catalogs[(catrel_from, arch, osrel)]
+ cat_to = catalogs[(catrel_to, arch, osrel)]
# Should use catalog comparator, but the data format is different
if cat_from is None:
cat_from = []
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 Mar 4 00:24:08 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Mar 2012 23:24:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[17283]
csw/mgar/gar/v2/lib/python/rest.py
Message-ID:
Revision: 17283
http://gar.svn.sourceforge.net/gar/?rev=17283&view=rev
Author: wahwah
Date: 2012-03-03 23:24:08 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
rest-client: Use ?quick=true by default
Cuts down the catalog fetch time from 3 minutes down to 20 seconds.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/rest.py
Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py 2012-03-03 23:23:38 UTC (rev 17282)
+++ csw/mgar/gar/v2/lib/python/rest.py 2012-03-03 23:24:08 UTC (rev 17283)
@@ -49,7 +49,7 @@
def GetCatalog(self, catrel, arch, osrel):
if not catrel:
raise ArgumentError("Missing catalog release.")
- url = self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/" % (catrel, arch, osrel)
+ url = self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/?quick=true" % (catrel, arch, osrel)
logging.debug("GetCatalog(): GET %s", url)
try:
data = urllib2.urlopen(url).read()
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 Mar 4 00:24:37 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Mar 2012 23:24:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[17284]
csw/mgar/gar/v2/lib/python/checkpkg2.py
Message-ID:
Revision: 17284
http://gar.svn.sourceforge.net/gar/?rev=17284&view=rev
Author: wahwah
Date: 2012-03-03 23:24:36 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
checkpkg: Typo fix
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/checkpkg2.py
Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-03-03 23:24:08 UTC (rev 17283)
+++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-03-03 23:24:36 UTC (rev 17284)
@@ -28,7 +28,7 @@
can override them pasting the lines below to the GAR recipe."""
AFTER_OVERRIDES = """Please note that checkpkg isn't suggesting you should
-simply add these overrides do the Makefile. It only informs what the overrides
+simply add these overrides to the Makefile. It only informs what the overrides
could look like. You need to understand what are the reported issues about and
use your best judgement to decide whether to fix the underlying problems or
override them. For more information, scroll up and read the detailed
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 Mar 4 00:25:14 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Mar 2012 23:25:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[17285] csw/mgar/gar/v2/lib/python
Message-ID:
Revision: 17285
http://gar.svn.sourceforge.net/gar/?rev=17285&view=rev
Author: wahwah
Date: 2012-03-03 23:25:14 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
checkpkg: Remove soname grouping guesswork
Checkpkg used to guess that if multiple libraries share the same soname
version, they should go into a single package.
libfoo-something.so.1
libfoo-otherthing.so.1
=> CSWlibfoo suggested
This caused increased checkpkg code complexity and guesses were often wrong
and/or confusing. It is simpler to take each soname separately without trying
to create package groups. Less magic in checkpkg allows maintainers to have
a clearer understanding of what and why checkpkg suggests.
In the rather rare cases when multiple libraries are bundled in one package,
overrides can be used. These cases are rather rare, because the main package
which used to bundle libraries is Boost, and it will be split into
one-lib-per-package anyway. Other cases are rather marginal, and often involve
bundline libraries with different soname versions (e.g. Kerberos private
libs).
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/package_checks.py
csw/mgar/gar/v2/lib/python/sharedlib_utils.py
Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-03 23:24:36 UTC (rev 17284)
+++ csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-03 23:25:14 UTC (rev 17285)
@@ -1033,106 +1033,48 @@
else:
soname = os.path.split(binary_info["path"])[1]
linkable_shared_libs.append((soname, binary_info))
- check_names = True
logging.debug("CheckSharedLibraryNamingPolicy(): "
"linkable shared libs of %s: %s"
% (pkgname, linkable_shared_libs))
- if len(linkable_shared_libs) > 1:
- sonames = sorted(set([x[0] for x in linkable_shared_libs]))
- tmp = su.MakePackageNameBySonameCollection(sonames)
- if tmp:
- multilib_pkgnames, multilib_catalogname = tmp
- else:
- multilib_pkgnames, multilib_catalogname = (None, None)
- if not multilib_pkgnames:
+ for soname, binary_info in linkable_shared_libs:
+ tmp = su.MakePackageNameBySoname(soname)
+ policy_pkgname_list, policy_catalogname_list = tmp
+ if pkgname not in policy_pkgname_list:
error_mgr.ReportError(
- "non-uniform-lib-versions-in-package",
- "sonames=%s"
- % (",".join(sonames)))
- messenger.Message(
- "Package %s contains shared libraries, and their soname "
- "versions are not in sync: %s. This means that "
- "each soname is likely to be retired at a different time "
- "and each soname is best placed in a separate package, "
- "named after soname and version. "
- % (pkgname, sonames))
- # If the sonames aren't uniform, there's no point in trying to match
- # sonames versus pkgname.
- messenger.SuggestGarLine(
- "# Suggesting how to separate out shared libraries.")
- messenger.SuggestGarLine(
- "# You will most probably need to further edit these lines. "
- "Use with caution!")
- for soname, binary_info in linkable_shared_libs:
- lib_path, lib_basename = os.path.split(binary_info["path"])
- tmp = su.MakePackageNameBySoname(soname)
- policy_pkgname_list, policy_catalogname_list = tmp
- pkginfo = pkg_data["pkginfo"]
- description = " ".join(pkginfo["NAME"].split(" ")[2:])
- depchecks.SuggestLibraryPackage(error_mgr, messenger,
- policy_pkgname_list[0],
- policy_catalogname_list[0],
- description,
- lib_path, lib_basename, soname,
- pkgname)
+ "shared-lib-pkgname-mismatch",
+ "file=%s "
+ "soname=%s "
+ "pkgname=%s "
+ "expected=%s"
+ % (binary_info["path"],
+ soname, pkgname,
+ ",".join(policy_pkgname_list)))
- check_names = False
- else: # len(linkable_shared_libs) > 1
- if pkgname not in multilib_pkgnames:
- error_mgr.ReportError(
- "shared-lib-pkgname-mismatch",
- "sonames=%s "
- "pkgname=%s "
- "expected=%s "
- % (",".join(sonames), pkgname, ",".join(multilib_pkgnames)))
- messenger.Message(
- "The collection of sonames (%s) "
- "is expected to be in package "
- "named %s, but the package name is %s. "
- "More information: "
- "http://wiki.opencsw.org/checkpkg-error-tags"
- % (sonames, multilib_pkgnames, pkgname))
- check_names = False
- if check_names:
- for soname, binary_info in linkable_shared_libs:
- tmp = su.MakePackageNameBySoname(soname)
- policy_pkgname_list, policy_catalogname_list = tmp
- if pkgname not in policy_pkgname_list:
- error_mgr.ReportError(
- "shared-lib-pkgname-mismatch",
- "file=%s "
- "soname=%s "
- "pkgname=%s "
- "expected=%s"
- % (binary_info["path"],
- soname, pkgname,
- ",".join(policy_pkgname_list)))
+ suggested_pkgname = policy_pkgname_list[0]
+ lib_path, lib_basename = os.path.split(binary_info["path"])
+ pkginfo = pkg_data["pkginfo"]
+ description = " ".join(pkginfo["NAME"].split(" ")[2:])
+ depchecks.SuggestLibraryPackage(error_mgr, messenger,
+ suggested_pkgname,
+ policy_catalogname_list[0],
+ description,
+ lib_path, lib_basename, soname,
+ pkgname)
- suggested_pkgname = policy_pkgname_list[0]
- lib_path, lib_basename = os.path.split(binary_info["path"])
- pkginfo = pkg_data["pkginfo"]
- description = " ".join(pkginfo["NAME"].split(" ")[2:])
- depchecks.SuggestLibraryPackage(error_mgr, messenger,
- suggested_pkgname,
- policy_catalogname_list[0],
- description,
- lib_path, lib_basename, soname,
- pkgname)
+ messenger.OneTimeMessage(
+ soname,
+ "This shared library (%s) is in a directory indicating that it "
+ "is likely to be linked to by other programs. If this is the "
+ "case, the library is best packaged separately, in a package "
+ "with a library-specific name. Examples of such names include: "
+ "%s. If this library is not meant to be linked to by other "
+ "packages, it's best moved to a 'private' directory. "
+ "For example, instead of /opt/csw/lib/foo.so, "
+ "try /opt/csw/lib/projectname/foo.so. "
+ "More information: http://wiki.opencsw.org/checkpkg-error-tags"
+ % (binary_info["path"], policy_pkgname_list))
- messenger.OneTimeMessage(
- soname,
- "This shared library (%s) is in a directory indicating that it "
- "is likely to be linked to by other programs. If this is the "
- "case, the library is best packaged separately, in a package "
- "with a library-specific name. Examples of such names include: "
- "%s. If this library is not meant to be linked to by other "
- "packages, it's best moved to a 'private' directory. "
- "For example, instead of /opt/csw/lib/foo.so, "
- "try /opt/csw/lib/projectname/foo.so. "
- "More information: http://wiki.opencsw.org/checkpkg-error-tags"
- % (binary_info["path"], policy_pkgname_list))
-
def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger):
"""If it's a package with shared libraries, it should not contain the .so file.
Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py
===================================================================
--- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-03 23:24:36 UTC (rev 17284)
+++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-03 23:25:14 UTC (rev 17285)
@@ -171,70 +171,6 @@
return shared_libs
-def GetCommonVersion(sonames):
- versions = []
- for soname in sonames:
- m = SONAME_VERSION_RE.search(soname)
- if m:
- versions.append(m.groupdict()["version"])
- else:
- versions.append("")
- versions_set = set(versions)
- if len(versions_set) > 1 or not versions_set:
- return (False, None)
- else:
- return (True, versions_set.pop())
-
-
-def ValidateCollectionName(l):
- letters = "".join(re.findall(r"[a-zA-Z]", l))
- # Special case for libz
- if len(letters) == 1 and letters[0] == 'z': return True
- if len(letters) <= 1:
- return False
- return True
-
-
-def MakePackageNameBySonameCollection(sonames):
- """Finds a name for a collection of sonames.
-
- Try to find the largest common prefix in the sonames, and establish
- whether there is a common version to them.
- """
- common_version_exists, common_version = GetCommonVersion(sonames)
- if not common_version_exists:
- # If the sonames don't have a common version, they shouldn't be together
- # in one package.
- return None
- common_substring_candidates = []
- for soname in sonames:
- candidate = soname
- # We always want such package to start with the prefix "lib". Therefore,
- # we're stripping the prefix "lib" if it exists, and we're adding it back
- # to the pkgname and soname at the end of the function.
- if candidate.startswith("lib"):
- candidate = candidate[3:]
- m = re.search("\.so", candidate)
- candidate = re.sub("\.so.*$", "", candidate)
- common_substring_candidates.append(candidate)
- lcs = CollectionLongestCommonSubstring(copy.copy(common_substring_candidates))
- if not ValidateCollectionName(lcs):
- return None
- pkgnames = [
- "CSW" + SonameToStringWithChar("lib%s%s" % (lcs, common_version), "-"),
- ]
- dashed = "CSW" + SonameToStringWithChar("lib%s-%s" % (lcs, common_version), "-")
- if dashed not in pkgnames:
- pkgnames.append(dashed)
- catalognames = [
- SonameToStringWithChar("lib%s%s" % (lcs, common_version), "_"),
- ]
- underscored = SonameToStringWithChar("lib%s_%s" % (lcs, common_version), "_")
- if underscored not in catalognames:
- catalognames.append(underscored)
- return pkgnames, catalognames
-
-
def LongestCommonSubstring(S, T):
"""Stolen from Wikibooks
@@ -256,16 +192,6 @@
return LCS
-def CollectionLongestCommonSubstring(collection):
- current_substring = collection.pop()
- while collection and current_substring:
- substring_set = LongestCommonSubstring(current_substring,
- collection.pop())
- if substring_set:
- current_substring = list(substring_set)[0]
- return current_substring
-
-
def IsBinary(file_info):
"""Returns True or False depending on file metadata."""
is_a_binary = False
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 Mar 4 13:29:06 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 12:29:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[17286]
csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
Message-ID:
Revision: 17286
http://gar.svn.sourceforge.net/gar/?rev=17286&view=rev
Author: wahwah
Date: 2012-03-04 12:29:06 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
checkpkg-inspect-stats: Display help first
...connect to the database second.
Modified Paths:
--------------
csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2012-03-03 23:25:14 UTC (rev 17285)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2012-03-04 12:29:06 UTC (rev 17286)
@@ -21,7 +21,6 @@
import configuration
def main():
- configuration.SetUpSqlobjectConnection()
usage = "Usage: %prog [ options ] file | md5 [ file | md5 [ ... ] ]"
parser = optparse.OptionParser(usage)
parser.add_option("-d", "--debug", dest="debug",
@@ -35,6 +34,7 @@
else:
logging.basicConfig(level=logging.INFO)
logging.debug("Collecting statistics about given package files.")
+ configuration.SetUpSqlobjectConnection()
pkgstat_objs = checkpkg.GetPackageStatsByFilenamesOrMd5s(
args,
options.debug)
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 Mar 4 13:29:39 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 12:29:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[17287]
csw/mgar/gar/v2/lib/python/package_stats.py
Message-ID:
Revision: 17287
http://gar.svn.sourceforge.net/gar/?rev=17287&view=rev
Author: wahwah
Date: 2012-03-04 12:29:39 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb: A few debug logging statements
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/package_stats.py
Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py 2012-03-04 12:29:06 UTC (rev 17286)
+++ csw/mgar/gar/v2/lib/python/package_stats.py 2012-03-04 12:29:39 UTC (rev 17287)
@@ -101,10 +101,15 @@
"""
pkg_stats = self.GetDbObject()
if not pkg_stats:
+ logging.debug("Could not get db object for %s", self.GetMd5sum())
return False
if pkg_stats.stats_version != PACKAGE_STATS_VERSION:
+ logging.debug("Stats version mismatch: package=%s code=%s",
+ pkg_stats.stats_version,
+ PACKAGE_STATS_VERSION)
return False
elif pkg_stats.data_obj is None:
+ logging.debug("Could not find data object for %s", self.GetMd5sum())
return False
else:
return True
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 Mar 4 13:30:27 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 12:30:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[17288] csw/mgar/gar/v2/lib/python
Message-ID:
Revision: 17288
http://gar.svn.sourceforge.net/gar/?rev=17288&view=rev
Author: wahwah
Date: 2012-03-04 12:30:27 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb: Removing unit tests for removed code
WRT [17285]
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/package_checks_test.py
csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py
Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-03-04 12:29:39 UTC (rev 17287)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-03-04 12:30:27 UTC (rev 17288)
@@ -1341,12 +1341,6 @@
class TestCheckSharedLibraryNamingPolicy(CheckTestHelper, unittest.TestCase):
FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy'
- def testNonUniformLibs(self):
- self.pkg_data = neon_stats[0]
- self.error_mgr_mock.ReportError(
- 'non-uniform-lib-versions-in-package',
- "sonames=libneon.so.26,libneon.so.27")
-
def testGood(self):
self.pkg_data = bdb48_stats[0]
Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-04 12:29:39 UTC (rev 17287)
+++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-04 12:30:27 UTC (rev 17288)
@@ -195,101 +195,6 @@
self.assertEqual("libpython3_1_1_0", su.SonameToStringWithChar("libpython3.1.so.1.0", "_"))
-class GetCommonVersionUnitTest(unittest.TestCase):
-
- def testGetCommonVersionSimple(self):
- sonames = ["libfoo.so.0", "libfoo_util.so.0"]
- self.assertEqual((True, "0"), su.GetCommonVersion(sonames))
-
- def testGetCommonVersionMore(self):
- sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.1"]
- self.assertEqual((True, "0.2.1"), su.GetCommonVersion(sonames))
-
- def testGetCommonVersionInvalid(self):
- sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.3"]
- self.assertEqual((False, None), su.GetCommonVersion(sonames))
-
- def testGetCommonVersionEndsWithSo(self):
- sonames = ["libfoo1.so", "libfoo1.so"]
- self.assertEqual((True, ""), su.GetCommonVersion(sonames))
-
-
-class MakePackageNameBySonameCollectionUnitTest(unittest.TestCase):
-
- def testMakePackageNameBySonameCollectionTwo(self):
- sonames = ["libfoo.so.0", "libfoo_util.so.0"]
- expected = (
- ["CSWlibfoo0"],
- ["libfoo0"],
- )
- self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames))
-
- def testMakePackageNameBySonameCollectionRepeated(self):
- sonames = ["libfoo.so.0", "libfoo.so.0"]
- expected = (
- ["CSWlibfoo0"],
- ["libfoo0"],
- )
- self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames))
-
- def testMakePackageNameBySonameCollectionBdb(self):
- sonames = ["libfoo.so.0", "libfoo_util.so.0"]
- expected = (
- ["CSWlibfoo0"],
- ["libfoo0"],
- )
- self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames))
-
- def testMakePackageNameBySonameCollectionNoCommonVersion(self):
- sonames = ["libfoo.so.0", "libfoo_util.so.1"]
- self.assertEqual(None, su.MakePackageNameBySonameCollection(sonames))
-
- def testMakePackageNameBySonameCollectionMultipleSo(self):
- sonames = ["libfoo1.so", "libfoo1.so"]
- expected = (
- ["CSWlibfoo1"],
- ["libfoo1"],
- )
- self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames))
-
- def testMakePackageNameBySonameCollectionMultipleSoGlib2(self):
- sonames = [
- "libgio-2.0.so.0",
- "libglib-2.0.so.0",
- "libgmodule-2.0.so.0",
- "libgobject-2.0.so.0",
- "libgthread-2.0.so.0",
- ]
- self.assertEqual(None, su.MakePackageNameBySonameCollection(sonames))
-
-
-class ValidateCollectionNameTest(unittest.TestCase):
-
- def testLetters(self):
- self.assertEqual(True, su.ValidateCollectionName("foo"))
-
- def testOneLetter(self):
- self.assertEqual(False, su.ValidateCollectionName("f"))
-
- def testNoLetters(self):
- self.assertEqual(False, su.ValidateCollectionName("-2.0"))
-
-
-class CommomSubstringTest(unittest.TestCase):
-
- def testLongestCommonSubstring_1(self):
- self.assertEqual(set(["foo"]), su.LongestCommonSubstring("foo", "foo"))
-
- def testLongestCommonSubstring_2(self):
- self.assertEqual(set([]), su.LongestCommonSubstring("foo", "bar"))
-
- def testLongestCommonSubstring_3(self):
- self.assertEqual(set(["bar"]), su.LongestCommonSubstring("barfoobar", "bar"))
-
- def testLongestCommonSubstring_4(self):
- self.assertEqual(set(['bcd', 'hij']), su.LongestCommonSubstring("abcdefghijk", "bcdhij"))
-
-
class GetIsalistUnitTest(unittest.TestCase):
def testGetIsalistSparc(self):
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 Mar 4 13:30:56 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 12:30:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[17289]
csw/mgar/gar/v2/lib/python/sharedlib_utils.py
Message-ID:
Revision: 17289
http://gar.svn.sourceforge.net/gar/?rev=17289&view=rev
Author: wahwah
Date: 2012-03-04 12:30:56 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb: Adding back a collection substring getter
It's used in another function.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/sharedlib_utils.py
Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py
===================================================================
--- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-04 12:30:27 UTC (rev 17288)
+++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-04 12:30:56 UTC (rev 17289)
@@ -230,3 +230,13 @@
"""Needs to be improved to escape more characters."""
s = s.replace(r'.', r'\.')
return s
+
+
+def CollectionLongestCommonSubstring(collection):
+ current_substring = collection.pop()
+ while collection and current_substring:
+ substring_set = LongestCommonSubstring(current_substring,
+ collection.pop())
+ if substring_set:
+ current_substring = list(substring_set)[0]
+ return current_substring
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 Mar 4 15:55:21 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 14:55:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[17290]
csw/mgar/gar/v2/lib/python/catalog_notifier.py
Message-ID:
Revision: 17290
http://gar.svn.sourceforge.net/gar/?rev=17290&view=rev
Author: wahwah
Date: 2012-03-04 14:55:21 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
catalog-notifier: Use the main SMTP host for sending notifications.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/catalog_notifier.py
Modified: csw/mgar/gar/v2/lib/python/catalog_notifier.py
===================================================================
--- csw/mgar/gar/v2/lib/python/catalog_notifier.py 2012-03-04 12:30:56 UTC (rev 17289)
+++ csw/mgar/gar/v2/lib/python/catalog_notifier.py 2012-03-04 14:55:21 UTC (rev 17290)
@@ -267,7 +267,7 @@
from_address = "Catalog update notifier "
msg['From'] = from_address
msg['To'] = email
- s = smtplib.SMTP('localhost')
+ s = smtplib.SMTP('mail.opencsw.org')
try:
s.sendmail(from_address, [email], msg.as_string())
except smtplib.SMTPRecipientsRefused, e:
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 Mar 4 15:55:52 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 14:55:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[17291] csw/mgar/gar/v2/lib/web
Message-ID:
Revision: 17291
http://gar.svn.sourceforge.net/gar/?rev=17291&view=rev
Author: wahwah
Date: 2012-03-04 14:55:52 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb-web: use mod_wsgi
Modified Paths:
--------------
csw/mgar/gar/v2/lib/web/pkgdb_web.py
csw/mgar/gar/v2/lib/web/releases_web.py
Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:55:21 UTC (rev 17290)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:55:52 UTC (rev 17291)
@@ -2,6 +2,10 @@
# A webpy application to allow HTTP access to the checkpkg database.
+import sys
+import os
+sys.path.append(os.path.join(os.path.split(__file__)[0], "..", ".."))
+
import web
import sqlobject
import json
@@ -44,9 +48,7 @@
)
urls = urls_html + urls_rest
-# render = web.template.render('templates/')
-# render = web.template.render('/home/maciej/src/pkgdb_web/templates/')
-render = web.template.render('/home/maciej/src/opencsw-git/gar/v2/'
+render = web.template.render('/home/web/bin/gar/'
'lib/web/templates/')
@@ -425,6 +427,7 @@
app = web.application(urls, globals())
main = app.wsgifunc()
+application = app.wsgifunc()
if __name__ == "__main__":
Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py 2012-03-04 14:55:21 UTC (rev 17290)
+++ csw/mgar/gar/v2/lib/web/releases_web.py 2012-03-04 14:55:52 UTC (rev 17291)
@@ -2,6 +2,10 @@
# A webpy application to allow HTTP access to the checkpkg database.
+import sys
+import os
+sys.path.append(os.path.join(os.path.split(__file__)[0], "..", ".."))
+
import web
import sqlobject
import json
@@ -13,8 +17,6 @@
from lib.python import opencsw
from lib.python import common_constants
import datetime
-import os
-import os.path
import hashlib
import logging
@@ -257,8 +259,11 @@
web.webapi.internalerror = web.debugerror
-app = web.application(urls, globals(), autoreload=False)
-main = app.wsgifunc()
+app = web.application(urls, globals())
+# main = app.wsgifunc()
+application = app.wsgifunc()
+from paste.exceptions.errormiddleware import ErrorMiddleware
+application = ErrorMiddleware(application, debug=True)
if __name__ == "__main__":
logging.basicConfig(level=logging.INFO)
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 Mar 4 15:56:21 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 14:56:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[17292]
csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID:
Revision: 17292
http://gar.svn.sourceforge.net/gar/?rev=17292&view=rev
Author: wahwah
Date: 2012-03-04 14:56:21 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb: Resolve a basename to packages
The same query that checkpkg does when looking for shared libraries.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/web/pkgdb_web.py
Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:55:52 UTC (rev 17291)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:56:21 UTC (rev 17292)
@@ -38,6 +38,8 @@
r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs',
r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename',
'PkgnameByFilename',
+ r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames-and-paths-by-basename',
+ 'PkgnamesAndPathsByBasename',
# Query by catalog release, arch, OS release and catalogname
r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname',
r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname',
@@ -308,6 +310,28 @@
raise web.notfound()
+class PkgnamesAndPathsByBasename(object):
+ def GET(self, catrel, arch, osrel):
+ ConnectToDatabase()
+ user_data = web.input()
+ basename = user_data.basename
+ send_filename = (
+ '%s-%s-%s-%s-packages.txt'
+ % (catrel, arch, osrel, basename.replace('/', '-')))
+ db_catalog = checkpkg_lib.Catalog()
+ try:
+ data = db_catalog.GetPathsAndPkgnamesByBasename(
+ basename, osrel, arch, catrel)
+ web.header(
+ 'Content-type',
+ 'application/x-vnd.opencsw.pkg;type=pkgname-list')
+ web.header('Content-Disposition',
+ 'attachment; filename=%s' % send_filename)
+ return json.dumps(data)
+ except sqlobject.main.SQLObjectNotFound, e:
+ raise web.notfound()
+
+
class RestSrv4Detail(object):
def GET(self, md5_sum):
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 Mar 4 15:56:50 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 14:56:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[17293]
csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID:
Revision: 17293
http://gar.svn.sourceforge.net/gar/?rev=17293&view=rev
Author: wahwah
Date: 2012-03-04 14:56:50 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb: Allow to fetch package data from JavaScript from other websites
Modified Paths:
--------------
csw/mgar/gar/v2/lib/web/pkgdb_web.py
Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:56:21 UTC (rev 17292)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:56:50 UTC (rev 17293)
@@ -405,6 +405,7 @@
srv4 = res.getOne()
mimetype, data = srv4.GetRestRepr()
web.header('Content-type', mimetype)
+ web.header('Access-Control-Allow-Origin', '*')
return json.dumps(data)
except sqlobject.main.SQLObjectNotFound:
return json.dumps(None)
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 Mar 4 15:57:21 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Mar 2012 14:57:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[17294]
csw/mgar/gar/v2/lib/web/templates/index.html
Message-ID:
Revision: 17294
http://gar.svn.sourceforge.net/gar/?rev=17294&view=rev
Author: wahwah
Date: 2012-03-04 14:57:21 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
pkgdb: Links to other project resources
Modified Paths:
--------------
csw/mgar/gar/v2/lib/web/templates/index.html
Modified: csw/mgar/gar/v2/lib/web/templates/index.html
===================================================================
--- csw/mgar/gar/v2/lib/web/templates/index.html 2012-03-04 14:56:50 UTC (rev 17293)
+++ csw/mgar/gar/v2/lib/web/templates/index.html 2012-03-04 14:57:21 UTC (rev 17294)
@@ -34,6 +34,21 @@
patterns in the source code.
+ Project resources:
+
+ [
+ Home page
+ |
+ Community Q&A
+ |
+ GAR
+ |
+ wiki
+ |
+ bugs
+ ]
+
+