SF.net SVN: gar:[26051] csw/mgar/pkg/evince/trunk

2016-11-25 Thread cgrzemba--- via devel 
Revision: 26051
  http://sourceforge.net/p/gar/code/26051
Author:   cgrzemba
Date: 2016-11-25 14:28:46 + (Fri, 25 Nov 2016)
Log Message:
---
mantis-5292: relax postinstall on non-global zones

Modified Paths:
--
csw/mgar/pkg/evince/trunk/Makefile
csw/mgar/pkg/evince/trunk/checksums
csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall

Modified: csw/mgar/pkg/evince/trunk/Makefile
===
--- csw/mgar/pkg/evince/trunk/Makefile  2016-11-24 16:28:34 UTC (rev 26050)
+++ csw/mgar/pkg/evince/trunk/Makefile  2016-11-25 14:28:46 UTC (rev 26051)
@@ -3,8 +3,8 @@
 # $Id$
 
 NAME = evince
-GNOME_VERSION = 2.32
-VERSION = $(GNOME_VERSION).0
+GNOME_VERSION = 2.91
+VERSION = $(GNOME_VERSION).93
 CATEGORIES = gnome
 GARTYPE = v2
 DESCRIPTION = Document viewer for multiple document formats: pdf, ps ,dvi
@@ -13,19 +13,19 @@
 
 SPKG_SOURCEURL = http://projects.gnome.org/evince/
 MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES  = $(NAME)-$(VERSION).tar.xz
 DISTFILES += CSWevince.postinstall
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # GARFLAVOR = DBG
-GARCOMPILER=GCC4
+GARCOMPILER=GCC5
 # GARCOMPILER=SOS12U3
 STRIP_LIBTOOL = 1
 
 PATCHFILES += 0001-honor-aclocal_flags.patch
 # PATCHFILES += 0002-poppler-api-changed.patch
 # PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch
-PATCHFILES += 0001-fix-poppler-api-linearized-problem.patch
+# PATCHFILES += 0001-fix-poppler-api-linearized-problem.patch
 # remove this patch if Mantis 5130 is closed!!!
 
 # PATCHFILES += 0003-libxml-2.0.pc-workaround
@@ -261,6 +261,7 @@
 BUILD_DEP_PKGS += CSWgnomedocutils
 BUILD_DEP_PKGS += CSWintltool
 BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibz-dev
 BUILD_DEP_PKGS += CSWlibxml2-dev
 BUILD_DEP_PKGS += CSWgnomeicontheme
 BUILD_DEP_PKGS += CSWsunx11devel
@@ -269,13 +270,13 @@
 BUILD_DEP_PKGS += CSWlibdbus-glib-dev
 BUILD_DEP_PKGS += CSWpoppler-dev
 BUILD_DEP_PKGS += CSWlibcairo-dev
+BUILD_DEP_PKGS += CSWlibpango-dev
 BUILD_DEP_PKGS += CSWlibspectre-dev
 BUILD_DEP_PKGS += CSWlibdjvulibre-dev
 BUILD_DEP_PKGS += CSWgobject-introspection-dev
 BUILD_DEP_PKGS += CSWbinutils
 BUILD_DEP_PKGS += CSWgnulinks
 BUILD_DEP_PKGS += CSWtetex
-BUILD_DEP_PKGS += CSWpangodevel
 BUILD_DEP_PKGS += CSWlibpixman-dev
 BUILD_DEP_PKGS += CSWlibfreetype-dev
 BUILD_DEP_PKGS += CSWlibpng-dev

Modified: csw/mgar/pkg/evince/trunk/checksums
===
--- csw/mgar/pkg/evince/trunk/checksums 2016-11-24 16:28:34 UTC (rev 26050)
+++ csw/mgar/pkg/evince/trunk/checksums 2016-11-25 14:28:46 UTC (rev 26051)
@@ -1 +1 @@
-f2621208fe255acab4172c0216a55504  evince-2.32.0.tar.gz
+a57956bfabb65c26f29263f5b14b9a7a  evince-3.21.4.tar.xz

Modified: csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall
===
--- csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall   2016-11-24 
16:28:34 UTC (rev 26050)
+++ csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall   2016-11-25 
14:28:46 UTC (rev 26051)
@@ -1 +1,13 @@
-/opt/csw/bin/glib-compile-schemas /opt/csw/share/glib-2.0/schemas/
+zname=`zonename`
+if  `/opt/csw/bin/glib-compile-schemas /opt/csw/share/glib-2.0/schemas/`; then
+  exit 0
+else
+  if [ $zname != "global" ]; then
+ # in non-global zone this could fail because of no write  permissions
+ echo "Warning: Could not run '/opt/csw/bin/glib-compile-schemas 
/opt/csw/share/glib-2.0/schemas/' in non-global zone"
+ exit 0
+  else
+ # in global zone this has to work
+ exit 1
+  fi
+fi

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26054] csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk

2016-12-01 Thread cgrzemba--- via devel 
Revision: 26054
  http://sourceforge.net/p/gar/code/26054
Author:   cgrzemba
Date: 2016-12-01 09:59:08 + (Thu, 01 Dec 2016)
Log Message:
---
gnome-base/gnome-icon-theme/trunk: update version 2.31

