From lblume at users.sourceforge.net Fri Aug 1 13:21:47 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 1 Aug 2014 11:21:47 +0000 Subject: SF.net SVN: gar:[23900] csw/mgar/pkg/znapzend/trunk Message-ID: <3hPmKV15pdzbP@mail.opencsw.org> Revision: 23900 http://sourceforge.net/p/gar/code/23900 Author: lblume Date: 2014-08-01 11:21:44 +0000 (Fri, 01 Aug 2014) Log Message: ----------- znapzend/trunk: Bump to 0.9.1; clean up things not needed anymore Modified Paths: -------------- csw/mgar/pkg/znapzend/trunk/Makefile csw/mgar/pkg/znapzend/trunk/checksums csw/mgar/pkg/znapzend/trunk/files/cswznapzend Modified: csw/mgar/pkg/znapzend/trunk/Makefile =================================================================== --- csw/mgar/pkg/znapzend/trunk/Makefile 2014-07-31 20:15:57 UTC (rev 23899) +++ csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-01 11:21:44 UTC (rev 23900) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = znapzend -VERSION = 0.8.7 +VERSION = 0.9.1 GARTYPE = v2 DESCRIPTION = The Multilevel Backup Tool for ZFS @@ -21,28 +21,6 @@ INITSMF = /etc/opt/csw/init.d/cswznapzend -REINPLACEMENTS += manifest servicename xmlloc datadir pmdir -# Bug, incorrect part in path -REINPLACE_MATCH_manifest = /oep/ -REINPLACE_WITH_manifest = / -REINPLACE_FILES_manifest = init/znapzend.xml.in -# Adjust the name for OpenCSW -REINPLACE_MATCH_servicename = name="oep/znapzend" -REINPLACE_WITH_servicename = name="system/cswznapzend" -REINPLACE_FILES_servicename = init/znapzend.xml.in -# Install that file manually in the right location -REINPLACE_MATCH_xmlloc = nobase_data_DATA = \$$\(PM\) init/znapzend.xml -REINPLACE_WITH_xmlloc = nobase_data_DATA = \$$\(PM\) -REINPLACE_FILES_xmlloc = Makefile.in -# datadir must be set -REINPLACE_MATCH_datadir = datadir = \$$\(prefix\) -REINPLACE_WITH_datadir = datadir = \@datadir\@ -REINPLACE_FILES_datadir = Makefile.in -# No need for lib/ subdir -REINPLACE_MATCH_pmdir = \$$\(DESTDIR\)\$$\(datadir\)/\$$\$$dir -REINPLACE_WITH_pmdir = \$$\(DESTDIR\)\$$\(datadir\)/ZnapZend -REINPLACE_FILES_pmdir = Makefile.in - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --datadir=$(libdir)/perl/csw/ CONFIGURE_ARGS += PERL5LIB=$(libdir)/perl/csw/ @@ -76,6 +54,3 @@ post-install: ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d -# ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/system -# ginstall -m 444 $(WORKSRC)/init/znapzend.xml $(DESTDIR)/var/opt/csw/svc/manifest/system/ - Modified: csw/mgar/pkg/znapzend/trunk/checksums =================================================================== --- csw/mgar/pkg/znapzend/trunk/checksums 2014-07-31 20:15:57 UTC (rev 23899) +++ csw/mgar/pkg/znapzend/trunk/checksums 2014-08-01 11:21:44 UTC (rev 23900) @@ -1 +1 @@ -7c68c7db9c4e0713f96e0d577248c5ee znapzend-0.8.7.tar.gz +7ddcd3393b35e43155e36882bd192eb9 znapzend-0.9.1.tar.gz Modified: csw/mgar/pkg/znapzend/trunk/files/cswznapzend =================================================================== --- csw/mgar/pkg/znapzend/trunk/files/cswznapzend 2014-07-31 20:15:57 UTC (rev 23899) +++ csw/mgar/pkg/znapzend/trunk/files/cswznapzend 2014-08-01 11:21:44 UTC (rev 23900) @@ -1,5 +1,9 @@ #!/bin/sh -#AUTOENABLE no # Before running always manual adjustment of smb.conf is needed +# +# ZnapZend SMF method script +# +# ### OpenCSW parameters ### +#AUTOENABLE no # Don't enable by default #FMRI system # FMRI path for service (S10+), default is /network. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Aug 2 15:24:25 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 2 Aug 2014 13:24:25 +0000 Subject: SF.net SVN: gar:[23903] csw/mgar/pkg/smartmontools/trunk/Makefile Message-ID: <3hQR0c4Gtfz1Q9@mail.opencsw.org> Revision: 23903 http://sourceforge.net/p/gar/code/23903 Author: lblume Date: 2014-08-02 13:24:21 +0000 (Sat, 02 Aug 2014) Log Message: ----------- smartmontools/trunk: Switch to GCC4; fix typo Modified Paths: -------------- csw/mgar/pkg/smartmontools/trunk/Makefile Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2014-08-02 13:20:38 UTC (rev 23902) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2014-08-02 13:24:21 UTC (rev 23903) @@ -16,10 +16,12 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +GARCOMPILER = GCC4 + # smartmontools packages built on 5.9 don't work on 5.10: # > Error SMART Thresholds Read failed: I/O error # > Smartctl: SMART Read Thresholds failed. -# However, packages built on 5.10 do work on 5.10. +# However, packages built on 5.10 do work on 5.11. PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Aug 3 00:10:44 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 2 Aug 2014 22:10:44 +0000 Subject: SF.net SVN: gar:[23906] csw/mgar/pkg/znapzend/trunk Message-ID: <3hQfgn4J4Lz7N@mail.opencsw.org> Revision: 23906 http://sourceforge.net/p/gar/code/23906 Author: lblume Date: 2014-08-02 22:10:39 +0000 (Sat, 02 Aug 2014) Log Message: ----------- znapzend/trunk: Bump to 0.10.0 Modified Paths: -------------- csw/mgar/pkg/znapzend/trunk/Makefile csw/mgar/pkg/znapzend/trunk/checksums Modified: csw/mgar/pkg/znapzend/trunk/Makefile =================================================================== --- csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-02 13:44:49 UTC (rev 23905) +++ csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-02 22:10:39 UTC (rev 23906) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = znapzend -VERSION = 0.9.1 +VERSION = 0.10.0 GARTYPE = v2 DESCRIPTION = The Multilevel Backup Tool for ZFS Modified: csw/mgar/pkg/znapzend/trunk/checksums =================================================================== --- csw/mgar/pkg/znapzend/trunk/checksums 2014-08-02 13:44:49 UTC (rev 23905) +++ csw/mgar/pkg/znapzend/trunk/checksums 2014-08-02 22:10:39 UTC (rev 23906) @@ -1 +1 @@ -7ddcd3393b35e43155e36882bd192eb9 znapzend-0.9.1.tar.gz +a1587cb27c841c29f689c579fbaa2c9e znapzend-0.10.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Aug 3 03:25:56 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 01:25:56 +0000 Subject: SF.net SVN: gar:[23907] csw/mgar/gar/v2/lib/python/package_age.py Message-ID: <3hQl110xxRzG3@mail.opencsw.org> Revision: 23907 http://sourceforge.net/p/gar/code/23907 Author: wahwah Date: 2014-08-03 01:25:51 +0000 (Sun, 03 Aug 2014) Log Message: ----------- package-ages: Correct default output file path Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_age.py Modified: csw/mgar/gar/v2/lib/python/package_age.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_age.py 2014-08-02 22:10:39 UTC (rev 23906) +++ csw/mgar/gar/v2/lib/python/package_age.py 2014-08-03 01:25:51 UTC (rev 23907) @@ -6,7 +6,7 @@ To draw a histogram of package ages, run this in R: -data <- read.table(file="/media/ivy-shared/package-ages.txt", header=TRUE, +data <- read.table(file="package-ages.txt", header=TRUE, colClasses=c("factor", "factor", "Date")) png(filename="package-ages.png", width=1024, height=1024) 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 Aug 3 03:26:05 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 01:26:05 +0000 Subject: SF.net SVN: gar:[23908] csw/mgar/gar/v2/go/src Message-ID: <3hQl1g50TPzKG@mail.opencsw.org> Revision: 23908 http://sourceforge.net/p/gar/code/23908 Author: wahwah Date: 2014-08-03 01:26:04 +0000 (Sun, 03 Aug 2014) Log Message: ----------- promote-packages: First working version. There was one thing I didn't know about Go and making HTTP requests: You have to call response.Body.Close(), otherwise it'll leak memory. The program produces 3 files: - HTML report with a timestamp, describing the state of affairs that it saw when it last ran. - Log from the application run with various log messages, including errors - Log with all the performed modifications to catalogs, and information on how to roll them back - a list of curl commands. Modified Paths: -------------- csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go Added Paths: ----------- csw/mgar/gar/v2/go/src/promote-packages/report-template.css csw/mgar/gar/v2/go/src/promote-packages/report-template.html Modified: csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go =================================================================== --- csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go 2014-08-03 01:25:51 UTC (rev 23907) +++ csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go 2014-08-03 01:26:04 UTC (rev 23908) @@ -120,7 +120,7 @@ Version string `json:"version"` Pkginst string `json:"pkgname"` Filename string `json:"basename"` - Md5_sum string `json:"md5_sum"` + Md5_sum Md5Sum `json:"md5_sum"` Size uint64 `json:"size"` Depends PkginstSlice `json:"deps"` Category string `json:"category"` @@ -135,7 +135,9 @@ p.Version, p.Pkginst, p.Filename, - p.Md5_sum, + // Md5_sum is of type which is an alias to string, but this means we have + // to explicitly convert it to a string. + fmt.Sprintf("%v", p.Md5_sum), fmt.Sprintf("%v", p.Size), p.Depends.FormatForIndexFile(), p.Category, @@ -166,6 +168,11 @@ // To avoid confusion between various things represented as strings. type Md5Sum string +// One more to do: pkginst as a type: +// type PkginstType string +// This one would require changing a number of places, including transformation +// from []string to []PkginstType. + // Extra information about a package type PackageExtra struct { Basename string `json:"basename"` @@ -192,6 +199,17 @@ return fmt.Sprintf("%s", p.Basename) } +func (p PackageExtra) UrlInCat(spec CatalogSpec) string { + return fmt.Sprintf("%s/catalogs/%s/%s/%s/%s/", + ReleasesUrl, + spec.Catrel, spec.Arch, spec.Osrel, + p.Md5_sum) +} + +func (p PackageExtra) CurlInvocation(spec CatalogSpec, verb string) string { + return fmt.Sprintf("curl --netrc -X %s %s", verb, p.UrlInCat(spec)) +} + // I'm not sure if this is a good idea. type CatalogExtra struct { Spec CatalogSpec @@ -667,7 +685,7 @@ fields[1], fields[2], fields[3], - fields[4], + Md5Sum(fields[4]), size, deps, fields[7], Modified: csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go =================================================================== --- csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go 2014-08-03 01:25:51 UTC (rev 23907) +++ csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go 2014-08-03 01:26:04 UTC (rev 23908) @@ -1,6 +1,6 @@ // Command promote-packages analyzes the state of the catalogs, and promotes -// packages from one catalog (unstable) to another one, based on a set of -// rules. +// packages from one catalog release (unstable) to another one (testing, but +// needs to be called by name, e.g. bratislava), based on a set of rules. // // Packages are put in groups. Groups are defined as: // - we start with a single package @@ -15,16 +15,19 @@ // When the same group is identified across all catalog pairs, the group is // scheduled to be promoted in all catalogs. // -// Features missing: -// - adding dependencies to a group -// - tracking the times when a package appeared or disappeared in a catalog -// (for time accounting) -// - making changes to the testing catalog +// TODO: +// - making actual changes +// HTTP Basic auth reading credentials +// Installing GCC-4.8.2 on experimental10s // -// This program has to be compiled with gcc-4.8.2, because gcc-4.9.0 produces -// a binary which segfaults (or the go runtime segfauls, hard to tell). -// The bug is filed in the gcc bugzilla: -// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61303 +// Known issues: +// - There can be a dependency cycle between package groups. In such cases +// integration will not work, unless the two groups are merged into one. +// There is no code to merge groups yet. +// - This program has to be compiled with gcc-4.8.x, because gcc-4.9.{0,1} +// produce a binary which segfaults (or the go runtime segfauls, hard to +// tell). The bug is filed in the gcc bugzilla: +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61303 package main @@ -34,9 +37,14 @@ "flag" "fmt" "html/template" + "io" "log" + "net/http" "os" + "os/exec" + "path" "sort" + "strings" "sync" "time" @@ -47,25 +55,40 @@ // Command line flags var from_catrel_flag string var to_catrel_flag string -var htmlReportFlag string +var htmlReportDir string var packageTimesFilename string +var htmlReportTemplate string +var daysOldRequired int64 +var logFile string +const ( + htmlReportFile = "promote-packages.html" +) func init() { flag.StringVar(&from_catrel_flag, "from-catrel", "unstable", "Actually, only unstable makes sense here.") flag.StringVar(&to_catrel_flag, "to-catrel", "bratislava", "The testing release.") - flag.StringVar(&htmlReportFlag, "html-report-path", - "/home/maciej/public_html/promote-packages.html", + flag.StringVar(&htmlReportDir, "html-report-path", + "/home/maciej/public_html", "Full path to the file where the HTML report will be " + "written. If the file already exists, it will be " + "overwritten. ") + flag.StringVar(&htmlReportTemplate, "html-report-template", + "src/promote-packages/report-template.html", + "HTML template used to generate the report.") flag.StringVar(&packageTimesFilename, "package-times-json-file", "/home/maciej/.checkpkg/package-times.json", "JSON file with package times state. This file is used " + "for persistence: it remembers when each of the packages " + "was last modified in the unstable catalog.") + flag.Int64Var(&daysOldRequired, "required-age-in-days", 14, + "Packages must be this number of days old before they can " + + "be integrated.") + flag.StringVar(&logFile, "log-file", + "/var/tmp/promote-packages.log", + "The log file contains rollback information.") } type CatalogSpecTransition struct { @@ -73,8 +96,6 @@ toCatspec diskformat.CatalogSpec } -// CONTINUE FROM HERE: The challenge is to plug in the time information. We -// need to combine the data from REST with previously serialized data. type CatalogWithSpecTransition struct { fromCat diskformat.CatalogExtra toCat diskformat.CatalogExtra @@ -87,8 +108,7 @@ Spec diskformat.CatalogSpec Removed *diskformat.PackageExtra Added *diskformat.PackageExtra - // Maybe add timing information here? - SourceChanged *time.Time + SourceChanged time.Time } // Type used to store information about the last time package was seen. @@ -106,12 +126,21 @@ type CatalogReleaseTimeInfo struct { Pkgs []PackageTimeInfo `json:"pkgs"` - // For faster operations. Indexed by MD5 sums. Not serialized. + // For faster operations. Indexed by MD5 sums. Not serialized directly. catalogs map[diskformat.CatalogSpec]map[diskformat.Md5Sum]PackageTimeInfo } -func (t *CatalogReleaseTimeInfo) Get(spec diskformat.CatalogSpec, md5_sum string) PackageTimeInfo { - return PackageTimeInfo{} +func (t *CatalogReleaseTimeInfo) Time(sourceSpec diskformat.CatalogSpec, md5Sum diskformat.Md5Sum) (time.Time, error) { + // return PackageTimeInfo{} + sourceSpec.Catrel = from_catrel_flag + + if catTime, ok := t.catalogs[sourceSpec]; ok { + if pti, ok := catTime[md5Sum]; ok { + return pti.ChangedAt, nil + } + return time.Time{}, fmt.Errorf("Could not find timing for %v in %v", md5Sum, sourceSpec) + } + return time.Time{}, fmt.Errorf("Could not find timing information for catalog %v", sourceSpec) } func (t *CatalogReleaseTimeInfo) Load() error { @@ -162,7 +191,7 @@ } // Updates the timing information based on a catalog. -// Packages are matched by md5 sum. Possible states: +// SVR4 files are identified by md5 sum. Possible states: // // State in cache | State in catalog | Action // ---------------+------------------+-------- @@ -175,7 +204,6 @@ // func (t *CatalogReleaseTimeInfo) Update(c diskformat.CatalogExtra) { if _, ok := t.catalogs[c.Spec]; !ok { - // Indexed by MD5 sum. t.catalogs[c.Spec] = make(map[diskformat.Md5Sum]PackageTimeInfo) } inCat := make(map[diskformat.Md5Sum]bool) @@ -198,6 +226,7 @@ if _, ok := inCat[md5]; !ok { // Packages that aren't in the catalog (any more). p := t.catalogs[c.Spec][md5] + // This field is not actually read anywhere. It's enough that an entry exists. p.Present = false p.ChangedAt = time.Now() t.catalogs[c.Spec][md5] = p @@ -206,21 +235,26 @@ } func (c catalogOperation) String() string { + var t string = " (last change time unknown)" + if (!c.SourceChanged.IsZero()) { + t = (" (" + c.SourceChanged.String() + ", that is " + + (time.Now().Sub(c.SourceChanged)).String() + " ago)") + } if c.Removed != nil && c.Added != nil { - return fmt.Sprintf("Change: %v %v ? %v in %v", + return fmt.Sprintf("Change: %v %v ? %v in %v %v", c.Removed.Catalogname, c.Removed.Version, - c.Added.Version, c.Spec) + c.Added.Version, c.Spec, t) } else if c.Removed != nil && c.Added == nil { - return fmt.Sprintf("Removal: %v %v in %v", + return fmt.Sprintf("Removal: %v %v in %v %v", c.Removed.Catalogname, c.Removed.Version, - c.Spec) + c.Spec, t) } if c.Removed == nil && c.Added != nil { - return fmt.Sprintf("Addition: %v %v in %v", + return fmt.Sprintf("Addition: %v %v in %v %v", c.Added.Catalogname, c.Added.Version, - c.Spec) + c.Spec, t) } - return fmt.Sprintf("What?") + return fmt.Sprintf("This operation does not remove nor add anything.") } // Returns the identifier of the group to which this operation should belong. @@ -228,7 +262,8 @@ func (c catalogOperation) GroupKey() (string, error) { if c.Removed != nil && c.Added != nil { if c.Removed.Bundle == "" && c.Added.Bundle == "" { - return "", fmt.Errorf("Either source or target package's bundle is empty, or both: %v -> %v.", c.Removed, c.Added) + return "", fmt.Errorf("Either source or target package's bundle is " + + "empty, or both: %v -> %v.", c.Removed, c.Added) } if c.Removed.Bundle == "" { // The removed package doesn't have a bundle but the added package has. @@ -272,18 +307,10 @@ func (c catalogOperation) Commands() []string { ans := make([]string, 0) if c.Removed != nil { - ans = append(ans, - fmt.Sprintf("curl --netrc -X DELETE %s/catalogs/%s/%s/%s/%s/", - diskformat.ReleasesUrl, - c.Spec.Catrel, c.Spec.Arch, c.Spec.Osrel, - c.Removed.Md5_sum)) + ans = append(ans, c.Removed.CurlInvocation(c.Spec, "DELETE")) } if c.Added != nil { - ans = append(ans, - fmt.Sprintf("curl --netrc -X PUT %s/catalogs/%s/%s/%s/%s/", - diskformat.ReleasesUrl, - c.Spec.Catrel, c.Spec.Arch, c.Spec.Osrel, - c.Added.Md5_sum)) + ans = append(ans, c.Added.CurlInvocation(c.Spec, "PUT ")) } return ans } @@ -291,32 +318,92 @@ func (c catalogOperation) Rollback() []string { rollback := make([]string, 0) if c.Added != nil { - rollback = append(rollback, - fmt.Sprintf("curl --netrc -X DELETE %s/catalogs/%s/%s/%s/%s/", - diskformat.ReleasesUrl, - c.Spec.Catrel, c.Spec.Arch, c.Spec.Osrel, - c.Added.Md5_sum)) + rollback = append(rollback, c.Added.CurlInvocation(c.Spec, "DELETE")) } if c.Removed != nil { - rollback = append(rollback, - fmt.Sprintf("curl --netrc -X PUT %s/catalogs/%s/%s/%s/%s/", - diskformat.ReleasesUrl, - c.Spec.Catrel, c.Spec.Arch, c.Spec.Osrel, - c.Removed.Md5_sum)) + rollback = append(rollback, c.Removed.CurlInvocation(c.Spec, "PUT ")) } return rollback } +type credentials struct { + username, password string +} + +// One of the messier parts. We're running on web, so we need to ssh back to +// the login host to get the password. +func GetCredentials() credentials { + // os.user.Current() seems not to work. + u := os.Getenv("LOGNAME") + args := []string{"login", "cat"} + args = append(args, fmt.Sprintf("/etc/opt/csw/releases/auth/%s", u)) + log.Println("Running ssh", args) + passwdBytes, err := exec.Command("ssh", args...).Output() + passwd := strings.TrimSpace(string(passwdBytes)) + if err != nil { + log.Fatalln(err); + } + return credentials{ + u, + passwd, + } +} + +func RestRequest(client *http.Client, cr credentials, verb, url string) error { + req, err := http.NewRequest(verb, url, nil) + if err != nil { + return err + } + req.SetBasicAuth(cr.username, cr.password) + resp, err := client.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + if resp.StatusCode >= 200 && resp.StatusCode < 300 { + log.Println(verb, "to", url, "successful:", resp.StatusCode) + } else { + return fmt.Errorf("Response to %s is not a success: %+v", req, resp) + } + return nil +} + +func (c catalogOperation) Perform(client *http.Client, cr credentials, w *os.File) error { + if c.Removed != nil { + url := c.Removed.UrlInCat(c.Spec) + if !diskformat.DryRun { + w.WriteString(fmt.Sprintf("# DELETE %s\n", url)) + if err := RestRequest(client, cr, "DELETE", url); err != nil { + return err + } + } else { + w.WriteString(fmt.Sprintf("# (dry run) DELETE %s\n", url)) + log.Println("Dry run: DELETE", url) + } + } + if c.Added != nil { + url := c.Added.UrlInCat(c.Spec) + if !diskformat.DryRun { + w.WriteString(fmt.Sprintf("# PUT %s\n", url)) + if err := RestRequest(client, cr, "PUT", url); err != nil { + return err + } + } else { + w.WriteString(fmt.Sprintf("# (dry run) PUT %s\n", url)) + log.Println("Dry run: PUT", url) + } + } + return nil +} + +// Group of packages to be moved, specific to one catalog. type integrationGroup struct { Key string Spec diskformat.CatalogSpec Ops []catalogOperation + LatestMod time.Time } -type IntegrationResult struct { - noidea string -} - type catalogIntegration struct { Spec diskformat.CatalogSpec Groups map[string]*integrationGroup @@ -330,6 +417,15 @@ Key string Ops map[diskformat.CatalogSpec][]catalogOperation Bugs []mantis.Bug + LatestMod time.Time + // Which other cross catalog groups this group depends on. Catalog operations + // which belong to this group must not be applied before applying operations + // from all the dependencies. + Dependencies map[string]*CrossCatIntGroup + + Evaluated bool + CanBeIntegratedNow bool + Messages []string } func NewCrossCatIntGroup(key string) (*CrossCatIntGroup) { @@ -337,9 +433,19 @@ g.Key = key g.Ops = make(map[diskformat.CatalogSpec][]catalogOperation) g.Bugs = make([]mantis.Bug, 0) + g.Dependencies = make(map[string]*CrossCatIntGroup) return g } +func (g CrossCatIntGroup) HasOperations() bool { + for _, ops := range g.Ops { + if len(ops) > 0 { + return true + } + } + return false +} + type reportData struct { CatalogName string GeneratedOn time.Time @@ -433,8 +539,7 @@ return nil } -func GroupsFromCatalogPair(t CatalogWithSpecTransition) (map[string]*integrationGroup, []catalogOperation) { - // No Mantis integration yet. +func GroupsFromCatalogPair(t CatalogWithSpecTransition, timing *CatalogReleaseTimeInfo) (map[string]*integrationGroup, []catalogOperation) { log.Println("GroupsFromCatalogPair from", t.fromCat.Spec, "to", t.toCat.Spec) @@ -453,20 +558,33 @@ continue } // There is a package with the same pkgname in the target catalog. - op := catalogOperation{t.toCat.Spec, pkgDestCat, pkgSrcCat, nil} - oplist = append(oplist, op) + if pkgTime, err := timing.Time(t.toCat.Spec, pkgSrcCat.Md5_sum); err == nil { + op := catalogOperation{t.toCat.Spec, pkgDestCat, pkgSrcCat, pkgTime} + oplist = append(oplist, op) + } else { + log.Fatalln(err) + } } else { // There is no package with the same pkgname in the target catalog. - op := catalogOperation{t.toCat.Spec, nil, pkgSrcCat, nil} - oplist = append(oplist, op) + if pkgTime, err := timing.Time(t.toCat.Spec, pkgSrcCat.Md5_sum); err == nil { + op := catalogOperation{t.toCat.Spec, nil, pkgSrcCat, pkgTime} + oplist = append(oplist, op) + } else { + log.Fatalln(err) + } } } // Packages that are only in the target catalog. for pkgname, topkg := range toByPkgname { if _, ok := fromByPkgname[pkgname]; !ok { - op := catalogOperation{t.toCat.Spec, topkg, nil, nil} - oplist = append(oplist, op) + if pkgTime, err := timing.Time(t.toCat.Spec, topkg.Md5_sum); err == nil { + // Deleted package information is still in the timing information. + op := catalogOperation{t.toCat.Spec, topkg, nil, pkgTime} + oplist = append(oplist, op) + } else { + log.Fatalln("Could not get timing information for", topkg.Md5_sum) + } } } log.Println("Found", len(oplist), "oplist") @@ -483,12 +601,23 @@ } if intgroup, ok := groups[key]; !ok { oplist := make([]catalogOperation, 0) - intgroup = &integrationGroup{key, op.Spec, oplist} + intgroup = &integrationGroup{key, op.Spec, oplist, time.Time{}} groups[key] = intgroup } groups[key].Ops = append(groups[key].Ops, op) } + for key := range groups { + // Set the group's latest change. + var youngest time.Time + for _, op := range groups[key].Ops { + if youngest.IsZero() || op.SourceChanged.Before(youngest) { + youngest = op.SourceChanged + } + } + groups[key].LatestMod = youngest + } + // We need to make sure that all the dependencies are present in the target // catalog. We need to mock-apply the group change, and then verify that // there aren't any missing dependencies there. @@ -496,6 +625,7 @@ if err := intGroupSane(t.toCat, group); err != nil { log.Println("Group", key, "it not sane:", err) } + } return groups, badops } @@ -543,19 +673,18 @@ } func writeReport(rd reportData) { - t := template.Must(template.ParseFiles( - "src/promote-packages/report-template.html")) - fo, err := os.Create(htmlReportFlag) + t := template.Must(template.ParseFiles(htmlReportTemplate)) + outFile := path.Join(htmlReportDir, htmlReportFile) + fo, err := os.Create(outFile) if err != nil { - log.Println("Could not open", htmlReportFlag) + log.Println("Could not open", outFile) panic(err) } defer fo.Close() - log.Println("Writing HTML") if err := t.Execute(fo, rd); err != nil { log.Fatal("Could not write the report:", err) } - log.Println("The report has been written.") + log.Println("The report has been written to", outFile) } type ByKey []*CrossCatIntGroup @@ -564,9 +693,167 @@ func (a ByKey) Swap(i, j int) { a[i], a[j] = a[j], a[i] } func (a ByKey) Less(i, j int) bool { return a[i].Key < a[j].Key } +func addBlockingBugs(groups map[string]*CrossCatIntGroup, mantisBugs <-chan mantis.Bug) { + // Severities from mantis that don't block package promotions. + lowSeverities := [...]string{ + "Trivial", + "Minor", + "Feature", + } + + // Add blocking Mantis Bugs. + bugsByCatname := make(map[string][]mantis.Bug) + for bug := range mantisBugs { + // Bugs that aren't blockers. + if bug.Status == "Closed" || bug.Status == "Resolved" { + continue + } + shouldSkip := false + for _, sev := range lowSeverities { + if bug.Severity == sev { + shouldSkip = true + break + } + } + if shouldSkip { + continue + } + c := bug.Catalogname + if _, ok := bugsByCatname[c]; !ok { + bugsByCatname[c] = make([]mantis.Bug, 0) + } + bugsByCatname[c] = append(bugsByCatname[c], bug) + } + + for _, g := range groups { + catNames := make(map[string]bool) + for _, ops := range g.Ops { + for _, op := range ops { + catNames[op.Catalogname()] = true + } + } + for catName, _ := range catNames { + g.Bugs = append(g.Bugs, bugsByCatname[catName]...) + } + } +} + +// Find the last time. +func setLatestModifications(groups map[string]*CrossCatIntGroup) { + // The latest operation in the group is the time of the whole group. + for key := range groups { + var t time.Time + for _, opslice := range groups[key].Ops { + for _, op := range opslice { + if t.IsZero() || t.Before(op.SourceChanged) { + t = op.SourceChanged + } + } + } + groups[key].LatestMod = t + } +} + +// Add dependencies. In every group: +// - For each catalog +// - For each added package +// - For each dependency of an added package +// - If there is another group which changes/adds this package, +// that group must be included in this group. +// - If there isn't another group which adds the package, the package +// must be already in the target catalog. +// +// Ingredients needed: +// - groups to modify +// - contents of the target catalog +func addDependencies(groups map[string]*CrossCatIntGroup, targetCatByPkgname map[diskformat.CatalogSpec]map[string]*diskformat.PackageExtra) { + groupProvides := make(map[diskformat.CatalogSpec]map[string]*CrossCatIntGroup) + for _, group := range groups { + for spec, ops := range group.Ops { + for _, op := range ops { + if _, ok := groupProvides[spec]; !ok { + groupProvides[spec] = make(map[string]*CrossCatIntGroup) + } + if op.Added != nil { + groupProvides[spec][op.Added.Pkgname] = group + } + } + } + } + + for _, group := range groups { + for spec, ops := range group.Ops { + for _, op := range ops { + if op.Added != nil { + for _, dep := range op.Added.Deps { + // A dependency of this group + // + // What if one group removes a package and another group depends on it? + // This is only possible if the source catalog is broken. + // Maybe we should still add some checks for it? + + if pkgByPkgname, ok := targetCatByPkgname[spec]; ok { + if _, ok := pkgByPkgname[dep]; !ok { + // No catalog provides this dependency. But there is stil hope! + // Maybe one of the groups provides the package? + if groupByPkgname, ok := groupProvides[spec]; ok { + if groupProviding, ok := groupByPkgname[dep]; ok { + if groupProviding.Key != group.Key { + group.Dependencies[groupProviding.Key] = groupProviding + // We could also add some information why this dependency is needed here. + } + } else { + log.Fatalln("The", groupProviding.Key, "group doesn't provide", dep) + } + } else { + log.Fatalln("Catalog", spec, "does not provide package", dep, + "which is required by package", + op.Added.Basename, op.Added.Md5_sum) + } + } + } else { + log.Fatalln("targetCatByPkgname does not provide catalog", spec) + } + } + } + } + } + } +} + +func canBeIntegrated(groups map[string]*CrossCatIntGroup) { + requiredAge := time.Duration(time.Hour * (-24) * time.Duration(daysOldRequired)) + now := time.Now() + for key := range groups { + problems := make([]string, 0) + // I can't make sense of the Before/After thing here. + if now.Add(requiredAge).Before(groups[key].LatestMod) { + msg := fmt.Sprintf("Not old enough: %v, but %v age is required (%v days)", + now.Sub(groups[key].LatestMod), (-1) * requiredAge, + daysOldRequired) + problems = append(problems, msg) + } + if len(groups[key].Bugs) > 0 { + msg := fmt.Sprintf("Critical bugs") + problems = append(problems, msg) + } + if len(groups[key].Dependencies) > 0 { + msg := ("This group depends on other groups. We cannot " + + "evaluate all groups recursively because of a potential graph " + + "cycle. " + + "You will need to integrate the dependencies first, and then " + + "proceed to this group in the next iteration.") + problems = append(problems, msg) + } + groups[key].CanBeIntegratedNow = len(problems) == 0 + groups[key].Evaluated = true + groups[key].Messages = append(groups[key].Messages, problems...) + } +} + // Analyzes the data. -func pipeStage3(in <-chan CatalogWithSpecTransition, mantisBugs <-chan mantis.Bug) <-chan IntegrationResult { - out := make(chan IntegrationResult) +func pipeStage3(in <-chan CatalogWithSpecTransition, mantisBugs <-chan mantis.Bug) <-chan reportData { + out := make(chan reportData) go func() { // Catalog timing information timing := new(CatalogReleaseTimeInfo) @@ -575,7 +862,6 @@ "-- If this is the first run, please create an empty file with", "the '{}' contents, location:", packageTimesFilename) } - rd := reportData{ to_catrel_flag, time.Now(), @@ -583,15 +869,26 @@ make([]*CrossCatIntGroup, 0), timing.catalogs, } + + // To discover dependencies later. + // We need to go from package name to md5 sum + // Then from package name to another integration group + // + // Pointer business again, to save memory. It will probably not work as expected. + targetCatByPkgname := make(map[diskformat.CatalogSpec]map[string]*diskformat.PackageExtra) + for t := range in { timing.Update(t.fromCat) - groups, badops := GroupsFromCatalogPair(t) + groups, badops := GroupsFromCatalogPair(t, timing) rd.Catalogs = append( rd.Catalogs, catalogIntegration{t.fromCat.Spec, groups, badops}) - msg := fmt.Sprintf("Processed data for: %+v ? %+v", - t.fromCat.Spec, t.toCat.Spec) - out <-IntegrationResult{msg} + if _, ok := targetCatByPkgname[t.toCat.Spec]; !ok { + targetCatByPkgname[t.toCat.Spec] = make(map[string]*diskformat.PackageExtra) + } + for i := range t.toCat.PkgsExtra { + targetCatByPkgname[t.toCat.Spec][t.toCat.PkgsExtra[i].Pkgname] = &t.toCat.PkgsExtra[i] + } } // We're walking the reportData structure and populating the @@ -606,7 +903,7 @@ group = NewCrossCatIntGroup(key) groups[key] = group } - // We have our CrossCatIntGroup here + // We have our CrossCatIntGroup now. if _, ok := group.Ops[srcIntGroup.Spec]; !ok { group.Ops[srcIntGroup.Spec] = make([]catalogOperation, 0) } @@ -615,63 +912,18 @@ } } - // Severities from mantis that don't block package promotions. - lowSeverities := [...]string{ - "Trivial", - "Minor", - "Feature", - } + setLatestModifications(groups) + addBlockingBugs(groups, mantisBugs) + addDependencies(groups, targetCatByPkgname) + canBeIntegrated(groups) - // Add blocking Mantis Bugs. - bugsByCatname := make(map[string][]mantis.Bug) - for bug := range mantisBugs { - // Bugs that aren't blockers. - if bug.Status == "Closed" || bug.Status == "Resolved" { - continue - } - shouldSkip := false - for _, sev := range lowSeverities { - if bug.Severity == sev { - shouldSkip = true - break - } - } - if shouldSkip { - continue - } - c := bug.Catalogname - if _, ok := bugsByCatname[c]; !ok { - bugsByCatname[c] = make([]mantis.Bug, 0) - } - bugsByCatname[c] = append(bugsByCatname[c], bug) - } - + // Sort by group / bundle name for _, g := range groups { - catNames := make(map[string]bool) - for _, ops := range g.Ops { - for _, op := range ops { - catNames[op.Catalogname()] = true - } - } - for catName, _ := range catNames { - g.Bugs = append(g.Bugs, bugsByCatname[catName]...) - } - } - - for _, g := range groups { rd.CrossCatGroups = append(rd.CrossCatGroups, g) } sort.Sort(ByKey(rd.CrossCatGroups)) - // Let's write the HTML report. - var wg sync.WaitGroup - wg.Add(1) - go func(rd reportData) { - log.Println("Starting a goroutine to write the report.") - defer wg.Done() - writeReport(rd) - }(rd) - wg.Wait() + out <- rd if err := timing.Save(); err != nil { log.Fatalln("Could not save the timing information:", err) @@ -728,16 +980,94 @@ return out } +func maybeApplyChanges(rd reportData, cr credentials) { + // Depends on dry_run. + logBasename := fmt.Sprintf(time.Now().Format("catalog-integrations-2006-01.log")) + runLog := path.Join(htmlReportDir, logBasename) + fo, err := os.OpenFile(runLog, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0644) + if err != nil { + log.Fatalln("Could not write to", runLog) + } + defer fo.Close() + + timestampWritten := false + client := new(http.Client) + for _, group := range rd.CrossCatGroups { + if !group.Evaluated { + log.Println("Group", group.Key, "was not evaluated, changes will not be applied.") + continue + } + if !group.CanBeIntegratedNow { + log.Println("Group", group.Key, "is not marked for integration now.") + continue + } + if !group.HasOperations() { + log.Println("Group", group.Key, "has no operations to perform.") + continue + } + if !timestampWritten { + fo.WriteString(fmt.Sprintf("# STARTED %s\n", rd.GeneratedOn)) + timestampWritten = true + } + log.Println("Continuing to process changes for", group.Key) + fo.WriteString(fmt.Sprintf("# PERFORMING %s\n", group.Key)) + for _, ops := range group.Ops { + for _, op := range ops { + if err := op.Perform(client, cr, fo); err != nil { + // This error contains auth info. + // fo.WriteString(fmt.Sprintf("# ERROR: %s\n", err)) + log.Fatalf("Performing '%s' has failed: %s", op, err) + } + } + } + fo.WriteString(fmt.Sprintf("# ROLLBACK FOR %s\n", group.Key)) + for _, ops := range group.Ops { + for _, op := range ops { + for _, line := range op.Rollback() { + fo.WriteString(fmt.Sprintf("%s\n", line)) + } + } + } + } + if timestampWritten { + fo.WriteString(fmt.Sprintf("# FINISHED %s\n", rd.GeneratedOn)) + } +} + func main() { + programStart := time.Now() flag.Parse() + + log.SetFlags(log.Llongfile | log.Ldate | log.Ltime) + if logFile != "-" { + fo, err := os.OpenFile(logFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0644) + if err != nil { + log.Println("Could not create the log file:", err) + return + } + defer fo.Close() + log.Println("Writing an additional copy of the log to", logFile) + log.SetOutput(io.MultiWriter(os.Stdout, fo)) + } + log.Println("Program start") + crch := make(chan credentials) + go func(crch chan credentials) { + crch <- GetCredentials() + }(crch) + mch := mantisChan() tch := pipeStage1() + // Parallelization of the pipeline. cch1 := pipeStage2(tch) cch2 := pipeStage2(tch) - rch := pipeStage3(merge(cch1, cch2), mch) - for r := range rch { - log.Println("Result:", r) + cch3 := pipeStage2(tch) + rch := pipeStage3(merge(cch1, cch2, cch3), mch) + + for rd := range rch { + writeReport(rd) + maybeApplyChanges(rd, <-crch) } + log.Println("Finished, running time: ", time.Since(programStart)) } Added: csw/mgar/gar/v2/go/src/promote-packages/report-template.css =================================================================== --- csw/mgar/gar/v2/go/src/promote-packages/report-template.css (rev 0) +++ csw/mgar/gar/v2/go/src/promote-packages/report-template.css 2014-08-03 01:26:04 UTC (rev 23908) @@ -0,0 +1,77 @@ +body, p, li, h1, h2, h3, h4, h5 { + font-family: sans-serif; +} +body, p, li { + font-size: 12px; +} +span.group-name { + font-weight: bold; +} +ul.commands-to-run { + list-style: none; + background-color: #DDD; +} +table.grid { + border-collapse: collapse; +} +table.grid td, table.grid th { + border: 1px solid #DDD; +} + +/* Blocking bugs */ +table.blocking-bugs { + width: 100%; + margin: 0; + padding: 0; +} +table.blocking-bugs th { + background-color: #FDD7E4; + font-size: 120%; + font-weight: bold; +} + +ul.commands-to-run li code { + white-space: pre; +} +table.ccatgroup { + margin-top: 10px; + margin-bottom: 10px; +} +table.ccatgroup th { + font-size: 120%; +} +table.ccatgroup th.key { + font-size: 250%; + font-weight: bold; +} +ul.group-summary-list { + list-style-type: none; +} +ul.group-summary-list li { + margin: 1px; + float: left; + width: 10em; +} +.can-be-integrated { + background-color: lightgreen; +} +.cannot-be-integrated { + background-color: pink; +} +.not-evaluated { + background-color: #EEE; +} +table.ccatgroup td.spec { + background-color: white; +} +table.ccatgroup td.spec a { + color: #AAA; + font-weight: bold; + text-decoration: none; +} +table.ccatgroup td.comment { + color: #AAA; +} +ul.cross-cat-groups { + list-style-type: none; +} Added: csw/mgar/gar/v2/go/src/promote-packages/report-template.html =================================================================== --- csw/mgar/gar/v2/go/src/promote-packages/report-template.html (rev 0) +++ csw/mgar/gar/v2/go/src/promote-packages/report-template.html 2014-08-03 01:26:04 UTC (rev 23908) @@ -0,0 +1,189 @@ + + + + unstable ? {{ .CatalogName }} report for {{ .GeneratedOn }} + + + + +