Modified Paths:
--
csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile
csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/checksums

Modified: csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile
===
--- csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile 2016-11-28 
15:47:56 UTC (rev 26053)
+++ csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile 2016-12-01 
09:59:08 UTC (rev 26054)
@@ -3,21 +3,30 @@
 # $Id: Makefile 8335 2010-02-03 18:36:29Z wahwah $
 
 NAME = gnome-icon-theme
-GNOME_VERSION = 2.22
+GNOME_VERSION = 2.31
 VERSION = $(GNOME_VERSION).0
 CATEGORIES = gnome
 GARTYPE = v2
+
 DESCRIPTION = GNOME icon theme
 define BLURB
 endef
+
 SPKG_SOURCEURL = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/
 MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
 PACKAGES = CSWgnomeicontheme   
 CATALOGNAME_CSWgnomeicontheme = gnome_icon_theme
 RUNTIME_DEP_PKGS_CSWgnomeicontheme = CSWicon-naming-utils
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnomeicontheme)
+ARCHALL_CSWgnomeicontheme = 1
+
+EXTRA_CONFIGURE_ENV = PATH=/opt/csw/gnu:$(PATH)
+
 CONFIGURE_ARGS = $(DIRPATHS)
-ARCHALL_CSWgnomeicontheme = 1
+
 include gar/category.mk
+
+PATH:=/opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/checksums
===
--- csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/checksums2016-11-28 
15:47:56 UTC (rev 26053)
+++ csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/checksums2016-12-01 
09:59:08 UTC (rev 26054)
@@ -1 +1 @@
-271b0b12b41539c7ca9bb5f19ced8a38  gnome-icon-theme-2.22.0.tar.gz
+35dee612dfbb9b3858bc4e6ff768d906  gnome-icon-theme-2.31.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26055] csw/mgar/pkg/icon-naming-utils/trunk/Makefile

2016-12-01 Thread cgrzemba--- via devel 
Revision: 26055
  http://sourceforge.net/p/gar/code/26055
Author:   cgrzemba
Date: 2016-12-01 10:19:37 + (Thu, 01 Dec 2016)
Log Message:
---
icon-naming-utils/trunk: update recipe

Modified Paths:
--
csw/mgar/pkg/icon-naming-utils/trunk/Makefile

Modified: csw/mgar/pkg/icon-naming-utils/trunk/Makefile
===
--- csw/mgar/pkg/icon-naming-utils/trunk/Makefile   2016-12-01 09:59:08 UTC 
(rev 26054)
+++ csw/mgar/pkg/icon-naming-utils/trunk/Makefile   2016-12-01 10:19:37 UTC 
(rev 26055)
@@ -6,15 +6,19 @@
 VERSION = 0.8.90
 CATEGORIES = gnome
 GARTYPE = v2
+
 DESCRIPTION = Icon naming utils
 define BLURB
 endef
+
 SPKG_SOURCEURL = http://tango.freedesktop.org/releases/
 MASTER_SITES = http://tango.freedesktop.org/releases/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
 CATALOGNAME_CSWicon-naming-utils = icon_naming_utils
 ARCHALL_CSWicon-naming-utils = 1
-RUNTIME_DEP_PKGS_CSWicon-naming-utils = CSWpmxmlsimple
+
 CONFIGURE_ARGS = $(DIRPATHS)
+
 include gar/category.mk

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26067] csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/ Makefile

2016-12-09 Thread cgrzemba--- via devel 
Revision: 26067
  http://sourceforge.net/p/gar/code/26067
Author:   cgrzemba
Date: 2016-12-09 14:55:53 + (Fri, 09 Dec 2016)
Log Message:
---
gnome-base/gnome-icon-theme/trunk: respin update only

Modified Paths:
--
csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile

Modified: csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile
===
--- csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile 2016-12-07 
09:10:56 UTC (rev 26066)
+++ csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile 2016-12-09 
14:55:53 UTC (rev 26067)
@@ -19,8 +19,8 @@
 
 PACKAGES = CSWgnomeicontheme   
 CATALOGNAME_CSWgnomeicontheme = gnome_icon_theme
-RUNTIME_DEP_PKGS_CSWgnomeicontheme = CSWicon-naming-utils
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnomeicontheme)
+BUILD_DEP_PKGS = CSWicon-naming-utils
+
 ARCHALL_CSWgnomeicontheme = 1
 
 EXTRA_CONFIGURE_ENV = PATH=/opt/csw/gnu:$(PATH)

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26121] csw/mgar/pkg/znapzend/trunk

2017-03-14 Thread cgrzemba--- via devel 
Revision: 26121
  http://sourceforge.net/p/gar/code/26121
Author:   cgrzemba
Date: 2017-03-14 13:25:14 + (Tue, 14 Mar 2017)
Log Message:
---
- update version 0.15.7
- use self distributed perl modules
- use system perl, Perl5.10 has no App::cpanminus

Modified Paths:
--
csw/mgar/pkg/znapzend/trunk/Makefile
csw/mgar/pkg/znapzend/trunk/checksums
csw/mgar/pkg/znapzend/trunk/files/cswznapzend

Added Paths:
---
csw/mgar/pkg/znapzend/trunk/files/001-perl-install-dir.Makefile.in.patch

Modified: csw/mgar/pkg/znapzend/trunk/Makefile
===
--- csw/mgar/pkg/znapzend/trunk/Makefile2017-03-09 20:09:05 UTC (rev 
26120)
+++ csw/mgar/pkg/znapzend/trunk/Makefile2017-03-14 13:25:14 UTC (rev 
26121)
@@ -2,8 +2,9 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = znapzend
-VERSION = 0.14.0
+VERSION = 0.15.7
 GARTYPE = v2
+AUTHOR = oetiker
 
 DESCRIPTION = The Multilevel Backup Tool for ZFS
 define BLURB
@@ -11,46 +12,53 @@
   The ZnapZend configuration is stored as properties in the ZFS filesystem 
itself.
 endef
 
-GITHUB_USER  = oetiker
+GITHUB_USER  = $(AUTHOR)
 #MASTER_SITES = $(GITHUB_MIRROR)
 MASTER_SITES = 
https://github.com/$(GITHUB_USER)/$(NAME)/releases/download/v$(VERSION)/
+# MASTER_SITES = http://github.com/$(AUTHOR)/$(NAME)/
 VENDOR_URL   = http://www.znapzend.org/
 
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += cswznapzend
 
+PACKAGING_PLATFORMS = solaris11-sparc solaris11-i386
+PKGFORMAT-5.11 = svr4
+
+PATCHFILES += 001-perl-install-dir.Makefile.in.patch
+
 INITSMF = /etc/opt/csw/init.d/cswznapzend
 
+EXTRA_CONFIGURE_ENV = PATH=/usr/xpg4/bin:$(PATH)
+EXTRA_BUILD_ENV = PATH=/opt/csw/gnu:$(PATH)
+
 CONFIGURE_ARGS =  $(DIRPATHS)
 CONFIGURE_ARGS += --datadir=$(libdir)/perl/csw/
-CONFIGURE_ARGS += PERL5LIB=$(libdir)/perl/csw/
+CONFIGURE_ARGS += --enable-svcinstall=/var/opt/csw/svc/manifest
+CONFIGURE_ARGS += PERL5LIB=$(libdir)/$(NAME)
+CONFIGURE_ARGS += PERL=/usr/bin/perl
+INSTALL_ARGS = libperldir=$(libdir)/$(NAME)
 
-BUILD_DEP_PKGS += CSWpm-pod-simple
-BUILD_DEP_PKGS += CSWpm-mojolicious
-BUILD_DEP_PKGS += CSWpm-mojo-ioloop-forkcall
-
-RUNTIME_DEP_PKGS_CSWznapzend += CSWperl
-RUNTIME_DEP_PKGS_CSWznapzend += CSWpm-pod-simple
-CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWpm-pod-simple
-RUNTIME_DEP_PKGS_CSWznapzend += CSWpm-mojolicious
-CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWpm-mojolicious
-RUNTIME_DEP_PKGS_CSWznapzend += CSWpm-mojo-ioloop-forkcall
-CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWpm-mojo-ioloop-forkcall
+# RUNTIME_DEP_PKGS_CSWznapzend += CSWperl
 # Can be used as an option
 RUNTIME_DEP_PKGS_CSWznapzend += CSWmbuffer
 CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWmbuffer
+CHECKPKG_OVERRIDES_CSWznapzend += missing-dependency|CSWperl
 
-ARCHALL_CSWznapzend = 1
-
 # Ok: usage examples
-CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/doc/znapzendzetup.pod
 CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/bin/znapzendzetup
+CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/znapzend.xml
+CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/ExtUtils/MakeMaker.pm
+CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/App/cpanminus.pm
+CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/App/cpanminus/fatscript.pm
+CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/TAP/Parser/SourceHandler/Perl.pm
+CHECKPKG_OVERRIDES_CSWznapzend += 
perllocal-pod-in-pkgmap|/opt/csw/lib/znapzend/sun4-solaris-64int/perllocal.pod
+CHECKPKG_OVERRIDES_CSWznapzend += 
perllocal-pod-in-pkgmap|/opt/csw/lib/znapzend/i86pc-solaris-64int/perllocal.pod
+include gar/category.mk
 
-# Ok: location of DTD
-CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/share|root/opt/csw/init/znapzend.xml
+pre-configure:
+   cd $(WORKSRC) && automake-1.14
+   @$(MAKECOOKIE)
 
-include gar/category.mk
-
-post-install:
-   ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-   ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d
+# post-install:
+#  ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+#  ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d

Modified: csw/mgar/pkg/znapzend/trunk/checksums
===
--- csw/mgar/pkg/znapzend/trunk/checksums   2017-03-09 20:09:05 UTC (rev 
26120)
+++ csw/mgar/pkg/znapzend/trunk/checksums   2017-03-14 13:25:14 UTC (rev 
26121)
@@ -1 +1 @@
-08b849cc05158374f533aeb2cc9bf7ea  znapzend-0.14.0.tar.gz
+d76cbeb62a820f1e9b271ca5a185054f  znapzend-0.15.7.tar.gz