unstable ? {{ .CatalogName }} report for {{ .GeneratedOn }}

+

Groups of packages (based on bundles)

+
+ +
+

Details

+ +

Not handled by automation

+

These packages don't have a defined bundle.

+ + Commands to run: + + + 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 Aug 3 07:18:08 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 05:18:08 +0000 Subject: SF.net SVN: gar:[23910] csw/mgar/gar/v2/go/src/promote-packages/ promote-packages.go Message-ID: <3hQr9014WLzS2@mail.opencsw.org> Revision: 23910 http://sourceforge.net/p/gar/code/23910 Author: wahwah Date: 2014-08-03 05:18:05 +0000 (Sun, 03 Aug 2014) Log Message: ----------- promote-packages: Support for package deletions This fixes 2 bugs: When a package goes from present to absent, we only update the timestamp the first time we see it's absent. If it continues to be absent, let's not touch the timestamp. When a package from from absent to present, but was previously in the timing data structure, we do need to erase the previous entry and create a new one. This is the !pti.Present condition. Modified Paths: -------------- csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go Modified: csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go =================================================================== --- csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go 2014-08-03 05:11:22 UTC (rev 23909) +++ csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go 2014-08-03 05:18:05 UTC (rev 23910) @@ -208,7 +208,7 @@ } inCat := make(map[diskformat.Md5Sum]bool) for _, p := range c.PkgsExtra { - if _, ok := t.catalogs[c.Spec][p.Md5_sum]; !ok { + if pti, ok := t.catalogs[c.Spec][p.Md5_sum]; !ok || !pti.Present { // Packages we haven't seen yet that are in the catalog. t.catalogs[c.Spec][p.Md5_sum] = PackageTimeInfo{ c.Spec, @@ -226,10 +226,13 @@ if _, ok := inCat[md5]; !ok { // Packages that aren't in the catalog (any more). p := t.catalogs[c.Spec][md5] - // This field is not actually read anywhere. It's enough that an entry exists. - p.Present = false - p.ChangedAt = time.Now() - t.catalogs[c.Spec][md5] = p + // Only update the last-seen time the first time the package goes from + // present to absent. Otherwise the entry wouldn't age. + if p.Present { + p.Present = false + p.ChangedAt = time.Now() + t.catalogs[c.Spec][md5] = p + } } } } 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 Aug 3 07:18:15 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 05:18:15 +0000 Subject: SF.net SVN: gar:[23911] csw/mgar/gar/v2/lib/python Message-ID: <3hQr973WHGzTX@mail.opencsw.org> Revision: 23911 http://sourceforge.net/p/gar/code/23911 Author: wahwah Date: 2014-08-03 05:18:15 +0000 (Sun, 03 Aug 2014) Log Message: ----------- checkpkg: New packages should not depend on stubs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-08-03 05:18:05 UTC (rev 23910) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-08-03 05:18:15 UTC (rev 23911) @@ -445,6 +445,10 @@ self.pkgs_by_path_cache[key] = pkgs return self.pkgs_by_path_cache[key] + def GetPkgByPkgname(self, pkgname): + return self.rest_client.Srv4ByCatalogAndPkgname( + self.catrel, self.arch, self.osrel, pkgname) + def GetInstalledPackages(self): return self.catalog.GetInstalledPackages( self.osrel, self.arch, self.catrel) Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2014-08-03 05:18:05 UTC (rev 23910) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2014-08-03 05:18:15 UTC (rev 23911) @@ -1320,3 +1320,40 @@ "in the usual locations. " "Locations checked for 64-bit binaries: %s." % (binaries[0], paths_64_str)) + +def CheckShouldNotDependOnStub(pkg_data, error_mgr, logger, messenger): + """Newly built packages should not declare stubs as dependencies. + + Example data structure: + { + "arch": "sparc", + "basename": "bash-4.3.0,REV=2014.03.15-SunOS5.10-sparc-CSW.pkg.gz", + "catalogname": "bash", + "file_basename": "bash-4.3.0,REV=2014.03.15-SunOS5.10-sparc-CSW.pkg.gz", + "filename_arch": "sparc", + "maintainer_email": "yann at opencsw.org", + "maintainer_full_name": "Yann Rouillard", + "maintainer_id": 50, + "md5_sum": "5556f5bb4317267f5b3b4c51a9a13d25", + "mtime": "2014-03-15T21:05:47", + "osrel": "SunOS5.10", + "pkgname": "CSWbash", + "repository_url": "https://chninkel/Makefile", + "rev": "2014.03.15", + "size": 2323045, + "vendor_url": "http://tiswww.case.edu/php/chet/bash/bashtop.html", + "version": "4.3.0,REV=2014.03.15", + "version_string": "4.3.0,REV=2014.03.15" + } + """ + for dep_pkgname, _ in pkg_data['depends']: + # This package better not be a stub. + # But how do we know it's a stub? We test for the presence of... + dep_data = error_mgr.GetPkgByPkgname(dep_pkgname) + if dep_data['catalogname'].endswith('_stub'): + error_mgr.ReportError( + 'dependency-on-stub', + dep_data['catalogname'], + 'Please not declare dependencies on stubs in newly built packages. ' + 'There is another dependency which you should use. ' + 'You need to find it in e.g. http://www.opencsw.org/packages/') Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2014-08-03 05:18:05 UTC (rev 23910) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2014-08-03 05:18:15 UTC (rev 23911) @@ -15,8 +15,6 @@ import os.path import pprint -from lib.python.testdata.djvulibre_rt_stats import pkgstats as djvulibre_rt_stats - from lib.python import checkpkg_lib from lib.python import fake_pkgstats_composer from lib.python import package_checks as pc @@ -26,10 +24,7 @@ from lib.python.testdata import stubs from lib.python.testdata.berkeleydb48_stats import pkgstats as bdb48_stats -# from lib.python.testdata.cadaver_stats import pkgstats as cadaver_stats -# from lib.python.testdata.ivtools_stats import pkgstats as ivtools_stats -# from lib.python.testdata.javasvn_stats import pkgstats as javasvn_stats -# from lib.python.testdata.mercurial_stats import pkgstats as mercurial_stats +from lib.python.testdata.djvulibre_rt_stats import pkgstats as djvulibre_rt_stats from lib.python.testdata.neon_stats import pkgstats as neon_stats from lib.python.testdata.rsync_stats import pkgstats as rsync_stats from lib.python.testdata.sudo_stats import pkgstats as sudo_stats Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2014-08-03 05:18:05 UTC (rev 23910) +++ csw/mgar/gar/v2/lib/python/rest.py 2014-08-03 05:18:15 UTC (rev 23911) @@ -70,7 +70,9 @@ self.ValidateMd5(md5_sum) return self.GetBlob('pkgstats', md5_sum) - @retry_decorator.Retry(tries=DEFAULT_TRIES, exceptions=(RestCommunicationError, httplib.BadStatusLine)) + @retry_decorator.Retry(tries=DEFAULT_TRIES, + exceptions=(RestCommunicationError, + httplib.BadStatusLine)) def GetCatalogData(self, md5_sum): self.ValidateMd5(md5_sum) url = self.pkgdb_url + "/srv4/%s/catalog-data/" % 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 Aug 3 13:04:48 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 11:04:48 +0000 Subject: SF.net SVN: gar:[23913] csw/mgar/gar/v2/lib/python Message-ID: <3hQzry21CZzhB@mail.opencsw.org> Revision: 23913 http://sourceforge.net/p/gar/code/23913 Author: wahwah Date: 2014-08-03 11:04:47 +0000 (Sun, 03 Aug 2014) Log Message: ----------- checkpkg: A dependency might not exist. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-08-03 10:24:24 UTC (rev 23912) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-08-03 11:04:47 UTC (rev 23913) @@ -981,8 +981,7 @@ ] res = m.Pkginst.select(oac, join=join) - pkgs = [x.pkgname for x in res] - return pkgs + return [x.pkgname for x in res] def GetPathsAndPkgnamesByBasename(self, basename, osrel, arch, catrel): """Retrieves pkginst names of packages that have certain files. Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2014-08-03 10:24:24 UTC (rev 23912) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2014-08-03 11:04:47 UTC (rev 23913) @@ -1350,6 +1350,8 @@ # This package better not be a stub. # But how do we know it's a stub? We test for the presence of... dep_data = error_mgr.GetPkgByPkgname(dep_pkgname) + if dep_data is None: + continue if dep_data['catalogname'].endswith('_stub'): error_mgr.ReportError( 'dependency-on-stub', 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 Aug 3 19:41:31 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 17:41:31 +0000 Subject: SF.net SVN: gar:[23915] csw/mgar/pkg/libyaml/branches/libyaml-1.x Message-ID: <3hR8fr2D3tz15H@mail.opencsw.org> Revision: 23915 http://sourceforge.net/p/gar/code/23915 Author: wahwah Date: 2014-08-03 17:41:30 +0000 (Sun, 03 Aug 2014) Log Message: ----------- libyaml/branches/libyaml-1.x: libyaml0-1 for Solaris 9 Modified Paths: -------------- csw/mgar/pkg/libyaml/branches/libyaml-1.x/Makefile csw/mgar/pkg/libyaml/branches/libyaml-1.x/checksums Modified: csw/mgar/pkg/libyaml/branches/libyaml-1.x/Makefile =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml-1.x/Makefile 2014-08-03 11:26:02 UTC (rev 23914) +++ csw/mgar/pkg/libyaml/branches/libyaml-1.x/Makefile 2014-08-03 17:41:30 UTC (rev 23915) @@ -3,37 +3,35 @@ # $Id$ NAME = libyaml -VERSION = 0.1.4 +VERSION = 0.1.2 GARTYPE = v2 DESCRIPTION = A YAML 1.1 parser and emitter written in C -define BLURB -endef VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 MASTER_SITES = http://pyyaml.org/download/libyaml/ -DISTFILES = yaml-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTNAME = yaml-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = -PACKAGES += CSWlibyaml0-2 -CATALOGNAME_CSWlibyaml0-2 = libyaml0_2 -PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2\.0\.2) -PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibyaml0-2 += $(DESCRIPTION), libyaml-0.so.2 -OBSOLETED_BY_CSWlibyaml0-2 = CSWlibyaml +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +PACKAGES += CSWlibyaml0-1 +CATALOGNAME_CSWlibyaml0-1 = libyaml0_1 +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibyaml0-1 += $(DESCRIPTION), libyaml-0.so.1 +OBSOLETED_BY_CSWlibyaml0-1 = CSWlibyaml + PACKAGES += CSWlibyaml-dev CATALOGNAME_CSWlibyaml-dev = libyaml_dev SPKG_DESC_CSWlibyaml-dev += $(DESCRIPTION), development files -RUNTIME_DEP_PKGS_CSWlibyaml-dev += CSWlibyaml0-2 +RUNTIME_DEP_PKGS_CSWlibyaml-dev += CSWlibyaml0-1 +OBSOLETED_BY_CSWlibyaml-dev = CSWlibyaml # PKGFILES is catchall -CATALOGNAME_CSWlibyaml = libyaml_stub - CONFIGURE_ARGS = $(DIRPATHS) BUILD64_LIBS_ONLY = 1 -WORKSRC = $(WORKDIR)/yaml-$(VERSION) include gar/category.mk Modified: csw/mgar/pkg/libyaml/branches/libyaml-1.x/checksums =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml-1.x/checksums 2014-08-03 11:26:02 UTC (rev 23914) +++ csw/mgar/pkg/libyaml/branches/libyaml-1.x/checksums 2014-08-03 17:41:30 UTC (rev 23915) @@ -1 +1 @@ -36c852831d02cf90508c29852361d01b yaml-0.1.4.tar.gz +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.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 Sun Aug 3 21:45:47 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 3 Aug 2014 19:45:47 +0000 Subject: SF.net SVN: gar:[23917] csw/mgar/pkg/libyaml/trunk Message-ID: <3hRCQ52XDqz1CD@mail.opencsw.org> Revision: 23917 http://sourceforge.net/p/gar/code/23917 Author: wahwah Date: 2014-08-03 19:45:38 +0000 (Sun, 03 Aug 2014) Log Message: ----------- libyaml/trunk: Version bump plus a stupid patch Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile csw/mgar/pkg/libyaml/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libyaml/trunk/files/0001-Solaris-headers-are-different.patch Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2014-08-03 19:15:58 UTC (rev 23916) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2014-08-03 19:45:38 UTC (rev 23917) @@ -3,7 +3,7 @@ # $Id$ NAME = libyaml -VERSION = 0.1.4 +VERSION = 0.1.6 GARTYPE = v2 DESCRIPTION = A YAML 1.1 parser and emitter written in C @@ -17,6 +17,8 @@ PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +PATCHFILES += 0001-Solaris-headers-are-different.patch + PACKAGES += CSWlibyaml0-2 CATALOGNAME_CSWlibyaml0-2 = libyaml0_2 PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2(\.\d+)*) Modified: csw/mgar/pkg/libyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/libyaml/trunk/checksums 2014-08-03 19:15:58 UTC (rev 23916) +++ csw/mgar/pkg/libyaml/trunk/checksums 2014-08-03 19:45:38 UTC (rev 23917) @@ -1 +1 @@ -36c852831d02cf90508c29852361d01b yaml-0.1.4.tar.gz +5fe00cda18ca5daeb43762b80c38e06e yaml-0.1.6.tar.gz Added: csw/mgar/pkg/libyaml/trunk/files/0001-Solaris-headers-are-different.patch =================================================================== --- csw/mgar/pkg/libyaml/trunk/files/0001-Solaris-headers-are-different.patch (rev 0) +++ csw/mgar/pkg/libyaml/trunk/files/0001-Solaris-headers-are-different.patch 2014-08-03 19:45:38 UTC (rev 23917) @@ -0,0 +1,33 @@ +From 4b174c3e9d937ea5276341c2e2bda7392d8a4571 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 3 Aug 2014 21:40:27 +0200 +Subject: [PATCH] Solaris headers are different + +--- + src/yaml_private.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/yaml_private.h b/src/yaml_private.h +index f0e1001..1d3fc7f 100644 +--- a/src/yaml_private.h ++++ b/src/yaml_private.h +@@ -10,7 +10,7 @@ + #include + + #ifndef _MSC_VER +-#include ++#include + #else + #ifdef _WIN64 + #define PTRDIFF_MAX _I64_MAX +@@ -18,6 +18,7 @@ + #define PTRDIFF_MAX INT_MAX + #endif + #endif ++#define PTRDIFF_MAX INT_MAX + + /* + * Memory management. +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Aug 4 07:44:42 2014 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 4 Aug 2014 05:44:42 +0000 Subject: SF.net SVN: gar:[23918] csw/mgar/pkg/mercurial/trunk Message-ID: <3hRSj80gLBz1Sj@mail.opencsw.org> Revision: 23918 http://sourceforge.net/p/gar/code/23918 Author: rthurner Date: 2014-08-04 05:44:37 +0000 (Mon, 04 Aug 2014) Log Message: ----------- mercurial/trunk: mercurial upgrade to hg-3.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 2014-08-03 19:45:38 UTC (rev 23917) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2014-08-04 05:44:37 UTC (rev 23918) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.0.2 +VERSION = 3.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2014-08-03 19:45:38 UTC (rev 23917) +++ csw/mgar/pkg/mercurial/trunk/checksums 2014-08-04 05:44:37 UTC (rev 23918) @@ -1 +1 @@ -c5be4265745a8140fec777a4dfc40e0e mercurial-3.0.2.tar.gz +d3916736a9d356899191409e546b5964 mercurial-3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Aug 4 10:46:33 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 4 Aug 2014 08:46:33 +0000 Subject: SF.net SVN: gar:[23919] csw/mgar/pkg/ImageMagick/trunk Message-ID: <3hRXkz0lb1zM7@mail.opencsw.org> Revision: 23919 http://sourceforge.net/p/gar/code/23919 Author: lblume Date: 2014-08-04 08:46:30 +0000 (Mon, 04 Aug 2014) Log Message: ----------- ImageMagick/trunk: Bump to 6.8.9-6; remove OBSOLETED_BY Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-08-04 05:44:37 UTC (rev 23918) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-08-04 08:46:30 UTC (rev 23919) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.8.9 -GARSUBREV = 2 +GARSUBREV = 6 #BETAREV = beta20140518 GARTYPE = v2 @@ -61,7 +61,6 @@ RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibmagickcore6q16hdri2 += CSWlibmagickcore6q16hdri1 PACKAGES += CSWlibmagickwand6q16hdri2 CATALOGNAME_CSWlibmagickwand6q16hdri2 = libmagickwand6q16hdri2 @@ -73,7 +72,6 @@ RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibmagickcore6q16hdri2 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibmagickwand6q16hdri2 += CSWlibmagickwand6q16hdri1 PACKAGES += CSWlibmagick++6q16hdri4 CATALOGNAME_CSWlibmagick++6q16hdri4 = libmagick++6q16hdri4 @@ -186,10 +184,8 @@ REINPLACE_USRLOCAL += config/mime.xml -#EXTRA_LINKER_FLAGS = -lsocket -lnsl -#EXTRA_LD_OPTIONS = -z nolazyload -EXTRA_LINKER_FLAGS = -lsocket -lnsl -Wl,-z,nolazyload -Wl,-Bdirect -EXTRA_LD_OPTIONS = -z nolazyload -Bdirect +EXTRA_LINKER_FLAGS = -lsocket -lnsl +EXTRA_LD_OPTIONS = -z nolazyload # We especially don't want ISALIST for the above /usr/openwin/lib # This should be reworked after a general rework of ISALIST in GAR Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2014-08-04 05:44:37 UTC (rev 23918) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2014-08-04 08:46:30 UTC (rev 23919) @@ -1 +1 @@ -c4bbc23fc209e7d43628d28296616cac ImageMagick-6.8.9-2.tar.xz +97f24ab74f1e42ac90d337b073f99799 ImageMagick-6.8.9-6.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Aug 4 12:02:59 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 4 Aug 2014 10:02:59 +0000 Subject: SF.net SVN: gar:[23922] csw/mgar/pkg/smartmontools/trunk/Makefile Message-ID: <3hRZR83YRyz1T6@mail.opencsw.org> Revision: 23922 http://sourceforge.net/p/gar/code/23922 Author: lblume Date: 2014-08-04 10:02:58 +0000 (Mon, 04 Aug 2014) Log Message: ----------- smartmontools/trunk: Disable building on S9 Modified Paths: -------------- csw/mgar/pkg/smartmontools/trunk/Makefile Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2014-08-04 09:47:59 UTC (rev 23921) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2014-08-04 10:02:58 UTC (rev 23922) @@ -16,13 +16,12 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -GARCOMPILER = GCC4 - # smartmontools packages built on 5.9 don't work on 5.10: # > Error SMART Thresholds Read failed: I/O error # > Smartctl: SMART Read Thresholds failed. # However, packages built on 5.10 do work on 5.11. -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +# update: from 6.3, doesn't build on S9 anymore. Disabling. +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Aug 4 14:47:52 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 4 Aug 2014 12:47:52 +0000 Subject: SF.net SVN: gar:[23923] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: <3hRf5Q6dpHzXQ@mail.opencsw.org> Revision: 23923 http://sourceforge.net/p/gar/code/23923 Author: lblume Date: 2014-08-04 12:47:51 +0000 (Mon, 04 Aug 2014) Log Message: ----------- ImageMagick/trunk: Adjust for soname change Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-08-04 10:02:58 UTC (rev 23922) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-08-04 12:47:51 UTC (rev 23923) @@ -73,15 +73,15 @@ RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1 -PACKAGES += CSWlibmagick++6q16hdri4 -CATALOGNAME_CSWlibmagick++6q16hdri4 = libmagick++6q16hdri4 -PKGFILES_CSWlibmagick++6q16hdri4 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.4\.0\.0) -PKGFILES_CSWlibmagick++6q16hdri4 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibmagick++6q16hdri4 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.4 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibmagickcore6q16hdri2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibmagickwand6q16hdri2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibstdc++6 +PACKAGES += CSWlibmagick++6q16hdri5 +CATALOGNAME_CSWlibmagick++6q16hdri5 = libmagick++6q16hdri5 +PKGFILES_CSWlibmagick++6q16hdri5 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.5\.0\.0) +PKGFILES_CSWlibmagick++6q16hdri5 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibmagick++6q16hdri5 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.5 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibmagickcore6q16hdri2 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibmagickwand6q16hdri2 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibstdc++6 PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries @@ -92,7 +92,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri2 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri2 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri4 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri5 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl PACKAGES += CSWimagemagick @@ -157,17 +157,17 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibgomp1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri4 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibglib2-0-0 endif ### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Aug 6 09:12:08 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 6 Aug 2014 07:12:08 +0000 Subject: SF.net SVN: gar:[23925] csw/mgar/pkg/pidgin-sipe/trunk Message-ID: <3hSkYC2ypNzJp@mail.opencsw.org> Revision: 23925 http://sourceforge.net/p/gar/code/23925 Author: lblume Date: 2014-08-06 07:12:04 +0000 (Wed, 06 Aug 2014) Log Message: ----------- pidgin-sipe/trunk: Bump to 1.18.2; remove useless dep; add needed LD_OPTIONS Modified Paths: -------------- csw/mgar/pkg/pidgin-sipe/trunk/Makefile csw/mgar/pkg/pidgin-sipe/trunk/checksums Modified: csw/mgar/pkg/pidgin-sipe/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin-sipe/trunk/Makefile 2014-08-05 12:37:11 UTC (rev 23924) +++ csw/mgar/pkg/pidgin-sipe/trunk/Makefile 2014-08-06 07:12:04 UTC (rev 23925) @@ -1,5 +1,5 @@ NAME = pidgin-sipe -VERSION = 1.15.1 +VERSION = 1.18.2 GARTYPE = v2 DESCRIPTION = The SIPE Project - A third-party Pidgin plugin for Microsoft LCS/OCS @@ -25,7 +25,6 @@ RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWpidgin RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibsmime3 RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibxml2-2 @@ -48,4 +47,6 @@ BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWpidgin +EXTRA_LD_OPTIONS = -lsocket -lnsl + include gar/category.mk Modified: csw/mgar/pkg/pidgin-sipe/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin-sipe/trunk/checksums 2014-08-05 12:37:11 UTC (rev 23924) +++ csw/mgar/pkg/pidgin-sipe/trunk/checksums 2014-08-06 07:12:04 UTC (rev 23925) @@ -1 +1 @@ -a08af4ad94a8df901ad01dc05792bec0 pidgin-sipe-1.15.1.tar.bz2 +c1a9d00170bc264e722d71834082ba25 pidgin-sipe-1.18.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Aug 6 09:26:39 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 6 Aug 2014 07:26:39 +0000 Subject: SF.net SVN: gar:[23926] csw/mgar/pkg/pidgin-sipe/trunk/Makefile Message-ID: <3hSksq00fnzbV@mail.opencsw.org> Revision: 23926 http://sourceforge.net/p/gar/code/23926 Author: lblume Date: 2014-08-06 07:26:31 +0000 (Wed, 06 Aug 2014) Log Message: ----------- pidgin-sipe/trunk: Add ld bug workaround Modified Paths: -------------- csw/mgar/pkg/pidgin-sipe/trunk/Makefile Modified: csw/mgar/pkg/pidgin-sipe/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin-sipe/trunk/Makefile 2014-08-06 07:12:04 UTC (rev 23925) +++ csw/mgar/pkg/pidgin-sipe/trunk/Makefile 2014-08-06 07:26:31 UTC (rev 23926) @@ -34,6 +34,18 @@ CHECKPKG_OVERRIDES_CSWpidgin-sipe += surplus-dependency|CSWpidgin +### +# Needed for the Solaris ld bug +ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibplc4 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibssl3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibnssutil3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibplds4 +endif +### + BUILD_DEP_PKGS += CSWintltool BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibgtk2-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Aug 6 15:51:35 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 6 Aug 2014 13:51:35 +0000 Subject: SF.net SVN: gar:[23929] csw/mgar/pkg Message-ID: <3hSvQ01MTJzrQ@mail.opencsw.org> Revision: 23929 http://sourceforge.net/p/gar/code/23929 Author: dmichelsen Date: 2014-08-06 13:51:33 +0000 (Wed, 06 Aug 2014) Log Message: ----------- apache24: Fix directory structure Added Paths: ----------- csw/mgar/pkg/apache24/ csw/mgar/pkg/apache24/Makefile csw/mgar/pkg/apache24/branches/ csw/mgar/pkg/apache24/tags/ csw/mgar/pkg/apache24/trunk/ Removed Paths: ------------- csw/mgar/pkg/apache24/ Copied: csw/mgar/pkg/apache24/Makefile (from rev 23923, csw/mgar/pkg/apache2/Makefile) =================================================================== --- csw/mgar/pkg/apache24/Makefile (rev 0) +++ csw/mgar/pkg/apache24/Makefile 2014-08-06 13:51:33 UTC (rev 23929) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Aug 6 20:24:29 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 6 Aug 2014 18:24:29 +0000 Subject: SF.net SVN: gar:[23930] csw/mgar/pkg/mailman/trunk Message-ID: <3hT1Sv0RfBzyY@mail.opencsw.org> Revision: 23930 http://sourceforge.net/p/gar/code/23930 Author: jake_goerzen Date: 2014-08-06 18:24:29 +0000 (Wed, 06 Aug 2014) Log Message: ----------- mailman: add CONFIGURE_ARGS options; add system USERGROUP entry Modified Paths: -------------- csw/mgar/pkg/mailman/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mailman/trunk/files/cswusergroup Modified: csw/mgar/pkg/mailman/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailman/trunk/Makefile 2014-08-06 13:51:33 UTC (rev 23929) +++ csw/mgar/pkg/mailman/trunk/Makefile 2014-08-06 18:24:29 UTC (rev 23930) @@ -26,6 +26,8 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --without-permcheck CONFIGURE_ARGS += --with-python=/opt/csw/bin/python2.7 +CONFIGURE_ARGS += --with-mailhost=mailhost +CONFIGURE_ARGS += --with-urlhost=example.com # There is no testsuite TEST_SCRIPTS = @@ -33,6 +35,8 @@ PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co] +USERGROUP = /etc/opt/csw/pkg/CSWmailman/cswusergroup + CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=18|arch_name=sparcv8+ CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=3|arch_name=i386 CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/share|root/opt/csw/mailman/Mailman/Defaults.py Added: csw/mgar/pkg/mailman/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/mailman/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mailman/trunk/files/cswusergroup 2014-08-06 18:24:29 UTC (rev 23930) @@ -0,0 +1 @@ +mailman:mailman:GNU Mailman:/dev/null:/bin/false:::NP This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Thu Aug 7 11:46:50 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Thu, 7 Aug 2014 09:46:50 +0000 Subject: SF.net SVN: gar:[23932] csw/mgar/pkg Message-ID: <3hTPxF0nM7z1RY@mail.opencsw.org> Revision: 23932 http://sourceforge.net/p/gar/code/23932 Author: rmottola Date: 2014-08-07 09:46:45 +0000 (Thu, 07 Aug 2014) Log Message: ----------- gs_gorm/trunk: GNUstep interface builder, first package Added Paths: ----------- csw/mgar/pkg/gs_gorm/ csw/mgar/pkg/gs_gorm/Makefile csw/mgar/pkg/gs_gorm/branches/ csw/mgar/pkg/gs_gorm/tags/ csw/mgar/pkg/gs_gorm/trunk/ csw/mgar/pkg/gs_gorm/trunk/Makefile csw/mgar/pkg/gs_gorm/trunk/checksums csw/mgar/pkg/gs_gorm/trunk/files/ Added: csw/mgar/pkg/gs_gorm/Makefile =================================================================== --- csw/mgar/pkg/gs_gorm/Makefile (rev 0) +++ csw/mgar/pkg/gs_gorm/Makefile 2014-08-07 09:46:45 UTC (rev 23932) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gs_gorm/trunk =================================================================== --- csw/mgar/pkg/gs_gorm/trunk 2014-08-07 06:59:38 UTC (rev 23931) +++ csw/mgar/pkg/gs_gorm/trunk 2014-08-07 09:46:45 UTC (rev 23932) Property changes on: csw/mgar/pkg/gs_gorm/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gs_gorm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_gorm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gs_gorm/trunk/Makefile 2014-08-07 09:46:45 UTC (rev 23932) @@ -0,0 +1,47 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gorm +VERSION = 1.2.20 +GARTYPE = v2 + +DESCRIPTION = GNUstep graphical interface builder +define BLURB + GORM (Graphical Object Relationship Modeller) is GNUstep Interface Builder equivalent to build graphically interface files. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui CSWgnustep-back + +MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + + +# now special targets for build and install so that we can source +# GNUstep.sh before +# configure is skipped +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + +include gar/category.mk + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gs_gorm/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gs_gorm/trunk/checksums =================================================================== --- csw/mgar/pkg/gs_gorm/trunk/checksums (rev 0) +++ csw/mgar/pkg/gs_gorm/trunk/checksums 2014-08-07 09:46:45 UTC (rev 23932) @@ -0,0 +1 @@ +099c2e749e6871c8ea2f8e68b9fe87b5 gorm-1.2.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Aug 7 11:52:00 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 7 Aug 2014 09:52:00 +0000 Subject: SF.net SVN: gar:[23933] csw/mgar/pkg/znapzend/trunk Message-ID: <3hTQ340bQVz1Vn@mail.opencsw.org> Revision: 23933 http://sourceforge.net/p/gar/code/23933 Author: lblume Date: 2014-08-07 09:51:58 +0000 (Thu, 07 Aug 2014) Log Message: ----------- znapzend/trunk: Bump to 0.11.1 Modified Paths: -------------- csw/mgar/pkg/znapzend/trunk/Makefile csw/mgar/pkg/znapzend/trunk/checksums Modified: csw/mgar/pkg/znapzend/trunk/Makefile =================================================================== --- csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-07 09:46:45 UTC (rev 23932) +++ csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-07 09:51:58 UTC (rev 23933) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = znapzend -VERSION = 0.11.0 +VERSION = 0.11.1 GARTYPE = v2 DESCRIPTION = The Multilevel Backup Tool for ZFS Modified: csw/mgar/pkg/znapzend/trunk/checksums =================================================================== --- csw/mgar/pkg/znapzend/trunk/checksums 2014-08-07 09:46:45 UTC (rev 23932) +++ csw/mgar/pkg/znapzend/trunk/checksums 2014-08-07 09:51:58 UTC (rev 23933) @@ -1 +1 @@ -b7b990d607ccdbf46e59a4178248a593 znapzend-0.11.0.tar.gz +5de8dafef90e07a293375bef931055be znapzend-0.11.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Aug 7 11:58:53 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 7 Aug 2014 09:58:53 +0000 Subject: SF.net SVN: gar:[23934] csw/mgar/pkg/znapzend/trunk Message-ID: <3hTQC06rBQzDl@mail.opencsw.org> Revision: 23934 http://sourceforge.net/p/gar/code/23934 Author: lblume Date: 2014-08-07 09:58:52 +0000 (Thu, 07 Aug 2014) Log Message: ----------- znapzend/trunk: Bump to 0.11.2 - OEtiker is on a roll Modified Paths: -------------- csw/mgar/pkg/znapzend/trunk/Makefile csw/mgar/pkg/znapzend/trunk/checksums Modified: csw/mgar/pkg/znapzend/trunk/Makefile =================================================================== --- csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-07 09:51:58 UTC (rev 23933) +++ csw/mgar/pkg/znapzend/trunk/Makefile 2014-08-07 09:58:52 UTC (rev 23934) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = znapzend -VERSION = 0.11.1 +VERSION = 0.11.2 GARTYPE = v2 DESCRIPTION = The Multilevel Backup Tool for ZFS Modified: csw/mgar/pkg/znapzend/trunk/checksums =================================================================== --- csw/mgar/pkg/znapzend/trunk/checksums 2014-08-07 09:51:58 UTC (rev 23933) +++ csw/mgar/pkg/znapzend/trunk/checksums 2014-08-07 09:58:52 UTC (rev 23934) @@ -1 +1 @@ -5de8dafef90e07a293375bef931055be znapzend-0.11.1.tar.gz +4c6649f0f0b702382e3d0a6884d00ed1 znapzend-0.11.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Aug 7 22:52:23 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 7 Aug 2014 20:52:23 +0000 Subject: SF.net SVN: gar:[23936] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: <3hThj41yFGzTG@mail.opencsw.org> Revision: 23936 http://sourceforge.net/p/gar/code/23936 Author: chninkel Date: 2014-08-07 20:52:21 +0000 (Thu, 07 Aug 2014) Log Message: ----------- openssl1/trunk: move OPENSSLDIR in /etc/opt/csw/ssl Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 19:28:42 UTC (rev 23935) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 20:52:21 UTC (rev 23936) @@ -245,6 +245,7 @@ LIBDIR = $(LIBDIR_$(MEMORYMODEL)) CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --openssldir=$(sysconfdir)/ssl CONFIGURE_ARGS += --install_prefix=$(DESTDIR) $(LIBDIR) CONFIGURE_ARGS += $(CONFIGURE_FLAGS) CONFIGURE_ARGS += $($(ISA)_$(GARCOMPILER_TYPE)_CONFIGURE_TARGET) @@ -306,13 +307,10 @@ @$(MAKECOOKIE) install-conf-misc: - if [ -f "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ] && [ ! -h "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ]; then \ - ginstall -d "$(PKGROOT)$(sysconfdir)/ssl"; \ - mv "$(PKGROOT)$(prefix)/ssl/openssl.cnf" $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW; \ - ln -sf ../../..$(sysconfdir)/ssl/openssl.cnf $(PKGROOT)$(prefix)/ssl/openssl.cnf; \ - fi + [ ! -f "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" ] || \ + mv "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW [ ! -d "$(PKGROOT)$(sysconfdir)/ssl/misc" ] || \ - mv "$(PKGROOT)$(sysconfdir)/ssl/misc" "$(PKGROOT)/$(prefix)/ssl/" + ( ginstall -d "$(PKGROOT)/$(prefix)/ssl/" && mv "$(PKGROOT)$(sysconfdir)/ssl/misc/" "$(PKGROOT)/$(prefix)/ssl/" ) merge-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Aug 7 22:55:32 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 7 Aug 2014 20:55:32 +0000 Subject: SF.net SVN: gar:[23937] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: <3hThmh1c4qzXW@mail.opencsw.org> Revision: 23937 http://sourceforge.net/p/gar/code/23937 Author: chninkel Date: 2014-08-07 20:55:32 +0000 (Thu, 07 Aug 2014) Log Message: ----------- openssl1/trunk: remove bad @$(MAKECOOKIE) line Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 20:52:21 UTC (rev 23936) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 20:55:32 UTC (rev 23937) @@ -318,7 +318,6 @@ (cd $(DOWNLOADDIR)/ && ginstall -m 0644 README.CSW changelog.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ (cd $(WORKSRC_FIRSTMOD)/ && ginstall -m 0644 $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ done - @$(MAKECOOKIE) post-merge-all: merge-doc install-conf-misc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Aug 7 22:58:01 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 7 Aug 2014 20:58:01 +0000 Subject: SF.net SVN: gar:[23938] csw/mgar/pkg/openssl1/trunk Message-ID: <3hThqh5ZvTzbk@mail.opencsw.org> Revision: 23938 http://sourceforge.net/p/gar/code/23938 Author: chninkel Date: 2014-08-07 20:57:51 +0000 (Thu, 07 Aug 2014) Log Message: ----------- openssl1/trunk: updated to 1.0.1i Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 20:55:32 UTC (rev 23937) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 20:57:51 UTC (rev 23938) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.1h +VERSION = 1.0.1i GARTYPE = v2 SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2014-08-07 20:55:32 UTC (rev 23937) +++ csw/mgar/pkg/openssl1/trunk/checksums 2014-08-07 20:57:51 UTC (rev 23938) @@ -1 +1 @@ -8d6d684a9430d5cc98a62a5d8fbda8cf openssl-1.0.1h.tar.gz +c8dc151a671b9b92ff3e4c118b174972 openssl-1.0.1i.tar.gz Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-08-07 20:55:32 UTC (rev 23937) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-08-07 20:57:51 UTC (rev 23938) @@ -1,3 +1,9 @@ +openssl (1.0.1i,rev=2014.08.07) unstable + + * New upstream release. + + -- yann rouillard Thu, 07 Aug 2014 22:57:06 +0200 + openssl (1.0.1h,rev=2014.06.08) unstable * Add the 0011-link-heartbeat_test-with-static-libraries patch to solve a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Aug 7 23:23:33 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 7 Aug 2014 21:23:33 +0000 Subject: SF.net SVN: gar:[23939] csw/mgar/pkg/openssl1/trunk Message-ID: <3hTjP42XzfzgJ@mail.opencsw.org> Revision: 23939 http://sourceforge.net/p/gar/code/23939 Author: chninkel Date: 2014-08-07 21:23:32 +0000 (Thu, 07 Aug 2014) Log Message: ----------- openssl1/trunk: remove patch 0011-link-heartbeat_test-with-static-libraries.patch that has been applied upstream Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 20:57:51 UTC (rev 23938) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 21:23:32 UTC (rev 23939) @@ -160,16 +160,6 @@ PATCHFILES += $(PATCHFILES.$(GARCH).$(GAROSREL)) -# Currently the heartbeat_test test file doesn't compile because it is linked -# dynamically and try to use an internal symbol of libssl. -# See bug report http://rt.openssl.org/Ticket/Display.html?id=3378 -# This patch solves the problem by linking to the static libraries instead of -# dynamic ones (it doesn't matter for a test). -# It has been sent upstream by the Debian Maintainer of the openssl package -# see: https://github.com/openssl/openssl/pull/125 -PATCHFILES += 0011-link-heartbeat_test-with-static-libraries.patch - - # Building openssl with "-j" option doesn't work properly because of dependencies # in the Makefile. # This patch fixes this problem, it's taken from gentoo and adapted so that it works Deleted: csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch 2014-08-07 20:57:51 UTC (rev 23938) +++ csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch 2014-08-07 21:23:32 UTC (rev 23939) @@ -1,40 +0,0 @@ -From 2e251ba8feaa696f9408a19336d1fbab148df55e Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx -Date: Sat, 7 Jun 2014 13:32:23 +0200 -Subject: [PATCH] Link heartbeat_test with the static version of the libraries - -It's using an internal API that that might not be available in the shared -library. ---- - test/Makefile | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/test/Makefile b/test/Makefile -index 005f2e8..d68e8b0 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -358,6 +358,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -+BUILD_CMD_STATIC=shlib_target=; \ -+ LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \ -+ $(MAKE) -f $(TOP)/Makefile.shared -e \ -+ APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ -+ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ -+ link_app.$${shlib_target} -+ - FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - fi; \ -@@ -476,7 +483,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) - @target=$(SRPTEST); $(BUILD_CMD) - - $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) -- @target=$(HEARTBEATTEST); $(BUILD_CMD) -+ @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) - - #$(AESTEST).o: $(AESTEST).c - # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c --- -1.9.3 Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-08-07 20:57:51 UTC (rev 23938) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-08-07 21:23:32 UTC (rev 23939) @@ -1,6 +1,8 @@ openssl (1.0.1i,rev=2014.08.07) unstable * New upstream release. + * Remove patch 0011-link-heartbeat_test-with-static-libraries + that has been applied upstream. -- yann rouillard Thu, 07 Aug 2014 22:57:06 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Aug 7 23:58:52 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 7 Aug 2014 21:58:52 +0000 Subject: SF.net SVN: gar:[23940] csw/mgar/pkg/openssl/trunk Message-ID: <3hTk9p4FnYzlL@mail.opencsw.org> Revision: 23940 http://sourceforge.net/p/gar/code/23940 Author: chninkel Date: 2014-08-07 21:58:45 +0000 (Thu, 07 Aug 2014) Log Message: ----------- openssl/trunk: remove 0005-add-missing-limits.h-header-inclusion-for-INT_MAX.patch Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2014-08-07 21:23:32 UTC (rev 23939) +++ csw/mgar/pkg/openssl/trunk/Makefile 2014-08-07 21:58:45 UTC (rev 23940) @@ -94,11 +94,6 @@ # (patchs taken from Debian Package) PATCHFILES += block_bad_certificates.patch -# the ssl/s3_pkt.c file uses the INT_MAX macro, this requires -# limits.h to be included on Solaris -PATCHFILES += 0005-add-missing-limits.h-header-inclusion-for-INT_MAX.patch - - LICENSE=LICENSE ##### Build and installation information ##### Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2014-08-07 21:23:32 UTC (rev 23939) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2014-08-07 21:58:45 UTC (rev 23940) @@ -1,6 +1,8 @@ openssl (0.9.8zb,REV=2014.08.07) unstable * New upstream release. + * Removed patch applied upstream: + 0005-add-missing-limits.h-header-inclusion-for-INT_MAX.patch -- Yann Rouillard Thu, 07 Aug 2014 21:20:12 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Aug 8 01:50:22 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 7 Aug 2014 23:50:22 +0000 Subject: SF.net SVN: gar:[23941] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: <3hTmfS2BNxzql@mail.opencsw.org> Revision: 23941 http://sourceforge.net/p/gar/code/23941 Author: chninkel Date: 2014-08-07 23:50:19 +0000 (Thu, 07 Aug 2014) Log Message: ----------- openssl1/trunk: remove now useless override and make maciej happy Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 21:58:45 UTC (rev 23940) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-08-07 23:50:19 UTC (rev 23941) @@ -67,11 +67,6 @@ CHECKPKG_OVERRIDES_CSWlibssl1-0-0_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 -# This is a false alarm, this is a configuration file added at install time -# through the preserveconf class -CHECKPKG_OVERRIDES_CSWopenssl-utils += file-needed-but-no-package-satisfies-it|/etc/opt/csw/ssl/openssl.cnf|CSWopenssl-utils|contains|symlink|/opt/csw/ssl/openssl.cnf|which|needs|the|target|file:|/etc/opt/csw/ssl/openssl.cnf - - # We use SUN perl, not the opencsw one CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl 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 Aug 8 10:07:05 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 8 Aug 2014 08:07:05 +0000 Subject: SF.net SVN: gar:[23943] csw/mgar/pkg/cpan/Mail-IMAPClient/trunk Message-ID: <3hTzgc1mDLz11r@mail.opencsw.org> Revision: 23943 http://sourceforge.net/p/gar/code/23943 Author: wahwah Date: 2014-08-08 08:07:04 +0000 (Fri, 08 Aug 2014) Log Message: ----------- cpan/Mail-IMAPClient/trunk: Bump version Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums Modified: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile 2014-08-08 08:06:10 UTC (rev 23942) +++ csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile 2014-08-08 08:07:04 UTC (rev 23943) @@ -1,5 +1,5 @@ NAME = Mail-IMAPClient -VERSION = 3.15 +VERSION = 3.16 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MARKOV @@ -10,10 +10,15 @@ scripts to interact with IMAP message stores. endef -PACKAGES = CSWpmmailimapclient -CATALOGNAME = pm_mailimapclient +PACKAGES = CSWpm-mailimapclient +SPKG_DESC_CSWpm-mailimapclient = $(DESCRIPTION) ARCHALL = 1 +OBSOLETED_BY_CSWpm-mailimapclient = CSWpmmailimapclient +CATALOGNAME_CSWpmmailimapclient = pm_mailimapclient_stub + +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + LICENSE = COPYRIGHT # Don't know about those yet Modified: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums 2014-08-08 08:06:10 UTC (rev 23942) +++ csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums 2014-08-08 08:07:04 UTC (rev 23943) @@ -1 +1 @@ -85450b57f77f92f8dda9ecf8ff046a1e download/Mail-IMAPClient-3.15.tar.gz +2f20bc70351bce6da15194cd7ebbf538 Mail-IMAPClient-3.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Aug 9 14:22:52 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 9 Aug 2014 12:22:52 +0000 Subject: SF.net SVN: gar:[23951] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: <3hVjJw5VNWzl5@mail.opencsw.org> Revision: 23951 http://sourceforge.net/p/gar/code/23951 Author: lblume Date: 2014-08-09 12:22:48 +0000 (Sat, 09 Aug 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump to 5.6.20; add subversion to the suffix; switch to GCC4 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-08-09 09:16:14 UTC (rev 23950) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-08-09 12:22:48 UTC (rev 23951) @@ -10,16 +10,17 @@ # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide # # !!WARNING!! -# From 5.6.4, stlport is used by default. +# From 5.6.4, stlport is used by default with Solaris Studio. +# It should not affect GCC4. # It appears to not be used by libmysql*, so there should not be any binary # incompatibility there. However, care must be taken that it does not creep # in, either in the lib*.so or in the mysql_config script. PROJ_NAME = mysql -NAME = $(PROJ_NAME)5 +NAME = $(PROJ_NAME)56 BASE_VERSION = 5.6 -PATCHLEVEL = 14 +PATCHLEVEL = 20 ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) @@ -28,7 +29,7 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -GARCOMPILER = SOS12U3 +GARCOMPILER = GCC4 # Solaris 10 needs a special map file since we need libnsl Version 1.9.1 # and libc 1.22.5 @@ -43,27 +44,36 @@ (Structured Query Language) database server. endef -# Those options follow those of the official builds -EXTRA_CFLAGS-sparc = -Xa -xstrconst -EXTRA_CFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -EXTRA_CXXFLAGS-sparc = -noex -EXTRA_CXXFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GARCH)) -g -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -xnorunpath -EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -norunpath -EXTRA_LDFLAGS += -Bdirect +# Comes from the MySQL5.5 recipe, though only one compiler will be kept in 5.6 +### For GCC4 +EXTRA_CFLAGS_GCC4_sparc += -mno-app-regs -# The official build used -xO2 on 32 bit x86, -xO3 for 64 bit -# Use that for all builds -OPT_FLAGS_SOS-32 = -xO2 -OPT_FLAGS_SOS-64 = -xO3 -OPT_FLAGS_SOS = $(OPT_FLAGS_SOS-$(MEMORYMODEL)) +EXTRA_CFLAGS_GCC4 += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_GCC4_$(GARCH)) +EXTRA_CXXFLAGS_GCC4 += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_GCC4_$(MEMORYMODEL)) +### +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCOMPILER)) +### +EXTRA_LINKER_FLAGS = -lm + +OPT_FLAGS_GCC4_32 = -O3 +OPT_FLAGS_GCC4_64 = -O3 +OPT_FLAGS_GCC4 += $(OPT_FLAGS_GCC4_$(MEMORYMODEL)) $(OPT_FLAGS_GCC4_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_GCC4_$(ISA)) + INITSMF = $(sysconfdir)/init\.d/csw$(NAME) MYSQL_LIB_VER = 18 -MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) +# The daemon to launch is selected by script, should not be automatic +# Some other files too should probably not be isaexec'd +EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/libexec/mysqld +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysql_config +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_safe +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_multi +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/my_print_defaults +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqlaccess +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqlaccess.conf PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files @@ -84,11 +94,6 @@ RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0 -PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) -PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) -SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r18 += CSWlibmysqlclient18 - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. client_programs += myisamlog @@ -108,7 +113,6 @@ client_programs += perror client_programs += replace -ISAEXEC_CSW$(NAME)client = 1 PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries PKGFILES_CSW$(NAME)client = $(bindir) @@ -126,13 +130,13 @@ SPKG_DESC_CSW$(NAME) = Multithreaded SQL database RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstlport1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/sparcv9/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/amd64/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 +INCOMPATIBLE_PKGS_CSW$(NAME) = CSWmysql5 # An example: # s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used @@ -143,6 +147,7 @@ EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.* BUILD64 = 1 +ISAEXEC = 1 MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ MASTER_SITES += http://mysql.skynet.be/Downloads/MySQL-$(BASE_VERSION)/ @@ -168,6 +173,7 @@ CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)/$(NAME) CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) +CMAKE_ARGS += -DINSTALL_SCRIPTDIR=$(subst $(prefix)/,,$(bindir)) CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin @@ -176,7 +182,6 @@ CMAKE_ARGS += -DINSTALL_INFODIR=$(subst $(prefix)/,,$(infodir))/$(NAME) CMAKE_ARGS += -DINSTALL_MYSQLSHAREDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME) CMAKE_ARGS += -DINSTALL_SUPPORTFILESDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)/support-files -CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system CMAKE_ARGS += -DWITH_ZLIB=system CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 @@ -184,8 +189,8 @@ CMAKE_ARGS += -DCOMPILATION_COMMENT='OpenCSW' CMAKE_ARGS += -DBUILD_CONFIG=mysql_release CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) -CMAKE_ARGS += -DC_FLAGS="$(CFLAGS)" -CMAKE_ARGS += -DCXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" CMAKE_ARGS += -DCMAKE_C_LINK_FLAGS="$(LDFLAGS)" CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS="$(LDFLAGS)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" @@ -222,7 +227,6 @@ CMAKE_ARGS += "-DWITH_PARTITION_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_PIC:BOOL=ON" -CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" @@ -315,12 +319,41 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d - (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ - ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) - (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ - ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) - # Do not distribute libstlport with MySQL, use a separate one - (cd $(DESTDIR)$(libdir); rm libstlport.*) + # Make sure the proper binary is called by the script since + # mgar does the configure part using only the base arch name, w/o + # the special instructions part + # Only needed for 64 bit + if [ "$(MEMORYMODEL)" = 64 ]; then \ + for file in mysqld_safe mysqld_multi; do \ + perl -pi \ + -e 'if (/^[^#]/) { s|/bin(?!/$(ISABINDIR))|/bin/$(ISABINDIR)|g }' \ + -e 'if (/^[^#]/) { s|/sbin(?!/$(ISABINDIR))|/sbin/$(ISABINDIR)|g }' \ + -e 'if (/^[^#]/) { s|/libexec(?!/$(ISABINDIR))|/libexec/$(ISABINDIR)|g }' \ + $(DESTDIR)$(bindir)/$$file; \ + done; \ + fi + + # Remove compiler-specific parameters + gsed -i \ + -e '/^[^#]/s/-xO[0-5][^ ]* *//g' \ + -e '/^[^#]/s/-xarch=[^ ]* *//g' \ + -e '/^[^#]/s/-xchip=[^ ]* *//g' \ + -e '/^[^#]/s/-norunpath[^ ]* *//g' \ + -e '/^[^#]/s/-lCrun[^ ]* *//g' \ + -e '/^[^#]/s/-lCstd[^ ]* *//g' \ + -e '/^[^#]/s/-mtune=[^ ]* *//g' \ + -e '/^[^#]/s/-march=[^ ]* *//g' \ + -e '/^[^#]/s/-Wall *//g' \ + -e '/^[^#]/s/-pipe *//g' \ + -e '/^[^#]/s/-KPIC/-fPIC/g' \ + -e '/^[^#]/s/-mno-app-regs//g' \ + -e '/^[^#]/s/-fno-omit-frame-pointer//g' \ + -e '/^[^#]/s/-fno-strict-aliasing//g' \ + -e '/^[^#]/s/-Wa[^ ]*//g' \ + -e '/^[^#]/s/-static-libgcc//g' \ + -e '/^[^#]/s/-pthread//g' \ + $(DESTDIR)$(bindir)/mysql_config + @$(MAKECOOKIE) post-merge: Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2014-08-09 09:16:14 UTC (rev 23950) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2014-08-09 12:22:48 UTC (rev 23951) @@ -1 +1 @@ -52224ce51dbf6ffbcef82be30688cc04 mysql-5.6.14.tar.gz +71ed71ecc53222a2f03523cd13cf2141 mysql-5.6.20.tar.gz Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall 2014-08-09 09:16:14 UTC (rev 23950) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall 2014-08-09 12:22:48 UTC (rev 23951) @@ -1,93 +0,0 @@ -#!/bin/ksh -p -# -# $Id$ -# -# initial version for blastwave.org by Alex Moore 2006.02.25 -# Revised 2006.03.25 - see bug report 0001542 -# -# This script creates a default database with the small-memory footprint. -# Input may be provided for DATADIR and DEFAULTS_FILE -# -# http://dev.mysql.com/doc/refman/5.0/en/option-files.html -# -prefix="/opt/csw" -BASEDIR="${prefix}" -MYSQL_HOME="/var${prefix}/mysql5" -sysconfdir="/etc${prefix}" -# https://www.opencsw.org/mantis/view.php?id=4646 -DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf -MYSQLD_USER="mysql" -MYSQLD_GROUP="mysql" -# Provide the default data directory -MYSQLD_DATADIR="${MYSQL_HOME}" -DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf" - -# http://bugs.mysql.com/bug.php?id=31164 -# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) -unset TMPDIR - -if [ -r "${DEPRECATED_DEFAULTS_FILE}" ]; then - echo "*** WARNING ***" - echo "File '${DEPRECATED_DEFAULTS_FILE}' found. This location is deprecated." - echo "This file takes no effect." -fi - -if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf - echo "Using $IN_DEFAULTS_FILE to create the options file." -else - IN_DEFAULTS_FILE=$DEFAULTS_FILE - echo "Using $DEFAULTS_FILE as the options file." -fi - -if [ -d "$MYSQLD_DATADIR/mysql" ]; then - echo "mysql database already exists." - echo "Leaving script without initializing a database." - exit 0 -fi - -echo "Setting up the database" -# Create the database directory and set the permissions if needed -if [ ! -d "$MYSQLD_DATADIR" ] ; then - mkdir -p $MYSQLD_DATADIR - chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR - chmod 0700 $MYSQLD_DATADIR -fi -# -# copy the configuration file if not exists. -CNFCOPIED=no -if [ ! -f "$DEFAULTS_FILE" ] ; then - cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE - CNFCOPIED=yes -fi -# -# Run the mysql script to create the database -echo "Creating MySQL core database in $MYSQLD_DATADIR" -echo -echo "### The following messages are from mysql_install_db." -"$BASEDIR/bin/mysql_install_db" \ - --defaults-extra-file="$DEFAULTS_FILE" \ - --user="$MYSQLD_USER" \ - --basedir="$BASEDIR" \ - --datadir="$MYSQLD_DATADIR" - -# Fix permissions on the data directory, since mysql_install_db was run as -# root. -chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR - -# Update --datadir in the cnf file with the correct value if file was copied -if [ x"$CNFCOPIED" = xyes ]; then - sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new - mv $DEFAULTS_FILE.new $DEFAULTS_FILE -fi - -# Ending message -echo -echo "### The following messages are from $0." -echo "See ${prefix}/share/doc/mysql5/README.CSW for packaging changes." -echo "Please ignore references to starting mysqld_safe in the messages above." -echo " These messages are from mysql_install_db." - -exit 0 - -# vim:set ts=2 sw=2 sts=2 expandtab: Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.preinstall 2014-08-09 09:16:14 UTC (rev 23950) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.preinstall 2014-08-09 12:22:48 UTC (rev 23951) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.postinstall (from rev 23950, csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.postinstall 2014-08-09 12:22:48 UTC (rev 23951) @@ -0,0 +1,93 @@ +#!/bin/ksh -p +# +# $Id$ +# +# initial version for blastwave.org by Alex Moore 2006.02.25 +# Revised 2006.03.25 - see bug report 0001542 +# +# This script creates a default database with the small-memory footprint. +# Input may be provided for DATADIR and DEFAULTS_FILE +# +# http://dev.mysql.com/doc/refman/5.0/en/option-files.html +# +prefix="/opt/csw" +BASEDIR="${prefix}" +MYSQL_HOME="/var${prefix}/mysql5" +sysconfdir="/etc${prefix}" +# https://www.opencsw.org/mantis/view.php?id=4646 +DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf +MYSQLD_USER="mysql" +MYSQLD_GROUP="mysql" +# Provide the default data directory +MYSQLD_DATADIR="${MYSQL_HOME}" +DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf" + +# http://bugs.mysql.com/bug.php?id=31164 +# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) +unset TMPDIR + +if [ -r "${DEPRECATED_DEFAULTS_FILE}" ]; then + echo "*** WARNING ***" + echo "File '${DEPRECATED_DEFAULTS_FILE}' found. This location is deprecated." + echo "This file takes no effect." +fi + +if [ ! -f "$DEFAULTS_FILE" ]; then + IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." +else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists." + echo "Leaving script without initializing a database." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +echo "Creating MySQL core database in $MYSQLD_DATADIR" +echo +echo "### The following messages are from mysql_install_db." +"$BASEDIR/bin/mysql_install_db" \ + --defaults-extra-file="$DEFAULTS_FILE" \ + --user="$MYSQLD_USER" \ + --basedir="$BASEDIR" \ + --datadir="$MYSQLD_DATADIR" + +# Fix permissions on the data directory, since mysql_install_db was run as +# root. +chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR + +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# Ending message +echo +echo "### The following messages are from $0." +echo "See ${prefix}/share/doc/mysql5/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db." + +exit 0 + +# vim:set ts=2 sw=2 sts=2 expandtab: Copied: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.preinstall (from rev 23950, csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql56.preinstall 2014-08-09 12:22:48 UTC (rev 23951) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl 2014-08-09 09:16:14 UTC (rev 23950) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl 2014-08-09 12:22:48 UTC (rev 23951) @@ -1,424 +0,0 @@ -#!/bin/sh -# vim:ft=sh: -# -# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB -# This file is public domain and comes with NO WARRANTY of any kind - -# MySQL daemon start/stop script. - -# Usually this is put in /etc/init.d (at least on machines SYSV R4 based -# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql. -# When this is done the mysql server will be started when the machine is -# started and shut down when the systems goes down. - -# Comments for OpenCSW's CAS scripts -#RC_KNUM 01 -#RC_SNUM 99 -#RC_KLEV 0,1,2,S -#RC_SLEV 3 -#FMRI network -#AUTOENABLE no - -# If you install MySQL on some other places than @prefix@, then you -# have to do one of the following things for this script to work: -# -# - Run this script from within the MySQL installation directory -# - Create a @sysconfdir@/my.cnf file with the following information: -# [mysqld] -# basedir= -# - Add the above to any other configuration file (for example ~/.my.ini) -# and copy my_print_defaults to /usr/bin -# - Add the path to the mysql-installation-directory to the basedir variable -# below. -# -# If you want to affect other MySQL variables, you should make your changes -# in the @sysconfdir@/my.cnf, ~/.my.cnf or other MySQL configuration files. - -# If you change base dir, you must also change datadir. These may get -# overwritten by settings in the MySQL configuration files. - -basedir= -datadir= - -# Default value, in seconds, afterwhich the script should timeout waiting -# for server start. -# Value here is overriden by value in my.cnf. -# 0 means don't wait at all -# Negative numbers mean to wait indefinitely -service_startup_timeout=900 - -# Lock directory for RedHat / SuSE. -lockdir='/var/lock/subsys' -lock_file_path="$lockdir/mysql" - -# The following variables are only set for letting mysql.server find things. - -# Set some defaults -mysqld_pid_file_path= -if test -z "$basedir" -then - basedir=@prefix@ - bindir=@bindir@ - if test -z "$datadir" - then - datadir=@localstatedir@ - fi - sbindir=@prefix@/libexec - libexecdir=@prefix@/libexec -else - bindir="$basedir/bin" - if test -z "$datadir" - then - datadir="$basedir/data" - fi - sbindir="$basedir/libexec" - libexecdir="$basedir/libexec" -fi - -# datadir_set is used to determine if datadir was set (and so should be -# *not* set inside of the --basedir= handler.) -datadir_set= - -# -# Use LSB init script functions for printing messages, if possible -# -lsb_functions="/lib/lsb/init-functions" -if test -f $lsb_functions ; then - . $lsb_functions -else - log_success_msg() - { - echo " SUCCESS! $@" - } - log_failure_msg() - { - echo " ERROR! $@" - } -fi - -PATH="/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin" -export PATH - -mode=$1 # start or stop - -[ $# -ge 1 ] && shift - - -other_args="$*" # uncommon, but needed when called from an RPM upgrade action - # Expected: "--skip-networking --skip-grant-tables" - # They are not checked here, intentionally, as it is the resposibility - # of the "spec" file author to give correct arguments only. - -case `echo "testing\c"`,`echo -n testing` in - *c*,-n*) echo_n= echo_c= ;; - *c*,*) echo_n=-n echo_c= ;; - *) echo_n= echo_c='\c' ;; -esac - -parse_server_arguments() { - for arg do - case "$arg" in - # $mysql5_arch must have been set (or left empty) for Solaris - # by the OpenCSW architecture selection bit - --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` - bindir="$basedir/bin/$mysql5_arch" - if test -z "$datadir_set"; then - datadir="$basedir/data" - fi - sbindir="$basedir/sbin/$mysql5_arch" - libexecdir="$basedir/libexec/$mysql5_arch" - ;; - --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` - datadir_set=1 - ;; - --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; - --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; - esac - done -} - -wait_for_pid () { - verb="$1" # created | removed - pid="$2" # process ID of the program operating on the pid-file - pid_file_path="$3" # path to the PID file. - - i=0 - avoid_race_condition="by checking again" - - while test $i -ne $service_startup_timeout ; do - - case "$verb" in - 'created') - # wait for a PID-file to pop into existence. - test -s "$pid_file_path" && i='' && break - ;; - 'removed') - # wait for this PID-file to disappear - test ! -s "$pid_file_path" && i='' && break - ;; - *) - echo "wait_for_pid () usage: wait_for_pid created|removed pid pid_file_path" - exit 1 - ;; - esac - - # if server isn't running, then pid-file will never be updated - if test -n "$pid"; then - if kill -0 "$pid" 2>/dev/null; then - : # the server still runs - else - # The server may have exited between the last pid-file check and now. - if test -n "$avoid_race_condition"; then - avoid_race_condition="" - continue # Check again. - fi - - # there's nothing that will affect the file. - log_failure_msg "The server quit without updating PID file ($pid_file_path)." - return 1 # not waiting any more. - fi - fi - - echo $echo_n ".$echo_c" - i=`expr $i + 1` - sleep 1 - - done - - if test -z "$i" ; then - log_success_msg - return 0 - else - log_failure_msg - return 1 - fi -} - -### START OPENCSW ARCHITECTURE SELECTION -# Source the configuration -# This is used to define the binary architeture to run - -# Check the old location first -[ -r @prefix@/etc/csw.conf ] && . @prefix@/etc/csw.conf - -# Check the current location, its content overrides the previous one -[ -r @sysconfdir@/csw.conf ] && . @sysconfdir@/csw.conf - -# If the package-specific variable is not set, try the default -if [ -z "$mysql5_arch" ]; then - if [ -n "$default_arch" ]; then - mysql5_arch="$default_arch" - fi -else - # In that specific case, by default, there is no subdir - if [ "$mysql5_arch" = "i386" -o "$mysql5_arch" = "sparc" ]; then - mysql5_arch="" - fi -fi - -# If a value was found -if [ -n "$mysql5_arch" ]; then - if [ "$mysql5_arch" = "kernel" ]; then - # Use the system's default arch - mysql5_arch=`isainfo -k` - fi - - # Add the architecture suffix to the executables' directories, if it exists - # The binaries themselves are tested below, so the script should fail - # mostly gracefully if a non-present arch is set up. - if [ -d "$bindir/$mysql5_arch" -a \ - -d "$sbindir/$mysql5_arch" -a \ - -d "$libexecdir/$mysql5_arch" ]; then - bindir="$bindir/$mysql5_arch" - sbindir="$sbindir/$mysql5_arch" - libexecdir="$libexecdir/$mysql5_arch" - fi -fi -### END OPENCSW ARCHITECTURE SELECTION - -# Get arguments from the my.cnf file, -# the only group, which is read from now on is [mysqld] -if test -x ./bin/my_print_defaults -then - print_defaults="./bin/my_print_defaults" -elif test -x $bindir/my_print_defaults -then - print_defaults="$bindir/my_print_defaults" -elif test -x $bindir/mysql_print_defaults -then - print_defaults="$bindir/mysql_print_defaults" -else - # Try to find basedir in @sysconfdir@/my.cnf - conf=@sysconfdir@/my.cnf - print_defaults= - if test -r $conf - then - subpat='^[^=]*basedir[^=]*=\(.*\)$' - dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf` - for d in $dirs - do - d=`echo $d | sed -e 's/[ ]//g'` - if test -x "$d/bin/my_print_defaults" - then - print_defaults="$d/bin/my_print_defaults" - break - fi - if test -x "$d/bin/mysql_print_defaults" - then - print_defaults="$d/bin/mysql_print_defaults" - break - fi - done - fi - - # Hope it's in the PATH ... but I doubt it - test -z "$print_defaults" && print_defaults="my_print_defaults" -fi - -# -# Read defaults file from 'basedir'. If there is no defaults file there -# check if it's in the old (depricated) place (datadir) and read it from there -# - -extra_args="" -if test -r "$basedir/my.cnf" -then - extra_args="-e $basedir/my.cnf" -else - if test -r "$datadir/my.cnf" - then - extra_args="-e $datadir/my.cnf" - fi -fi - -parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server` - -# -# Set pid file if not given -# -if test -z "$mysqld_pid_file_path" -then - mysqld_pid_file_path=$datadir/`hostname`.pid -else - case "$mysqld_pid_file_path" in - /* ) ;; - * ) mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;; - esac -fi - -case "$mode" in - 'start') - # Start daemon - - # Safeguard (relative paths, core dumps..) - # Changed to /opt for OpenCSW to avoid mysqld_safe picking the 32 bit - # binary in libexec/ - cd /opt - - echo $echo_n "Starting MySQL" - if test -x $bindir/mysqld_safe - then - # Give extra arguments to mysqld with the my.cnf file. This script - # may be overwritten at next upgrade. - $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null 2>&1 & - wait_for_pid created "$!" "$mysqld_pid_file_path"; return_value=$? - - # Make lock for RedHat / SuSE - if test -w "$lockdir" - then - touch "$lock_file_path" - fi - - exit $return_value - else - log_failure_msg "Couldn't find MySQL server ($bindir/mysqld_safe)" - fi - ;; - - 'stop') - # Stop daemon. We use a signal here to avoid having to know the - # root password. - - if test -s "$mysqld_pid_file_path" - then - mysqld_pid=`cat "$mysqld_pid_file_path"` - - if (kill -0 $mysqld_pid 2>/dev/null) - then - echo $echo_n "Shutting down MySQL" - kill $mysqld_pid - # mysqld should remove the pid file when it exits, so wait for it. - wait_for_pid removed "$mysqld_pid" "$mysqld_pid_file_path"; return_value=$? - else - log_failure_msg "MySQL server process #$mysqld_pid is not running!" - rm "$mysqld_pid_file_path" - fi - - # Delete lock for RedHat / SuSE - if test -f "$lock_file_path" - then - rm -f "$lock_file_path" - fi - exit $return_value - else - log_failure_msg "MySQL server PID file could not be found!" - fi - ;; - - 'restart') - # Stop the service and regardless of whether it was - # running or not, start it again. - if $0 stop $other_args; then - $0 start $other_args - else - log_failure_msg "Failed to stop running server, so refusing to try to start." - exit 1 - fi - ;; - - 'reload'|'force-reload') - if test -s "$mysqld_pid_file_path" ; then - read mysqld_pid < "$mysqld_pid_file_path" - kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL" - touch "$mysqld_pid_file_path" - else - log_failure_msg "MySQL PID file could not be found!" - exit 1 - fi - ;; - 'status') - # First, check to see if pid file exists - if test -s "$mysqld_pid_file_path" ; then - read mysqld_pid < "$mysqld_pid_file_path" - if kill -0 $mysqld_pid 2>/dev/null ; then - log_success_msg "MySQL running ($mysqld_pid)" - exit 0 - else - log_failure_msg "MySQL is not running, but PID file exists" - exit 1 - fi - else - # Try to find appropriate mysqld process - mysqld_pid=`pgrep $libexecdir/mysqld` - if test -z "$mysqld_pid" ; then - if test -f "$lock_file_path" ; then - log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists" - exit 2 - fi - log_failure_msg "MySQL is not running" - exit 3 - else - log_failure_msg "MySQL is running but PID file could not be found" - exit 4 - fi - fi - ;; - *) - # usage - basename=`basename "$0"` - echo "Usage: $basename {start|stop|restart|reload|force-reload|status} [ MySQL server options ]" - exit 1 - ;; -esac - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl (from rev 23950, csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl 2014-08-09 12:22:48 UTC (rev 23951) @@ -0,0 +1,424 @@ +#!/bin/sh +# vim:ft=sh: +# +# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB +# This file is public domain and comes with NO WARRANTY of any kind + +# MySQL daemon start/stop script. + +# Usually this is put in /etc/init.d (at least on machines SYSV R4 based +# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql. +# When this is done the mysql server will be started when the machine is +# started and shut down when the systems goes down. + +# Comments for OpenCSW's CAS scripts +#RC_KNUM 01 +#RC_SNUM 99 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#FMRI network +#AUTOENABLE no + +# If you install MySQL on some other places than @prefix@, then you +# have to do one of the following things for this script to work: +# +# - Run this script from within the MySQL installation directory +# - Create a @sysconfdir@/my.cnf file with the following information: +# [mysqld] +# basedir= +# - Add the above to any other configuration file (for example ~/.my.ini) +# and copy my_print_defaults to /usr/bin +# - Add the path to the mysql-installation-directory to the basedir variable +# below. +# +# If you want to affect other MySQL variables, you should make your changes +# in the @sysconfdir@/my.cnf, ~/.my.cnf or other MySQL configuration files. + +# If you change base dir, you must also change datadir. These may get +# overwritten by settings in the MySQL configuration files. + +basedir= +datadir= + +# Default value, in seconds, afterwhich the script should timeout waiting +# for server start. +# Value here is overriden by value in my.cnf. +# 0 means don't wait at all +# Negative numbers mean to wait indefinitely +service_startup_timeout=900 + +# Lock directory for RedHat / SuSE. +lockdir='/var/lock/subsys' +lock_file_path="$lockdir/mysql" + +# The following variables are only set for letting mysql.server find things. + +# Set some defaults +mysqld_pid_file_path= +if test -z "$basedir" +then + basedir=@prefix@ + bindir=@bindir@ + if test -z "$datadir" + then + datadir=@localstatedir@ + fi + sbindir=@prefix@/libexec + libexecdir=@prefix@/libexec +else + bindir="$basedir/bin" + if test -z "$datadir" + then + datadir="$basedir/data" + fi + sbindir="$basedir/libexec" + libexecdir="$basedir/libexec" +fi + +# datadir_set is used to determine if datadir was set (and so should be +# *not* set inside of the --basedir= handler.) +datadir_set= + +# +# Use LSB init script functions for printing messages, if possible +# +lsb_functions="/lib/lsb/init-functions" +if test -f $lsb_functions ; then + . $lsb_functions +else + log_success_msg() + { + echo " SUCCESS! $@" + } + log_failure_msg() + { + echo " ERROR! $@" + } +fi + +PATH="/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin" +export PATH + +mode=$1 # start or stop + +[ $# -ge 1 ] && shift + + +other_args="$*" # uncommon, but needed when called from an RPM upgrade action + # Expected: "--skip-networking --skip-grant-tables" + # They are not checked here, intentionally, as it is the resposibility + # of the "spec" file author to give correct arguments only. + +case `echo "testing\c"`,`echo -n testing` in + *c*,-n*) echo_n= echo_c= ;; + *c*,*) echo_n=-n echo_c= ;; + *) echo_n= echo_c='\c' ;; +esac + +parse_server_arguments() { + for arg do + case "$arg" in + # $mysql5_arch must have been set (or left empty) for Solaris + # by the OpenCSW architecture selection bit + --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` + bindir="$basedir/bin/$mysql5_arch" + if test -z "$datadir_set"; then + datadir="$basedir/data" + fi + sbindir="$basedir/sbin/$mysql5_arch" + libexecdir="$basedir/libexec/$mysql5_arch" + ;; + --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` + datadir_set=1 + ;; + --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; + --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; + esac + done +} + +wait_for_pid () { + verb="$1" # created | removed + pid="$2" # process ID of the program operating on the pid-file + pid_file_path="$3" # path to the PID file. + + i=0 + avoid_race_condition="by checking again" + + while test $i -ne $service_startup_timeout ; do + + case "$verb" in + 'created') + # wait for a PID-file to pop into existence. + test -s "$pid_file_path" && i='' && break + ;; + 'removed') + # wait for this PID-file to disappear + test ! -s "$pid_file_path" && i='' && break + ;; + *) + echo "wait_for_pid () usage: wait_for_pid created|removed pid pid_file_path" + exit 1 + ;; + esac + + # if server isn't running, then pid-file will never be updated + if test -n "$pid"; then + if kill -0 "$pid" 2>/dev/null; then + : # the server still runs + else + # The server may have exited between the last pid-file check and now. + if test -n "$avoid_race_condition"; then + avoid_race_condition="" + continue # Check again. + fi + + # there's nothing that will affect the file. + log_failure_msg "The server quit without updating PID file ($pid_file_path)." + return 1 # not waiting any more. + fi + fi + + echo $echo_n ".$echo_c" + i=`expr $i + 1` + sleep 1 + + done + + if test -z "$i" ; then + log_success_msg + return 0 + else + log_failure_msg + return 1 + fi +} + +### START OPENCSW ARCHITECTURE SELECTION +# Source the configuration +# This is used to define the binary architeture to run + +# Check the old location first +[ -r @prefix@/etc/csw.conf ] && . @prefix@/etc/csw.conf + +# Check the current location, its content overrides the previous one +[ -r @sysconfdir@/csw.conf ] && . @sysconfdir@/csw.conf + +# If the package-specific variable is not set, try the default +if [ -z "$mysql5_arch" ]; then + if [ -n "$default_arch" ]; then + mysql5_arch="$default_arch" + fi +else + # In that specific case, by default, there is no subdir + if [ "$mysql5_arch" = "i386" -o "$mysql5_arch" = "sparc" ]; then + mysql5_arch="" + fi +fi + +# If a value was found +if [ -n "$mysql5_arch" ]; then + if [ "$mysql5_arch" = "kernel" ]; then + # Use the system's default arch + mysql5_arch=`isainfo -k` + fi + + # Add the architecture suffix to the executables' directories, if it exists + # The binaries themselves are tested below, so the script should fail + # mostly gracefully if a non-present arch is set up. + if [ -d "$bindir/$mysql5_arch" -a \ + -d "$sbindir/$mysql5_arch" -a \ + -d "$libexecdir/$mysql5_arch" ]; then + bindir="$bindir/$mysql5_arch" + sbindir="$sbindir/$mysql5_arch" + libexecdir="$libexecdir/$mysql5_arch" + fi +fi +### END OPENCSW ARCHITECTURE SELECTION + +# Get arguments from the my.cnf file, +# the only group, which is read from now on is [mysqld] +if test -x ./bin/my_print_defaults +then + print_defaults="./bin/my_print_defaults" +elif test -x $bindir/my_print_defaults +then + print_defaults="$bindir/my_print_defaults" +elif test -x $bindir/mysql_print_defaults +then + print_defaults="$bindir/mysql_print_defaults" +else + # Try to find basedir in @sysconfdir@/my.cnf + conf=@sysconfdir@/my.cnf + print_defaults= + if test -r $conf + then + subpat='^[^=]*basedir[^=]*=\(.*\)$' + dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf` + for d in $dirs + do + d=`echo $d | sed -e 's/[ ]//g'` + if test -x "$d/bin/my_print_defaults" + then + print_defaults="$d/bin/my_print_defaults" + break + fi + if test -x "$d/bin/mysql_print_defaults" + then + print_defaults="$d/bin/mysql_print_defaults" + break + fi + done + fi + + # Hope it's in the PATH ... but I doubt it + test -z "$print_defaults" && print_defaults="my_print_defaults" +fi + +# +# Read defaults file from 'basedir'. If there is no defaults file there +# check if it's in the old (depricated) place (datadir) and read it from there +# + +extra_args="" +if test -r "$basedir/my.cnf" +then + extra_args="-e $basedir/my.cnf" +else + if test -r "$datadir/my.cnf" + then + extra_args="-e $datadir/my.cnf" + fi +fi + +parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server` + +# +# Set pid file if not given +# +if test -z "$mysqld_pid_file_path" +then + mysqld_pid_file_path=$datadir/`hostname`.pid +else + case "$mysqld_pid_file_path" in + /* ) ;; + * ) mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;; + esac +fi + +case "$mode" in + 'start') + # Start daemon + + # Safeguard (relative paths, core dumps..) + # Changed to /opt for OpenCSW to avoid mysqld_safe picking the 32 bit + # binary in libexec/ + cd /opt + + echo $echo_n "Starting MySQL" + if test -x $bindir/mysqld_safe + then + # Give extra arguments to mysqld with the my.cnf file. This script + # may be overwritten at next upgrade. + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null 2>&1 & + wait_for_pid created "$!" "$mysqld_pid_file_path"; return_value=$? + + # Make lock for RedHat / SuSE + if test -w "$lockdir" + then + touch "$lock_file_path" + fi + + exit $return_value + else + log_failure_msg "Couldn't find MySQL server ($bindir/mysqld_safe)" + fi + ;; + + 'stop') + # Stop daemon. We use a signal here to avoid having to know the + # root password. + + if test -s "$mysqld_pid_file_path" + then + mysqld_pid=`cat "$mysqld_pid_file_path"` + + if (kill -0 $mysqld_pid 2>/dev/null) + then + echo $echo_n "Shutting down MySQL" + kill $mysqld_pid + # mysqld should remove the pid file when it exits, so wait for it. + wait_for_pid removed "$mysqld_pid" "$mysqld_pid_file_path"; return_value=$? + else + log_failure_msg "MySQL server process #$mysqld_pid is not running!" + rm "$mysqld_pid_file_path" + fi + + # Delete lock for RedHat / SuSE + if test -f "$lock_file_path" + then + rm -f "$lock_file_path" + fi + exit $return_value + else + log_failure_msg "MySQL server PID file could not be found!" + fi + ;; + + 'restart') + # Stop the service and regardless of whether it was + # running or not, start it again. + if $0 stop $other_args; then + $0 start $other_args + else + log_failure_msg "Failed to stop running server, so refusing to try to start." + exit 1 + fi + ;; + + 'reload'|'force-reload') + if test -s "$mysqld_pid_file_path" ; then + read mysqld_pid < "$mysqld_pid_file_path" + kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL" + touch "$mysqld_pid_file_path" + else + log_failure_msg "MySQL PID file could not be found!" + exit 1 + fi + ;; + 'status') + # First, check to see if pid file exists + if test -s "$mysqld_pid_file_path" ; then + read mysqld_pid < "$mysqld_pid_file_path" + if kill -0 $mysqld_pid 2>/dev/null ; then + log_success_msg "MySQL running ($mysqld_pid)" + exit 0 + else + log_failure_msg "MySQL is not running, but PID file exists" + exit 1 + fi + else + # Try to find appropriate mysqld process + mysqld_pid=`pgrep $libexecdir/mysqld` + if test -z "$mysqld_pid" ; then + if test -f "$lock_file_path" ; then + log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists" + exit 2 + fi + log_failure_msg "MySQL is not running" + exit 3 + else + log_failure_msg "MySQL is running but PID file could not be found" + exit 4 + fi + fi + ;; + *) + # usage + basename=`basename "$0"` + echo "Usage: $basename {start|stop|restart|reload|force-reload|status} [ MySQL server options ]" + exit 1 + ;; +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Aug 10 11:01:35 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Aug 2014 09:01:35 +0000 Subject: SF.net SVN: gar:[23955] csw/mgar/gar/v2/go/src/promote-packages/ report-template.html Message-ID: <3hWDnX70G3z19K@mail.opencsw.org> Revision: 23955 http://sourceforge.net/p/gar/code/23955 Author: wahwah Date: 2014-08-10 09:01:33 +0000 (Sun, 10 Aug 2014) Log Message: ----------- package-promotions: Correct a template bug The documentation[1] says that you can do: {{ if x }} ... {{ else if y }} ... {{ else }} ... {{ end }} In practice, it doesn't work. [1] http://godoc.org/text/template Modified Paths: -------------- csw/mgar/gar/v2/go/src/promote-packages/report-template.html Modified: csw/mgar/gar/v2/go/src/promote-packages/report-template.html =================================================================== --- csw/mgar/gar/v2/go/src/promote-packages/report-template.html 2014-08-10 08:30:10 UTC (rev 23954) +++ csw/mgar/gar/v2/go/src/promote-packages/report-template.html 2014-08-10 09:01:33 UTC (rev 23955) @@ -14,7 +14,7 @@ {{ range $ccg := .CrossCatGroups }}
  • {{ $ccg.Key }} {{ if $ccg.Bugs }} (blocking bugs!) @@ -35,7 +35,8 @@ - {{ $ccg.Key }} 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 Aug 10 16:47:22 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Aug 2014 14:47:22 +0000 Subject: SF.net SVN: gar:[23957] csw/mgar/pkg/hexdump/trunk Message-ID: <3hWNSd5BRGz1Vl@mail.opencsw.org> Revision: 23957 http://sourceforge.net/p/gar/code/23957 Author: wahwah Date: 2014-08-10 14:47:21 +0000 (Sun, 10 Aug 2014) Log Message: ----------- hexdump/trunk: Version bump, switch to GCC (stdbool.h) Modified Paths: -------------- csw/mgar/pkg/hexdump/trunk/Makefile csw/mgar/pkg/hexdump/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/hexdump/trunk/Makefile Modified: csw/mgar/pkg/hexdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/hexdump/trunk/Makefile 2014-08-10 14:12:40 UTC (rev 23956) +++ csw/mgar/pkg/hexdump/trunk/Makefile 2014-08-10 14:47:21 UTC (rev 23957) @@ -1,10 +1,10 @@ +# $Id$ + NAME = hexdump -VERSION = 1.7 +VERSION = 1.8 GARTYPE = v2 DESCRIPTION = A hex dumper that can handle EBCDIC -define BLURB -endef MASTER_SITES = http://www.catb.org/~esr/hexdump/ DISTFILES = $(NAME)-$(VERSION).tar.gz @@ -14,10 +14,14 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +GARCOMPILER = GNU + # hexdump Makefile only uses $(CC), not $(CFLAGS) -BUILD_ARGS = CC='$(CC) $(CFLAGS)' +BUILD_ARGS = CC='$(CC) $(CFLAGS) -std=c99' NORUNPATH = 1 +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + include gar/category.mk install-custom: Property changes on: csw/mgar/pkg/hexdump/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: csw/mgar/pkg/hexdump/trunk/checksums =================================================================== --- csw/mgar/pkg/hexdump/trunk/checksums 2014-08-10 14:12:40 UTC (rev 23956) +++ csw/mgar/pkg/hexdump/trunk/checksums 2014-08-10 14:47:21 UTC (rev 23957) @@ -1 +1 @@ -c9c06ff710f46a0da258426f775437f7 hexdump-1.7.tar.gz +6e9a9e060ec892790fdf4358dc550f97 hexdump-1.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Aug 10 19:55:45 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 10 Aug 2014 17:55:45 +0000 Subject: SF.net SVN: gar:[23961] csw/mgar/pkg/nagios_plugins/trunk/Makefile Message-ID: <3hWSdt6n1fz5B@mail.opencsw.org> Revision: 23961 http://sourceforge.net/p/gar/code/23961 Author: guengel Date: 2014-08-10 17:55:42 +0000 (Sun, 10 Aug 2014) Log Message: ----------- nagios_plugins/trunk: Use modulation to enable build of check_swap. check_swap can only be built with --disable-largefile. Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2014-08-10 16:54:03 UTC (rev 23960) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2014-08-10 17:55:42 UTC (rev 23961) @@ -30,12 +30,24 @@ POSTMSG += /opt/csw/share/doc/nagios-plugins/README.CSW +# check_swap won't be compiled if --enable-largefile is provided. So +# we employ a modulation using --disable-largefile which builds +# check_swap. This is the only file from that particular modulation +# that makes it into the final package (so far). +EXTRA_MODULATORS = FILEBITS +MODULATIONS_FILEBITS = large small + +CONFIGURE_ARGS_isa-sparcv8plus-filebits-large = --enable-largefile +CONFIGURE_ARGS_isa-sparcv8plus-filebits-small = --disable-largefile + +CONFIGURE_ARGS_isa-pentium_pro-filebits-large = --enable-largefile +CONFIGURE_ARGS_isa-pentium_pro-filebits-small = --disable-largefile + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-openssl=/opt/csw CONFIGURE_ARGS += --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin:/opt/csw/bin:/opt/csw/sbin CONFIGURE_ARGS += --with-mysql=/opt/csw CONFIGURE_ARGS += --with-pgsql=/opt/csw/postgresql -CONFIGURE_ARGS += --enable-largefile CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl CONFIGURE_ARGS += --with-openssl=/opt/csw @@ -45,6 +57,7 @@ CONFIGURE_ARGS += --with-ping6-command="/usr/sbin/ping -A inet6 -s %s 56 %d" CONFIGURE_ARGS += --with-snmpget-command=/opt/csw/bin/snmpget CONFIGURE_ARGS += --with-snmpgetnext-command=/opt/csw/bin/snmpgetnext +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) # We currently fix on 1.22.5, libmysql needs a higher level due to getpagesize2 LINKER_MAPS = @@ -77,13 +90,18 @@ # Testsuite is interactive SKIPTEST ?= 1 -include gar/category.mk - DOCS += FAQ README REQUIREMENTS SUPPORT COPYING DOCDEST = $(DESTDIR)$(docdir)/$(NAME) ROOT_PLUGINS = check_dhcp check_icmp pst3 PLUGINDEST = $(DESTDIR)$(libexecdir) +MERGE_SCRIPTS_isa-sparcv8plus-filebits-large = copy-all +MERGE_SCRIPTS_isa-sparcv8plus-filebits-small = copy-fb-small-only + +MERGE_SCRIPTS_isa-pentium_pro-filebits-large = copy-all +MERGE_SCRIPTS_isa-pentium_pro-filebits-small = copy-fb-small-only + +include gar/category.mk post-install-modulated: @ginstall -m 755 -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @@ -99,3 +117,6 @@ @rm $(PKGROOT)$(libdir)/charset.alias @$(MAKECOOKIE) +merge-copy-fb-small-only: + cp $(INSTALLISADIR)$(libexecdir)/check_swap $(PKGROOT)$(libexecdir)/check_swap + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Aug 10 20:35:24 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 10 Aug 2014 18:35:24 +0000 Subject: SF.net SVN: gar:[23963] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: <3hWTWf0M77z8w@mail.opencsw.org> Revision: 23963 http://sourceforge.net/p/gar/code/23963 Author: lblume Date: 2014-08-10 18:35:22 +0000 (Sun, 10 Aug 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Fix more dependencies Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-08-10 18:08:50 UTC (rev 23962) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-08-10 18:35:22 UTC (rev 23963) @@ -88,6 +88,8 @@ PKGFILES_CSW$(NAME)-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSW$(NAME)-dev += $(prefix)/include.* INCOMPATIBLE_PKGS_CSW$(NAME)-dev = CSWmysql-dev +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-collision +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += surplus-dependency|CSWlibmysqlclient-$(MYSQL_LIB_VER) PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -99,7 +101,7 @@ PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r18 += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibmysqlclient$(MYSQL_LIB_VER) # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Aug 10 21:48:55 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 10 Aug 2014 19:48:55 +0000 Subject: SF.net SVN: gar:[23965] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: <3hWW8S1rMDzF3@mail.opencsw.org> Revision: 23965 http://sourceforge.net/p/gar/code/23965 Author: lblume Date: 2014-08-10 19:48:52 +0000 (Sun, 10 Aug 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Typo in the dep name Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-08-10 18:41:35 UTC (rev 23964) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-08-10 19:48:52 UTC (rev 23965) @@ -89,7 +89,7 @@ PKGFILES_CSW$(NAME)-dev += $(prefix)/include.* INCOMPATIBLE_PKGS_CSW$(NAME)-dev = CSWmysql-dev CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-collision -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += surplus-dependency|CSWlibmysqlclient-$(MYSQL_LIB_VER) +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += surplus-dependency|CSWlibmysqlclient-r$(MYSQL_LIB_VER) PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Aug 10 22:52:43 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 10 Aug 2014 20:52:43 +0000 Subject: SF.net SVN: gar:[23967] csw/mgar/pkg/ilmbase/trunk Message-ID: <3hWXZ42TwHzJZ@mail.opencsw.org> Revision: 23967 http://sourceforge.net/p/gar/code/23967 Author: lblume Date: 2014-08-10 20:52:42 +0000 (Sun, 10 Aug 2014) Log Message: ----------- ilmbase/trunk: Bump to 2.1.0 Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile csw/mgar/pkg/ilmbase/trunk/checksums Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2014-08-10 20:47:47 UTC (rev 23966) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2014-08-10 20:52:42 UTC (rev 23967) @@ -1,5 +1,5 @@ NAME = ilmbase -VERSION = 2.0.1 +VERSION = 2.1.0 GARTYPE = v2 DESCRIPTION = Base libraries used by OpenEXR Modified: csw/mgar/pkg/ilmbase/trunk/checksums =================================================================== --- csw/mgar/pkg/ilmbase/trunk/checksums 2014-08-10 20:47:47 UTC (rev 23966) +++ csw/mgar/pkg/ilmbase/trunk/checksums 2014-08-10 20:52:42 UTC (rev 23967) @@ -1 +1 @@ -74c0d0d2873960bd0dc1993f8e03f0ae ilmbase-2.0.1.tar.gz +8ba2f608191ad020e50277d8a3ba0850 ilmbase-2.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Aug 12 17:00:44 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 12 Aug 2014 15:00:44 +0000 Subject: SF.net SVN: gar:[23973] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3hXcgD46hRzP0@mail.opencsw.org> Revision: 23973 http://sourceforge.net/p/gar/code/23973 Author: slowfranklin Date: 2014-08-12 15:00:43 +0000 (Tue, 12 Aug 2014) Log Message: ----------- netatalk/trunk: Override for s10-sparc Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-08-12 11:45:15 UTC (rev 23972) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-08-12 15:00:43 UTC (rev 23973) @@ -85,6 +85,8 @@ CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_pam.so CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_passwd.so CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_randnum.so +CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 = surplus-dependency|CSWlibgmodule2-0-0 +CHECKPKG_OVERRIDES_CSWnetatalk += $(CHECKPKG_OVERRIDES_CSWnetatalk_$(GARCH)_$(GAROSREL)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Aug 13 00:13:03 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 12 Aug 2014 22:13:03 +0000 Subject: SF.net SVN: gar:[23974] csw/mgar/pkg/cpan/Mojolicious/trunk Message-ID: <3hXpFv2sdDzfJ@mail.opencsw.org> Revision: 23974 http://sourceforge.net/p/gar/code/23974 Author: lblume Date: 2014-08-12 22:13:02 +0000 (Tue, 12 Aug 2014) Log Message: ----------- cpan/Mojolicious/trunk: Bump to 5.27; force use of OpenCSW perl Modified Paths: -------------- csw/mgar/pkg/cpan/Mojolicious/trunk/Makefile csw/mgar/pkg/cpan/Mojolicious/trunk/checksums Modified: csw/mgar/pkg/cpan/Mojolicious/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mojolicious/trunk/Makefile 2014-08-12 15:00:43 UTC (rev 23973) +++ csw/mgar/pkg/cpan/Mojolicious/trunk/Makefile 2014-08-12 22:13:02 UTC (rev 23974) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = Mojolicious -VERSION = 5.22 +VERSION = 5.27 GARTYPE = v2 CATEGORIES = cpan AUTHOR = SRI @@ -23,3 +23,8 @@ include gar/category.mk +post-install: + # Ensure that OpenCSW perl is used + gsed -i '1,1s!perl!/opt/csw/bin/perl!' $(DESTDIR)$(bindir)/* + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/cpan/Mojolicious/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mojolicious/trunk/checksums 2014-08-12 15:00:43 UTC (rev 23973) +++ csw/mgar/pkg/cpan/Mojolicious/trunk/checksums 2014-08-12 22:13:02 UTC (rev 23974) @@ -1 +1 @@ -6984c2217bf09cda0f4d5b5c3db68262 Mojolicious-5.22.tar.gz +d38ba249c202e34264e6300fc58ffb08 Mojolicious-5.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 14:12:01 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 12:12:01 +0000 Subject: SF.net SVN: gar:[23976] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hY8sv1gD0z13D@mail.opencsw.org> Revision: 23976 http://sourceforge.net/p/gar/code/23976 Author: claudio_sf Date: 2014-08-13 12:11:57 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: Let's get 32-bit built first Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 12:10:39 UTC (rev 23975) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 12:11:57 UTC (rev 23976) @@ -11,11 +11,11 @@ DISTFILES += $(DISTNAME).tar.gz GARCOMPILER = GCC4 -BUILD64 = 1 -ISAEXEC = 1 -IGNORE_DESTDIR = 1 +#BUILD64 = 1 +#ISAEXEC = 1 +#IGNORE_DESTDIR = 1 # We want 64 bit binaries -MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) #CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 14:37:06 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 12:37:06 +0000 Subject: SF.net SVN: gar:[23978] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hY9Qn4jsfz16l@mail.opencsw.org> Revision: 23978 http://sourceforge.net/p/gar/code/23978 Author: claudio_sf Date: 2014-08-13 12:37:04 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: runtime dependencies Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 12:30:07 UTC (rev 23977) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 12:37:04 UTC (rev 23978) @@ -17,6 +17,10 @@ PKGFILES_CSWliblog4shib1 += $(call baseisadirs,$(libdir),liblog4shib\.so\.1(\.\d+)*) SPKG_DESC_CSWliblog4shib1 += $(DESCRIPTION), liblog4shib.so.1 RUNTIME_DEP_PKGS_CSWlog4shib += CSWliblog4shib1 +RUNTIME_DEP_PKGS_CSWlog4shib-dev += CSWliblog4shib1 +RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibstdc++6 + # The end of CSWliblog4shib1 definition # (If CSWlog4shib-dev doesn't exist yet) PACKAGES += CSWlog4shib-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 15:03:49 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 13:03:49 +0000 Subject: SF.net SVN: gar:[23979] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYB1j460jz1B0@mail.opencsw.org> Revision: 23979 http://sourceforge.net/p/gar/code/23979 Author: claudio_sf Date: 2014-08-13 13:03:46 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: overrides Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 12:37:04 UTC (rev 23978) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 13:03:46 UTC (rev 23979) @@ -11,23 +11,9 @@ DISTFILES += $(DISTNAME).tar.gz # separate packages -PACKAGES += CSWliblog4shib1 -CATALOGNAME_CSWliblog4shib1 = liblog4shib1 -PKGFILES_CSWliblog4shib1 += $(call baseisadirs,$(libdir),liblog4shib\.so\.1\.0\.8) -PKGFILES_CSWliblog4shib1 += $(call baseisadirs,$(libdir),liblog4shib\.so\.1(\.\d+)*) -SPKG_DESC_CSWliblog4shib1 += $(DESCRIPTION), liblog4shib.so.1 -RUNTIME_DEP_PKGS_CSWlog4shib += CSWliblog4shib1 -RUNTIME_DEP_PKGS_CSWlog4shib-dev += CSWliblog4shib1 RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibstdc++6 -# The end of CSWliblog4shib1 definition -# (If CSWlog4shib-dev doesn't exist yet) -PACKAGES += CSWlog4shib-dev -CATALOGNAME_CSWlog4shib-dev = log4shib_dev -SPKG_DESC_CSWlog4shib-dev += $(DESCRIPTION), development files -PKGFILES_CSWlog4shib-dev += /opt/csw/lib/liblog4shib.so - GARCOMPILER = GCC4 #BUILD64 = 1 #ISAEXEC = 1 @@ -35,6 +21,11 @@ # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) +#OVERRIDES +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so + #CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 15:36:59 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 13:36:59 +0000 Subject: SF.net SVN: gar:[23980] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYBlz0jNDz1Fk@mail.opencsw.org> Revision: 23980 http://sourceforge.net/p/gar/code/23980 Author: claudio_sf Date: 2014-08-13 13:36:56 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: 64-bit, no -dev split Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 13:03:46 UTC (rev 23979) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 13:36:56 UTC (rev 23980) @@ -15,21 +15,26 @@ RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibstdc++6 GARCOMPILER = GCC4 -#BUILD64 = 1 -#ISAEXEC = 1 +BUILD64 = 1 +ISAEXEC = 1 #IGNORE_DESTDIR = 1 # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) -#OVERRIDES +#OVERRIDES: let not split -dev for now CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so +#CHECKPKG_OVERRIDES_CSWlog4shib += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so + #CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6 -CONFIGURE_ARGS = --disable-static --disable-doxygen --prefix=/opt/csw --mandir=/opt/csw/share/man +CONFIGURE_ARGS = --disable-static --disable-doxygen --prefix=/opt/csw --mandir=/opt/csw/share/man --libdir=$(libdir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 16:00:28 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 14:00:28 +0000 Subject: SF.net SVN: gar:[23981] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYCH52JK7z1KR@mail.opencsw.org> Revision: 23981 http://sourceforge.net/p/gar/code/23981 Author: claudio_sf Date: 2014-08-13 14:00:27 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: parallel_build Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 13:36:56 UTC (rev 23980) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 14:00:27 UTC (rev 23981) @@ -15,6 +15,8 @@ RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibstdc++6 GARCOMPILER = GCC4 +MAKE_OPT_unstable10s = -j 24 +MAKE_OPT_unstable10x = -j 4 BUILD64 = 1 ISAEXEC = 1 #IGNORE_DESTDIR = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 16:34:44 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 14:34:44 +0000 Subject: SF.net SVN: gar:[23982] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYD2Z57xpz1PD@mail.opencsw.org> Revision: 23982 http://sourceforge.net/p/gar/code/23982 Author: claudio_sf Date: 2014-08-13 14:34:43 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: overrides++ Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 14:00:27 UTC (rev 23981) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 14:34:43 UTC (rev 23982) @@ -21,18 +21,17 @@ ISAEXEC = 1 #IGNORE_DESTDIR = 1 # We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) +MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) #OVERRIDES: let not split -dev for now CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so -#CHECKPKG_OVERRIDES_CSWlog4shib += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWlog4shib += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so - #CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 13 16:37:41 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 13 Aug 2014 14:37:41 +0000 Subject: SF.net SVN: gar:[23983] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYD5y6MNHz1ST@mail.opencsw.org> Revision: 23983 http://sourceforge.net/p/gar/code/23983 Author: claudio_sf Date: 2014-08-13 14:37:39 +0000 (Wed, 13 Aug 2014) Log Message: ----------- log4shib/trunk: remove uncommited override Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 14:34:43 UTC (rev 23982) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-13 14:37:39 UTC (rev 23983) @@ -28,7 +28,6 @@ CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so -CHECKPKG_OVERRIDES_CSWlog4shib += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so 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 Wed Aug 13 19:45:43 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 13 Aug 2014 17:45:43 +0000 Subject: SF.net SVN: gar:[23984] csw/mgar/pkg/tor/trunk Message-ID: <3hYJH71j4bz2s@mail.opencsw.org> Revision: 23984 http://sourceforge.net/p/gar/code/23984 Author: jake_goerzen Date: 2014-08-13 17:45:41 +0000 (Wed, 13 Aug 2014) Log Message: ----------- tor: bump to version 0.2.4.23 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2014-08-13 14:37:39 UTC (rev 23983) +++ csw/mgar/pkg/tor/trunk/Makefile 2014-08-13 17:45:41 UTC (rev 23984) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.4.22 +VERSION = 0.2.4.23 GARTYPE = v2 DESCRIPTION = Secure network traffic router Modified: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2014-08-13 14:37:39 UTC (rev 23983) +++ csw/mgar/pkg/tor/trunk/checksums 2014-08-13 17:45:41 UTC (rev 23984) @@ -1 +1 @@ -5a7eee0d9df87233255d78b25c6f8270 tor-0.2.4.22.tar.gz +9e39928e310612c3bffee727f554c63f tor-0.2.4.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Aug 13 22:17:24 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 13 Aug 2014 20:17:24 +0000 Subject: SF.net SVN: gar:[23986] csw/mgar/pkg/gnupg/trunk Message-ID: <3hYMdy5mDFz8X@mail.opencsw.org> Revision: 23986 http://sourceforge.net/p/gar/code/23986 Author: lblume Date: 2014-08-13 20:17:14 +0000 (Wed, 13 Aug 2014) Log Message: ----------- gnupg/trunk: Bump to 1.4.18 Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2014-08-13 20:16:09 UTC (rev 23985) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2014-08-13 20:17:14 UTC (rev 23986) @@ -1,5 +1,5 @@ NAME = gnupg -VERSION = 1.4.16 +VERSION = 1.4.18 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2014-08-13 20:16:09 UTC (rev 23985) +++ csw/mgar/pkg/gnupg/trunk/checksums 2014-08-13 20:17:14 UTC (rev 23986) @@ -1 +1 @@ -6df73c57d3ece1dd36dc2a7679f00fb0 gnupg-1.4.16.tar.bz2 +54db1be9588b11afbbdd8b82d4ea883a gnupg-1.4.18.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 14 09:32:00 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Aug 2014 07:32:00 +0000 Subject: SF.net SVN: gar:[23990] csw/mgar/pkg Message-ID: <3hYfcR03lVzM4@mail.opencsw.org> Revision: 23990 http://sourceforge.net/p/gar/code/23990 Author: dmichelsen Date: 2014-08-14 07:31:57 +0000 (Thu, 14 Aug 2014) Log Message: ----------- ruby21: Initial commit Modified Paths: -------------- csw/mgar/pkg/ruby21/trunk/Makefile csw/mgar/pkg/ruby21/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ruby21/ Modified: csw/mgar/pkg/ruby21/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby20/trunk/Makefile 2014-05-28 09:49:59 UTC (rev 23717) +++ csw/mgar/pkg/ruby21/trunk/Makefile 2014-08-14 07:31:57 UTC (rev 23990) @@ -1,13 +1,10 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = ruby20 -SHORTVER = 2.0 -DISTVERSION = $(SHORTVER).0 -DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL) -VERSION = $(DISTVERSION) -PATCHLEVEL = p451 -GARTYPE = v2 +NAME = ruby +SHORTVER = 2.1 +VERSION = $(SHORTVER).2 +API_VERSION = $(VERSION) DESCRIPTION = An object-oriented language for quick and easy programming. define BLURB @@ -21,9 +18,39 @@ endef MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/$(SHORTVER)/ -DISTFILES = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.gz +DISTFILES += $(DISTNAME).tar.gz +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 + +PACKAGES += CSWruby21 +SPKG_DESC_CSWruby21 = Ruby 2.1.x +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibgdbm3 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibyaml0-2 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWruby21 += CSWlibreadline5 + +#GARCOMPILER = SOS12U2 +GARCOMPILER = SOS12U2 + CONFIGURE_ARGS = $(DIRPATHS) +# Enabled DTrace support has problems during linking +CONFIGURE_ARGS += --disable-dtrace + +CONFIGURE_ARGS += --program-suffix=21 +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --with-soname=ruby$(API_VERSION) +CONFIGURE_ARGS += --with-out-ext=tk + + +# There are tests failing +SKIPTEST ?= 1 + include gar/category.mk Modified: csw/mgar/pkg/ruby21/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby20/trunk/checksums 2014-05-28 09:49:59 UTC (rev 23717) +++ csw/mgar/pkg/ruby21/trunk/checksums 2014-08-14 07:31:57 UTC (rev 23990) @@ -1 +1 @@ -9227787a9636551f1749ee8394b5ffe5 ruby-2.0.0-p451.tar.gz +a5b5c83565f8bd954ee522bd287d2ca1 ruby-2.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Aug 14 10:08:12 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 14 Aug 2014 08:08:12 +0000 Subject: SF.net SVN: gar:[23991] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYgQ80dPxzQg@mail.opencsw.org> Revision: 23991 http://sourceforge.net/p/gar/code/23991 Author: claudio_sf Date: 2014-08-14 08:08:08 +0000 (Thu, 14 Aug 2014) Log Message: ----------- log4shib/trunk: override party Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-14 07:31:57 UTC (rev 23990) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-14 08:08:08 UTC (rev 23991) @@ -24,9 +24,6 @@ MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) #OVERRIDES: let not split -dev for now -CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so -CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 -CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Aug 14 10:20:12 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 14 Aug 2014 08:20:12 +0000 Subject: SF.net SVN: gar:[23992] csw/mgar/pkg/log4shib/trunk/Makefile Message-ID: <3hYggz5jrlzV2@mail.opencsw.org> Revision: 23992 http://sourceforge.net/p/gar/code/23992 Author: claudio_sf Date: 2014-08-14 08:20:09 +0000 (Thu, 14 Aug 2014) Log Message: ----------- log4shib/trunk: override party Modified Paths: -------------- csw/mgar/pkg/log4shib/trunk/Makefile Modified: csw/mgar/pkg/log4shib/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-14 08:08:08 UTC (rev 23991) +++ csw/mgar/pkg/log4shib/trunk/Makefile 2014-08-14 08:20:09 UTC (rev 23992) @@ -24,6 +24,9 @@ MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) #OVERRIDES: let not split -dev for now +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 +CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Aug 14 12:17:47 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 14 Aug 2014 10:17:47 +0000 Subject: SF.net SVN: gar:[23994] csw/mgar/pkg Message-ID: <3hYkHh63cnzb4@mail.opencsw.org> Revision: 23994 http://sourceforge.net/p/gar/code/23994 Author: claudio_sf Date: 2014-08-14 10:17:45 +0000 (Thu, 14 Aug 2014) Log Message: ----------- libxmltooling-c/trunk: First commit Added Paths: ----------- csw/mgar/pkg/libxmltooling-c/ csw/mgar/pkg/libxmltooling-c/Makefile csw/mgar/pkg/libxmltooling-c/branches/ csw/mgar/pkg/libxmltooling-c/tags/ csw/mgar/pkg/libxmltooling-c/trunk/ csw/mgar/pkg/libxmltooling-c/trunk/Makefile csw/mgar/pkg/libxmltooling-c/trunk/checksums csw/mgar/pkg/libxmltooling-c/trunk/files/ Added: csw/mgar/pkg/libxmltooling-c/Makefile =================================================================== --- csw/mgar/pkg/libxmltooling-c/Makefile (rev 0) +++ csw/mgar/pkg/libxmltooling-c/Makefile 2014-08-14 10:17:45 UTC (rev 23994) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libxmltooling-c/trunk =================================================================== --- csw/mgar/pkg/libxmltooling-c/trunk 2014-08-14 09:10:55 UTC (rev 23993) +++ csw/mgar/pkg/libxmltooling-c/trunk 2014-08-14 10:17:45 UTC (rev 23994) Property changes on: csw/mgar/pkg/libxmltooling-c/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libxmltooling-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxmltooling-c/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libxmltooling-c/trunk/Makefile 2014-08-14 10:17:45 UTC (rev 23994) @@ -0,0 +1,53 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libxmltooling-c +VERSION = 1.5.3 +GARTYPE = v2 + +DESCRIPTION = Library for XML processing regarding signing and encryption + +MASTER_SITES += http://shibboleth.net/downloads/c++-opensaml/latest/ +DISTFILES += xmltooling-$(VERSION).tar.gz + +GARCOMPILER = GCC4 +MAKE_OPT_unstable10s = -j 24 +MAKE_OPT_unstable10x = -j 4 +BUILD64 = 1 +ISAEXEC = 1 +#IGNORE_DESTDIR = 1 +# We want 64 bit binaries +MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +#OVERRIDES: let not split -dev for now + +#CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6 +CONFIGURE_ARGS = --disable-static --disable-doxygen --prefix=/opt/csw --mandir=/opt/csw/share/man --libdir=$(libdir) + +include gar/category.mk +# --with-boost=DIR prefix of Boost [guess] +# --with-log4shib=PATH where log4shib-config is installed +# --with-log4cpp=PATH where log4cpp-config is installed +# --with-xerces=PATH where xerces-c is installed +# --with-xmlsec=PATH where xmlsec is installed +# --with-openssl=PATH where openssl is installed +# --with-curl=PATH where curl-config is installed +# --with-cxxtest=PATH where cxxtest is installed +# +#Some influential environment variables: +# CC C compiler command +# CFLAGS C compiler flags +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# nonstandard directory +# LIBS libraries to pass to the linker, e.g. -l +# CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if +# you have headers in a nonstandard directory +# CPP C preprocessor +# DOXYGEN_PAPER_SIZE +# a4wide (default), a4, letter, legal or executive +# CXX C++ compiler command +# CXXFLAGS C++ compiler flags +# CXXCPP C++ preprocessor +# BOOST_ROOT Location of Boost installation Property changes on: csw/mgar/pkg/libxmltooling-c/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libxmltooling-c/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Aug 14 13:38:13 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 14 Aug 2014 11:38:13 +0000 Subject: SF.net SVN: gar:[23995] csw/mgar/pkg Message-ID: <3hYm4R0gLrzg3@mail.opencsw.org> Revision: 23995 http://sourceforge.net/p/gar/code/23995 Author: claudio_sf Date: 2014-08-14 11:38:10 +0000 (Thu, 14 Aug 2014) Log Message: ----------- xmltooling/trunk: First commit Added Paths: ----------- csw/mgar/pkg/xmltooling/ csw/mgar/pkg/xmltooling/Makefile csw/mgar/pkg/xmltooling/branches/ csw/mgar/pkg/xmltooling/tags/ csw/mgar/pkg/xmltooling/trunk/ csw/mgar/pkg/xmltooling/trunk/Makefile csw/mgar/pkg/xmltooling/trunk/checksums csw/mgar/pkg/xmltooling/trunk/files/ Added: csw/mgar/pkg/xmltooling/Makefile =================================================================== --- csw/mgar/pkg/xmltooling/Makefile (rev 0) +++ csw/mgar/pkg/xmltooling/Makefile 2014-08-14 11:38:10 UTC (rev 23995) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/xmltooling/trunk =================================================================== --- csw/mgar/pkg/xmltooling/trunk 2014-08-14 10:17:45 UTC (rev 23994) +++ csw/mgar/pkg/xmltooling/trunk 2014-08-14 11:38:10 UTC (rev 23995) Property changes on: csw/mgar/pkg/xmltooling/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/xmltooling/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmltooling/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xmltooling/trunk/Makefile 2014-08-14 11:38:10 UTC (rev 23995) @@ -0,0 +1,53 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xmltooling +VERSION = 1.5.3 +GARTYPE = v2 + +DESCRIPTION = Library for XML processing regarding signing and encryption + +MASTER_SITES += http://shibboleth.net/downloads/c++-opensaml/latest/ +DISTFILES += $(NAME)-$(VERSION).tar.gz + +GARCOMPILER = GCC4 +MAKE_OPT_unstable10s = -j 24 +MAKE_OPT_unstable10x = -j 4 +BUILD64 = 1 +ISAEXEC = 1 +#IGNORE_DESTDIR = 1 +# We want 64 bit binaries +MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +#OVERRIDES: let not split -dev for now + +#CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6 +CONFIGURE_ARGS = --disable-static --disable-doxygen --prefix=/opt/csw --mandir=/opt/csw/share/man --libdir=$(libdir) + +include gar/category.mk +# --with-boost=DIR prefix of Boost [guess] +# --with-log4shib=PATH where log4shib-config is installed +# --with-log4cpp=PATH where log4cpp-config is installed +# --with-xerces=PATH where xerces-c is installed +# --with-xmlsec=PATH where xmlsec is installed +# --with-openssl=PATH where openssl is installed +# --with-curl=PATH where curl-config is installed +# --with-cxxtest=PATH where cxxtest is installed +# +#Some influential environment variables: +# CC C compiler command +# CFLAGS C compiler flags +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# nonstandard directory +# LIBS libraries to pass to the linker, e.g. -l +# CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if +# you have headers in a nonstandard directory +# CPP C preprocessor +# DOXYGEN_PAPER_SIZE +# a4wide (default), a4, letter, legal or executive +# CXX C++ compiler command +# CXXFLAGS C++ compiler flags +# CXXCPP C++ preprocessor +# BOOST_ROOT Location of Boost installation Property changes on: csw/mgar/pkg/xmltooling/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/xmltooling/trunk/checksums =================================================================== 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 Aug 14 14:15:10 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Aug 2014 12:15:10 +0000 Subject: SF.net SVN: gar:[23996] csw/mgar/pkg/privoxy/trunk Message-ID: <3hYmv538cpzkh@mail.opencsw.org> Revision: 23996 http://sourceforge.net/p/gar/code/23996 Author: dmichelsen Date: 2014-08-14 12:15:06 +0000 (Thu, 14 Aug 2014) Log Message: ----------- privoxy/trunk: Adjust locations and ownership Modified Paths: -------------- csw/mgar/pkg/privoxy/trunk/Makefile csw/mgar/pkg/privoxy/trunk/files/cswprivoxy Modified: csw/mgar/pkg/privoxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/privoxy/trunk/Makefile 2014-08-14 11:38:10 UTC (rev 23995) +++ csw/mgar/pkg/privoxy/trunk/Makefile 2014-08-14 12:15:06 UTC (rev 23996) @@ -22,6 +22,7 @@ DISTNAME = $(NAME)-$(VERSION)-stable DISTFILES += $(DISTNAME)-src.tar.gz DISTFILES += cswprivoxy +EXPANDVARS += cswprivoxy DISTFILES += cswusergroup VENDOR_URL = http://www.privoxy.org/ @@ -39,6 +40,14 @@ CONFFILES += user.filter PRESERVECONF += $(addprefix $(sysconfdir)/,$(CONFFILES)) +PIDDIR = $(localstatedir)/privoxy + +PROTOTYPE_MODIFIERS += chownprivoxy +PROTOTYPE_FILES_chownprivoxy += $(PIDDIR) +PROTOTYPE_FILES_chownprivoxy += $(sysconfdir)(/.*)? +PROTOTYPE_USER_chownprivoxy = privoxy +PROTOTYPE_GROUP_chownprivoxy = privoxy + # This is just an example CHECKPKG_OVERRIDES_CSWprivoxy += file-with-bad-content|/usr/share|root/etc/opt/csw/privoxy/config.CSW @@ -48,8 +57,8 @@ CONFIGURE_ARGS = $(DIRPATHS) # Supress sub directories for logs and pid file -INSTALL_ARGS += LOGS_DEST=$(localstatedir) -INSTALL_ARGS += PIDS_DEST=$(localstatedir) +INSTALL_ARGS += LOGS_DEST=$(localstatedir)/privoxy +INSTALL_ARGS += PIDS_DEST=$(localstatedir)/privoxy include gar/category.mk @@ -71,4 +80,6 @@ @echo --- Installing cswinitsmf file --- ginstall -d $(DESTDIR)/etc/opt/csw/init.d cp $(WORKDIR)/cswprivoxy $(DESTDIR)/etc/opt/csw/init.d/ + + mkdir -p $(DESTDIR)$(PIDDIR) @$(MAKECOOKIE) Modified: csw/mgar/pkg/privoxy/trunk/files/cswprivoxy =================================================================== --- csw/mgar/pkg/privoxy/trunk/files/cswprivoxy 2014-08-14 11:38:10 UTC (rev 23995) +++ csw/mgar/pkg/privoxy/trunk/files/cswprivoxy 2014-08-14 12:15:06 UTC (rev 23996) @@ -102,10 +102,10 @@ # Path to executable. P_DAEMON=privoxy # Full path to location of Privoxy config file. -P_CONF_FILE=/opt/csw/etc/privoxy/config +P_CONF_FILE=@sysconfdir@/config # Full path to PID file location. Location must be writable by # whoever runs this script and by Privoxy itself. -P_PIDFILE=/var/opt/csw/privoxy/privoxy.pid +P_PIDFILE=@PIDDIR@/privoxy.pid # If uncommented, this script will try to run as USER=privoxy, which # may require special handling of config, *.action, trust, logfile, # jarfile, and pidfile. 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 Aug 15 17:39:21 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Aug 2014 15:39:21 +0000 Subject: SF.net SVN: gar:[24000] csw/mgar/pkg/gsoap/trunk/Makefile Message-ID: <3hZTNB4QZTzLl@mail.opencsw.org> Revision: 24000 http://sourceforge.net/p/gar/code/24000 Author: dmichelsen Date: 2014-08-15 15:39:20 +0000 (Fri, 15 Aug 2014) Log Message: ----------- gsoap/trunk: Juggle around version numbering so that the package gets a proper version Modified Paths: -------------- csw/mgar/pkg/gsoap/trunk/Makefile Modified: csw/mgar/pkg/gsoap/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsoap/trunk/Makefile 2014-08-15 14:20:22 UTC (rev 23999) +++ csw/mgar/pkg/gsoap/trunk/Makefile 2014-08-15 15:39:20 UTC (rev 24000) @@ -2,15 +2,17 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = gsoap -VERSION = 2.8 +BASEVERSION = 2.8 SUBVERSION = 17 +VERSION = $(BASEVERSION).$(SUBVERSION) +DISTNAME = $(NAME)-$(BASEVERSION) GARTYPE = v2 DESCRIPTION = Development toolkit for Web services and XML SF_PROJECT = gsoap2 MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(NAME)_$(VERSION).$(SUBVERSION).zip +DISTFILES = $(NAME)_$(VERSION).zip PACKAGES += CSWgsoap SPKG_DESC_CSWgsoap = Development toolkit for Web services and XML 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 Aug 16 01:52:48 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Aug 2014 23:52:48 +0000 Subject: SF.net SVN: gar:[24002] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.r.cswcrontab Message-ID: <3hZhKd3dN0zjT@mail.opencsw.org> Revision: 24002 http://sourceforge.net/p/gar/code/24002 Author: bdwalton Date: 2014-08-15 23:52:46 +0000 (Fri, 15 Aug 2014) Log Message: ----------- cswclassutils/trunk: fix a bug in the crontab CAS that was nuking all lines below the intended marker Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2014-08-15 22:28:19 UTC (rev 24001) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2014-08-15 23:52:46 UTC (rev 24002) @@ -41,13 +41,14 @@ if echo "${LINE}" | grep "^# ${crontab_tag} ${cron_id}\$" >/dev/null; then state=2 continue + else + echo "${LINE}" >> "${cron_file}" fi - if [ ${state} -eq 2 ]; then + fi + + if [ ${state} -eq 2 ]; then echo >/dev/null # ...since /bin/sh doesn't understand negation state=1 - else - echo "${LINE}" >> "${cron_file}" - fi fi done } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 17 13:24:04 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Aug 2014 11:24:04 +0000 Subject: SF.net SVN: gar:[24006] csw/mgar/gar/v2/bin/csw-upload-pkg Message-ID: <3hbbcp1Sg4z194@mail.opencsw.org> Revision: 24006 http://sourceforge.net/p/gar/code/24006 Author: bdwalton Date: 2014-08-17 11:24:00 +0000 (Sun, 17 Aug 2014) Log Message: ----------- alter csw-upload-pkg wrapper to allow it to work when symlinked from other directories Modified Paths: -------------- csw/mgar/gar/v2/bin/csw-upload-pkg Modified: csw/mgar/gar/v2/bin/csw-upload-pkg =================================================================== --- csw/mgar/gar/v2/bin/csw-upload-pkg 2014-08-17 09:31:06 UTC (rev 24005) +++ csw/mgar/gar/v2/bin/csw-upload-pkg 2014-08-17 11:24:00 UTC (rev 24006) @@ -3,6 +3,6 @@ set -e set -u -basedir=$(dirname $0)/.. +basedir=$(dirname $(realpath $0))/.. export PYTHONPATH=$basedir exec /opt/csw/bin/python2.6 "$basedir/lib/python/csw_upload_pkg.py" "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Aug 17 13:38:37 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 17 Aug 2014 11:38:37 +0000 Subject: SF.net SVN: gar:[24007] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: <3hbbxS0FWkz1Pt@mail.opencsw.org> Revision: 24007 http://sourceforge.net/p/gar/code/24007 Author: lblume Date: 2014-08-17 11:38:36 +0000 (Sun, 17 Aug 2014) Log Message: ----------- gnupg2/trunk: Remove OBSOLETED_BY Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2014-08-17 11:24:00 UTC (rev 24006) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2014-08-17 11:38:36 UTC (rev 24007) @@ -51,7 +51,6 @@ # For gpg-agent. Pinentry is not because of shared libraries. RUNTIME_DEP_PKGS_CSWgnupg2 += CSWpinentry CHECKPKG_OVERRIDES_CSWgnupg2 += surplus-dependency|CSWpinentry -OBSOLETED_BY_CSWgnupg2 = CSWgnupg-agent NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Aug 18 10:08:09 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 18 Aug 2014 08:08:09 +0000 Subject: SF.net SVN: gar:[24008] csw/mgar/pkg/libassuan/trunk Message-ID: <3hc7D90smkz6J@mail.opencsw.org> Revision: 24008 http://sourceforge.net/p/gar/code/24008 Author: lblume Date: 2014-08-18 08:08:07 +0000 (Mon, 18 Aug 2014) Log Message: ----------- libassuan/trunk: Bump to 2.1.2; remove patch Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile csw/mgar/pkg/libassuan/trunk/checksums Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2014-08-17 11:38:36 UTC (rev 24007) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2014-08-18 08:08:07 UTC (rev 24008) @@ -1,5 +1,5 @@ NAME = libassuan -VERSION = 2.1.1 +VERSION = 2.1.2 GARTYPE = v2 DESCRIPTION = IPC library used by some GnuPG related software @@ -19,9 +19,6 @@ # http://bugs.g10code.com/gnupg/issue1350 PATCHFILES += 0001-Fix-usage-of-variadic-arguments.patch -# Patch provided by upstream to avoid segv in gnupg 2.0.26 tests -PATCHFILES += 0002-fix-possible-segv.patch - PACKAGES += CSWlibassuan0 SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0 PKGFILES_CSWlibassuan0 += $(call pkgfiles_lib,libassuan.so.0) Modified: csw/mgar/pkg/libassuan/trunk/checksums =================================================================== --- csw/mgar/pkg/libassuan/trunk/checksums 2014-08-17 11:38:36 UTC (rev 24007) +++ csw/mgar/pkg/libassuan/trunk/checksums 2014-08-18 08:08:07 UTC (rev 24008) @@ -1 +1 @@ -757243cc4a71b30ed8d8dbe784035d36 libassuan-2.1.1.tar.bz2 +1dc4c3e1dbfb3939bfa2d72db8e136ba libassuan-2.1.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Aug 18 10:22:55 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Aug 2014 08:22:55 +0000 Subject: SF.net SVN: gar:[24009] csw/mgar/pkg/ruby21/trunk/Makefile Message-ID: <3hc7YB1Ydrz9r@mail.opencsw.org> Revision: 24009 http://sourceforge.net/p/gar/code/24009 Author: dmichelsen Date: 2014-08-18 08:22:54 +0000 (Mon, 18 Aug 2014) Log Message: ----------- ruby21/trunk: Switch to gcc Modified Paths: -------------- csw/mgar/pkg/ruby21/trunk/Makefile Modified: csw/mgar/pkg/ruby21/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby21/trunk/Makefile 2014-08-18 08:08:07 UTC (rev 24008) +++ csw/mgar/pkg/ruby21/trunk/Makefile 2014-08-18 08:22:54 UTC (rev 24009) @@ -36,7 +36,7 @@ RUNTIME_DEP_PKGS_CSWruby21 += CSWlibreadline5 #GARCOMPILER = SOS12U2 -GARCOMPILER = SOS12U2 +GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Mon Aug 18 10:55:46 2014 From: laurent at opencsw.org (Laurent Blume) Date: Mon, 18 Aug 2014 10:55:46 +0200 Subject: SF.net SVN: gar:[24006] csw/mgar/gar/v2/bin/csw-upload-pkg In-Reply-To: <3hbbcp1Sg4z194@mail.opencsw.org> References: <3hbbcp1Sg4z194@mail.opencsw.org> Message-ID: <53F1BF92.3080001@opencsw.org> Hello, That breaks the script, apparently because there's only "grealpath" available. Could you have a look at it? Thanks! Laurent Le 2014/08/17 13:24 +0200, Bdwalton a ?crit: > -basedir=$(dirname $0)/.. > +basedir=$(dirname $(realpath $0))/.. From claudio_sf at users.sourceforge.net Mon Aug 18 14:02:13 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 18 Aug 2014 12:02:13 +0000 Subject: SF.net SVN: gar:[24013] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: <3hcDQN1vGGzLD@mail.opencsw.org> Revision: 24013 http://sourceforge.net/p/gar/code/24013 Author: claudio_sf Date: 2014-08-18 12:02:10 +0000 (Mon, 18 Aug 2014) Log Message: ----------- xerces-c/trunk: dependency to libgcc and libstdc++6 Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-18 11:58:20 UTC (rev 24012) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-18 12:02:10 UTC (rev 24013) @@ -26,6 +26,10 @@ PACKAGES += CSWlibxerces-c3-1 SPKG_DESC_CSWlibxerces-c3-1 = Xerces XML parser for C++ providing libxerces-c-3.1.so PKGFILES_CSWlibxerces-c3-1 = $(call pkgfiles_lib,libxerces-c-3.1.so) +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibz1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon Aug 18 14:47:06 2014 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 18 Aug 2014 12:47:06 +0000 Subject: SF.net SVN: gar:[24014] csw/mgar/pkg/zabbix/trunk Message-ID: <3hcFQ15cTPzQ1@mail.opencsw.org> Revision: 24014 http://sourceforge.net/p/gar/code/24014 Author: wilbury Date: 2014-08-18 12:47:03 +0000 (Mon, 18 Aug 2014) Log Message: ----------- zabbix/trunk: Version update Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2014-08-18 12:02:10 UTC (rev 24013) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2014-08-18 12:47:03 UTC (rev 24014) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 2.2.1 +VERSION = 2.2.5 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2014-08-18 12:02:10 UTC (rev 24013) +++ csw/mgar/pkg/zabbix/trunk/checksums 2014-08-18 12:47:03 UTC (rev 24014) @@ -1 +1 @@ -558497839b13a548f533eb2fc951a4e3 zabbix-2.2.1.tar.gz +e7b74a0208743f743585d9cc1d46eccf zabbix-2.2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Aug 18 16:02:27 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 18 Aug 2014 14:02:27 +0000 Subject: SF.net SVN: gar:[24015] csw/mgar/pkg/lang-python Message-ID: <3hcH542NcvzW4@mail.opencsw.org> Revision: 24015 http://sourceforge.net/p/gar/code/24015 Author: cgrzemba Date: 2014-08-18 14:02:26 +0000 (Mon, 18 Aug 2014) Log Message: ----------- lang-python/httplib2/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/httplib2/ csw/mgar/pkg/lang-python/httplib2/Makefile csw/mgar/pkg/lang-python/httplib2/branches/ csw/mgar/pkg/lang-python/httplib2/tags/ csw/mgar/pkg/lang-python/httplib2/trunk/ csw/mgar/pkg/lang-python/httplib2/trunk/Makefile csw/mgar/pkg/lang-python/httplib2/trunk/checksums csw/mgar/pkg/lang-python/httplib2/trunk/files/ Added: csw/mgar/pkg/lang-python/httplib2/Makefile =================================================================== --- csw/mgar/pkg/lang-python/httplib2/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/httplib2/Makefile 2014-08-18 14:02:26 UTC (rev 24015) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/httplib2/trunk =================================================================== --- csw/mgar/pkg/lang-python/httplib2/trunk 2014-08-18 12:47:03 UTC (rev 24014) +++ csw/mgar/pkg/lang-python/httplib2/trunk 2014-08-18 14:02:26 UTC (rev 24015) Property changes on: csw/mgar/pkg/lang-python/httplib2/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/httplib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/httplib2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/httplib2/trunk/Makefile 2014-08-18 14:02:26 UTC (rev 24015) @@ -0,0 +1,22 @@ +# $Id$ +NAME = httplib2 +VERSION = 0.9 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = HTTP client library +define BLURB +endef + +# 1st char of NAME is the directory name +MASTER_SITE_DIR = $(shell echo $(NAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(NAME)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +ARCHALL_CSWpy-httplib2 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/httplib2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/httplib2/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/httplib2/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/httplib2/trunk/checksums 2014-08-18 14:02:26 UTC (rev 24015) @@ -0,0 +1 @@ +09d8e8016911fc40e2e4c58f1aa3ec24 httplib2-0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Aug 18 16:37:31 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 18 Aug 2014 14:37:31 +0000 Subject: SF.net SVN: gar:[24016] csw/mgar/pkg/lang-python/django-haystack/trunk Message-ID: <3hcHsR0nL6zZn@mail.opencsw.org> Revision: 24016 http://sourceforge.net/p/gar/code/24016 Author: cgrzemba Date: 2014-08-18 14:37:31 +0000 (Mon, 18 Aug 2014) Log Message: ----------- lang-python/django-haystack/trunk: update version Modified Paths: -------------- csw/mgar/pkg/lang-python/django-haystack/trunk/Makefile csw/mgar/pkg/lang-python/django-haystack/trunk/checksums Modified: csw/mgar/pkg/lang-python/django-haystack/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-haystack/trunk/Makefile 2014-08-18 14:02:26 UTC (rev 24015) +++ csw/mgar/pkg/lang-python/django-haystack/trunk/Makefile 2014-08-18 14:37:31 UTC (rev 24016) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 NAME = django-haystack -VERSION = 2.1.0 +VERSION = 2.2.0 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Search for Django @@ -23,6 +23,6 @@ CHECKPKG_OVERRIDES_CSWpy-django-haystack += surplus-dependency|CSWpy-django -# SKIPTEST=1 +SKIPTEST=1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/django-haystack/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django-haystack/trunk/checksums 2014-08-18 14:02:26 UTC (rev 24015) +++ csw/mgar/pkg/lang-python/django-haystack/trunk/checksums 2014-08-18 14:37:31 UTC (rev 24016) @@ -1 +1 @@ -0bc74c0d71c30169ddb796c20655fe98 django-haystack-2.1.0.tar.gz +6d3a5d91fc174bbe2b655e5cf86dc9e9 django-haystack-2.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Aug 18 21:01:01 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 18 Aug 2014 19:01:01 +0000 Subject: SF.net SVN: gar:[24017] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: <3hcPjT5Q5TzqQ@mail.opencsw.org> Revision: 24017 http://sourceforge.net/p/gar/code/24017 Author: claudio_sf Date: 2014-08-18 19:00:59 +0000 (Mon, 18 Aug 2014) Log Message: ----------- xerces-c/trunk: dependencies Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-18 14:37:31 UTC (rev 24016) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-18 19:00:59 UTC (rev 24017) @@ -30,13 +30,10 @@ RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicui18n48 # The version number is in the base and not appended to .so as usual CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += soname-equals-filename This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Aug 18 22:08:29 2014 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 18 Aug 2014 21:08:29 +0100 Subject: SF.net SVN: gar:[24006] csw/mgar/gar/v2/bin/csw-upload-pkg In-Reply-To: References: <3hbbcp1Sg4z194@mail.opencsw.org> <53F1BF92.3080001@opencsw.org> Message-ID: Should be fixed with revision 24018. Thanks -Ben On Mon, Aug 18, 2014 at 7:24 PM, Ben Walton wrote: > Doh! Yes. I'll either switch binary names or as /opt/csw/gnu to the > path... Sorry about that. > > Thanks > -Ben > On Aug 18, 2014 9:55 AM, "Laurent Blume" wrote: > >> Hello, >> >> That breaks the script, apparently because there's only "grealpath" >> available. >> >> Could you have a look at it? >> >> Thanks! >> >> Laurent >> >> Le 2014/08/17 13:24 +0200, Bdwalton a ?crit: >> >>> -basedir=$(dirname $0)/.. >>> +basedir=$(dirname $(realpath $0))/.. >>> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From claudio_sf at users.sourceforge.net Tue Aug 19 11:48:55 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 19 Aug 2014 09:48:55 +0000 Subject: SF.net SVN: gar:[24019] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: <3hcnPz5mbvz190@mail.opencsw.org> Revision: 24019 http://sourceforge.net/p/gar/code/24019 Author: claudio_sf Date: 2014-08-19 09:48:54 +0000 (Tue, 19 Aug 2014) Log Message: ----------- xerces-c/trunk: Fix pkginfo-opencsw-repository-uncommitted error :) Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-18 20:08:00 UTC (rev 24018) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-19 09:48:54 UTC (rev 24019) @@ -48,13 +48,6 @@ SPKG_DESC_CSWxerces-c = Utility programs from the Xerces XML parser PKGFILES_CSWxerces-c = $(bindir)/.* RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibxerces-c3-1 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibz1 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicui18n48 # Rebuild with GCC GARCOMPILER = GCC4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Tue Aug 19 15:27:49 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Tue, 19 Aug 2014 13:27:49 +0000 Subject: SF.net SVN: gar:[24021] csw/mgar/pkg/cpan Message-ID: <3hctGf69vjz1Gt@mail.opencsw.org> Revision: 24021 http://sourceforge.net/p/gar/code/24021 Author: guillomovitch Date: 2014-08-19 13:27:46 +0000 (Tue, 19 Aug 2014) Log Message: ----------- move in correct location Added Paths: ----------- csw/mgar/pkg/cpan/ExtUtils-CChecker/ csw/mgar/pkg/cpan/ExtUtils-CChecker/Makefile csw/mgar/pkg/cpan/ExtUtils-CChecker/branches/ csw/mgar/pkg/cpan/ExtUtils-CChecker/tags/ csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/ csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/checksums csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/files/ Added: csw/mgar/pkg/cpan/ExtUtils-CChecker/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CChecker/Makefile (rev 0) +++ csw/mgar/pkg/cpan/ExtUtils-CChecker/Makefile 2014-08-19 13:27:46 UTC (rev 24021) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk 2014-08-19 13:10:48 UTC (rev 24020) +++ csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk 2014-08-19 13:27:46 UTC (rev 24021) Property changes on: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile 2014-08-19 13:27:46 UTC (rev 24021) @@ -0,0 +1,19 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ExtUtils-CChecker +VERSION = X.Y +GARTYPE = v2 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Tue Aug 19 15:33:34 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Tue, 19 Aug 2014 13:33:34 +0000 Subject: SF.net SVN: gar:[24022] csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk Message-ID: <3hctPG24HGz1LG@mail.opencsw.org> Revision: 24022 http://sourceforge.net/p/gar/code/24022 Author: guillomovitch Date: 2014-08-19 13:33:32 +0000 (Tue, 19 Aug 2014) Log Message: ----------- cpan/ExtUtils-CChecker/trunk: initial import Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/checksums Modified: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile 2014-08-19 13:27:46 UTC (rev 24021) +++ csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/Makefile 2014-08-19 13:33:32 UTC (rev 24022) @@ -1,19 +1,18 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# NAME = ExtUtils-CChecker -VERSION = X.Y +VERSION = 0.09 +CATEGORIES = cpan GARTYPE = v2 +AUTHOR = PEVANS -DESCRIPTION = Brief description +DESCRIPTION = Configure-time utilities for using C headers, libraries, or OS features define BLURB - Long description endef -MASTER_SITES = -DISTFILES = $(DISTNAME).tar.gz +LICENSE_TEXT = This module is licensed under the Perl license -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES = CSWpm-extutils-cchecker +CATALOGNAME = pm_extutils_cchecker include gar/category.mk Modified: csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/checksums 2014-08-19 13:27:46 UTC (rev 24021) +++ csw/mgar/pkg/cpan/ExtUtils-CChecker/trunk/checksums 2014-08-19 13:33:32 UTC (rev 24022) @@ -0,0 +1 @@ +2c7b30a367fc67851be44f9b4c98b652 ExtUtils-CChecker-0.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Aug 19 16:12:14 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 19 Aug 2014 14:12:14 +0000 Subject: SF.net SVN: gar:[24024] csw/mgar/pkg/lang-python/django/trunk Message-ID: <3hcvFp1DFvz1Q3@mail.opencsw.org> Revision: 24024 http://sourceforge.net/p/gar/code/24024 Author: cgrzemba Date: 2014-08-19 14:12:11 +0000 (Tue, 19 Aug 2014) Log Message: ----------- lang-python/django/trunk: update version 1.6.5 Modified Paths: -------------- csw/mgar/pkg/lang-python/django/trunk/Makefile csw/mgar/pkg/lang-python/django/trunk/checksums Modified: csw/mgar/pkg/lang-python/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django/trunk/Makefile 2014-08-19 13:46:26 UTC (rev 24023) +++ csw/mgar/pkg/lang-python/django/trunk/Makefile 2014-08-19 14:12:11 UTC (rev 24024) @@ -3,7 +3,7 @@ # $Id$ NAME = django -VERSION = 1.6.1 +VERSION = 1.6.5 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/django/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django/trunk/checksums 2014-08-19 13:46:26 UTC (rev 24023) +++ csw/mgar/pkg/lang-python/django/trunk/checksums 2014-08-19 14:12:11 UTC (rev 24024) @@ -1 +1 @@ -3ea7a00ea9e7a014e8a4067dd6466a1b Django-1.6.1.tar.gz +e4c5b2d35ecb3807317713afa70a0c77 Django-1.6.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Tue Aug 19 16:30:15 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Tue, 19 Aug 2014 14:30:15 +0000 Subject: SF.net SVN: gar:[24026] csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Message-ID: <3hcvff5Z00z1Tj@mail.opencsw.org> Revision: 24026 http://sourceforge.net/p/gar/code/24026 Author: guillomovitch Date: 2014-08-19 14:30:06 +0000 (Tue, 19 Aug 2014) Log Message: ----------- fusioninventory-agent/trunk: add dependency on CSWpm-socket-getaddrinfo Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-08-19 14:23:29 UTC (rev 24025) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-08-19 14:30:06 UTC (rev 24026) @@ -35,6 +35,7 @@ RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-proc-daemon RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-proc-pid-file RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-net-ip +RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-socket-getaddrinfo RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-text-template RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-universal-require RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-xml-treepp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Aug 20 04:20:43 2014 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 20 Aug 2014 02:20:43 +0000 Subject: SF.net SVN: gar:[24028] csw/mgar/pkg/libserf/trunk Message-ID: <3hdCQM1xLVzpn@mail.opencsw.org> Revision: 24028 http://sourceforge.net/p/gar/code/24028 Author: rthurner Date: 2014-08-20 02:20:40 +0000 (Wed, 20 Aug 2014) Log Message: ----------- libserf/trunk: update to serf-1.3.7, security release, update makefile to different google download format 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 2014-08-19 18:11:01 UTC (rev 24027) +++ csw/mgar/pkg/libserf/trunk/Makefile 2014-08-20 02:20:40 UTC (rev 24028) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.3.6 +VERSION = 1.3.7 DISTNAME = serf-$(VERSION) GARTYPE = v2 @@ -13,7 +13,8 @@ endef GOOGLE_PROJECT = serf -MASTER_SITES = $(GOOGLE_MIRROR) +#MASTER_SITES = $(GOOGLE_MIRROR) +MASTER_SITES = http://serf.googlecode.com/svn/src_releases/ DISTFILES += $(DISTNAME).tar.bz2 PATCHFILES += 0001-mark-solaris-as-posix-for-scons.patch Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2014-08-19 18:11:01 UTC (rev 24027) +++ csw/mgar/pkg/libserf/trunk/checksums 2014-08-20 02:20:40 UTC (rev 24028) @@ -1 +1 @@ -7fe38fa6eab078e0beabf291d8e4995d serf-1.3.6.tar.bz2 +0a6fa745df4517dd8f79c75c538919bc serf-1.3.7.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 Wed Aug 20 04:22:00 2014 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 20 Aug 2014 02:22:00 +0000 Subject: SF.net SVN: gar:[24029] csw/mgar/pkg/subversion/trunk Message-ID: <3hdCRp6h5zzt1@mail.opencsw.org> Revision: 24029 http://sourceforge.net/p/gar/code/24029 Author: rthurner Date: 2014-08-20 02:21:58 +0000 (Wed, 20 Aug 2014) Log Message: ----------- subversion/trunk: update to svn-1.8.10, security release. 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 2014-08-20 02:20:40 UTC (rev 24028) +++ csw/mgar/pkg/subversion/trunk/Makefile 2014-08-20 02:21:58 UTC (rev 24029) @@ -20,7 +20,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.8.9 +VERSION = 1.8.10 GARTYPE = v2 DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2014-08-20 02:20:40 UTC (rev 24028) +++ csw/mgar/pkg/subversion/trunk/checksums 2014-08-20 02:21:58 UTC (rev 24029) @@ -1 +1 @@ -bd495517a760ddd764ce449a891971db subversion-1.8.9.tar.bz2 +3068256761b40863df96128834d6b71b subversion-1.8.10.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 20 08:48:54 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 20 Aug 2014 06:48:54 +0000 Subject: SF.net SVN: gar:[24030] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: <3hdKMn3v9Lz1Jh@mail.opencsw.org> Revision: 24030 http://sourceforge.net/p/gar/code/24030 Author: claudio_sf Date: 2014-08-20 06:48:52 +0000 (Wed, 20 Aug 2014) Log Message: ----------- xerces-c/trunk: bump to libicu*52 Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-20 02:21:58 UTC (rev 24029) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-20 06:48:52 UTC (rev 24030) @@ -30,9 +30,9 @@ RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicudata52 # The version number is in the base and not appended to .so as usual CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += soname-equals-filename @@ -48,15 +48,16 @@ PKGFILES_CSWxerces-c = $(bindir)/.* RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibxerces-c3-1 RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicudata52 RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibz1 RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicuuc52 RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicui18n52 BUILD64 = 1 ISAEXEC = 1 +EXTRA_LINKER_FLAGS += -norunpath EXTRA_CONFIGURE_EXPORTS = icu_config EXTRA_CONFIGURE_ENV_icu_config = $(bindir)/icu-config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Aug 20 09:05:38 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 20 Aug 2014 07:05:38 +0000 Subject: SF.net SVN: gar:[24031] csw/mgar/pkg/lang-python Message-ID: <3hdKl72CVpz1N5@mail.opencsw.org> Revision: 24031 http://sourceforge.net/p/gar/code/24031 Author: cgrzemba Date: 2014-08-20 07:05:37 +0000 (Wed, 20 Aug 2014) Log Message: ----------- lang-python/django-pdb/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/django-pdb/ csw/mgar/pkg/lang-python/django-pdb/Makefile csw/mgar/pkg/lang-python/django-pdb/branches/ csw/mgar/pkg/lang-python/django-pdb/tags/ csw/mgar/pkg/lang-python/django-pdb/trunk/ csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile csw/mgar/pkg/lang-python/django-pdb/trunk/checksums csw/mgar/pkg/lang-python/django-pdb/trunk/files/ Added: csw/mgar/pkg/lang-python/django-pdb/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-pdb/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/django-pdb/Makefile 2014-08-20 07:05:37 UTC (rev 24031) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/django-pdb/trunk =================================================================== --- csw/mgar/pkg/lang-python/django-pdb/trunk 2014-08-20 06:48:52 UTC (rev 24030) +++ csw/mgar/pkg/lang-python/django-pdb/trunk 2014-08-20 07:05:37 UTC (rev 24031) Property changes on: csw/mgar/pkg/lang-python/django-pdb/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile 2014-08-20 07:05:37 UTC (rev 24031) @@ -0,0 +1,29 @@ +# Copyright 2011 OpenCSW +# Distributed under the terms of the GNU General Public License v2 + +NAME = django-pdb +VERSION = 0.4.0 +CATEGORIES = python +GARTYPE = v2 +DESCRIPTION = PDB access in django +define BLURB + simple. +endef + +# https://pypi.python.org/packages/source/d/django-pdb/django-pdb-0.4.0.tar.gz +DISTNAME = $(NAME)-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +MASTER_SITE_DIR = $(shell echo $(NAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(NAME)/ + +BUILD_DEP_PKGS += CSWpysetuptools +RUNTIME_DEP_PKGS += CSWpy-django + +ARCHALL_CSWpy-django-pdb = 1 + +# checkpkg can't detect python run time dependencies + +# SKIPTEST=1 +#TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/django-pdb/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django-pdb/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/django-pdb/trunk/checksums 2014-08-20 07:05:37 UTC (rev 24031) @@ -0,0 +1 @@ +79c7f7ad80d0afa68d1a307afbaf60fb django-pdb-0.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Aug 20 09:11:36 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 20 Aug 2014 07:11:36 +0000 Subject: SF.net SVN: gar:[24032] csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile Message-ID: <3hdKsz2QmTz1RR@mail.opencsw.org> Revision: 24032 http://sourceforge.net/p/gar/code/24032 Author: cgrzemba Date: 2014-08-20 07:11:34 +0000 (Wed, 20 Aug 2014) Log Message: ----------- lang-python/django-pdb/trunk: add override Modified Paths: -------------- csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile 2014-08-20 07:05:37 UTC (rev 24031) +++ csw/mgar/pkg/lang-python/django-pdb/trunk/Makefile 2014-08-20 07:11:34 UTC (rev 24032) @@ -18,6 +18,7 @@ BUILD_DEP_PKGS += CSWpysetuptools RUNTIME_DEP_PKGS += CSWpy-django +CHECKPKG_OVERRIDES_CSWpy-django-pdb += surplus-dependency|CSWpy-django ARCHALL_CSWpy-django-pdb = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Aug 20 09:30:19 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 20 Aug 2014 07:30:19 +0000 Subject: SF.net SVN: gar:[24033] csw/mgar/pkg/cups/trunk/Makefile Message-ID: <3hdLHZ23K5z1Vq@mail.opencsw.org> Revision: 24033 http://sourceforge.net/p/gar/code/24033 Author: cgrzemba Date: 2014-08-20 07:30:18 +0000 (Wed, 20 Aug 2014) Log Message: ----------- cups/trunk: add runtime dependency Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2014-08-20 07:11:34 UTC (rev 24032) +++ csw/mgar/pkg/cups/trunk/Makefile 2014-08-20 07:30:18 UTC (rev 24033) @@ -150,8 +150,9 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 +# pdftops filter needs poppler's /opt/csw/bin/pdftops +RUNTIME_DEP_PKGS_CSWcupsd += CSWpoppler RUNTIME_DEP_PKGS_CSWcupsd += $(RUNTIME_DEP_PKGS_CSWcupsd_$(GARCH)) -# need /opt/csw/bin/pdftops PACKAGES += CSWcupsclient SPKG_DESC_CSWcupsclient = CUPS client binaries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Aug 20 10:33:21 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 20 Aug 2014 08:33:21 +0000 Subject: SF.net SVN: gar:[24035] csw/mgar/pkg/libmediaart/trunk Message-ID: <3hdMhM0ZzXzC6@mail.opencsw.org> Revision: 24035 http://sourceforge.net/p/gar/code/24035 Author: slowfranklin Date: 2014-08-20 08:33:18 +0000 (Wed, 20 Aug 2014) Log Message: ----------- libmediaart/trunk: Update to 0.6.0 Modified Paths: -------------- csw/mgar/pkg/libmediaart/trunk/Makefile csw/mgar/pkg/libmediaart/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch Modified: csw/mgar/pkg/libmediaart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmediaart/trunk/Makefile 2014-08-20 07:31:07 UTC (rev 24034) +++ csw/mgar/pkg/libmediaart/trunk/Makefile 2014-08-20 08:33:18 UTC (rev 24035) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = libmediaart -VERSION = 0.1.0 +VERSION = 0.6.0 GARTYPE = v2 DESCRIPTION = Libmediaart, manage, extract and handle media art caches @@ -19,26 +19,23 @@ # Tests fail left and right SKIPTEST = 1 -PATCHFILES += eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch +PACKAGES += CSWlibmediaart1-0-0 +CATALOGNAME_CSWlibmediaart1-0-0 = libmediaart1_0_0 +SPKG_DESC_CSWlibmediaart1-0-0 += $(DESCRIPTION), libmediaart-1.0.so.0 +PKGFILES_CSWlibmediaart1-0-0 += $(call baseisadirs,$(libdir),libmediaart-1\.0\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0_sparc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0_sparc += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0_sparc += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibmediaart1-0-0_$(GARCH)) +RUNTIME_DEP_PKGS_CSWlibmediaart-dev += CSWlibmediaart1-0-0 -PACKAGES += CSWlibmediaart0-2-0 -CATALOGNAME_CSWlibmediaart0-2-0 = libmediaart0_2_0 -SPKG_DESC_CSWlibmediaart0-2-0 += $(DESCRIPTION), libmediaart-0.2.so.0 -PKGFILES_CSWlibmediaart0-2-0 += $(call baseisadirs,$(libdir),libmediaart-0\.2\.so\.0\.100\.0) -PKGFILES_CSWlibmediaart0-2-0 += $(call baseisadirs,$(libdir),libmediaart-0\.2\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibqtgui4 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibqtcore4 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += $(RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibmediaart-dev += CSWlibmediaart0-2-0 - PACKAGES += CSWlibmediaart-dev SPKG_DESC_CSWlibmediaart-dev = $(DESCRIPTION), development files PKGFILES_CSWlibmediaart-dev = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/libmediaart/trunk/checksums =================================================================== --- csw/mgar/pkg/libmediaart/trunk/checksums 2014-08-20 07:31:07 UTC (rev 24034) +++ csw/mgar/pkg/libmediaart/trunk/checksums 2014-08-20 08:33:18 UTC (rev 24035) @@ -1 +1 @@ -c9b873f63ea621f2ae339163782b3f79 libmediaart-0.1.0.tar.xz +8bd508886c47397925771e2717c80d52 libmediaart-0.6.0.tar.xz Deleted: csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch =================================================================== --- csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch 2014-08-20 07:31:07 UTC (rev 24034) +++ csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch 2014-08-20 08:33:18 UTC (rev 24035) @@ -1,34 +0,0 @@ -From eba1a1f1276e40b68e7b7084863469a0c97ef41a Mon Sep 17 00:00:00 2001 -From: Martyn Russell -Date: Fri, 7 Mar 2014 09:23:23 +0000 -Subject: [PATCH] extract: Don't break on dummy implementation due to incorrect - args in init() - ---- - libmediaart/extractdummy.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libmediaart/extractdummy.c b/libmediaart/extractdummy.c -index 8d25b74..195de31 100644 ---- a/libmediaart/extractdummy.c -+++ b/libmediaart/extractdummy.c -@@ -23,13 +23,15 @@ - #include "extractgeneric.h" - - void --media_art_plugin_init (void) -+media_art_plugin_init (gint max_width) - { -+ /* Initialize something */ - } - - void - media_art_plugin_shutdown (void) - { -+ /* Shutdown something */ - } - - gboolean --- -1.9.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Aug 20 16:21:17 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 20 Aug 2014 14:21:17 +0000 Subject: SF.net SVN: gar:[24046] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: <3hdWPt47kxzkf@mail.opencsw.org> Revision: 24046 http://sourceforge.net/p/gar/code/24046 Author: claudio_sf Date: 2014-08-20 14:21:15 +0000 (Wed, 20 Aug 2014) Log Message: ----------- xerces-c/trunk: gcc runtime deps Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-20 12:48:36 UTC (rev 24045) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2014-08-20 14:21:15 UTC (rev 24046) @@ -15,7 +15,7 @@ MASTER_SITES = http://www.apache.org/dist/xerces/c/3/sources/ DISTFILES += $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0001-Do-not-strip-norunpath.patch +#PATCHFILES += 0001-Do-not-strip-norunpath.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -28,11 +28,6 @@ PKGFILES_CSWlibxerces-c3-1 = $(call pkgfiles_lib,libxerces-c-3.1.so) RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicuuc52 -#CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += surplus-dependency|CSWlibicudata52 -#CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += surplus-dependency|CSWlibssl1-0-0 -#CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += surplus-dependency|CSWlibidn11 -#CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += surplus-dependency|CSWlibicui18n52 -#CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += surplus-dependency|CSWlibz1 # The version number is in the base and not appended to .so as usual @@ -43,23 +38,26 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWlibxerces-c3-1 +# GCC migration runtime deps +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibz1 + + PACKAGES += CSWxerces-c CATALOGNAME_CSWxerces-c = xerces_c SPKG_DESC_CSWxerces-c = Utility programs from the Xerces XML parser PKGFILES_CSWxerces-c = $(bindir)/.* RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibxerces-c3-1 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibssl1-0-0 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibicui18n52 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibicudata52 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibcurl4 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibidn11 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibz1 -#CHECKPKG_OVERRIDES_CSWxerces-c += surplus-dependency|CSWlibicuuc52 - +GARCOMPILER = GCC4 BUILD64 = 1 ISAEXEC = 1 -EXTRA_LINKER_FLAGS += -norunpath +#EXTRA_LINKER_FLAGS += -norunpath EXTRA_CONFIGURE_EXPORTS = icu_config EXTRA_CONFIGURE_ENV_icu_config = $(bindir)/icu-config 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 Aug 22 13:11:28 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 22 Aug 2014 11:11:28 +0000 Subject: SF.net SVN: gar:[24047] csw/mgar/pkg/nodejs/trunk Message-ID: <3hfg7Y3zTQz1R5@mail.opencsw.org> Revision: 24047 http://sourceforge.net/p/gar/code/24047 Author: dmichelsen Date: 2014-08-22 11:11:27 +0000 (Fri, 22 Aug 2014) Log Message: ----------- nodejs/trunk: Update to 0.10.30 Modified Paths: -------------- csw/mgar/pkg/nodejs/trunk/Makefile csw/mgar/pkg/nodejs/trunk/checksums Modified: csw/mgar/pkg/nodejs/trunk/Makefile =================================================================== --- csw/mgar/pkg/nodejs/trunk/Makefile 2014-08-20 14:21:15 UTC (rev 24046) +++ csw/mgar/pkg/nodejs/trunk/Makefile 2014-08-22 11:11:27 UTC (rev 24047) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = nodejs -VERSION = 0.10.21 +VERSION = 0.10.30 GARTYPE = v2 DESCRIPTION = Node.js JavaScript interpreter @@ -15,30 +15,49 @@ LICENSE = LICENSE -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris11-sparc solaris11-i386 GARCOMPILER = GNU -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --openssl-includes=$(includedir) -CONFIGURE_ARGS += --openssl-libpath=$(libdir) +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibcares-dev -EXTRA_CONFIGURE_EXPORTS += PWD -CONFIGURE_ENV_PWD = $(abspath $(WORKSRC)) - RUNTIME_DEP_PKGS_CSWnodejs += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWnodejs += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWnodejs += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWnodejs += CSWlibz1 - -CHECKPKG_OVERRIDES_CSWnodejs += missing-dependency|CSWpython +RUNTIME_DEP_PKGS_CSWnodejs += CSWlibcares2 +CHECKPKG_OVERRIDES_CSWnodejs += missing-dependency|CSWemacs-common CHECKPKG_OVERRIDES_CSWnodejs += file-with-bad-content +CHECKPKG_OVERRIDES_CSWnodejs += discouraged-path-in-pkgmap|/opt/csw/lib/node_modules/npm/node_modules/request/node_modules/qs/.gitmodules -TEST_SCRIPTS = +# Pathes are difficult to adjust, skip 64 bit for now +# BUILD64 = 1 -include gar/category.mk +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --shared-openssl +CONFIGURE_ARGS += --openssl-includes=$(includedir) +CONFIGURE_ARGS += --openssl-libpath=$(libdir) +CONFIGURE_ARGS += --shared-zlib +CONFIGURE_ARGS += --shared-zlib-include=$(includedir) +CONFIGURE_ARGS += --shared-zlib-libpath=$(libdir) +CONFIGURE_ARGS += --shared-cares +CONFIGURE_ARGS += --shared-cares-includes=$(includedir) +CONFIGURE_ARGS += --shared-cares-libpath=$(libdir) +CPU-32 = ia32 +CPU-64 = x64 +CONFIGURE_ARGS += --dest-cpu=$(CPU-$(MEMORYMODEL)) -PATH := /opt/csw/gnu:$(PATH) +# Node.js needs to find objdump from binutils, gobjdump is not sufficient, +# otherwise strange error like this occur: +# dtrace: failed to compile script src/v8ustack.d: line 399: failed to resolve V8DBG_OFF_FP_CONTEXT: Unknown variable name +# https://github.com/joyent/node/issues/7933 +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) +BUILD_ENV_PATH = /opt/csw/gnu:$(PATH) -configure-custom: - cd $(WORKSRC) && /usr/bin/env -i $(CONFIGURE_ENV) PWD=$(abspath $(WORKSRC)) ./configure $(CONFIGURE_ARGS) - @$(MAKECOOKIE) +TEST_TARGET = test + +# There are some tests failing, mostly because of too low limits for open filedescriptors and timeouts +SKIPTEST ?= 1 + +include gar/category.mk Modified: csw/mgar/pkg/nodejs/trunk/checksums =================================================================== --- csw/mgar/pkg/nodejs/trunk/checksums 2014-08-20 14:21:15 UTC (rev 24046) +++ csw/mgar/pkg/nodejs/trunk/checksums 2014-08-22 11:11:27 UTC (rev 24047) @@ -1 +1 @@ -774bc17875c042ac42ad2d96b9c96734 node-v0.10.21.tar.gz +bae597a31bf6d23da1c4217bfed611dc node-v0.10.30.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 Mon Aug 25 06:56:40 2014 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 25 Aug 2014 04:56:40 +0000 Subject: SF.net SVN: gar:[24048] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <3hhLf46YTNzls@mail.opencsw.org> Revision: 24048 http://sourceforge.net/p/gar/code/24048 Author: rthurner Date: 2014-08-25 04:56:37 +0000 (Mon, 25 Aug 2014) Log Message: ----------- subversion/trunk: svn, bi-monthly tinkering with overrides due to mgar never doing the same as before ... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2014-08-22 11:11:27 UTC (rev 24047) +++ csw/mgar/pkg/subversion/trunk/Makefile 2014-08-25 04:56:37 UTC (rev 24048) @@ -124,7 +124,6 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 PACKAGES += CSWpmsvn SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding @@ -165,6 +164,8 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1 +CHECKPKG_OVERRIDES_CSWrbsvn += dependency-on-stub|ruby_stub + PACKAGES += CSWpythonsvn SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding PKGFILES_CSWpythonsvn += $(libdir)/python.* @@ -187,51 +188,50 @@ CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython # These are all due to linker problems with -z ignore -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0 -HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsasl2-2 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibintl8 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWbdb48 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibz1 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1 +#CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0 +#HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibz1 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibmagic1 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0 +#CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibaprutil1-0 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibintl8 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibz1 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibmagic1 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibexpat1 +#CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibsqlite3-0 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsqlite3-0 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibaprutil1-0 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWbdb48 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibz1 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibmagic1 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibexpat1 +#CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibserf1-1 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsasl2-2 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibaprutil1-0 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWbdb48 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibz1 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibmagic1 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibexpat1 +#CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsqlite3-0 +#CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2 # should be in lib ... put something below to at least make it compile. # on the svn mailing list people say we should not build the package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Aug 26 13:00:36 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Aug 2014 11:00:36 +0000 Subject: SF.net SVN: gar:[24050] csw/mgar/pkg/rapidsvn/trunk/Makefile Message-ID: <3hj6gZ4TdKztq@mail.opencsw.org> Revision: 24050 http://sourceforge.net/p/gar/code/24050 Author: dmichelsen Date: 2014-08-26 11:00:34 +0000 (Tue, 26 Aug 2014) Log Message: ----------- rapidsvn/trunk: Add additional dependencies Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2014-08-25 09:16:51 UTC (rev 24049) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2014-08-26 11:00:34 UTC (rev 24050) @@ -34,6 +34,9 @@ RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibsvncpp3 RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsvn RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2 +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibiconv2 PACKAGES += CSWlibsvncpp3 SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Aug 26 13:11:24 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Aug 2014 11:11:24 +0000 Subject: SF.net SVN: gar:[24051] csw/mgar/pkg/rapidsvn/trunk/Makefile Message-ID: <3hj6vv142wzyG@mail.opencsw.org> Revision: 24051 http://sourceforge.net/p/gar/code/24051 Author: dmichelsen Date: 2014-08-26 11:11:24 +0000 (Tue, 26 Aug 2014) Log Message: ----------- rapidsvn/trunk: Add overrides Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2014-08-26 11:00:34 UTC (rev 24050) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2014-08-26 11:11:24 UTC (rev 24051) @@ -38,6 +38,11 @@ RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibiconv2 +# Linker differences between x86 and sparc +CHECKPKG_OVERRIDES_CSWrapidsvn += surplus-dependency|CSWlibaprutil1-0 +CHECKPKG_OVERRIDES_CSWrapidsvn += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWrapidsvn += surplus-dependency|CSWlibexpat1 + PACKAGES += CSWlibsvncpp3 SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding PKGFILES_CSWlibsvncpp3 += $(call pkgfiles_lib,libsvncpp.so.3) 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 Thu Aug 28 23:47:38 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 28 Aug 2014 21:47:38 +0000 Subject: SF.net SVN: gar:[24056] csw/mgar/pkg/bluefish/trunk Message-ID: <3hkcxC5mJjz18X@mail.opencsw.org> Revision: 24056 http://sourceforge.net/p/gar/code/24056 Author: jake_goerzen Date: 2014-08-28 21:47:37 +0000 (Thu, 28 Aug 2014) Log Message: ----------- bluefish: bump to version 2.2.6; remove unused deps Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile csw/mgar/pkg/bluefish/trunk/checksums Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2014-08-28 19:46:48 UTC (rev 24055) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2014-08-28 21:47:37 UTC (rev 24056) @@ -1,5 +1,5 @@ NAME = bluefish -VERSION = 2.2.5 +VERSION = 2.2.6 DESCRIPTION = Advanced Gtk+ HTML editor define BLURB @@ -27,11 +27,7 @@ RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibpango1-0-0 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibpangoft2-1-0-0 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibenchant1 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibpangocairo1-0-0 EXTRA_MERGE_EXCLUDE_FILES = .*treemagic.* Modified: csw/mgar/pkg/bluefish/trunk/checksums =================================================================== --- csw/mgar/pkg/bluefish/trunk/checksums 2014-08-28 19:46:48 UTC (rev 24055) +++ csw/mgar/pkg/bluefish/trunk/checksums 2014-08-28 21:47:37 UTC (rev 24056) @@ -1 +1 @@ -3e1c80c7c68a0a79e115b0094a17d30d bluefish-2.2.5.tar.gz +e35ed734cbd16daa392a6ed6ed18753b bluefish-2.2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Aug 29 14:58:18 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 29 Aug 2014 12:58:18 +0000 Subject: SF.net SVN: gar:[24057] csw/mgar/pkg/netatalk/trunk Message-ID: <3hl17x1k27z1N3@mail.opencsw.org> Revision: 24057 http://sourceforge.net/p/gar/code/24057 Author: slowfranklin Date: 2014-08-29 12:58:16 +0000 (Fri, 29 Aug 2014) Log Message: ----------- netatalk/trunk: Backport two patches for Spotlight and mDNS Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0001-Spotlight-enhance-behaviour-for-long-running-queries.patch csw/mgar/pkg/netatalk/trunk/files/0002-netatalk-fix-a-crash-on-Solaris-when-registering-wit.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-08-28 21:47:37 UTC (rev 24056) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-08-29 12:58:16 UTC (rev 24057) @@ -54,6 +54,9 @@ PATCHFILES += 0001-Disable-noinst-binary-fails-to-link-on-SPARC.patch PATCHFILES += 0002-Ensure-gsettings-is-called-from-opt-csw-bin.patch PATCHFILES += 0003-Disable-dbus-start-by-default.patch +# will be in 3.1.7 +PATCHFILES += 0001-Spotlight-enhance-behaviour-for-long-running-queries.patch +PATCHFILES += 0002-netatalk-fix-a-crash-on-Solaris-when-registering-wit.patch PRESERVECONF += $(sysconfdir)/afp.conf PRESERVECONF += $(sysconfdir)/extmap.conf Added: csw/mgar/pkg/netatalk/trunk/files/0001-Spotlight-enhance-behaviour-for-long-running-queries.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0001-Spotlight-enhance-behaviour-for-long-running-queries.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0001-Spotlight-enhance-behaviour-for-long-running-queries.patch 2014-08-29 12:58:16 UTC (rev 24057) @@ -0,0 +1,65 @@ +From 2e2040f26fda19d0db3de3f914b55ee657741ca1 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 29 Aug 2014 10:58:51 +0200 +Subject: [PATCH 1/2] Spotlight: enhance behaviour for long running queries + +Status code 35 is taken from an AFP packet capture. + +Clients will now show a "progress wheel" while waiting for initial +results. + +Signed-off-by: Ralph Boehme +--- + NEWS | 5 +++++ + etc/afpd/spotlight.c | 15 ++++++++++++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index a306a1e..f98e319 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,8 @@ ++Changes in 3.1.7 ++================ ++* UPD: Spotlight: enhance behaviour for long running queries, client ++ will now show "progress wheel" while waiting for first results. ++ + Changes in 3.1.6 + ================ + * FIX: Spotlight: fix for long running queries +diff --git a/etc/afpd/spotlight.c b/etc/afpd/spotlight.c +index 8644d46..d2539b8 100644 +--- a/etc/afpd/spotlight.c ++++ b/etc/afpd/spotlight.c +@@ -402,7 +402,7 @@ static bool create_result_handle(slq_t *slq) + static bool add_results(sl_array_t *array, slq_t *slq) + { + sl_filemeta_t *fm; +- uint64_t status = 0; ++ uint64_t status; + + /* FileMeta */ + fm = talloc_zero(array, sl_filemeta_t); +@@ -410,6 +410,19 @@ static bool add_results(sl_array_t *array, slq_t *slq) + return false; + } + ++ switch (slq->slq_state) { ++ case SLQ_STATE_RUNNING: ++ /* ++ * Wtf, why 35? Taken from an AFP capture. ++ */ ++ status = 35; ++ break; ++ ++ default: ++ status = 0; ++ break; ++ } ++ + dalloc_add_copy(array, &status, uint64_t); + dalloc_add(array, slq->query_results->cnids, sl_cnids_t); + if (slq->query_results->num_results > 0) { +-- +1.9.3 + Added: csw/mgar/pkg/netatalk/trunk/files/0002-netatalk-fix-a-crash-on-Solaris-when-registering-wit.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0002-netatalk-fix-a-crash-on-Solaris-when-registering-wit.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0002-netatalk-fix-a-crash-on-Solaris-when-registering-wit.patch 2014-08-29 12:58:16 UTC (rev 24057) @@ -0,0 +1,67 @@ +From eff6b8621d8857f1b2e52054b42688d412041138 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 29 Aug 2014 14:52:43 +0200 +Subject: [PATCH 2/2] netatalk: fix a crash on Solaris when registering with + mDNS + +Signed-off-by: Ralph Boehme +--- + NEWS | 1 + + etc/netatalk/afp_mdns.c | 8 ++------ + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/NEWS b/NEWS +index f98e319..6ab9cc1 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,7 @@ Changes in 3.1.7 + ================ + * UPD: Spotlight: enhance behaviour for long running queries, client + will now show "progress wheel" while waiting for first results. ++* FIX: netatalk: fix a crash on Solaris when registering with mDNS + + Changes in 3.1.6 + ================ +diff --git a/etc/netatalk/afp_mdns.c b/etc/netatalk/afp_mdns.c +index 65ea55a..e298270 100644 +--- a/etc/netatalk/afp_mdns.c ++++ b/etc/netatalk/afp_mdns.c +@@ -18,7 +18,6 @@ + + #include + #include +-#include + #include + #include + +@@ -160,7 +159,6 @@ static void unregister_stuff() { + static void register_stuff(const AFPObj *obj) { + uint port; + const struct vol *volume; +- DSI *dsi; + char name[MAXINSTANCENAMELEN+1]; + DNSServiceErrorType error; + TXTRecordRef txt_adisk; +@@ -234,8 +232,6 @@ static void register_stuff(const AFPObj *obj) { + LOG(log_error, logtype_afpd, "Could not set Zeroconf instance name"); + goto fail; + } +- LOG(log_info, logtype_afpd, "Registering server '%s' with Bonjour", +- dsi->bonjourname); + + error = DNSServiceRegister(&svc_refs[svc_ref_count++], + 0, // no flags +@@ -276,8 +272,8 @@ static void register_stuff(const AFPObj *obj) { + } + + if (obj->options.mimicmodel) { +- LOG(log_info, logtype_afpd, "Registering server '%s' with model '%s'", +- dsi->bonjourname, obj->options.mimicmodel); ++ LOG(log_info, logtype_afpd, "Registering server as model '%s'", ++ obj->options.mimicmodel); + TXTRecordCreate(&txt_devinfo, 0, NULL); + if ( 0 > TXTRecordPrintf(&txt_devinfo, "model", obj->options.mimicmodel) ) { + LOG ( log_error, logtype_afpd, "Could not create Zeroconf TXTRecord for model"); +-- +1.9.3 + 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 Sat Aug 30 04:58:11 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 30 Aug 2014 02:58:11 +0000 Subject: SF.net SVN: gar:[24059] csw/mgar/pkg/freeciv/trunk Message-ID: <3hlMn62czcz47@mail.opencsw.org> Revision: 24059 http://sourceforge.net/p/gar/code/24059 Author: jake_goerzen Date: 2014-08-30 02:58:08 +0000 (Sat, 30 Aug 2014) Log Message: ----------- freeciv: bump to version 2.4.3; add patch of tile.h Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freeciv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeciv/trunk/files/0002-restore-previous-version-tile.h.patch Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2014-08-29 16:03:50 UTC (rev 24058) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2014-08-30 02:58:08 UTC (rev 24059) @@ -1,5 +1,5 @@ NAME = freeciv -VERSION = 2.4.2 +VERSION = 2.4.3 GARTYPE = v2 DESCRIPTION = Free turn-based multiplayer strategy game @@ -41,6 +41,7 @@ GARCOMPILER = GNU PATCHFILES += 0001-use-finite-instead-of-isfinite-function.patch +PATCHFILES += 0002-restore-previous-version-tile.h.patch TEST_SCRIPTS = Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2014-08-29 16:03:50 UTC (rev 24058) +++ csw/mgar/pkg/freeciv/trunk/checksums 2014-08-30 02:58:08 UTC (rev 24059) @@ -1 +1 @@ -4bf03bbe7084d3e23739f1e5b2ccc529 freeciv-2.4.2.tar.bz2 +437f9a4aadb80619a7c5ae9643142b8b freeciv-2.4.3.tar.bz2 Added: csw/mgar/pkg/freeciv/trunk/files/0002-restore-previous-version-tile.h.patch =================================================================== --- csw/mgar/pkg/freeciv/trunk/files/0002-restore-previous-version-tile.h.patch (rev 0) +++ csw/mgar/pkg/freeciv/trunk/files/0002-restore-previous-version-tile.h.patch 2014-08-30 02:58:08 UTC (rev 24059) @@ -0,0 +1,25 @@ +From 536f556c5fc10ebd08b69844494072bc02f49500 Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Sat, 30 Aug 2014 03:31:11 +0200 +Subject: [PATCH] restore previous version tile.h + +--- + common/tile.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/tile.h b/common/tile.h +index ba1923d..5e06f4a 100644 +--- a/common/tile.h ++++ b/common/tile.h +@@ -78,7 +78,7 @@ struct tile { + + + /* Tile accessor functions. */ +-#define tile_index(_pt_) (_pt_)->index ++int tile_index(const struct tile *ptile); + + struct city *tile_city(const struct tile *ptile); + +-- +2.0.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.