Added: csw/mgar/pkg/znapzend/trunk/files/001-perl-install-dir.Makefil

SF.net SVN: gar:[26122] csw/mgar/pkg/znapzend/trunk/Makefile

2017-03-14 Thread cgrzemba--- via devel 
Revision: 26122
  http://sourceforge.net/p/gar/code/26122
Author:   cgrzemba
Date: 2017-03-14 14:17:33 + (Tue, 14 Mar 2017)
Log Message:
---
znapzend/trunk: readd post-install cswznapzend

Modified Paths:
--
csw/mgar/pkg/znapzend/trunk/Makefile

Modified: csw/mgar/pkg/znapzend/trunk/Makefile
===
--- csw/mgar/pkg/znapzend/trunk/Makefile2017-03-14 13:25:14 UTC (rev 
26121)
+++ csw/mgar/pkg/znapzend/trunk/Makefile2017-03-14 14:17:33 UTC (rev 
26122)
@@ -59,6 +59,6 @@
cd $(WORKSRC) && automake-1.14
@$(MAKECOOKIE)
 
-# post-install:
-#  ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-#  ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d
+post-install:
+   ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+   ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26123] csw/mgar/pkg/znapzend/trunk

2017-03-14 Thread cgrzemba--- via devel 
Revision: 26123
  http://sourceforge.net/p/gar/code/26123
Author:   cgrzemba
Date: 2017-03-14 15:25:34 + (Tue, 14 Mar 2017)
Log Message:
---
znapzend/trunk: bump version 017.0 because bug in SMF, but here test failed

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/Makefile2017-03-14 14:17:33 UTC (rev 
26122)
+++ csw/mgar/pkg/znapzend/trunk/Makefile2017-03-14 15:25:34 UTC (rev 
26123)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = znapzend
-VERSION = 0.15.7
+VERSION = 0.17.0
 GARTYPE = v2
 AUTHOR = oetiker
 
@@ -24,6 +24,8 @@
 PACKAGING_PLATFORMS = solaris11-sparc solaris11-i386
 PKGFORMAT-5.11 = svr4
 
+SKIPTEST = 1
+
 PATCHFILES += 001-perl-install-dir.Makefile.in.patch
 
 INITSMF = /etc/opt/csw/init.d/cswznapzend
@@ -53,10 +55,11 @@
 CHECKPKG_OVERRIDES_CSWznapzend += 
file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/TAP/Parser/SourceHandler/Perl.pm
 CHECKPKG_OVERRIDES_CSWznapzend += 
perllocal-pod-in-pkgmap|/opt/csw/lib/znapzend/sun4-solaris-64int/perllocal.pod
 CHECKPKG_OVERRIDES_CSWznapzend += 
perllocal-pod-in-pkgmap|/opt/csw/lib/znapzend/i86pc-solaris-64int/perllocal.pod
+
 include gar/category.mk
 
 pre-configure:
-   cd $(WORKSRC) && automake-1.14
+   cd $(WORKSRC) && automake-1.15
@$(MAKECOOKIE)
 
 post-install:

Modified: csw/mgar/pkg/znapzend/trunk/checksums
===
--- csw/mgar/pkg/znapzend/trunk/checksums   2017-03-14 14:17:33 UTC (rev 
26122)
+++ csw/mgar/pkg/znapzend/trunk/checksums   2017-03-14 15:25:34 UTC (rev 
26123)
@@ -1 +1 @@
-d76cbeb62a820f1e9b271ca5a185054f  znapzend-0.15.7.tar.gz
+6f730b44940a4bac3ba7233b48a03afd  znapzend-0.17.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26505] csw/mgar/pkg/opencsw-manual/trunk/files/ osqa-migration

2019-01-25 Thread cgrzemba--- via devel 
Revision: 26505
  http://sourceforge.net/p/gar/code/26505
Author:   cgrzemba
Date: 2019-01-25 12:26:38 + (Fri, 25 Jan 2019)
Log Message:
---
add css styling and some extensions

Modified Paths:
--
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/threads.json

Added Paths:
---
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/export-osqa-db.py

csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py

csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_quest_html.py
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/question.html.tmpl

Removed Paths:
-
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_html.py

Added: csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl
===
--- csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl 
(rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl 
2019-01-25 12:26:38 UTC (rev 26505)
@@ -0,0 +1,58 @@
+
+
+
+  
+  
+
+
+
+
+
+http://www.opencsw.org"; title="OpenCSW Solaris packages">Home
+
+
+http://www.opencsw.org/community"; title="OpenCSW OSQA">Questions
+
+
+
+
+{{ title }}
+
+
+{{ body }}
+
+
+asked: {{ added_at|datetimeformat }}
+by: {{ username }}
+
+
+{% for com in comment %}
+
+
+{{ com.username }} commented:
+
+
+{{ com.body }}
+
+{% endfor %}
+
+{% for ans in answer %}
+
+
+{{ ans.username }} answers:
+
+
+{{ ans.body }}
+
+{% for com in ans.comment %}
+
+
+{{ com.username }} commented:
+
+
+{{ com.body }}
+
+{% endfor %}
+{% endfor %}
+
+

Added: csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/export-osqa-db.py
===
--- csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/export-osqa-db.py
(rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/export-osqa-db.py
2019-01-25 12:26:38 UTC (rev 26505)
@@ -0,0 +1,60 @@
+import MySQLdb
+import json
+from datetime import date, datetime
+
+SPAMMERS = ['raggieapauly']
+
+def json_serial(obj):
+"""JSON serializer for objects not serializable by default json code"""
+
+if isinstance(obj, (datetime, date)):
+return obj.isoformat()
+raise TypeError ("Type %s not serializable" % type(obj))
+ 
+db = MySQLdb.connect(host="dbchbie01",  # your host 
+ user="osqacsw2_prod",   # username
+ passwd="NoisHevryb", # password
+ db="osqacsw2_prod")   # name of the database
+ 
+# Create a Cursor object to execute queries.
+cur = db.cursor()
+cur = db.cursor (MySQLdb.cursors.DictCursor)
+ 
+# Select data from table using SQL query.
+cur.execute("select n.id, n.parent_id, n.abs_parent_id, a.username, 
u.real_name, n.node_type, n.title, n.body, n.added_at from forum_node 
n,forum_user u, auth_user a where n.author_id = u.user_ptr_id and n.author_id = 
a.id and a.is_active = 1;")
+ 
+# print the first and second columns  
+
+questions = [];
+answers = [];
+comments = [];
+for row in cur.fetchall() :
+if row['username'] not in SPAMMERS:
+if row['node_type'] == 'question':
+row['answer'] = []
+row['comment'] = []
+questions.append(row)
+elif row['node_type'] == 'answer':
+answers.append(row)
+elif row['node_type'] == 'comment':
+comments.append(row)
+for answer in answers:
+try:
+for q in questions:
+if q['id'] == answer['abs_parent_id']:
+answer['comment'] = [] 
+q['answer'].append(answer)
+except IndexError as e:
+import pdb; pdb.set_trace();
+for comment in comments:
+try:
+for a in answers:
+if a['id'] == comment['parent_id']:
+a['comment'].append(comment)
+except IndexError as e:
+import pdb; pdb.set_trace();
+
+import pdb; pdb.set_trace()
+
+with open('/var/tmp/threads.json', 'w') as outfile:
+json.dump(questions, outfile, default = json_serial)

Added: 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py
===
--- 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py  
(rev 0)
+++ 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py  
2019-01-25 12:26:38 UTC (rev 26505)
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+import re
+import os
+import os.path
+import json
+import pprint
+import datetime
+from jinja2 import Template, environmentfilter, Environment, FileSystemLoader
+
+HTML_PATH="/home/cgrzemba/public_html/osqa-static"
+ENCODING = 'utf-8'
+SPAMMERS = ['maloriegrebetr']
+
+@en

SF.net SVN: gar:[26506] csw/mgar/pkg/opencsw-manual/trunk/files/ osqa-migration

2019-01-28 Thread cgrzemba--- via devel 
Revision: 26506
  http://sourceforge.net/p/gar/code/26506
Author:   cgrzemba
Date: 2019-01-28 10:58:56 + (Mon, 28 Jan 2019)
Log Message:
---
- Order the index / list alphabetically
- Add a paragraph to the index, explaining that this is an archive of OSQA
- checked HTML syntax
- add canonical link URL

Modified Paths:
--
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl

csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py

csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_quest_html.py
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/question.html.tmpl

Added Paths:
---
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/css/
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/css/style.css
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/images/
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/images/logo_1.png

Modified: 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl
===
--- csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl 
2019-01-25 12:26:38 UTC (rev 26505)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl 
2019-01-28 10:58:56 UTC (rev 26506)
@@ -1,30 +1,34 @@
-
-
+
+
+
 
+  
+  
+  https://www.opencsw.org/community/{{id}}/{{title|slugify}}/index.html" />
+  OpenCSW  Q&A Forum
+
+
   
   
-
-
-
-
-
-http://www.opencsw.org"; title="OpenCSW Solaris packages">Home
-
-
-http://www.opencsw.org/community"; title="OpenCSW OSQA">Questions
-
-
-
+
+  
+  
+
+  http://www.opencsw.org"; title="OpenCSW Solaris 
packages">Home
+
+
+  http://www.opencsw.org/community"; title="OpenCSW 
OSQA">Questions
+
+  
+  
+
 
 {{ title }}
 
-
 {{ body }}
-
 
 asked: {{ added_at|datetimeformat }}
 by: {{ username }}
-
 
 {% for com in comment %}
 
@@ -31,9 +35,7 @@
 
 {{ com.username }} commented:
 
-
 {{ com.body }}
-
 {% endfor %}
 
 {% for ans in answer %}
@@ -41,17 +43,13 @@
 
 {{ ans.username }} answers:
 
-
 {{ ans.body }}
-
 {% for com in ans.comment %}
 
 
 {{ com.username }} commented:
 
-
 {{ com.body }}
-
 {% endfor %}
 {% endfor %}
 

Added: csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/css/style.css
===
--- csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/css/style.css
(rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/css/style.css
2019-01-28 10:58:56 UTC (rev 26506)
@@ -0,0 +1,160 @@
+/*
+ * OpenCSW modified CSS template
+ * Main palette:
+ * #89CB11 - light green (bar)
+ * Same but darker: #50770a
+ * #3E5867 on #F4F8F9 - text on light grey background / boxes
+ *  - this color doesn't fit the other colors
+ */
+
+body {
+/*overflow-y: scroll;
+height: 100%; */
+background: none repeat scroll 0 0 #FF;
+color: #00;
+font-family: sans-serif;
+font-size: 12px;
+line-height: 150%;
+margin: 0;
+padding: 0;
+}
+
+div {
+margin: 0 auto;
+padding: 0;
+}
+
+h1, h2, h3, form, img, p {
+border: medium none;
+margin: 0;
+padding: 0;
+}
+
+label {
+vertical-align: middle;
+}
+
+hr {
+border-color: #CE -moz-use-text-color -moz-use-text-color;
+border-right: medium none;
+border-style: dashed none none;
+border-width: 1px medium medium;
+}
+
+p {
+font-size: 13px;
+line-height: 140%;
+margin-bottom: 13px;
+}
+
+li.answi a {
+color: #ff;
+text-decoration: none;
+}
+
+li.answi a:hover {
+text-shadow: 1px 1px 1px #000;
+}
+
+a {
+color: #3060A8;
+text-decoration: none;
+}
+a:visited{
+   color:#1F2F8A;
+   text-decoration: none;
+}
+a:hover{
+   text-decoration: underline;
+}
+
+.clear {
+  clear: both;
+  width: 0px;
+  height: 0px;
+}
+
+h1 {
+color: #3060ab;
+font-size: 160%;
+padding: 5px 0;
+line-height: 110%;
+overflow: hidden;
+}
+
+h2 {
+font-size: 140%;
+padding: 3px 0;
+line-height: 110%;
+}
+
+h3 {
+font-size: 120%;
+padding: 3px 0;
+line-height: 110%;
+}
+
+ul#answ {
+list-style: none;
+padding: 0px 28px 0px 18px;
+}
+
+ol {
+list-style: decimal outside none;
+margin-bottom: 1em;
+margin-left: 30px;
+padding-left: 0;
+}
+
+td ul {
+vertical-align: middle;
+}
+
+li.answi {
+float: left;
+padding: 5px 10px;
+font: 100%/1.5 "Lucida Grande", "Helvetica Neue", Arial, "Lucida Sans 
Unicode", sans-serif;
+font-size: 175%;
+}
+
+pre {
+background-color: #F5F5F5;
+font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
+font-size: 90%;
+margin-bottom: 10px;
+overflow: auto;
+padding-left: 5px;
+padding-top: 5px;
+white-space: pre-wrap;
+}
+
+code {
+font-family: Consolas, Monaco, Liberation Mono, Lucida Con

SF.net SVN: gar:[26509] csw/mgar/pkg/opencsw-manual/trunk/files/ osqa-migration

2019-01-28 Thread cgrzemba--- via devel 
Revision: 26509
  http://sourceforge.net/p/gar/code/26509
Author:   cgrzemba
Date: 2019-01-29 07:35:51 + (Tue, 29 Jan 2019)
Log Message:
---
add subpath 'questions', shorten canonical link

Modified Paths:
--
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl

csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/question.html.tmpl

Modified: 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl
===
--- csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl 
2019-01-28 19:48:49 UTC (rev 26508)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/answer.html.tmpl 
2019-01-29 07:35:51 UTC (rev 26509)
@@ -3,8 +3,8 @@
 
 
   
-  
-  https://www.opencsw.org/community/{{id}}/{{title|slugify}}/index.html" />
+  
+  https://www.opencsw.org/community/questions/{{id}}/{{title|slugify}}" />
   OpenCSW  Q&A Forum
 
 

Modified: 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py
===
--- 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py  
2019-01-28 19:48:49 UTC (rev 26508)
+++ 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/generate_answer_html.py  
2019-01-29 07:35:51 UTC (rev 26509)
@@ -8,7 +8,7 @@
 import datetime
 from jinja2 import Template, environmentfilter, Environment, FileSystemLoader
 
-HTML_PATH="/home/cgrzemba/public_html/osqa-static"
+HTML_PATH="/home/cgrzemba/public_html/osqa-static/questions/"
 ENCODING = 'utf-8'
 SPAMMERS = ['maloriegrebetr']
 

Modified: 
csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/question.html.tmpl
===
--- csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/question.html.tmpl   
2019-01-28 19:48:49 UTC (rev 26508)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/osqa-migration/question.html.tmpl   
2019-01-29 07:35:51 UTC (rev 26509)
@@ -21,7 +21,9 @@
   
   
 
-We retired the OSQA community website and archive the posts. This web site 
offers the content collected the last years. If you have a question, write to 
the users mailing list us...@lists.opencsw.org or join the IRC #opencsw.
+We retired the OSQA community website and archive the posts. This web site 
offers the content collected the last years.
+
+ If you have a question, write to the users mailing list 
us...@lists.opencsw.org or join the IRC #opencsw.
 
 
 OSQA Community questions
@@ -29,7 +31,7 @@
 
 {% for quest in questions %}
   
-{{ 
quest.title }}
+{{ 
quest.title }}
   
 {% endfor %}
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

Re: upgrading lynx package -env not found

2020-05-12 Thread cgrzemba--- via devel 
mostly the dowloaded archive has a special structure/namimg.?

Am 13.05.20 01:20 schrieb Riccardo Mottola via devel  
: 
> 
> Hi All!
> 
> long time no news from me... just got asked by someone to attempt an
> update and add of certain packages.
> 
> First, lynx... I just tried to update the package version and issue
> configure and get a strange error:
> 
> [= NOW BUILDING: lynx2-8-9 MODULATION isa-sparcv8plus:
> ISA=sparcv8plus =]
>  [extract-modulated] complete for lynx.
>  [patch-modulated] complete for lynx.
>  ==> Running configure in
> work/solaris10-sparc/build-isa-sparcv8plus/lynx2-8-9
> cd work/solaris10-sparc/build-isa-sparcv8plus/lynx2-8-9 && mkdir -p . &&
> cd . && /usr/bin/env -i HOME="/home/rmottola"
> PATH="/home/rmottola/opencsw/.buildsys/v2/gar/bin/sos12-wrappers:/home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/install-isa-sparcv8plus/opt/csw/bin:/home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/install-isa-sparcv8plus/opt/csw/bin:/home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/install-isa-sparcv8plus/opt/csw/sbin:/home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/install-isa-sparcv8plus/opt/csw/sbin:/opt/csw/bin:/opt/csw/bin:/opt/csw/sbin:/opt/csw/sbin:/opt/SUNWspro/bin:/home/rmottola/opencsw/.buildsys/v2/gar/bin:/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin"
> LC_ALL="C" prefix="/opt/csw" exec_prefix="/opt/csw"
> bindir="/opt/csw/bin" sbindir="/opt/csw/sbin"
> libexecdir="/opt/csw/libexec" datadir="/opt/csw/share"
> sysconfdir="/etc/opt/csw" sharedstatedir="/opt/csw/share"
> localstatedir="/var/opt/csw" libdir="/opt/csw/lib"
> infodir="/opt/csw/share/info" lispdir="/opt/csw/share/emacs/site-lisp"
> includedir="/opt/csw/include" mandir="/opt/csw/share/man"
> docdir="/opt/csw/share/doc" sourcedir="/opt/csw/src"
> CPPFLAGS="-I/opt/csw/include" CFLAGS="-xO3 -m32 -xarch=sparc"
> CXXFLAGS="-xO3 -m32 -xarch=sparc" LDFLAGS="-m32 -xarch=sparc
> -L/opt/csw/lib" FFLAGS="-xO3 -m32 -xarch=sparc" FCFLAGS="-xO3 -m32
> -xarch=sparc" F77="/opt/SUNWspro/bin/f77" FC="/opt/SUNWspro/bin/f95"
> ASFLAGS="" OPTFLAGS="-xO3 -m32 -xarch=sparc" CC="/opt/SUNWspro/bin/cc"
> CXX="/opt/SUNWspro/bin/CC" CC_HOME="/opt/SUNWspro" CC_VERSION="Sun C 5.9
> SunOS_sparc Patch 124867-16 2010/08/11" CXX_VERSION="Sun C++ 5.9
> SunOS_sparc Patch 124863-30 2012/07/11" GARCH="sparc" GAROSREL="5.10"
> GARPACKAGE="trunk" LD_OPTIONS="-R/opt/csw/lib/\$ISALIST -R/opt/csw/lib
> -M /home/rmottola/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct
> -z ignore" PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
> DESTDIR="/home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/install-isa-sparcv8plus"
>  
> /home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/build-isa-sparcv8plus/lynx2-8-9/configure
> --prefix=/opt/csw --exec_prefix=/opt/csw --bindir=/opt/csw/bin
> --sbindir=/opt/csw/sbin --libexecdir=/opt/csw/libexec
> --datadir=/opt/csw/share --sysconfdir=/etc/opt/csw
> --sharedstatedir=/opt/csw/share --localstatedir=/var/opt/csw
> --libdir=/opt/csw/lib --infodir=/opt/csw/share/info
> --includedir=/opt/csw/include --mandir=/opt/csw/share/man
> --with-screen=ncurses --enable-default-colors --with-ssl --with-bzlib
> --with-zlib --disable-finger --disable-gopher --disable-news
> --enable-cgi-links --enable-exec-links --enable-exec-scripts
> /usr/bin/env: No such file or directory
> 
> Where is the issue? The configure command is run in the wrong place:
> 
> /home/rmottola/opencsw/lynx/trunk/work/solaris10-sparc/build-isa-sparcv8plus/lynx2-8-9/configure
> 
> 
> Should be instead:
> ls work/solaris10-sparc/build-isa-sparcv8plus/
> lynx2-8-9 lynx2.8.9rel.1
> 
> there is a discrepancy between the two work dirs, only one should exist.
> What is wrong?
> 
> Riccardo
> 
>

SF.net SVN: gar:[26710] csw/mgar/pkg/nmap/trunk

2020-11-05 Thread cgrzemba--- via devel 
Revision: 26710
  http://sourceforge.net/p/gar/code/26710
Author:   cgrzemba
Date: 2020-11-05 11:27:18 + (Thu, 05 Nov 2020)
Log Message:
---
nmap/trunk: update version 7.91

Modified Paths:
--
csw/mgar/pkg/nmap/trunk/Makefile
csw/mgar/pkg/nmap/trunk/checksums

Added Paths:
---
csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===
--- csw/mgar/pkg/nmap/trunk/Makefile2020-10-25 22:24:51 UTC (rev 26709)
+++ csw/mgar/pkg/nmap/trunk/Makefile2020-11-05 11:27:18 UTC (rev 26710)
@@ -1,7 +1,7 @@
 NAME = nmap
-VERSION = 6.46
+VERSION = 7.91
 GARTYPE = v2
-GARCOMPILER = GCC4
+GARCOMPILER = GCC5
 
 DESCRIPTION = A network exploration tool and security/port scanner
 define BLURB
@@ -37,8 +37,10 @@
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWnmap += CSWliblua5-2
-RUNTIME_DEP_PKGS_CSWnmap += CSWpython
-CHECKPKG_OVERRIDES_CSWnmap += surplus-dependency|CSWpython
+RUNTIME_DEP_PKGS_CSWnmap += CSWpython27
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibssh2-1
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibz1
+CHECKPKG_OVERRIDES_CSWnmap += surplus-dependency|CSWpython27
 
 PACKAGES += CSWzenmap
 SPKG_DESC_CSWzenmap = zenmap
@@ -58,8 +60,8 @@
 CHECKPKG_OVERRIDES_CSWzenmap += catalogname-does-not-start-with-py_
 CHECKPKG_OVERRIDES_CSWzenmap += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWzenmap += 
pkginfo-description-not-starting-with-uppercase|zenmap
-CHECKPKG_OVERRIDES_CSWzenmap += 
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/zenmapCore/Paths.py
-CHECKPKG_OVERRIDES_CSWzenmap += 
file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/zenmapCore/NmapParser.py
+CHECKPKG_OVERRIDES_CSWzenmap += 
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/zenmapCore/Paths.py
+CHECKPKG_OVERRIDES_CSWzenmap += 
file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/zenmapCore/NmapParser.py
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libpcre=$(prefix)

Modified: csw/mgar/pkg/nmap/trunk/checksums
===
--- csw/mgar/pkg/nmap/trunk/checksums   2020-10-25 22:24:51 UTC (rev 26709)
+++ csw/mgar/pkg/nmap/trunk/checksums   2020-11-05 11:27:18 UTC (rev 26710)
@@ -1 +1 @@
-5a36ad3a63d5b7ea5514f745a397436a  nmap-6.46.tar.bz2
+239cef725863ab454590a1bb8793b72b  nmap-7.91.tar.bz2

Added: csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch
===
--- csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch 
(rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch 2020-11-05 
11:27:18 UTC (rev 26710)
@@ -0,0 +1,12 @@
+diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc
+index 1679789..1890a2f 100644
+--- a/nping/NpingOps.cc
 b/nping/NpingOps.cc
+@@ -72,6 +72,7 @@
+ #include "ArgParser.h"
+ #include "output.h"
+ #include "common.h"
++#include 
+ 
+ 
+ 
/**

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

SF.net SVN: gar:[26711] csw/mgar/pkg/nmap/trunk

2020-11-05 Thread cgrzemba--- via devel 
Revision: 26711
  http://sourceforge.net/p/gar/code/26711
Author:   cgrzemba
Date: 2020-11-05 13:24:20 + (Thu, 05 Nov 2020)
Log Message:
---
nmap/trunk: update version 7.91, add patches, reinplace usr/local

Modified Paths:
--
csw/mgar/pkg/nmap/trunk/Makefile
csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===
--- csw/mgar/pkg/nmap/trunk/Makefile2020-11-05 11:27:18 UTC (rev 26710)
+++ csw/mgar/pkg/nmap/trunk/Makefile2020-11-05 13:24:20 UTC (rev 26711)
@@ -23,7 +23,12 @@
 
 PATCHFILES += -Add-vasprintf-compatibility.patch
 PATCHFILES += -Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch
+PATCHFILES += 0001-limit-NpingOps.patch
 
+REINPLACE_MATCH = /usr/local
+REINPLACE_WITH = /opt/csw
+REINPLACE_FILES += liblua/luaconf.h
+
 BUILD_DEP_PKGS += CSWlibpcre-dev
 BUILD_DEP_PKGS += CSWlibpcap-dev
 BUILD_DEP_PKGS += CSWlibssl-dev
@@ -36,7 +41,6 @@
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWnmap += CSWliblua5-2
 RUNTIME_DEP_PKGS_CSWnmap += CSWpython27
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibssh2-1
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibz1

Modified: csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch
===
--- csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch 2020-11-05 
11:27:18 UTC (rev 26710)
+++ csw/mgar/pkg/nmap/trunk/files/0001-limit-NpingOps.patch 2020-11-05 
13:24:20 UTC (rev 26711)
@@ -1,5 +1,3 @@
-diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc
-index 1679789..1890a2f 100644
 --- a/nping/NpingOps.cc
 +++ b/nping/NpingOps.cc
 @@ -72,6 +72,7 @@

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.