From lblume at users.sourceforge.net  Mon Dec  1 12:01:15 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Mon,  1 Dec 2014 11:01:15 +0000
Subject: SF.net SVN: gar:[24395] csw/mgar/pkg/apcupsd/trunk
Message-ID: <3jrk5l4ZZjz44@mail.opencsw.org>

Revision: 24395
          http://sourceforge.net/p/gar/code/24395
Author:   lblume
Date:     2014-12-01 11:01:15 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
apcupsd/trunk: The default lockdir is risky

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

Added Paths:
-----------
    csw/mgar/pkg/apcupsd/trunk/files/0003-change-lockdir.patch

Modified: csw/mgar/pkg/apcupsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/Makefile	2014-11-30 11:15:54 UTC (rev 24394)
+++ csw/mgar/pkg/apcupsd/trunk/Makefile	2014-12-01 11:01:15 UTC (rev 24395)
@@ -20,6 +20,7 @@
 
 PATCHFILES += 0001-apccontrol-fix.patch
 PATCHFILES += 0002-apctest.patch
+PATCHFILES += 0003-change-lockdir.patch
 
 PACKAGES += CSWapcupsd
 SPKG_DESC_CSWapcupsd = A daemon for controlling APC UPS

Added: csw/mgar/pkg/apcupsd/trunk/files/0003-change-lockdir.patch
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/files/0003-change-lockdir.patch	                        (rev 0)
+++ csw/mgar/pkg/apcupsd/trunk/files/0003-change-lockdir.patch	2014-12-01 11:01:15 UTC (rev 24395)
@@ -0,0 +1,12 @@
+index 49663a8..c8a0f7c 100755
+--- a/configure
++++ b/configure
+@@ -13235,7 +13235,7 @@ sun)
+    SERIALDEV=/dev/ttya
+    PWRFAILDIR=/etc
+    PIDDIR=/var/run
+-   LOCKDIR=/var/spool/locks
++   LOCKDIR=/var/run
+    LOGDIR=${sysconfdir}
+    APCUPSD_MAIL=/usr/bin/mailx
+    PTHREAD_CFLAGS="-D_POSIX_PTHREAD_SEMANTICS"

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 Dec  1 21:38:30 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Mon,  1 Dec 2014 20:38:30 +0000
Subject: SF.net SVN: gar:[24398] csw/mgar/pkg/minicom/trunk/Makefile
Message-ID: <3jryxN2kNFzFJ@mail.opencsw.org>

Revision: 24398
          http://sourceforge.net/p/gar/code/24398
Author:   lblume
Date:     2014-12-01 20:38:27 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
minicom/trunk: Replace usr/local occurrences

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

Modified: csw/mgar/pkg/minicom/trunk/Makefile
===================================================================
--- csw/mgar/pkg/minicom/trunk/Makefile	2014-12-01 20:16:42 UTC (rev 24397)
+++ csw/mgar/pkg/minicom/trunk/Makefile	2014-12-01 20:38:27 UTC (rev 24398)
@@ -18,6 +18,8 @@
 # The device cannot be forced if it doesn't exist on the build machine
 PATCHFILES += 0001-force-device.patch
 
+REINPLACE_USRLOCAL += src/rwconf.c
+
 BUILD_DEP_PKGS += CSWggettext
 BUILD_DEP_PKGS += CSWlibncurses-dev
 BUILD_DEP_PKGS += CSWlibiconv-dev

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


From lblume at users.sourceforge.net  Tue Dec  2 09:51:35 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Tue,  2 Dec 2014 08:51:35 +0000
Subject: SF.net SVN: gar:[24399]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <3jsHCD4HJRzZJ@mail.opencsw.org>

Revision: 24399
          http://sourceforge.net/p/gar/code/24399
Author:   lblume
Date:     2014-12-02 08:51:32 +0000 (Tue, 02 Dec 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Bump to 5.5.41

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-12-01 20:38:27 UTC (rev 24398)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-12-02 08:51:32 UTC (rev 24399)
@@ -14,7 +14,7 @@
 PROJ_NAME    = mysql
 NAME         = $(PROJ_NAME)5
 BASE_VERSION = 5.5
-PATCHLEVEL   = 40
+PATCHLEVEL   = 41
 ALTS_PRIO    = 55
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 

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


From lblume at users.sourceforge.net  Tue Dec  2 10:10:29 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Tue,  2 Dec 2014 09:10:29 +0000
Subject: SF.net SVN: gar:[24401]
	csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
Message-ID: <3jsHbK4G2Qzcs@mail.opencsw.org>

Revision: 24401
          http://sourceforge.net/p/gar/code/24401
Author:   lblume
Date:     2014-12-02 09:10:27 +0000 (Tue, 02 Dec 2014)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: Makesum

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums	2014-12-02 08:52:00 UTC (rev 24400)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums	2014-12-02 09:10:27 UTC (rev 24401)
@@ -1 +1 @@
-e47c3a70b8d89db3199a349204b2ae4e  mysql-5.6.21.tar.gz
+3985b634294482363f3d87e0d67f2262  mysql-5.6.22.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  Tue Dec  2 10:11:11 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Tue,  2 Dec 2014 09:11:11 +0000
Subject: SF.net SVN: gar:[24402]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums
Message-ID: <3jsHc65qRJzgH@mail.opencsw.org>

Revision: 24402
          http://sourceforge.net/p/gar/code/24402
Author:   lblume
Date:     2014-12-02 09:11:10 +0000 (Tue, 02 Dec 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Makesum

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums	2014-12-02 09:10:27 UTC (rev 24401)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums	2014-12-02 09:11:10 UTC (rev 24402)
@@ -1 +1 @@
-90c5a7b69e833c393de5f07659b786bd  mysql-5.5.40.tar.gz
+211ace59652eed6fb0e5cfd76834afab  mysql-5.5.41.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  Fri Dec  5 13:32:58 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri,  5 Dec 2014 12:32:58 +0000
Subject: SF.net SVN: gar:[24406] csw/mgar/pkg
Message-ID: <3jvCxl4LCqz15r@mail.opencsw.org>

Revision: 24406
          http://sourceforge.net/p/gar/code/24406
Author:   cgrzemba
Date:     2014-12-05 12:32:56 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
sqlitebrowser/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/sqlitebrowser/
    csw/mgar/pkg/sqlitebrowser/Makefile
    csw/mgar/pkg/sqlitebrowser/branches/
    csw/mgar/pkg/sqlitebrowser/tags/
    csw/mgar/pkg/sqlitebrowser/trunk/
    csw/mgar/pkg/sqlitebrowser/trunk/Makefile
    csw/mgar/pkg/sqlitebrowser/trunk/checksums
    csw/mgar/pkg/sqlitebrowser/trunk/files/
    csw/mgar/pkg/sqlitebrowser/trunk/files/0001-fix-namespace.patch

Added: csw/mgar/pkg/sqlitebrowser/Makefile
===================================================================
--- csw/mgar/pkg/sqlitebrowser/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sqlitebrowser/Makefile	2014-12-05 12:32:56 UTC (rev 24406)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/sqlitebrowser/trunk
===================================================================
--- csw/mgar/pkg/sqlitebrowser/trunk	2014-12-04 23:40:29 UTC (rev 24405)
+++ csw/mgar/pkg/sqlitebrowser/trunk	2014-12-05 12:32:56 UTC (rev 24406)

Property changes on: csw/mgar/pkg/sqlitebrowser/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/sqlitebrowser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sqlitebrowser/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sqlitebrowser/trunk/Makefile	2014-12-05 12:32:56 UTC (rev 24406)
@@ -0,0 +1,66 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = sqlitebrowser
+VERSION = 3.4.0
+GIT_VERSION = v$(VERSION)
+GARTYPE = v2
+CATEGORIES = gnome
+
+DESCRIPTION = DB Browser for SQLite
+define BLURB
+  DB Browser for SQLite is a high quality, visual, open source tool to create, design, and edit database files compatible with SQLite.
+endef
+
+MASTER_SITES =
+GIT_REPOS = http://github.com/$(NAME)/$(NAME).git
+GIT_TREEISH_sqlitebrowser.git = $(GIT_VERSION)
+
+# g++4 handles nested namespaces different
+PATCHFILES += 0001-fix-namespace.patch
+
+BUILD_DEP_PKGS += CSWqt4-dev
+BUILD_DEP_PKGS += CSWcmake
+
+GARCOMPILER = GCC4
+SKIPTEST = 1
+
+RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibgcc-s1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# http://dev.mysql.com/doc/internals/en/autotools-to-cmake.html
+CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CPPFLAGS) $(CFLAGS)"
+# CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
+CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
+CMAKE_ARGS += -DCMAKE_SKIP_RPATH=NO
+CMAKE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="-Wl,-Bdirect -Wl,-zignore"
+CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=1
+
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+INSTALL_SCRIPTS = custom
+
+configure-custom: 
+	cd $(WORKSRC) && ([ ! -d build ] && mkdir build || true) && cd build && \
+	$(CONFIGURE_ENV) cmake .. $(CMAKE_ARGS)
+	@$(MAKECOOKIE)
+
+build-custom: 
+	cd $(WORKSRC)/build && gmake V=1
+	@$(MAKECOOKIE)
+
+install-custom: 
+	cd $(WORKSRC)/build && gmake install DESTDIR=$(DESTDIR)
+	@$(MAKECOOKIE)
+
+#	cd $(WORKSRC) && $(bindir)/qmake $(call tolower,$(NAME)).pro
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/sqlitebrowser/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/sqlitebrowser/trunk/checksums
===================================================================
Added: csw/mgar/pkg/sqlitebrowser/trunk/files/0001-fix-namespace.patch
===================================================================
--- csw/mgar/pkg/sqlitebrowser/trunk/files/0001-fix-namespace.patch	                        (rev 0)
+++ csw/mgar/pkg/sqlitebrowser/trunk/files/0001-fix-namespace.patch	2014-12-05 12:32:56 UTC (rev 24406)
@@ -0,0 +1,11 @@
+--- a/libs/antlr-2.7.7/antlr/config.hpp
++++ b/libs/antlr-2.7.7/antlr/config.hpp
+@@ -15,7 +15,7 @@
+  *
+  * These are the defaults. Per compiler these are amended.
+  */
+-#define ANTLR_USE_NAMESPACE(_x_) _x_::
++#define ANTLR_USE_NAMESPACE(_x_) ::_x_::
+ #define ANTLR_USING_NAMESPACE(_x_) using namespace _x_;
+ #define ANTLR_CXX_SUPPORTS_NAMESPACE 1
+ #define ANTLR_C_USING(_x_)

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  Mon Dec  8 19:44:37 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon,  8 Dec 2014 18:44:37 +0000
Subject: SF.net SVN: gar:[24416] csw/mgar/pkg/freeciv/trunk
Message-ID: <3jxD391D9Gz13b@mail.opencsw.org>

Revision: 24416
          http://sourceforge.net/p/gar/code/24416
Author:   jake_goerzen
Date:     2014-12-08 18:44:35 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
freeciv: update to 2.4.4

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

Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile	2014-12-08 18:31:38 UTC (rev 24415)
+++ csw/mgar/pkg/freeciv/trunk/Makefile	2014-12-08 18:44:35 UTC (rev 24416)
@@ -1,5 +1,5 @@
 NAME = freeciv
-VERSION = 2.4.3
+VERSION = 2.4.4
 GARTYPE = v2
 
 DESCRIPTION = Free turn-based multiplayer strategy game

Modified: csw/mgar/pkg/freeciv/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeciv/trunk/checksums	2014-12-08 18:31:38 UTC (rev 24415)
+++ csw/mgar/pkg/freeciv/trunk/checksums	2014-12-08 18:44:35 UTC (rev 24416)
@@ -1 +1 @@
-437f9a4aadb80619a7c5ae9643142b8b  freeciv-2.4.3.tar.bz2
+038c53184497fcf31bcd268418dbe4f6  freeciv-2.4.4.tar.bz2

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 Dec 10 22:57:08 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 10 Dec 2014 21:57:08 +0000
Subject: SF.net SVN: gar:[24428] csw/mgar/pkg/sdlnet/trunk/Makefile
Message-ID: <3jyXDN0jgbz1D0@mail.opencsw.org>

Revision: 24428
          http://sourceforge.net/p/gar/code/24428
Author:   jake_goerzen
Date:     2014-12-10 21:57:08 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
sdlnet: add EXTRA_LDFLAGS = -lsocket -lnsl

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

Modified: csw/mgar/pkg/sdlnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlnet/trunk/Makefile	2014-12-10 21:45:22 UTC (rev 24427)
+++ csw/mgar/pkg/sdlnet/trunk/Makefile	2014-12-10 21:57:08 UTC (rev 24428)
@@ -30,6 +30,8 @@
 
 BUILD64_LIBS_ONLY = 1
 
+EXTRA_LDFLAGS = -lsocket -lnsl
+
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 TEST_SCRIPTS =
 

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 Dec 10 23:21:42 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 10 Dec 2014 22:21:42 +0000
Subject: SF.net SVN: gar:[24429] csw/mgar/pkg/sdlmixer/trunk/Makefile
Message-ID: <3jyXmb64R0z1Kk@mail.opencsw.org>

Revision: 24429
          http://sourceforge.net/p/gar/code/24429
Author:   jake_goerzen
Date:     2014-12-10 22:21:40 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
sdlmixer: remove Solaris 9 build; Split development files into separate package; recipe clean-up

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

Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlmixer/trunk/Makefile	2014-12-10 21:57:08 UTC (rev 24428)
+++ csw/mgar/pkg/sdlmixer/trunk/Makefile	2014-12-10 22:21:40 UTC (rev 24429)
@@ -13,10 +13,17 @@
 PACKAGES += CSWlibsdl-mixer1-2-0
 CATALOGNAME_CSWlibsdl-mixer1-2-0 = libsdl_mixer1_2_0
 OBSOLETED_BY_CSWlibsdl-mixer1-2-0 = CSWsdlmixer
-
 SPKG_DESC_CSWlibsdl-mixer1-2-0 += $(DESCRIPTION), libSDL_mixer-1.2.so.0
 RUNTIME_DEP_PKGS_CSWlibsdl-mixer1-2-0 += CSWlibsdl1-2-0
 
+# Split development files into a separate package.
+PACKAGES += CSWlibsdl-mixer1-2-0-dev
+CATALOGNAME_CSWlibsdl-mixer1-2-0-dev = libsdl_mixer1_2_0_dev
+SPKG_DESC_CSWlibsdl-mixer1-2-0-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibsdl-mixer1-2-0-dev += /opt/csw/lib/libSDL_mixer.so
+PKGFILES_CSWlibsdl-mixer1-2-0-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibsdl-mixer1-2-0-dev += CSWlibsdl-mixer1-2-0
+
 EXTRA_LDFLAGS = -lm
 
 REINPLACE_USRLOCAL += timidity/config.h
@@ -28,7 +35,4 @@
 CONFIGURE_ARGS = --prefix=$(prefix) --disable-static
 TEST_SCRIPTS =
 
-CHECKPKG_OVERRIDES_CSWlibsdl-mixer1-2-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libSDL_mixer.so
-
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
 include gar/category.mk

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 Dec 11 00:21:21 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 10 Dec 2014 23:21:21 +0000
Subject: SF.net SVN: gar:[24430] csw/mgar/pkg/sdlttf/trunk/
Message-ID: <3jyZ5P0BmGz1Rn@mail.opencsw.org>

Revision: 24430
          http://sourceforge.net/p/gar/code/24430
Author:   jake_goerzen
Date:     2014-12-10 23:21:19 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
sdlttf: Changed to mGAR v2

Property Changed:
----------------
    csw/mgar/pkg/sdlttf/trunk/

Index: csw/mgar/pkg/sdlttf/trunk
===================================================================
--- csw/mgar/pkg/sdlttf/trunk	2014-12-10 22:21:40 UTC (rev 24429)
+++ csw/mgar/pkg/sdlttf/trunk	2014-12-10 23:21:19 UTC (rev 24430)

Property changes on: csw/mgar/pkg/sdlttf/trunk
___________________________________________________________________
Added: svn:externals
## -0,0 +1 ##
+gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jake_goerzen at users.sourceforge.net  Thu Dec 11 00:55:40 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 10 Dec 2014 23:55:40 +0000
Subject: SF.net SVN: gar:[24431] csw/mgar/pkg/sdlttf/trunk
Message-ID: <3jyZs211sCz1VP@mail.opencsw.org>

Revision: 24431
          http://sourceforge.net/p/gar/code/24431
Author:   jake_goerzen
Date:     2014-12-10 23:55:39 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
sdlttf: update to 2.0.11; add EXTRA_LDFLAGS; recipe clean-up

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

Modified: csw/mgar/pkg/sdlttf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-10 23:21:19 UTC (rev 24430)
+++ csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-10 23:55:39 UTC (rev 24431)
@@ -1,6 +1,6 @@
 NAME = SDL_ttf
-VERSION = 2.0.9
-GARTYPE = v1
+VERSION = 2.0.11
+GARTYPE = v2
 
 DESCRIPTION = TrueType font rendering library for SDL applications
 define BLURB
@@ -9,12 +9,11 @@
 
 MASTER_SITES = http://www.libsdl.org/projects/SDL_ttf/release/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWsdlttf,)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-#PATCHFILES = SDL_ttf.c.diff
+EXTRA_LDFLAGS = -lm -L/opt/csw/lib -liconv
 
 TEST_SCRIPTS =
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/sdlttf/trunk/checksums
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/checksums	2014-12-10 23:21:19 UTC (rev 24430)
+++ csw/mgar/pkg/sdlttf/trunk/checksums	2014-12-10 23:55:39 UTC (rev 24431)
@@ -1,2 +1 @@
-6dd5a85e4924689a35a5fb1cb3336156  download/SDL_ttf-2.0.9.tar.gz
-4001323bb09e378c18f05fdffda5b9ce  download/CSWsdlttf.gspec
+61e29bd9da8d245bc2471d1b2ce591aa  SDL_ttf-2.0.11.tar.gz

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 Dec 11 01:23:23 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 11 Dec 2014 00:23:23 +0000
Subject: SF.net SVN: gar:[24432] csw/mgar/pkg/sdlttf/trunk/Makefile
Message-ID: <3jybT20fbPzl@mail.opencsw.org>

Revision: 24432
          http://sourceforge.net/p/gar/code/24432
Author:   jake_goerzen
Date:     2014-12-11 00:23:22 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
sdlttf: add RUNTIME_DEPs and cleanup recipe

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

Modified: csw/mgar/pkg/sdlttf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-10 23:55:39 UTC (rev 24431)
+++ csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 00:23:22 UTC (rev 24432)
@@ -13,13 +13,20 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
+PACKAGES += CSWlibsdl-ttf2-0-0
+CATALOGNAME_CSWlibsdl-ttf2-0-0 = libsdl_ttf2_0_0
+PKGFILES_CSWlibsdl-ttf2-0-0 += $(call baseisadirs,$(libdir),libSDL_ttf-2\.0\.so\.0\.10\.1)
+PKGFILES_CSWlibsdl-ttf2-0-0 += $(call baseisadirs,$(libdir),libSDL_ttf-2\.0\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibsdl-ttf2-0-0 += $(DESCRIPTION), libSDL_ttf-2.0.so.0
+OBSOLETED_BY_CSWlibsdl-ttf2-0-0 = CSWsdlttf
+
+RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibfreetype6
+
 EXTRA_LDFLAGS = -lm -L/opt/csw/lib -liconv
 
 TEST_SCRIPTS =
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
-
-#pre-configure:
-#	( cd $(WORKSRC) ; ./autogen.sh )
-#	@$(MAKECOOKIE)

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 Dec 11 01:31:14 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 11 Dec 2014 00:31:14 +0000
Subject: SF.net SVN: gar:[24433] csw/mgar/pkg/sdlttf/trunk/Makefile
Message-ID: <3jybf32ZYdz3w@mail.opencsw.org>

Revision: 24433
          http://sourceforge.net/p/gar/code/24433
Author:   jake_goerzen
Date:     2014-12-11 00:31:14 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
sdlttf: add another RUNTIME_DEP; Split development files into separate package

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

Modified: csw/mgar/pkg/sdlttf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 00:23:22 UTC (rev 24432)
+++ csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 00:31:14 UTC (rev 24433)
@@ -20,8 +20,16 @@
 SPKG_DESC_CSWlibsdl-ttf2-0-0 += $(DESCRIPTION), libSDL_ttf-2.0.so.0
 OBSOLETED_BY_CSWlibsdl-ttf2-0-0 = CSWsdlttf
 
+# Split the development files into a separate package.
+PACKAGES += CSWlibsdl-ttf2-0-0-dev
+CATALOGNAME_CSWlibsdl-ttf2-0-0-dev = libsdl_ttf2_0_0_dev
+SPKG_DESC_CSWlibsdl-ttf2-0-0-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibsdl-ttf2-0-0-dev += /opt/csw/lib/libSDL_net.so
+PKGFILES_CSWlibsdl-ttf2-0-0-dev += $(PKGFILES_DEVEL)
+
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0-dev += CSWlibsdl-ttf2-0-0
 
 EXTRA_LDFLAGS = -lm -L/opt/csw/lib -liconv
 

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


From tosmi at users.sourceforge.net  Thu Dec 11 12:51:31 2014
From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net)
Date: Thu, 11 Dec 2014 11:51:31 +0000
Subject: SF.net SVN: gar:[24437] csw/mgar/pkg
Message-ID: <3jytl73G1pzLN@mail.opencsw.org>

Revision: 24437
          http://sourceforge.net/p/gar/code/24437
Author:   tosmi
Date:     2014-12-11 11:51:30 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
facter-ruby18: new facter pkg for puppet 2.7

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

Added Paths:
-----------
    csw/mgar/pkg/facter-ruby18/
    csw/mgar/pkg/facter-ruby18/Makefile
    csw/mgar/pkg/facter-ruby18/branches/
    csw/mgar/pkg/facter-ruby18/tags/
    csw/mgar/pkg/facter-ruby18/trunk/
    csw/mgar/pkg/facter-ruby18/trunk/Makefile
    csw/mgar/pkg/facter-ruby18/trunk/checksums
    csw/mgar/pkg/facter-ruby18/trunk/files/

Added: csw/mgar/pkg/facter-ruby18/Makefile
===================================================================
--- csw/mgar/pkg/facter-ruby18/Makefile	                        (rev 0)
+++ csw/mgar/pkg/facter-ruby18/Makefile	2014-12-11 11:51:30 UTC (rev 24437)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/facter-ruby18/trunk
===================================================================
--- csw/mgar/pkg/facter-ruby18/trunk	2014-12-11 10:20:33 UTC (rev 24436)
+++ csw/mgar/pkg/facter-ruby18/trunk	2014-12-11 11:51:30 UTC (rev 24437)

Property changes on: csw/mgar/pkg/facter-ruby18/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/facter-ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/facter-ruby18/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/facter-ruby18/trunk/Makefile	2014-12-11 11:51:30 UTC (rev 24437)
@@ -0,0 +1,50 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+NAME = facter-ruby18
+VERSION = 1.7.6
+GARTYPE = v2
+
+DESCRIPTION = A system fact gatherer
+define BLURB
+  A cross-platform Ruby library for retrieving facts from operating systems.
+  Supports multiple resolution mechanisms, any of which can be restricted to
+  working only on certain operating systems or environments. Facter is
+  especially useful for retrieving things like operating system names, IP
+  addresses, MAC addresses, and SSH keys.
+
+  It is easy to extend Facter to include your own custom facts or to include
+  additional mechanisms for retrieving facts.
+endef
+
+MASTER_SITES   = http://puppetlabs.com/downloads/facter/
+DISTFILES      = facter-$(VERSION).tar.gz
+DISTNAME       = facter-$(VERSION)
+SPKG_SOURCEURL = http://puppetlabs.com/
+LICENSE        = LICENSE
+
+RUNTIME_DEP_PKGS = CSWruby18
+BUILD_DEP_PKGS  = $(RUNTIME_DEP_PKGS)
+
+INCOMPATIBLE_PKGS = CSWfacter
+
+ARCHALL = 1
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS     =
+TEST_SCRIPTS      =
+INSTALL_SCRIPTS   = facter
+
+CHECKPKG_OVERRIDES_CSWfacter-ruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/ssh.rb
+CHECKPKG_OVERRIDES_CSWfacter-ruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/Cfkey.rb
+CHECKPKG_OVERRIDES_CSWfacter-ruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/util/manufacturer.rb
+CHECKPKG_OVERRIDES_CSWfacter-ruby18 += file-collision|/opt/csw/bin/facter|CSWfacter|CSWfacter-ruby18
+CHECKPKG_OVERRIDES_CSWfacter-ruby18 += file-collision|/opt/csw/share/man/man8/facter.8|CSWfacter|CSWfacter-ruby18
+
+include gar/category.mk
+
+install-facter:
+	(cd $(WORKDIR)/$(DISTNAME); /opt/csw/bin/ruby18 install.rb --destdir=$(DESTDIR))
+	# we depend on ruby18 so fix the shebang
+	find $(DESTDIR)$(bindir) -type f -depth -print | xargs -n 1 gsed -i -e '1 s|ruby$$|ruby18|g'
+	gunzip $(DESTDIR)/$(mandir)/man8/facter.8.gz


Property changes on: csw/mgar/pkg/facter-ruby18/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/facter-ruby18/trunk/checksums
===================================================================
--- csw/mgar/pkg/facter-ruby18/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/facter-ruby18/trunk/checksums	2014-12-11 11:51:30 UTC (rev 24437)
@@ -0,0 +1 @@
+f29d0c33de0ec4d08c8a1b5f645f6399  facter-1.7.6.tar.gz

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2014-12-11 10:20:33 UTC (rev 24436)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2014-12-11 11:51:30 UTC (rev 24437)
@@ -51,7 +51,7 @@
 SPKG_DESC_CSWpuppet       = System configuration management tool, client daemon
 SPKG_DESC_CSWpuppetmaster = System configuration management tool, server
 
-RUNTIME_DEP_PKGS                  = CSWfacter
+RUNTIME_DEP_PKGS                  = CSWfacter-ruby18
 RUNTIME_DEP_PKGS                 += CSWruby18
 RUNTIME_DEP_PKGS				 += CSWrubyaugeas
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet

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


From tosmi at users.sourceforge.net  Thu Dec 11 13:10:03 2014
From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net)
Date: Thu, 11 Dec 2014 12:10:03 +0000
Subject: SF.net SVN: gar:[24438] csw/mgar/pkg/puppet/trunk/Makefile
Message-ID: <3jyv8S6dGrzP3@mail.opencsw.org>

Revision: 24438
          http://sourceforge.net/p/gar/code/24438
Author:   tosmi
Date:     2014-12-11 12:10:00 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
puppet: changed dependency to facter_ruby18

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

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2014-12-11 11:51:30 UTC (rev 24437)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2014-12-11 12:10:00 UTC (rev 24438)
@@ -75,7 +75,7 @@
 INSTALL_SCRIPTS   = puppet
 
 CHECKPKG_OVERRIDES_CSWpuppetmaster  = surplus-dependency|CSWruby18
-CHECKPKG_OVERRIDES_CSWpuppet        = surplus-dependency|CSWfacter
+CHECKPKG_OVERRIDES_CSWpuppet        = surplus-dependency|CSWfacter-ruby18
 CHECKPKG_OVERRIDES_CSWpuppet	   += surplus-dependency|CSWrubyaugeas
 CHECKPKG_OVERRIDES_CSWpuppet       += missing-dependency|CSWpython
 # Puppet has hardcoded paths to look at for many OSes, many of which involve

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 Dec 11 13:37:09 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 11 Dec 2014 12:37:09 +0000
Subject: SF.net SVN: gar:[24439] csw/mgar/pkg/nginx/trunk
Message-ID: <3jyvlf25m0zRY@mail.opencsw.org>

Revision: 24439
          http://sourceforge.net/p/gar/code/24439
Author:   dmichelsen
Date:     2014-12-11 12:37:07 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
nginx/trunk: Update to 1.7.8

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2014-12-11 12:10:00 UTC (rev 24438)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2014-12-11 12:37:07 UTC (rev 24439)
@@ -1,5 +1,5 @@
 NAME = nginx
-VERSION = 1.6.0
+VERSION = 1.7.8
 GARTYPE = v2
 
 DESCRIPTION = HTTP server and mail proxy server

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2014-12-11 12:10:00 UTC (rev 24438)
+++ csw/mgar/pkg/nginx/trunk/checksums	2014-12-11 12:37:07 UTC (rev 24439)
@@ -1 +1 @@
-8efa354f1c3c2ccf434a50d3fbe82340  nginx-1.6.0.tar.gz
+fd5ab813fc1853cd8efe580ead577c3e  nginx-1.7.8.tar.gz

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


From bonivart at users.sourceforge.net  Thu Dec 11 17:52:41 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 11 Dec 2014 16:52:41 +0000
Subject: SF.net SVN: gar:[24442] csw/mgar/pkg/clamav/trunk
Message-ID: <3jz1Qk51jxzhV@mail.opencsw.org>

Revision: 24442
          http://sourceforge.net/p/gar/code/24442
Author:   bonivart
Date:     2014-12-11 16:52:40 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
clamav/trunk: update to 0.98.5

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

Added Paths:
-----------
    csw/mgar/pkg/clamav/trunk/files/0001-config.patch

Removed Paths:
-------------
    csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2014-12-11 16:49:07 UTC (rev 24441)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2014-12-11 16:52:40 UTC (rev 24442)
@@ -1,5 +1,5 @@
 NAME       = clamav
-VERSION    = 0.98.4
+VERSION    = 0.98.5
 GARTYPE = v2
 
 DESCRIPTION = Clam AntiVirus
@@ -38,7 +38,7 @@
 RUNTIME_DEP_PKGS_CSWlibclam6-dev  = CSWlibclam6
 INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel
 
-PATCHFILES += 0001-Enable-conf-files-fix-some-paths.patch
+PATCHFILES += 0001-config.patch
 
 # Must have 64-bit libmilter for this to work
 #BUILD64 = 1
@@ -93,15 +93,29 @@
 
 # These are harmless examples
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
-CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.23
+#CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.23
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-milter.conf.CSW
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamav-milter
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamd
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/sigtool
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdtop
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamscan
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamconf
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdscan
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clambc
+CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam
+CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.22
 
 # We don't split to three separate packages
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.23|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.23|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.23|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.23|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.23|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.23|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.22|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.22|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.22|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
 
 # Weirdly needed for sparc
-CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6
 
 # Weirdly needed for i386
 CHECKPKG_OVERRIDES_CSWclamav += surplus-dependency|CSWlibbz2-1-0

Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums	2014-12-11 16:49:07 UTC (rev 24441)
+++ csw/mgar/pkg/clamav/trunk/checksums	2014-12-11 16:52:40 UTC (rev 24442)
@@ -1 +1 @@
-6d409eab6c311de05a0a591fccd2ec83  clamav-0.98.4.tar.gz
+abb5c7efaff3394c0a49ff970841a2ac  clamav-0.98.5.tar.gz

Deleted: csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch	2014-12-11 16:49:07 UTC (rev 24441)
+++ csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch	2014-12-11 16:52:40 UTC (rev 24442)
@@ -1,85 +0,0 @@
-From e9e2ae967643bd37ed0533aadffac2f7503d8006 Mon Sep 17 00:00:00 2001
-From: Peter Bonivart <bonivart at opencsw.org>
-Date: Sun, 22 Sep 2013 14:55:21 +0200
-Subject: [PATCH] Enable conf files, fix some paths
-
----
- etc/clamav-milter.conf.sample | 4 ++--
- etc/clamd.conf.sample         | 4 ++--
- etc/freshclam.conf.sample     | 2 +-
- shared/optparser.c            | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample
-index b7d66a4..2a968c7 100644
---- a/etc/clamav-milter.conf.sample
-+++ b/etc/clamav-milter.conf.sample
-@@ -3,7 +3,7 @@
- ##
- 
- # Comment or remove the line below.
--Example
-+#Example
- 
- 
- ##
-@@ -201,7 +201,7 @@ Example
- # Note #3: clamav-milter will wait for the process to exit. Be quick or fork to
- # avoid unnecessary delays in email delievery
- # Default: disabled
--#VirusAction /usr/local/bin/my_infected_message_handler
-+#VirusAction /opt/csw/bin/my_infected_message_handler
- 
- ##
- ## Logging options
-diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample
-index 9aab51a..4c3f4d6 100644
---- a/etc/clamd.conf.sample
-+++ b/etc/clamd.conf.sample
-@@ -5,7 +5,7 @@
- 
- 
- # Comment or remove the line below.
--Example
-+#Example
- 
- # Uncomment this option to enable logging.
- # LogFile must be writable for the user running daemon.
-@@ -82,7 +82,7 @@ Example
- 
- # Path to a local socket file the daemon will listen on.
- # Default: disabled (must be specified by a user)
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /tmp/clamd.socket
- 
- # Sets the group ownership on the unix socket.
- # Default: disabled (the primary group of the user running clamd)
-diff --git a/etc/freshclam.conf.sample b/etc/freshclam.conf.sample
-index d2ea3d1..859bfea 100644
---- a/etc/freshclam.conf.sample
-+++ b/etc/freshclam.conf.sample
-@@ -5,7 +5,7 @@
- 
- 
- # Comment or remove the line below.
--Example
-+#Example
- 
- # Path to the database directory.
- # WARNING: It must match clamd.conf's directive!
-diff --git a/shared/optparser.c b/shared/optparser.c
-index d706098..b34db39 100644
---- a/shared/optparser.c
-+++ b/shared/optparser.c
-@@ -509,7 +509,7 @@ const struct clam_option __clam_options[] = {
- 
-     { "ReportHostname", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "When AddHeader is in use, this option allows you to set the reported\nhostname. This may be desirable in order to avoid leaking internal names.\nIf unset the real machine name is used.", "my.mail.server.name" },
-
--    { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/usr/local/bin/my_infected_message_handler" },
-+    { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/opt/csw/bin/my_infected_message_handler" },
-
-     { "Chroot", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Chroot to the specified directory.\nChrooting is performed just after reading the config file and before\ndropping privileges.", "/newroot" },
- 
--- 
-1.8.3.4
-

Added: csw/mgar/pkg/clamav/trunk/files/0001-config.patch
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/0001-config.patch	                        (rev 0)
+++ csw/mgar/pkg/clamav/trunk/files/0001-config.patch	2014-12-11 16:52:40 UTC (rev 24442)
@@ -0,0 +1,62 @@
+From c3a191a59fd3f45c594ff54b571549725b6cdd88 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Thu, 11 Dec 2014 16:00:10 +0100
+Subject: [PATCH] config
+
+---
+ etc/clamav-milter.conf.sample | 2 +-
+ etc/clamd.conf.sample         | 4 ++--
+ etc/freshclam.conf.sample     | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample
+index b7d66a4..cdf54c5 100644
+--- a/etc/clamav-milter.conf.sample
++++ b/etc/clamav-milter.conf.sample
+@@ -3,7 +3,7 @@
+ ##
+ 
+ # Comment or remove the line below.
+-Example
++#Example
+ 
+ 
+ ##
+diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample
+index 30515cb..75371d4 100644
+--- a/etc/clamd.conf.sample
++++ b/etc/clamd.conf.sample
+@@ -5,7 +5,7 @@
+ 
+ 
+ # Comment or remove the line below.
+-Example
++#Example
+ 
+ # Uncomment this option to enable logging.
+ # LogFile must be writable for the user running daemon.
+@@ -82,7 +82,7 @@ Example
+ 
+ # Path to a local socket file the daemon will listen on.
+ # Default: disabled (must be specified by a user)
+-#LocalSocket /tmp/clamd.socket
++LocalSocket /tmp/clamd.socket
+ 
+ # Sets the group ownership on the unix socket.
+ # Default: disabled (the primary group of the user running clamd)
+diff --git a/etc/freshclam.conf.sample b/etc/freshclam.conf.sample
+index 1cc4a81..c5c2bbf 100644
+--- a/etc/freshclam.conf.sample
++++ b/etc/freshclam.conf.sample
+@@ -5,7 +5,7 @@
+ 
+ 
+ # Comment or remove the line below.
+-Example
++#Example
+ 
+ # Path to the database directory.
+ # WARNING: It must match clamd.conf's directive!
+-- 
+2.1.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 Dec 11 22:15:17 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 11 Dec 2014 21:15:17 +0000
Subject: SF.net SVN: gar:[24444] csw/mgar/pkg/sdlttf/trunk/Makefile
Message-ID: <3jz7FT333vzr2@mail.opencsw.org>

Revision: 24444
          http://sourceforge.net/p/gar/code/24444
Author:   jake_goerzen
Date:     2014-12-11 21:15:15 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
sdlttf: switch to GCC4; enable 64-bit build

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

Modified: csw/mgar/pkg/sdlttf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 18:44:55 UTC (rev 24443)
+++ csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 21:15:15 UTC (rev 24444)
@@ -10,6 +10,8 @@
 MASTER_SITES = http://www.libsdl.org/projects/SDL_ttf/release/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
+GARCOMPILER = GCC4
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -35,6 +37,8 @@
 
 TEST_SCRIPTS =
 
+BUILD64_LIBS_ONLY = 1
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

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


From jake_goerzen at users.sourceforge.net  Thu Dec 11 22:18:58 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 11 Dec 2014 21:18:58 +0000
Subject: SF.net SVN: gar:[24445] csw/mgar/pkg/sdlttf/trunk/Makefile
Message-ID: <3jz7Kk5JJ5ztR@mail.opencsw.org>

Revision: 24445
          http://sourceforge.net/p/gar/code/24445
Author:   jake_goerzen
Date:     2014-12-11 21:18:58 +0000 (Thu, 11 Dec 2014)
Log Message:
-----------
sdlttf: add RUNTIME_DEP for CSWlibgcc-s1

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

Modified: csw/mgar/pkg/sdlttf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 21:15:15 UTC (rev 24444)
+++ csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-11 21:18:58 UTC (rev 24445)
@@ -31,6 +31,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0-dev += CSWlibsdl-ttf2-0-0
 
 EXTRA_LDFLAGS = -lm -L/opt/csw/lib -liconv

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


From tosmi at users.sourceforge.net  Fri Dec 12 13:12:35 2014
From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net)
Date: Fri, 12 Dec 2014 12:12:35 +0000
Subject: SF.net SVN: gar:[24446] csw/mgar/pkg/puppet/trunk/Makefile
Message-ID: <3jzWC66nrWz18c@mail.opencsw.org>

Revision: 24446
          http://sourceforge.net/p/gar/code/24446
Author:   tosmi
Date:     2014-12-12 12:12:35 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
puppet: use ruby18, change facter dep to facter_ruby18, drop augeas support

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

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2014-12-11 21:18:58 UTC (rev 24445)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2014-12-12 12:12:35 UTC (rev 24446)
@@ -53,7 +53,6 @@
 
 RUNTIME_DEP_PKGS                  = CSWfacter-ruby18
 RUNTIME_DEP_PKGS                 += CSWruby18
-RUNTIME_DEP_PKGS				 += CSWrubyaugeas
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby18
 
@@ -67,7 +66,7 @@
 
 sysconfdir     = /etc$(prefix)
 localstatedir  = /var$(prefix)
-rubysitelibdir = $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+rubysitelibdir = $(shell ruby18 -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS     =
@@ -102,7 +101,7 @@
 	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/init.d
-	cd $(WORKSRC) && $(INSTALL_ENV) ruby install.rb \
+	cd $(WORKSRC) && $(INSTALL_ENV) ruby18 install.rb \
 		--configdir=$(sysconfdir)/puppet \
 		--bindir=$(bindir) \
 		--sbindir=$(sbindir) \

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


From bonivart at users.sourceforge.net  Fri Dec 12 23:12:19 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 12 Dec 2014 22:12:19 +0000
Subject: SF.net SVN: gar:[24449] csw/mgar/pkg/cpan/Dancer/trunk/Makefile
Message-ID: <3jzmSr2hZ0z1TJ@mail.opencsw.org>

Revision: 24449
          http://sourceforge.net/p/gar/code/24449
Author:   bonivart
Date:     2014-12-12 22:12:18 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
cpan/Dancer/trunk: fix deps

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Dancer/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Dancer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Dancer/trunk/Makefile	2014-12-12 12:33:20 UTC (rev 24448)
+++ csw/mgar/pkg/cpan/Dancer/trunk/Makefile	2014-12-12 22:12:18 UTC (rev 24449)
@@ -20,7 +20,7 @@
 RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpm-http-server-simple-psgi
 RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpm-libwww-perl
 RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpm-uri
-RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpmmimetypes
+RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpm-mime-types
 
 include gar/category.mk
 

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


From bonivart at users.sourceforge.net  Fri Dec 12 23:40:55 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 12 Dec 2014 22:40:55 +0000
Subject: SF.net SVN: gar:[24451] csw/mgar/pkg/cpan/IP-Country/trunk/Makefile
Message-ID: <3jzn5q4N2zz1XR@mail.opencsw.org>

Revision: 24451
          http://sourceforge.net/p/gar/code/24451
Author:   bonivart
Date:     2014-12-12 22:40:52 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
cpan/IP-Country/trunk: fix deps

Modified Paths:
--------------
    csw/mgar/pkg/cpan/IP-Country/trunk/Makefile

Modified: csw/mgar/pkg/cpan/IP-Country/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IP-Country/trunk/Makefile	2014-12-12 22:39:21 UTC (rev 24450)
+++ csw/mgar/pkg/cpan/IP-Country/trunk/Makefile	2014-12-12 22:40:52 UTC (rev 24451)
@@ -13,10 +13,8 @@
 PACKAGES = CSWpm-ip-country
 CATALOGNAME = pm_ip_country
 SPKG_DESC_CSWpm-ip-country = $(DESCRIPTION)
-OBSOLETED_BY_CSWpm-ip-country = CSWpmipcountry
-CATALOGNAME_CSWpmipcountry = pm_ipcountry
 
-RUNTIME_DEP_PKGS += CSWpmgeocountries
+RUNTIME_DEP_PKGS += CSWpm-geography-countries
 
 ARCHALL = 1
 

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


From bonivart at users.sourceforge.net  Fri Dec 12 23:45:00 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 12 Dec 2014 22:45:00 +0000
Subject: SF.net SVN: gar:[24453]
	csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile
Message-ID: <3jznBX5xGDz2h@mail.opencsw.org>

Revision: 24453
          http://sourceforge.net/p/gar/code/24453
Author:   bonivart
Date:     2014-12-12 22:45:00 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
cpan/Text-CSV-Encoded/trunk: fix deps

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile	2014-12-12 22:44:32 UTC (rev 24452)
+++ csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile	2014-12-12 22:45:00 UTC (rev 24453)
@@ -12,7 +12,7 @@
 CATALOGNAME = pm_text_csv_encoded
 ARCHALL = 1
 
-RUNTIME_DEP_PKGS += CSWpmtextcsv
+RUNTIME_DEP_PKGS += CSWpm-text-csv
 
 CONFIGURE_ARGS = 
 

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 Dec 13 03:58:03 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Sat, 13 Dec 2014 02:58:03 +0000
Subject: SF.net SVN: gar:[24454] csw/mgar/pkg/sdlimage/trunk
Message-ID: <3jztpc5CFsz5q@mail.opencsw.org>

Revision: 24454
          http://sourceforge.net/p/gar/code/24454
Author:   jake_goerzen
Date:     2014-12-13 02:58:03 +0000 (Sat, 13 Dec 2014)
Log Message:
-----------
sdlimage: downgrade to 1.2.10; add patch to build on default SUN compiler

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

Added Paths:
-----------
    csw/mgar/pkg/sdlimage/trunk/files/IMG_png.c.patch

Modified: csw/mgar/pkg/sdlimage/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlimage/trunk/Makefile	2014-12-12 22:45:00 UTC (rev 24453)
+++ csw/mgar/pkg/sdlimage/trunk/Makefile	2014-12-13 02:58:03 UTC (rev 24454)
@@ -1,5 +1,5 @@
 NAME = SDL_image
-VERSION = 1.2.12
+VERSION = 1.2.10
 GARTYPE = v2
 
 DESCRIPTION = SDL image file loading library
@@ -10,7 +10,8 @@
 MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-GARCOMPILER = GCC4
+# http://hg.libsdl.org/SDL_image/rev/7264bae1db63
+PATCHFILES = IMG_png.c.patch
 
 PACKAGES += CSWlibsdl-image1-2-0
 CATALOGNAME_CSWlibsdl-image1-2-0 = libsdl_image1_2_0
@@ -30,7 +31,6 @@
 
 RUNTIME_DEP_PKGS_CSWsdlimage-dev += CSWlibsdl-image1-2-0
 RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibsdl1-2-0
-RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibgcc-s1
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 

Modified: csw/mgar/pkg/sdlimage/trunk/checksums
===================================================================
--- csw/mgar/pkg/sdlimage/trunk/checksums	2014-12-12 22:45:00 UTC (rev 24453)
+++ csw/mgar/pkg/sdlimage/trunk/checksums	2014-12-13 02:58:03 UTC (rev 24454)
@@ -1 +1 @@
-a0f9098ebe5400f0bdc9b62e60797ecb  SDL_image-1.2.12.tar.gz
+6c06584b31559e2b59f2b982d0d1f628  SDL_image-1.2.10.tar.gz

Added: csw/mgar/pkg/sdlimage/trunk/files/IMG_png.c.patch
===================================================================
--- csw/mgar/pkg/sdlimage/trunk/files/IMG_png.c.patch	                        (rev 0)
+++ csw/mgar/pkg/sdlimage/trunk/files/IMG_png.c.patch	2014-12-13 02:58:03 UTC (rev 24454)
@@ -0,0 +1,137 @@
+
+diff -r 87ec529fd6ce -r 7264bae1db63 IMG_png.c
+--- a/IMG_png.c	Tue Jan 18 11:10:17 2011 -0800
++++ b/IMG_png.c	Wed Jan 19 19:32:18 2011 -0800
+@@ -80,6 +80,8 @@
+ 	void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr);
+ 	png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method);
+ 	png_voidp (*png_get_io_ptr) (png_structp png_ptr);
++	png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr);
++	png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette);
+ 	png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
+ 	png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag);
+ 	void (*png_read_image) (png_structp png_ptr, png_bytepp image);
+@@ -91,6 +93,7 @@
+ 	void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
+ 	void (*png_set_strip_16) (png_structp png_ptr);
+ 	int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check);
++	jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t);
+ } lib;
+ 
+ #ifdef LOAD_PNG_DYNAMIC
+@@ -129,6 +132,13 @@
+ 			SDL_UnloadObject(lib.handle);
+ 			return -1;
+ 		}
++		lib.png_get_channels =
++			(png_byte (*) (png_structp, png_infop))
++			SDL_LoadFunction(lib.handle, "png_get_channels");
++		if ( lib.png_get_channels == NULL ) {
++			SDL_UnloadObject(lib.handle);
++			return -1;
++		}
+ 		lib.png_get_io_ptr =
+ 			(png_voidp (*) (png_structp))
+ 			SDL_LoadFunction(lib.handle, "png_get_io_ptr");
+@@ -136,6 +146,13 @@
+ 			SDL_UnloadObject(lib.handle);
+ 			return -1;
+ 		}
++		lib.png_get_PLTE =
++			(png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *))
++			SDL_LoadFunction(lib.handle, "png_get_PLTE");
++		if ( lib.png_get_PLTE == NULL ) {
++			SDL_UnloadObject(lib.handle);
++			return -1;
++		}
+ 		lib.png_get_tRNS =
+ 			(png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *))
+ 			SDL_LoadFunction(lib.handle, "png_get_tRNS");
+@@ -213,6 +230,13 @@
+ 			SDL_UnloadObject(lib.handle);
+ 			return -1;
+ 		}
++		lib.png_set_longjmp_fn =
++			(jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t))
++			SDL_LoadFunction(lib.handle, "png_set_longjmp_fn");
++		if ( lib.png_set_longjmp_fn == NULL ) {
++			SDL_UnloadObject(lib.handle);
++			return -1;
++		}
+ 	}
+ 	++lib.loaded;
+ 
+@@ -236,7 +260,9 @@
+ 		lib.png_create_read_struct = png_create_read_struct;
+ 		lib.png_destroy_read_struct = png_destroy_read_struct;
+ 		lib.png_get_IHDR = png_get_IHDR;
++		lib.png_get_channels = png_get_channels;
+ 		lib.png_get_io_ptr = png_get_io_ptr;
++		lib.png_get_PLTE = png_get_PLTE;
+ 		lib.png_get_tRNS = png_get_tRNS;
+ 		lib.png_get_valid = png_get_valid;
+ 		lib.png_read_image = png_read_image;
+@@ -347,7 +373,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf)))) {
+ 		error = "Error reading the PNG file.";
+ 		goto done;
+ 	}
+@@ -416,9 +442,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -426,7 +452,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		error = "Out of memory";
+ 		goto done;
+@@ -467,6 +493,9 @@
+ 	/* Load the palette, if any */
+ 	palette = surface->format->palette;
+ 	if ( palette ) {
++	    int png_num_palette;
++	    png_colorp png_palette;
++	    lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
+ 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
+ 		palette->ncolors = 256;
+ 		for(i = 0; i < 256; i++) {
+@@ -474,12 +503,12 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else if (png_num_palette > 0 ) {
++		palette->ncolors = png_num_palette; 
++		for( i=0; i<png_num_palette; ++i ) {
++		    palette->colors[i].b = png_palette[i].blue;
++		    palette->colors[i].g = png_palette[i].green;
++		    palette->colors[i].r = png_palette[i].red;
+ 		}
+ 	    }
+ 	}
+
+
+
+
+

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


From bonivart at users.sourceforge.net  Sat Dec 13 09:19:19 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 13 Dec 2014 08:19:19 +0000
Subject: SF.net SVN: gar:[24455] csw/mgar/pkg/sendmail/trunk
Message-ID: <3k01xD6jNbz9D@mail.opencsw.org>

Revision: 24455
          http://sourceforge.net/p/gar/code/24455
Author:   bonivart
Date:     2014-12-13 08:19:16 +0000 (Sat, 13 Dec 2014)
Log Message:
-----------
sendmail/trunk: update to 8.15.1

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

Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile	2014-12-13 02:58:03 UTC (rev 24454)
+++ csw/mgar/pkg/sendmail/trunk/Makefile	2014-12-13 08:19:16 UTC (rev 24455)
@@ -31,7 +31,7 @@
 # + #4150 Sendmail 8.14.4 released -> this is 8.14.5
 
 NAME = sendmail
-VERSION = 8.14.9
+VERSION = 8.15.1
 GARTYPE = v2
 
 DESCRIPTION = Sendmail MTA

Modified: csw/mgar/pkg/sendmail/trunk/checksums
===================================================================
--- csw/mgar/pkg/sendmail/trunk/checksums	2014-12-13 02:58:03 UTC (rev 24454)
+++ csw/mgar/pkg/sendmail/trunk/checksums	2014-12-13 08:19:16 UTC (rev 24455)
@@ -1 +1 @@
-6a3bdceffa592316f830be289a4bd783  sendmail.8.14.9.tar.gz
+a45308a08d8ce64be91b7d86a7523e4f  sendmail.8.15.1.tar.gz

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


From bonivart at users.sourceforge.net  Sat Dec 13 13:13:55 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 13 Dec 2014 12:13:55 +0000
Subject: SF.net SVN: gar:[24456] csw/mgar/pkg/bind/trunk
Message-ID: <3k07852KH5zDc@mail.opencsw.org>

Revision: 24456
          http://sourceforge.net/p/gar/code/24456
Author:   bonivart
Date:     2014-12-13 12:13:54 +0000 (Sat, 13 Dec 2014)
Log Message:
-----------
bind/trunk: update to 9.9.6-P1

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

Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile	2014-12-13 08:19:16 UTC (rev 24455)
+++ csw/mgar/pkg/bind/trunk/Makefile	2014-12-13 12:13:54 UTC (rev 24456)
@@ -2,7 +2,7 @@
 # owner/group for device files? (root:sys)
 
 NAME = bind
-VERSION = 9.9.5
+VERSION = 9.9.6
 GARTYPE = v2
 
 # Enable these for Px-releases
@@ -33,12 +33,12 @@
 PACKAGES += CSWbind
 CATALOGNAME_CSWbind = bind
 SPKG_DESC_CSWbind = ISC BIND DNS main package
-RUNTIME_DEP_PKGS_CSWbind  = CSWlibbind
 RUNTIME_DEP_PKGS_CSWbind += CSWbindutils
+RUNTIME_DEP_PKGS_CSWbind += CSWlibbind
+RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2
+#RUNTIME_DEP_PKGS_CSWbind += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWbind += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWbind += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWbind += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWbind += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2
 
 PACKAGES += CSWbind-dev
 CATALOGNAME_CSWbind-dev = bind_dev
@@ -49,22 +49,22 @@
 PACKAGES += CSWlibbind
 CATALOGNAME_CSWlibbind = libbind
 SPKG_DESC_CSWlibbind = ISC BIND DNS library package
-RUNTIME_DEP_PKGS_CSWlibbind  = CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibbind += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibbind += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibbind += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibbind += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibbind += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibbind += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibbind += CSWlibz1
 
 PACKAGES += CSWbindutils
 CATALOGNAME_CSWbindutils = bind_utils
 SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package
-RUNTIME_DEP_PKGS_CSWbindutils  = CSWlibbind
+RUNTIME_DEP_PKGS_CSWbindutils += CSWlibbind
+RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2
 
 PACKAGES += CSWbindchroot
 CATALOGNAME_CSWbindchroot = bind_chroot
@@ -74,20 +74,16 @@
 
 GARCOMPILER = GNU
 
-CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-libtool
 CONFIGURE_ARGS += --with-openssl=/opt/csw
 CONFIGURE_ARGS += --enable-threads
 CONFIGURE_ARGS += --enable-largefile
 CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named
-CONFIGURE_ARGS += --with-dlz-ldap=/opt/csw
 CONFIGURE_ARGS += --enable-rrl
+#CONFIGURE_ARGS += --with-dlz-ldap=/opt/csw
 
-# Bug in combo of BIND and GCC 4.9 optimization regarding null pointers
-# 2014-06-17 Should not be needed with 9.9.5-P1
-#EXTRA_CFLAGS += -fno-delete-null-pointer-checks
-
 EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la $(mandir)/man1/isc-config.sh.1 $(bindir)/isc-config.sh
 
 #EXTRA_INC = /opt/csw/include
@@ -126,12 +122,12 @@
 CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot
 
 # Will not split out all these libs
-CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.5.0|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95
-CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.9|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90
-CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.100.2.2|soname=libdns.so.100|pkgname=CSWlibbind|expected=CSWlibdns100
-CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.1.0|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90
+CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.11|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90
+CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.104.1.0|soname=libdns.so.104|pkgname=CSWlibbind|expected=CSWlibdns104
+CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.8.0|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95
+CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.2.3|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90
+CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.91.0.0|soname=liblwres.so.91|pkgname=CSWlibbind|expected=CSWliblwres91
 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.6|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90
-CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.7|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90
 
 # Some new checks, have no idea about their relevance
 CHECKPKG_OVERRIDES_CSWlibbind += no-direct-binding

Modified: csw/mgar/pkg/bind/trunk/checksums
===================================================================
--- csw/mgar/pkg/bind/trunk/checksums	2014-12-13 08:19:16 UTC (rev 24455)
+++ csw/mgar/pkg/bind/trunk/checksums	2014-12-13 12:13:54 UTC (rev 24456)
@@ -1 +1 @@
-3408af8c6d27d6cb8a05287f2ee32ad0  bind-9.9.5-P1.tar.gz
+ca9d8f4d26e740668d361bfc50d90fc7  bind-9.9.6-P1.tar.gz

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


From dmichelsen at users.sourceforge.net  Sat Dec 13 20:52:16 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 13 Dec 2014 19:52:16 +0000
Subject: SF.net SVN: gar:[24457] csw/mgar/pkg/squid/trunk/Makefile
Message-ID: <3k0KJn2TQJzJy@mail.opencsw.org>

Revision: 24457
          http://sourceforge.net/p/gar/code/24457
Author:   dmichelsen
Date:     2014-12-13 19:52:14 +0000 (Sat, 13 Dec 2014)
Log Message:
-----------
squid/trunk: Switch from select to devpoll

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

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2014-12-13 12:13:54 UTC (rev 24456)
+++ csw/mgar/pkg/squid/trunk/Makefile	2014-12-13 19:52:14 UTC (rev 24457)
@@ -68,7 +68,8 @@
 CONFIGURE_ARGS += --enable-large-cache-files
 CONFIGURE_ARGS += --enable-referer-log
 CONFIGURE_ARGS += --enable-removal-policies=heap,lru
-CONFIGURE_ARGS += --enable-select
+# Use devpoll in favor of select as it is much faster
+CONFIGURE_ARGS += --enable-devpoll
 CONFIGURE_ARGS += --enable-snmp
 CONFIGURE_ARGS += --enable-ssl
 CONFIGURE_ARGS += --enable-useragent-log

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  Tue Dec 16 01:22:46 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Tue, 16 Dec 2014 00:22:46 +0000
Subject: SF.net SVN: gar:[24458] csw/mgar/pkg/sdlimage/trunk
Message-ID: <3k1gD61RBFz1Hr@mail.opencsw.org>

Revision: 24458
          http://sourceforge.net/p/gar/code/24458
Author:   jake_goerzen
Date:     2014-12-16 00:22:44 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
sdlimage: update to 1.2.12; add EXTRA_LINKER_FLAGS -lwebp; remove old patch

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

Modified: csw/mgar/pkg/sdlimage/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlimage/trunk/Makefile	2014-12-13 19:52:14 UTC (rev 24457)
+++ csw/mgar/pkg/sdlimage/trunk/Makefile	2014-12-16 00:22:44 UTC (rev 24458)
@@ -1,5 +1,5 @@
 NAME = SDL_image
-VERSION = 1.2.10
+VERSION = 1.2.12
 GARTYPE = v2
 
 DESCRIPTION = SDL image file loading library
@@ -10,9 +10,6 @@
 MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# http://hg.libsdl.org/SDL_image/rev/7264bae1db63
-PATCHFILES = IMG_png.c.patch
-
 PACKAGES += CSWlibsdl-image1-2-0
 CATALOGNAME_CSWlibsdl-image1-2-0 = libsdl_image1_2_0
 PKGFILES_CSWlibsdl-image1-2-0 += $(call baseisadirs,$(libdir),libSDL_image-1\.2\.so\.0\.8\.4)
@@ -36,6 +33,8 @@
 
 BUILD64_LIBS_ONLY = 1
 
+EXTRA_LINKER_FLAGS = -lwebp
+
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/sdlimage/trunk/checksums
===================================================================
--- csw/mgar/pkg/sdlimage/trunk/checksums	2014-12-13 19:52:14 UTC (rev 24457)
+++ csw/mgar/pkg/sdlimage/trunk/checksums	2014-12-16 00:22:44 UTC (rev 24458)
@@ -1 +1 @@
-6c06584b31559e2b59f2b982d0d1f628  SDL_image-1.2.10.tar.gz
+a0f9098ebe5400f0bdc9b62e60797ecb  SDL_image-1.2.12.tar.gz

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  Tue Dec 16 01:37:24 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Tue, 16 Dec 2014 00:37:24 +0000
Subject: SF.net SVN: gar:[24459] csw/mgar/pkg/sdlimage/trunk/Makefile
Message-ID: <3k1gXr33G3z1LH@mail.opencsw.org>

Revision: 24459
          http://sourceforge.net/p/gar/code/24459
Author:   jake_goerzen
Date:     2014-12-16 00:37:23 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
sdlimage: add RUNTIME_DEP and CHECKPKG_OVERRIDE for CSWlibwebp4

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

Modified: csw/mgar/pkg/sdlimage/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlimage/trunk/Makefile	2014-12-16 00:22:44 UTC (rev 24458)
+++ csw/mgar/pkg/sdlimage/trunk/Makefile	2014-12-16 00:37:23 UTC (rev 24459)
@@ -28,6 +28,7 @@
 
 RUNTIME_DEP_PKGS_CSWsdlimage-dev += CSWlibsdl-image1-2-0
 RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibwebp4
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -39,4 +40,6 @@
 
 TEST_SCRIPTS =
 
+CHECKPKG_OVERRIDES_CSWlibsdl-image1-2-0 += surplus-dependency|CSWlibwebp4
+
 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 Dec 17 14:38:54 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 17 Dec 2014 13:38:54 +0000
Subject: SF.net SVN: gar:[24463] csw/mgar/pkg/npth/trunk/Makefile
Message-ID: <3k2crD0rZvz12M@mail.opencsw.org>

Revision: 24463
          http://sourceforge.net/p/gar/code/24463
Author:   lblume
Date:     2014-12-17 13:38:51 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
npth/trunk: Listen to checkpkg advice

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

Modified: csw/mgar/pkg/npth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/npth/trunk/Makefile	2014-12-17 13:22:44 UTC (rev 24462)
+++ csw/mgar/pkg/npth/trunk/Makefile	2014-12-17 13:38:51 UTC (rev 24463)
@@ -23,6 +23,18 @@
 
 BUILD64 = 1
 
+PACKAGES += CSWlibnpth0
+CATALOGNAME_CSWlibnpth0 = libnpth0
+PKGFILES_CSWlibnpth0 += $(call baseisadirs,$(libdir),libnpth\.so\.0\.0\.4)
+PKGFILES_CSWlibnpth0 += $(call baseisadirs,$(libdir),libnpth\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibnpth0 += $(DESCRIPTION), libnpth.so.0
+RUNTIME_DEP_PKGS_CSWlibnpth0 += CSWlibgcc-s1
+
+PKGFILES_CSWnpth-dev += $(PKGFILES_DEVEL)
+
+RUNTIME_DEP_PKGS_CSWnpth += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWnpth += CSWlibnpth0
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 EXTRA_CFLAGS = -std=c99

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 Dec 17 14:52:36 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 17 Dec 2014 13:52:36 +0000
Subject: SF.net SVN: gar:[24464] csw/mgar/pkg/npth/trunk/Makefile
Message-ID: <3k2d7x4m44z14p@mail.opencsw.org>

Revision: 24464
          http://sourceforge.net/p/gar/code/24464
Author:   lblume
Date:     2014-12-17 13:52:36 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
npth/trunk: More packaging adjustment

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

Modified: csw/mgar/pkg/npth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/npth/trunk/Makefile	2014-12-17 13:38:51 UTC (rev 24463)
+++ csw/mgar/pkg/npth/trunk/Makefile	2014-12-17 13:52:36 UTC (rev 24464)
@@ -30,15 +30,16 @@
 SPKG_DESC_CSWlibnpth0 += $(DESCRIPTION), libnpth.so.0
 RUNTIME_DEP_PKGS_CSWlibnpth0 += CSWlibgcc-s1
 
+
+PACKAGES += CSWnpth-dev
+CATALOGNAME_CSWnpth-dev = npth_dev
+SPKG_DESC_CSWnpth-dev = Development files for libnpth.so.0
 PKGFILES_CSWnpth-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWnpth-dev += CSWlibnpth0
 
-RUNTIME_DEP_PKGS_CSWnpth += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWnpth += CSWlibnpth0
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 EXTRA_CFLAGS = -std=c99
-# -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6
 
 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 Dec 17 15:53:27 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 17 Dec 2014 14:53:27 +0000
Subject: SF.net SVN: gar:[24466] csw/mgar/pkg/libgpg_error/trunk/Makefile
Message-ID: <3k2fV73JbPz1GL@mail.opencsw.org>

Revision: 24466
          http://sourceforge.net/p/gar/code/24466
Author:   lblume
Date:     2014-12-17 14:53:26 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
libgpg_error/trunk: fix some Makefile oddity

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

Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgpg_error/trunk/Makefile	2014-12-17 14:19:52 UTC (rev 24465)
+++ csw/mgar/pkg/libgpg_error/trunk/Makefile	2014-12-17 14:53:26 UTC (rev 24466)
@@ -44,4 +44,6 @@
 
 EXTRA_LINKER_FLAGS = -lrt
 
+CONFIGURE_ARGS  = $(DIRPATHS)
+
 include gar/category.mk

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


From rmottola at users.sourceforge.net  Wed Dec 17 17:25:10 2014
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Wed, 17 Dec 2014 16:25:10 +0000
Subject: SF.net SVN: gar:[24470] csw/mgar/pkg/gs_gorm/trunk/Makefile
Message-ID: <3k2hX44jjMz2v@mail.opencsw.org>

Revision: 24470
          http://sourceforge.net/p/gar/code/24470
Author:   rmottola
Date:     2014-12-17 16:25:10 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
import changes suggested by Dago already in gnustep-base

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

Modified: csw/mgar/pkg/gs_gorm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gs_gorm/trunk/Makefile	2014-12-17 16:18:03 UTC (rev 24469)
+++ csw/mgar/pkg/gs_gorm/trunk/Makefile	2014-12-17 16:25:10 UTC (rev 24470)
@@ -10,12 +10,26 @@
   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
 
+
+BUILD_DEP_PKGS += CSWgmake
+BUILD_DEP_PKGS += CSWgcc4objc
+
+CHECKPKG_OVERRIDES_CSWgorm += CSWgnustep-make
+CHECKPKG_OVERRIDES_CSWgorm += CSWgnustep-base
+CHECKPKG_OVERRIDES_CSWgorm += CSWgnustep-gui
+CHECKPKG_OVERRIDES_CSWgorm += CSWgnustep-back
+
+
+#overrides
+CHECKPKG_OVERRIDES_CSWgnustep-base += surplus-dependency|CSWgnustep-make
+
+#where can we build?
+PACKAGING_PLATFORMS += solaris9-sparc
+PACKAGING_PLATFORMS += solaris10-sparc
+
 #we absolutely need GCC for Objective-C support. The only alternative in the future would be clang
 GARCOMPILER = GNU
 
@@ -30,17 +44,17 @@
 INSTALL_SCRIPTS = sourcegs
 
 # Disable test scripts for now
-TEST_SCRIPTS = none
-SKIPTEST = 1
+TEST_SCRIPTS = 
+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)
+	$(BUILD_ENV) && . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && $(MAKE)
 	@$(MAKECOOKIE)
 
 install-sourcegs:
-	. $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR)
+	$(INSTALL_ENV) &&. $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && $(MAKE) install DESTDIR=$(DESTDIR)
 	@$(MAKECOOKIE)
 
 test-none :

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 Dec 17 21:22:19 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 17 Dec 2014 20:22:19 +0000
Subject: SF.net SVN: gar:[24475] csw/mgar/pkg/libgpg_error/trunk/Makefile
Message-ID: <3k2nnc1nsPzgT@mail.opencsw.org>

Revision: 24475
          http://sourceforge.net/p/gar/code/24475
Author:   lblume
Date:     2014-12-17 20:22:18 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
libgpg_error/trunk: Add missing dep; skip tests

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

Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgpg_error/trunk/Makefile	2014-12-17 18:59:33 UTC (rev 24474)
+++ csw/mgar/pkg/libgpg_error/trunk/Makefile	2014-12-17 20:22:18 UTC (rev 24475)
@@ -27,6 +27,7 @@
 PKGFILES_CSWlibgpg-error0 += $(call pkgfiles_lib,libgpg-error.so.0)
 PKGFILES_CSWlibgpg-error0 += .*/libgpg-error.mo
 RUNTIME_DEP_PKGS_CSWlibgpg-error0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgpg-error0 += CSWlibgcc-s1
 OBSOLETED_BY_libgpg-error0 = CSWgpgerr
 
 PACKAGES += CSWlibgpg-error-dev
@@ -42,6 +43,9 @@
 
 BUILD64_LIBS_ONLY = 1
 
+# Some test binaries dump core on sparc only since 1.13
+SKIPTEST = 1
+
 EXTRA_LINKER_FLAGS = -lrt
 
 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  Thu Dec 18 14:53:49 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu, 18 Dec 2014 13:53:49 +0000
Subject: SF.net SVN: gar:[24478] csw/mgar/pkg/gnupg2/branches
Message-ID: <3k3F730WxZz1Bm@mail.opencsw.org>

Revision: 24478
          http://sourceforge.net/p/gar/code/24478
Author:   lblume
Date:     2014-12-18 13:53:49 +0000 (Thu, 18 Dec 2014)
Log Message:
-----------
gnupg2/branches/gnupg-2.1: Add GnuPG 2.1

Added Paths:
-----------
    csw/mgar/pkg/gnupg2/branches/gnupg-2.1/
    csw/mgar/pkg/gnupg2/branches/gnupg-2.1/Makefile
    csw/mgar/pkg/gnupg2/branches/gnupg-2.1/checksums
    csw/mgar/pkg/gnupg2/branches/gnupg-2.1/files/

Index: csw/mgar/pkg/gnupg2/branches/gnupg-2.1
===================================================================
--- csw/mgar/pkg/gnupg2/branches/gnupg-2.1	2014-12-18 11:05:45 UTC (rev 24477)
+++ csw/mgar/pkg/gnupg2/branches/gnupg-2.1	2014-12-18 13:53:49 UTC (rev 24478)

Property changes on: csw/mgar/pkg/gnupg2/branches/gnupg-2.1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/gnupg2/branches/gnupg-2.1/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/branches/gnupg-2.1/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gnupg2/branches/gnupg-2.1/Makefile	2014-12-18 13:53:49 UTC (rev 24478)
@@ -0,0 +1,82 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+NAME    = gnupg
+VERSION = 2.1.1
+GARTYPE = v2
+
+DESCRIPTION = GnuPG is a complete and free replacement for PGP
+define BLURB
+  RFC 2440 compliant tool for secure communication and data storage
+endef
+
+MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/
+DISTFILES = $(DISTNAME).tar.bz2
+
+VENDOR_URL = http://www.gnupg.org/
+
+GARCOMPILER = GCC4
+
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_common)
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWgnupg21)
+
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWlibgpg-error-dev
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+BUILD_DEP_PKGS += CSWlibassuan-dev
+BUILD_DEP_PKGS += CSWlibksba-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
+BUILD_DEP_PKGS += CSWopenldap-dev
+BUILD_DEP_PKGS += CSWnpth-dev
+BUILD_DEP_PKGS += CSWlibp11kit-dev
+BUILD_DEP_PKGS += CSWlibadns-dev
+
+PACKAGES += CSWgnupg21
+SPKG_DESC_CSWgnupg21 = GnuPG is a complete and free replacement for PGP
+# PKGFILES is catchall
+
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibksba8
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibgcrypt20
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibassuan0
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibadns1
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWlibldap2-4-2
+# For gpg-agent. Pinentry is not because of shared libraries.
+RUNTIME_DEP_PKGS_CSWgnupg21 += CSWpinentry
+CHECKPKG_OVERRIDES_CSWgnupg21 += surplus-dependency|CSWpinentry
+
+# Modern GnuPG, not a straight upgrade from v2.0
+INCOMPATIBLE_PKGS_CSWgnupg21 = CSWgnupg2
+
+NOISALIST = 1
+
+BUILD64 = 1
+ISAEXEC = 1
+
+# POSIX forms such as $() are officially used in the tests scripts
+REINPLACE_MATCH = ^\#!/bin/sh
+REINPLACE_WITH  = \#!$(prefix)/bin/bash
+REINPLACE_FILES = tests/openpgp/*.test
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-ldap=$(prefix)
+CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-bzip2=$(prefix)
+CONFIGURE_ARGS += --with-readline=$(prefix)
+CONFIGURE_ARGS += --with-pinentry-pgm=$(prefix)/bin/pinentry-curses
+CONFIGURE_ARGS += --enable-gpgtar
+
+EXTRA_LDFLAGS = -lsocket -lnsl
+
+PROTOTYPE_MODIFIERS = suid
+PROTOTYPE_FILES_suid = .*/gpg2
+PROTOTYPE_PERMS_suid = 4755
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/gnupg2/branches/gnupg-2.1/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/gnupg2/branches/gnupg-2.1/checksums
===================================================================
--- csw/mgar/pkg/gnupg2/branches/gnupg-2.1/checksums	                        (rev 0)
+++ csw/mgar/pkg/gnupg2/branches/gnupg-2.1/checksums	2014-12-18 13:53:49 UTC (rev 24478)
@@ -0,0 +1 @@
+9a314c3dcef0a091de90b6aa4d467db5  gnupg-2.1.1.tar.bz2

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


From cgrzemba at users.sourceforge.net  Thu Dec 18 16:42:46 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 18 Dec 2014 15:42:46 +0000
Subject: SF.net SVN: gar:[24479] csw/mgar/pkg/netsnmp/trunk
Message-ID: <3k3HYP5BNpz1Hy@mail.opencsw.org>

Revision: 24479
          http://sourceforge.net/p/gar/code/24479
Author:   cgrzemba
Date:     2014-12-18 15:42:45 +0000 (Thu, 18 Dec 2014)
Log Message:
-----------
netsnmp/trunk: add patches from solaris-userland

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

Added Paths:
-----------
    csw/mgar/pkg/netsnmp/trunk/files/0002-pkcs.patch
    csw/mgar/pkg/netsnmp/trunk/files/0011-Makefile.in.patch
    csw/mgar/pkg/netsnmp/trunk/files/0012-Makefile.PL.patch
    csw/mgar/pkg/netsnmp/trunk/files/0015+0016-vmstat_solaris2.patch
    csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch
    csw/mgar/pkg/netsnmp/trunk/files/0034-manpage-snmptrapd.conf.5.def.patch
    csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch
    csw/mgar/pkg/netsnmp/trunk/files/0048+0027-mnt-cache-hr_filesys.patch
    csw/mgar/pkg/netsnmp/trunk/files/0051-CVE-2014-2285.patch
    csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch
    csw/mgar/pkg/netsnmp/trunk/files/net-snmp-CVE-2014-3565.patch

Modified: csw/mgar/pkg/netsnmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/Makefile	2014-12-18 13:53:49 UTC (rev 24478)
+++ csw/mgar/pkg/netsnmp/trunk/Makefile	2014-12-18 15:42:45 UTC (rev 24479)
@@ -35,6 +35,16 @@
 PATCHFILES += 0002-workaround-ksh-stop-alias-problem.patch
 PATCHFILES += 0003-configure-disable-perl-cc-checks.patch
 PATCHFILES += 0004-enable-python-version-select.patch
+PATCHFILES += 0002-pkcs.patch
+PATCHFILES += 0011-Makefile.in.patch
+PATCHFILES += 0012-Makefile.PL.patch
+PATCHFILES += 0015+0016-vmstat_solaris2.patch
+PATCHFILES += 0024-kernel_sunos5.patch
+PATCHFILES += 0034-manpage-snmptrapd.conf.5.def.patch
+PATCHFILES += 0035-bug-1849903.patch
+PATCHFILES += 0048+0027-mnt-cache-hr_filesys.patch
+PATCHFILES += 0051-CVE-2014-2285.patch
+PATCHFILES += 0052-dyn-cpu-cpu_kstat.patch
 
 VENDOR_URL = http://www.net-snmp.org/
 

Added: csw/mgar/pkg/netsnmp/trunk/files/0002-pkcs.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0002-pkcs.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0002-pkcs.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,32 @@
+--- a/snmplib/pkcs.c
++++ b/snmplib/pkcs.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright Copyright 2003 Sun Microsystems, Inc. All rights reserved.
++ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+  * Use is subject to license terms specified in the COPYING file
+  * distributed with the Net-SNMP package.
+  */
+@@ -105,19 +105,13 @@ pkcs_init(void)
+ static int
+ free_slots(int majorID, int minorID, void *serverarg, void *clientarg)
+ {
+-    int            slotcount, i;
++    (void) C_Finalize(NULL);
+ 
+     if (pSlot != NULL) {
+-        slotcount = pSlot->count;
+-        for (i = 0; i < slotcount; i++) {
+-            if (pSlot->pSession->hdl != NULL) {
+-                free(pSlot->pSession->hdl);
+-            }
+-        }
+-        free(pSlot);
++        SNMP_FREE(pSlot->pSession);
++        SNMP_FREE(pSlot);
+     }
+ 
+-    (void) C_Finalize(NULL);
+     return 0;
+ }
+ 

Added: csw/mgar/pkg/netsnmp/trunk/files/0011-Makefile.in.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0011-Makefile.in.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0011-Makefile.in.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,64 @@
+--- a/agent/Makefile.in
++++ b/agent/Makefile.in
+@@ -276,7 +276,10 @@ FTOBJS		= $(LLIBAGENTFTS) $(FTAGENTOBJS) mib_modules.ft auto_nlist.ft
+ 
+ FEATUREFILE     = $(top_builddir)/include/net-snmp/agent/features.h
+ 
+-all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
++LIB_LD_ADD_AGENT	=-lnetsnmp -lnetsnmphelpers
++LIB_LD_ADD_PATH_MIBS	=-Lhelpers -L../snmplib
++
++all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
+ 
+ #
+ # build stuff targets
+@@ -306,6 +309,10 @@ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS
+ 
+ agentlib: $(AGENTLIB)
+ 
++relinklib:     ${LLIBAGENTOBJS} $(USELIBS)
++	$(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT)
++	$(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT)
++
+ miblib: $(MIBLIB)
+ 
+ libs: $(AGENTLIB) $(MIBLIB)
+--- a/agent/helpers/Makefile.in
++++ b/agent/helpers/Makefile.in
+@@ -31,8 +31,11 @@ OBJS = dummy.o
+ 
+ LOBJS = dummy.lo
+ 
++LIB_LD_ADD	=-lnetsnmp
++LIB_LD_ADD_PATH	=-L../../snmplib
++
+ all: standardall
+ 
+ libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
+-	$(LIB_LD_CMD) $@ $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS)
+-	$(RANLIB) $@
++	$(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD)
++	$(RANLIB) $@ $(LIB_LD_ADD)
+--- a/snmplib/Makefile.in
++++ b/snmplib/Makefile.in
+@@ -223,6 +223,9 @@ TOBJS=$(LOBJS)
+ 
+ FEATUREFILE     = $(top_builddir)/include/net-snmp/library/features.h
+ 
++# To satisfy -zdefs
++LIB_LD_ADD	=-lnsl -lsocket -L$(libdir)
++
+ # 
+ CPPFLAGS = $(TOP_INCLUDES) -I. 	$(SNMPLIB_INCLUDES) @CPPFLAGS@
+ 
+@@ -230,8 +233,8 @@ all: standardall
+ 
+ # how to build the libraries.
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+-	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
+-	$(RANLIB) $@
++	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ $(LIB_LD_ADD)
++	$(RANLIB) $@ $(LIB_LD_ADD)
+ 
+ libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+ 	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@

Added: csw/mgar/pkg/netsnmp/trunk/files/0012-Makefile.PL.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0012-Makefile.PL.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0012-Makefile.PL.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,11 @@
+--- a/perl/agent/Makefile.PL
++++ b/perl/agent/Makefile.PL
+@@ -89,7 +89,7 @@ sub InitMakeParams {
+ 	    $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ " . $Params{'LIBS'};
+ 	    $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
+ #	} else {
+-	    $Params{'LIBS'} = `$opts->{'nsconfig'} --libdir` . $Params{'LIBS'};
++	    $Params{'LIBS'} =  $Params{'LIBS'} . `$opts->{'nsconfig'} --libdir`;
+ #	    $Params{'PREREQ_PM'} = {'NetSNMP::OID' => '0.1'};
+ 	}
+ 	$Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings

Added: csw/mgar/pkg/netsnmp/trunk/files/0015+0016-vmstat_solaris2.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0015+0016-vmstat_solaris2.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0015+0016-vmstat_solaris2.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,82 @@
+--- a/agent/mibgroup/ucd-snmp/vmstat_solaris2.c
++++ b/agent/mibgroup/ucd-snmp/vmstat_solaris2.c
+@@ -590,6 +590,7 @@ update_stats(unsigned int registrationNumber, void *clientarg)
+             cpu_sum += (css_new->css_cpu[i] - css_old->css_cpu[i]);
+         }
+ 
++        if (cpu_sum == 0) { cpu_sum = 1; }
+         /*
+          * Now calculate the absolute percentage values 
+          * Looks somewhat complicated sometimes but tries to get around using floats to increase speed 
+--- a/agent/mibgroup/ucd-snmp/vmstat_solaris2.c
++++ b/agent/mibgroup/ucd-snmp/vmstat_solaris2.c
+@@ -703,7 +704,12 @@ var_extensible_vmstat(struct variable *vp,
+     case CPUIDLE:
+         return ((u_char *) (&cpu_perc[CPU_IDLE]));
+     case CPURAWUSER:
+-        take_snapshot(&raw_values);
++	/* Take the current snapshot */
++	if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++		snmp_log(LOG_WARNING,
++		    "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++		return (NULL);
++	}
+         /*
+          * LINTED has to be 'long' 
+          */
+@@ -717,7 +723,12 @@ var_extensible_vmstat(struct variable *vp,
+          * (Has been changed to Counter32 in the latest MIB version!) 
+          */
+     case CPURAWSYSTEM:
+-        take_snapshot(&raw_values);
++	/* Take the current snapshot */
++	if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++		snmp_log(LOG_WARNING,
++		    "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++		return (NULL);
++	}
+         /*
+          * LINTED has to be 'long' 
+          */
+@@ -726,7 +737,12 @@ var_extensible_vmstat(struct variable *vp,
+                      raw_values.css_cpu[CPU_WAIT]) / raw_values.css_cpus);
+         return ((u_char *) (&long_ret));
+     case CPURAWIDLE:
+-        take_snapshot(&raw_values);
++	/* Take the current snapshot */
++	if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++		snmp_log(LOG_WARNING,
++		    "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++		return (NULL);
++	}
+         /*
+          * LINTED has to be 'long' 
+          */
+@@ -734,7 +750,12 @@ var_extensible_vmstat(struct variable *vp,
+             (long) (raw_values.css_cpu[CPU_IDLE] / raw_values.css_cpus);
+         return ((u_char *) (&long_ret));
+     case CPURAWWAIT:
+-        take_snapshot(&raw_values);
++	/* Take the current snapshot */
++	if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++		snmp_log(LOG_WARNING,
++		    "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++		return (NULL);
++	}
+         /*
+          * LINTED has to be 'long' 
+          */
+@@ -742,7 +763,12 @@ var_extensible_vmstat(struct variable *vp,
+             (long) (raw_values.css_cpu[CPU_WAIT] / raw_values.css_cpus);
+         return ((u_char *) (&long_ret));
+     case CPURAWKERNEL:
+-        take_snapshot(&raw_values);
++	/* Take the current snapshot */
++	if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++		snmp_log(LOG_WARNING,
++		    "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++		return (NULL);
++	}
+         /*
+          * LINTED has to be 'long' 
+          */

Added: csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,629 @@
+--- a/agent/mibgroup/kernel_sunos5.c
++++ b/agent/mibgroup/kernel_sunos5.c
+@@ -60,6 +60,8 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+ 
++#include <libdladm.h>
++#include <libdllink.h>
+ /*-
+  * Includes of local application header files 
+  */
+@@ -82,15 +84,15 @@ kstat_ctl_t    *kstat_fd = 0;
+ static
+ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
+     {MIB_SYSTEM, 0, (void *) -1, 0, 0, 0, 0},
+-    {MIB_INTERFACES, 50 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
++    {MIB_INTERFACES, 128 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
+      0},
+     {MIB_AT, 0, (void *) -1, 0, 0, 0, 0},
+     {MIB_IP, sizeof(mib2_ip_t), (void *) -1, 0, 60, 0, 0},
+-    {MIB_IP_ADDR, 20 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
++    {MIB_IP_ADDR, 128 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
+      0},
+-    {MIB_IP_ROUTE, 200 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
++    {MIB_IP_ROUTE, 400 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
+      0, 0},
+-    {MIB_IP_NET, 100 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
++    {MIB_IP_NET, 400 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
+      300, 0, 0},
+     {MIB_ICMP, sizeof(mib2_icmp_t), (void *) -1, 0, 60, 0, 0},
+     {MIB_TCP, sizeof(mib2_tcp_t), (void *) -1, 0, 60, 0, 0},
+@@ -105,13 +107,13 @@ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
+     {MIB_SNMP, 0, (void *) -1, 0, 0, 0, 0},
+ #ifdef SOLARIS_HAVE_IPV6_MIB_SUPPORT
+ #ifdef SOLARIS_HAVE_RFC4293_SUPPORT
+-    {MIB_IP_TRAFFIC_STATS, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
++    {MIB_IP_TRAFFIC_STATS, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
+      30, 0, 0},
+-    {MIB_IP6, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
+ #else
+-    {MIB_IP6, 20 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6, 128 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
+ #endif
+-    {MIB_IP6_ADDR, 20 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6_ADDR, 128 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
+     {MIB_TCP6_CONN, 1000 * sizeof(mib2_tcp6ConnEntry_t), (void *) -1, 0, 30,
+      0, 0},
+     {MIB_UDP6_ENDPOINT, 1000 * sizeof(mib2_udp6Entry_t), (void *) -1, 0, 30,
+@@ -184,9 +186,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type, mib2_ifEntry_t *resp,
+       size_t *length, int (*comp)(void *, void *), void *arg);
+ static void 
+ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+-            int mtu);
++            boolean_t flags_unknown, int mtu);
+ static int get_if_stats(mib2_ifEntry_t *ifp);
+-
++static int link_to_phydev(char *link, char *phy_devname);
+ #if defined(HAVE_IF_NAMEINDEX) && defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)
+ static int _dlpi_open(const char *devname);
+ static int _dlpi_get_phys_address(int fd, char *paddr, int maxlen,
+@@ -294,7 +296,9 @@ getKstatInt(const char *classname, const char *statname,
+     kstat_t        *ks;
+     kid_t           kid;
+     kstat_named_t  *named;
++ 
+     int             ret = -1;        /* fail unless ... */
++    int             lookup_stat = 0;	
+ 
+     if (kstat_fd == 0) {
+ 	kstat_fd = kstat_open();
+@@ -305,27 +309,88 @@ getKstatInt(const char *classname, const char *statname,
+     if ((ksc = kstat_fd) == NULL) {
+ 	goto Return;
+     }
+-    ks = kstat_lookup(ksc, classname, -1, statname);
+-    if (ks == NULL) {
+-	DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
+-		classname ? classname : "NULL",
+-		statname ? statname : "NULL"));
+-	goto Return;
+-    }
+-    kid = kstat_read(ksc, ks, NULL);
+-    if (kid == -1) {
+-	DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
+-		classname ? classname : "NULL", statname ? statname : "NULL"));
+-	goto Return;
+-    }
+-    named = kstat_data_lookup(ks, varname);
+-    if (named == NULL) {
+-	DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
+-		varname, classname ? classname : "NULL",
+-		statname ? statname : "NULL"));
+-	goto Return;
++   
++    if ((ks = kstat_lookup(ksc, statname, -1, "link")) != NULL)
++    {
++        kid = kstat_read(ksc, ks, NULL);
++        if (kid == -1) {
++            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
++                    statname ? statname : "NULL", "link"));
++        }
++        else
++        {
++            named = kstat_data_lookup(ks, varname);
++            if (named == NULL) {
++	        DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
++                        varname, statname ? statname : "NULL", "link"));
++            }
++            else {
++                    switch (named->data_type) {
++#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
++                        case KSTAT_DATA_INT32:
++                            if(named->value.i32)
++                                lookup_stat = 1;
++	                    break;
++                        case KSTAT_DATA_UINT32:
++                            if(named->value.ui32)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_INT64:
++                            if(named->value.i64)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_UINT64:
++                            if(named->value.ui64)
++                                lookup_stat = 1;
++                            break;
++#else
++                        case KSTAT_DATA_LONG:
++                            if(named->value.l)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_ULONG:
++                            if(named->value.ul)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_LONGLONG:
++                            if(named->value.ll)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_ULONGLONG:
++                            if(named->value.ull)
++                                lookup_stat = 1;
++                            break;
++#endif
++                    } 
++            }
++        }
+     }
+-
++     
++    if(!lookup_stat) 
++    {
++        ks = kstat_lookup(ksc, classname, -1, statname);
++        if (ks == NULL) {
++        DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
++                   classname ? classname : "NULL",
++                   statname ? statname : "NULL"));
++        goto Return;
++        }
++        
++	kid = kstat_read(ksc, ks, NULL);
++        if (kid == -1) {
++            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
++                   classname ? classname : "NULL", statname ? statname : "NULL"));
++            goto Return;
++        }
++        
++	named = kstat_data_lookup(ks, varname);
++        if (named == NULL) {
++            DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
++                    varname, classname ? classname : "NULL",
++                    statname ? statname : "NULL"));
++            goto Return;
++        }
++    } 
+     ret = 0;                /* maybe successful */
+     switch (named->data_type) {
+ #ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
+@@ -442,11 +507,20 @@ getKstat(const char *statname, const char *varname, void *value)
+     /*
+      * Get the named statistics 
+      */
+-    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL) {
+-	ret = -10;
+-	goto Return;        /* kstat errors */
+-    }
+ 
++    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL)
++    {
++        /*
++         * Try to lookup the kstat module with
++         * modulename = linkname and statname = "link".
++         */
++
++        if ((ks = kstat_lookup(ksc, statname, 0, "link")) == NULL) {
++            ret = -10;
++            goto Return;    /* kstat errors */
++        }
++    }
++   		
+     if (kstat_read(ksc, ks, NULL) <= 0) {
+ 	ret = -10;
+ 	goto Return;        /* kstat errors */
+@@ -1080,18 +1154,21 @@ getmib(int groupname, int subgroupname, void **statbuf, size_t *size,
+ static int
+ _dlpi_open(const char *devname)
+ {
+-    char *devstr;
++    char devstr[255], devstrcpy[255];
+     int fd = -1;
+     int ppa = -1;
++    int ret = -1; 	
+ 
+     DEBUGMSGTL(("kernel_sunos5", "_dlpi_open called\n"));
+ 
+     if (devname == NULL)
+-        return (-1);
++	return (-1);
++    
++    ret = snprintf(devstr, sizeof(devstr), "/dev/%s", devname);
+ 
+-    if ((devstr = malloc(5 + strlen(devname) + 1)) == NULL)
+-        return (-1);
+-    (void) sprintf(devstr, "/dev/%s", devname);
++    if(ret < 0 || ret > sizeof(devstr) - 1)
++	return -1;
++    
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
+     /*
+      * First try opening the device using style 1, if the device does not
+@@ -1102,13 +1179,49 @@ _dlpi_open(const char *devname)
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open(%s)\n", devstr));
+     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
+         DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open failed\n"));
+-        if (_dlpi_parse_devname(devstr, &ppa) == 0) {
+-            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 parse: %s, %d\n", 
+-                       devstr, ppa));
+-            /* try style 2 */
+-            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open(%s)\n", devstr));
++	fd = -1;
++    } else {
++      DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
++    }
++
++    /* Creating a copy of the devname incase style 3 open
++     *  is required
++     */
++    ret = strlcpy(devstrcpy, devstr, sizeof(devstrcpy));
++
++    if(ret > sizeof(devstrcpy) - 1)
++        return -1;
+ 
+-            if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) != -1) {
++    DEBUGMSGTL(("kernel_sunos5:dlpi", "devstrcpy(%s)\n", devstrcpy));
++
++
++    if (fd == -1 ) {
++      ret = snprintf(devstr, sizeof(devstr), "/dev/net/%s", devname);
++      
++      if(ret < 0 || ret > sizeof(devstr) - 1)
++          return -1;
++
++      DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
++      
++      /* try style 2 */
++
++     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
++        DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
++	fd = -1;
++      } else {
++	DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open succeeded\n"));
++      }
++    }
++    
++
++    if (fd == -1 ) {
++        if (_dlpi_parse_devname(devstrcpy, &ppa) == 0) {
++            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 parse: %s, %d\n", 
++                       devstrcpy, ppa));
++            /* try style 3 */
++            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open(%s)\n", devstrcpy));
++
++            if ((fd = open(devstrcpy, O_RDWR | O_NONBLOCK)) != -1) {
+                 if (_dlpi_attach(fd, ppa) == 0) {
+                     DEBUGMSGTL(("kernel_sunos5:dlpi", "attached\n"));
+                 } else {
+@@ -1117,16 +1230,11 @@ _dlpi_open(const char *devname)
+                     fd = -1;
+                 }
+             } else {
+-                DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
++                DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open failed\n"));
+             }
+         } 
+-    } else {
+-        DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
+     }
+ 
+-    /* clean up */
+-    free(devstr);
+-
+     return (fd);
+ }
+ 
+@@ -1141,7 +1249,9 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
+     struct strbuf       ctlbuf;
+     char                buf[MAX(DL_PHYS_ADDR_ACK_SIZE+64, DL_ERROR_ACK_SIZE)];
+     int                 flag = 0;
+-
++    struct pollfd 		pfd;
++    int			timeout = 100;
++	
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_phys_address\n"));
+ 
+     paddr_req.dl_primitive = DL_PHYS_ADDR_REQ;
+@@ -1154,7 +1264,22 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
+     ctlbuf.maxlen = sizeof(buf);
+     ctlbuf.len = 0;
+     ctlbuf.buf = buf;
+-    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
++
++    pfd.fd = fd;
++    pfd.events = POLLIN | POLLPRI;
++
++    switch (poll(&pfd, 1, timeout)) {
++    default:
++	if (pfd.revents & POLLHUP)
++    	    return (-1);
++   	break;
++    case 0:
++    	return (-1);
++    case -1:
++    	return (-1);
++    }
++    
++	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
+         return (-1);
+ 
+     if (ctlbuf.len < sizeof(uint32_t))
+@@ -1196,6 +1321,8 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
+     struct strbuf       ctlbuf;
+     char                buf[MAX(DL_INFO_ACK_SIZE, DL_ERROR_ACK_SIZE)];
+     int                 flag = 0;
++    struct pollfd       pfd;
++    int                 timeout = 100;
+ 
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_iftype\n"));
+ 
+@@ -1210,7 +1337,22 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
+     ctlbuf.maxlen = sizeof(buf);
+     ctlbuf.len = 0;
+     ctlbuf.buf = buf;
+-    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
++   
++    pfd.fd = fd;
++    pfd.events = POLLIN | POLLPRI;
++
++    switch (poll(&pfd, 1, timeout)) {
++    default:
++        if (pfd.revents & POLLHUP)
++            return (-1);
++        break;
++    case 0:
++        return (-1);
++    case -1:
++        return (-1);
++    } 
++
++	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
+         DEBUGMSGTL(("kernel_sunos5:dlpi", "getmsg failed: %d\n", errno));
+         return (-1);
+     }
+@@ -1367,8 +1509,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+     mib2_ifEntry_t *ifp;
+     int             nentries = size / sizeof(mib2_ifEntry_t);
+     found_e         result = NOT_FOUND;
+-    boolean_t       if_isv6;
++    boolean_t       if_isv6, flags_unknown;
+     uint64_t        if_flags;    
++    short           mtu = 0;
+     struct if_nameindex *ifname, *ifnp;
+ 
+     lifrp = &lifreq; 
+@@ -1400,6 +1543,7 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+         memcpy(lifrp->lifr_name, ifnp->if_name, LIFNAMSIZ);
+         if_isv6 = B_FALSE;
+ 
++        flags_unknown = B_FALSE;
+         if (ioctl(ifsd, SIOCGLIFFLAGS, lifrp) < 0) {
+             if (ifsd6 == -1) {
+                 if ((ifsd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+@@ -1408,17 +1552,19 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+                 }
+             }
+             if (ioctl(ifsd6, SIOCGLIFFLAGS, lifrp) < 0) {
+-                snmp_log(LOG_ERR, "SIOCGLIFFLAGS %s: %s\n", 
+-                         lifrp->lifr_name, strerror(errno));
+-                continue;
++                DEBUGMSGTL(("kernel_sunos5",
++                            "...... SIOCGLIFFLAGS failed\n"));
++                flags_unknown = B_TRUE;
+             }
+             if_isv6 = B_TRUE;
+         } 
+         if_flags = lifrp->lifr_flags;
+             
+         if (ioctl(if_isv6?ifsd6:ifsd, SIOCGLIFMTU, lifrp) < 0) {
++            mtu = 0;
+             DEBUGMSGTL(("kernel_sunos5", "...... SIOCGLIFMTU failed\n"));
+-            continue;
++        } else {
++            mtu = lifrp->lifr_mtu;
+         }
+ 
+         memset(ifp, 0, sizeof(mib2_ifEntry_t));
+@@ -1433,11 +1579,12 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+         }
+ 
+         set_if_info(ifp, ifnp->if_index, ifnp->if_name, if_flags, 
+-                    lifrp->lifr_metric);
++                    flags_unknown, mtu);
+ 
+         if (get_if_stats(ifp) < 0) {
++            snmp_log(LOG_ERR, "Failed to get interface statistics for %s\n",
++                     ifnp->if_name);
+             DEBUGMSGTL(("kernel_sunos5", "...... get_if_stats failed\n"));
+-            continue;
+         }
+ 
+         /*
+@@ -1614,11 +1761,155 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+ }
+ #endif /*defined(HAVE_IF_NAMEINDEX)&&defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)*/
+ 
++int link_to_phydev(char *link, char *phy_devname)
++{
++        char *key = NULL;
++        datalink_id_t linkid;
++        dladm_phys_attr_t dpa;
++        dladm_handle_t handle;
++
++        if (dladm_open(&handle, NULL) != DLADM_STATUS_OK) {
++            DEBUGMSGTL(("kernel_sunos5","dladm_open failed "
++                       "with errno=%d\n",errno));
++            return (-1);
++        }
++
++        if (dladm_name2info(handle, link, &linkid, NULL, NULL, NULL) !=
++            DLADM_STATUS_OK) {
++                DEBUGMSGTL(("kernel_sunos5","dladm_name2info failed "
++                           "with errno=%d\n",errno));
++                dladm_close(handle);
++                return (-1);
++        }
++
++        /*
++         * Get the device name of the link, which will be used as the door
++         * file name used to communicate with the driver.
++         */
++        if (dladm_phys_info(handle, linkid, &dpa, DLADM_OPT_ACTIVE) !=
++            DLADM_STATUS_OK) {
++                DEBUGMSGTL(("kernel_sunos5","dladm_phys_info failed "
++                           "with errno=%d\n",errno));
++                dladm_close(handle);
++                return (-1);
++        }
++
++        if(dpa.dp_dev == NULL) {
++            DEBUGMSGTL(("kernel_sunos5","device name from "
++                       "dladm_phys_info = NULL\n")); 
++            dladm_close(handle);
++            return -1;
++        
++        }
++        strcpy(phy_devname, dpa.dp_dev);
++        dladm_close(handle); 
++        
++        return 0;
++}
++
++
++static int getKstatIntInstance(const char *classname, int instance,
++                               const char *statname, const char *varname,
++                               int *value)
++{
++    kstat_ctl_t    *ksc;
++    kstat_t        *ks;
++    kid_t           kid;
++    kstat_named_t  *named;
++
++    int             ret = -1;        /* fail unless ... */
++    int             lookup_stat = 0;
++    
++    DEBUGMSGTL(("kernel_sunos5","\n Inside getKstatIntInstance: variable = %s",
++               varname));
++
++    if (kstat_fd == 0) {
++        kstat_fd = kstat_open();
++        if (kstat_fd == 0) {
++            snmp_log_perror("kstat_open");
++        }
++    }
++    if ((ksc = kstat_fd) == NULL) {
++        goto Return;
++    }
++
++    ks = kstat_lookup(ksc, classname, instance, statname);
++    if (ks == NULL) {
++        DEBUGMSGTL(("kernel_sunos5","\nclass %s, stat %s not found\n",
++                   classname ? classname : "NULL",
++                   statname ? statname : "NULL"));
++        goto Return;
++    }
++
++    kid = kstat_read(ksc, ks, NULL);
++    if (kid == -1) {
++        DEBUGMSGTL(("kernel_sunos5","\ncannot read class %s stats %s\n",
++                   classname ? classname : "NULL", 
++                   statname ? statname : "NULL"));
++        goto Return;
++    }
++
++    named = kstat_data_lookup(ks, varname);
++    if (named == NULL) {
++         DEBUGMSGTL(("kernel_sunos5","\nno var %s for class %s stat %s\n",
++                    varname, classname ? classname : "NULL",
++                    statname ? statname : "NULL"));
++         goto Return;
++    }
++    ret = 0;                /* maybe successful */
++    switch (named->data_type) {
++#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
++    case KSTAT_DATA_INT32:
++        DEBUGMSGTL(("kernel_sunos5"," value: %d\n", named->value.i32));
++        *value = named->value.i32; 
++        break;
++    case KSTAT_DATA_UINT32:
++        DEBUGMSGTL(("kernel_sunos5"," value: %u\n", named->value.ui32));
++        *value = named->value.ui32; 
++        break;
++    case KSTAT_DATA_INT64:
++        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.i64));
++        *value = named->value.i64;
++        break;
++    case KSTAT_DATA_UINT64:
++        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n", named->value.ui64));
++        *value = named->value.ui64; 
++        break;
++#else
++    case KSTAT_DATA_LONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.l));
++        *value = named->value.l; 
++        break;
++    case KSTAT_DATA_ULONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %lu\n", named->value.ul));
++        *value = named->value.ul; 
++        break;
++    case KSTAT_DATA_LONGLONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %lld\n", (long) named->value.ll));
++        *value = (long)named->value.ll;  
++        break;
++    case KSTAT_DATA_ULONGLONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n",
++                   (unsigned long) named->value.ull));
++        *value = (unsigned long)named->value.ull;  
++        break;
++#endif
++    default:
++        ret = -1;            /* fail */
++        break;
++    }
++ Return:
++    return ret;
++}
++
+ static void
+ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+-            int mtu)
++            boolean_t flags_unknown, int mtu)
+ { 
+     boolean_t havespeed = B_FALSE;
++    char phydevname[100];
++    char devbasename[100];
++    int instance = -1;
+ 
+     /*
+      * Set basic information 
+@@ -1627,7 +1918,10 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+     ifp->ifDescr.o_length = strlen(name);
+     strcpy(ifp->ifDescr.o_bytes, name);
+     ifp->ifAdminStatus = (flags & IFF_UP) ? 1 : 2;
+-    ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
++    if (flags_unknown)
++        ifp->ifOperStatus = 4; /* status unknown */
++    else
++        ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
+     ifp->ifLastChange = 0;      /* Who knows ...  */
+     ifp->flags = flags;
+     ifp->ifMtu = mtu;
+@@ -1649,14 +1943,26 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+          * this is good 
+          */
+ 	havespeed = B_TRUE;
++    } else if ((getKstatInt("link", name, "ifspeed", &ifp->ifSpeed) == 0) ||
++               (getKstatInt("link", name, "ifSpeed", &ifp->ifSpeed) == 0)) {
++        havespeed = B_TRUE;
+     }
+-
+     /* make ifOperStatus depend on link status if available */
+     if (ifp->ifAdminStatus == 1) {
+         int i_tmp;
+         /* only UPed interfaces get correct link status - if any */
+         if (getKstatInt(NULL, name,"link_up",&i_tmp) == 0) {
+             ifp->ifOperStatus = i_tmp ? 1 : 2;
++        } else if(link_to_phydev(name, phydevname) == 0) {
++                 strcpy(devbasename, phydevname);
++                 DEBUGMSGTL(("kernel_sunos5","phydevname = %s\n", phydevname));
++                 _dlpi_parse_devname(devbasename, &instance);
++                 DEBUGMSGTL(("kernel_sunos5","devbasename = %s, "
++                            "instance= %d\n", devbasename, instance));
++                 if(getKstatIntInstance(devbasename, instance, "phys",
++                                        "link_up", &i_tmp) == 0) {
++                     ifp->ifOperStatus = i_tmp ? 1 : 2;
++                 } 
+ #ifdef IFF_FAILED
+         } else if (flags & IFF_FAILED) {
+             /*

Added: csw/mgar/pkg/netsnmp/trunk/files/0034-manpage-snmptrapd.conf.5.def.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0034-manpage-snmptrapd.conf.5.def.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0034-manpage-snmptrapd.conf.5.def.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,19 @@
+--- a/man/snmptrapd.conf.5.def
++++ b/man/snmptrapd.conf.5.def
+@@ -203,12 +203,11 @@ SNMPv1 traps being converted as per RFC 2576, before being passed to the
+ program.
+ The input format is as follows, one entry per line:
+ .RS
+-.IP HOSTNAME
+-The name of the host that sent the notification, as determined by
+-.IR gethostbyaddr(3) .
++.IP HOSTDETAILS
++The details of the host that sent the notification in the format :
++.IP
++Host : HOSTNAME (PROTOCOL: [IPADDRESS]:PORTNO)
+ .br
+-.IP IPADDRESS
+-The IP address of the host that sent the notification.
+ .\"
+ .\" XXX - What about non-IPv4 transports?
+ .\"

Added: csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,123 @@
+--- a/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
++++ b/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
+@@ -14,6 +14,12 @@
+ 
+ netsnmp_feature_require(container_linked_list)
+ 
++typedef struct cd_container_s {
++    netsnmp_container *current;
++    netsnmp_container *deleted;
++} cd_container;
++
++
+ /*
+  * include our parent header 
+  */
+@@ -485,8 +491,21 @@ static void
+ _add_new_interface(netsnmp_interface_entry *ifentry,
+                    netsnmp_container *container)
+ {
+-    ifTable_rowreq_ctx *rowreq_ctx;
+-
++    ifTable_rowreq_ctx *rowreq_ctx, *container_entry;
++    netsnmp_iterator *ctxit;
++    ctxit = CONTAINER_ITERATOR(container);
++    container_entry = ITERATOR_FIRST(ctxit);
++
++    for(; container_entry; container_entry = ITERATOR_NEXT(ctxit)) {
++	if(!strcmp(ifentry->name, container_entry->data.ifName) && \
++	    ifentry->index != container_entry->data.ifentry->index) {
++		DEBUGMSGTL(("ifTable:access", "removing old entry %s (index %d != %d)\n",
++		    container_entry->data.ifName, container_entry->data.ifentry->index, ifentry->index));
++		    se_remove_value_from_slist("interfaces", container_entry->data.ifName);
++		CONTAINER_REMOVE(container, container_entry);
++		ifTable_release_rowreq_ctx(container_entry);
++		}
++    }
+     DEBUGMSGTL(("ifTable:access", "creating new entry\n"));
+ 
+     /*
+@@ -533,6 +552,21 @@ _add_new_interface(netsnmp_interface_entry *ifentry,
+         }
+     }
+ }
++ 
++/**
++ * delete removed entry
++ */
++static void
++_delete_missing_interface(ifTable_rowreq_ctx *rowreq_ctx,
++                          netsnmp_container *container)
++{
++    DEBUGMSGTL(("ifTable:access", "removing missing entry %s\n",
++                rowreq_ctx->data.ifName));
++
++    CONTAINER_REMOVE(container, rowreq_ctx);
++
++    ifTable_release_rowreq_ctx(rowreq_ctx);
++}
+ 
+ /**
+  * add new entry
+--- a/agent/mibgroup/if-mib/ifTable/ifTable_data_access.h
++++ b/agent/mibgroup/if-mib/ifTable/ifTable_data_access.h
+@@ -50,6 +50,8 @@ extern          "C" {
+ 
+ #define IFTABLE_REMOVE_MISSING_AFTER     (5 * 60) /* seconds */
+ 
++#define IFTABLE_REMOVE_MISSING_AFTER     (5 * 60) /* seconds */
++
+     void            ifTable_container_init(netsnmp_container
+                                            **container_ptr_ptr,
+                                            netsnmp_cache * cache);
+--- a/snmplib/snmp_enum.c
++++ b/snmplib/snmp_enum.c
+@@ -220,6 +220,28 @@ se_find_value_in_list(struct snmp_enum_list *list, const char *label)
+     return SE_DNE;              /* XXX: um, no good solution here */
+ }
+ 
++int se_remove_value_from_list(struct snmp_enum_list **list, const char *label)
++{
++   struct snmp_enum_list *lastlist;
++   if(!list)
++     return SE_DNE;
++
++   lastlist = NULL;
++   while(*list) {
++      if(strcmp((*list)->label, label) == 0) {
++	 free((*list)->label);
++	 if(lastlist)
++	   lastlist->next = (*list)->next;
++	 free(*list);
++	 *list = NULL;
++	 return 0;
++      }
++      lastlist = *list;
++      (*list) = (*list)->next;
++   }
++   
++}
++
+ int
+ se_find_free_value_in_list(struct snmp_enum_list *list)
+ {
+@@ -341,6 +363,19 @@ se_find_label_in_slist(const char *listname, int value)
+     return (se_find_label_in_list(se_find_slist(listname), value));
+ }
+ 
++void se_remove_value_from_slist(const char *listname, const char *label)
++{
++   struct snmp_enum_list_str *sptr, *lastp = NULL;
++   struct snmp_enum_list *list;
++   if (!listname)
++     return;
++
++   for (sptr = sliststorage;
++	sptr != NULL; lastp = sptr, sptr = sptr->next)
++     if (sptr->name && strcmp(sptr->name, listname) == 0)
++       se_remove_value_from_list(&sptr->list, label);
++}
++
+ int
+ se_find_value_in_slist(const char *listname, const char *label)
+ {

Added: csw/mgar/pkg/netsnmp/trunk/files/0048+0027-mnt-cache-hr_filesys.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0048+0027-mnt-cache-hr_filesys.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0048+0027-mnt-cache-hr_filesys.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,244 @@
+--- a/agent/mibgroup/host/hr_filesys.c
++++ b/agent/mibgroup/host/hr_filesys.c
+@@ -46,6 +46,10 @@
+ #include <sys/mount.h>
+ #endif
+ 
++#ifdef solaris2
++#include <sys/stat.h>
++#endif
++
+ #include <ctype.h>
+ #if HAVE_STRING_H
+ #include <string.h>
+@@ -108,7 +112,11 @@ netsnmp_feature_require(ctime_to_timet)
+ #ifdef solaris2
+ 
+ struct mnttab   HRFS_entry_struct;
+-struct mnttab  *HRFS_entry = &HRFS_entry_struct;
++struct mnttab  *HRFS_entry;
++struct mnttab	*HRFS_list;
++static int fscount;
++static time_t last_access = -1;
++
+ #define	HRFS_name	mnt_special
+ #define	HRFS_mount	mnt_mountp
+ #define	HRFS_type	mnt_fstype
+@@ -207,6 +215,9 @@ char           *cook_device(char *);
+ static u_char  *when_dumped(char *filesys, int level, size_t * length);
+ int             header_hrfilesys(struct variable *, oid *, size_t *, int,
+                                  size_t *, WriteMethod **);
++#ifdef solaris2
++static int      load_mnttab_cache_solaris(void);
++#endif
+ 
+         /*********************
+ 	 *
+@@ -662,7 +673,12 @@ Init_HR_FileSys(void)
+     HRFS_index = 1;
+     if (fp != NULL)
+         fclose(fp);
++#ifdef solaris2
++    if(!load_mnttab_cache_solaris())
++        return;
++#else
+     fp = fopen(ETC_MNTTAB, "r");
++#endif
+     if (!fp) {
+       netsnmp_config_error("Can't open mnttab %s\n", ETC_MNTTAB);
+     }
+@@ -722,6 +738,140 @@ const char     *HRFS_ignores[] = {
+     NULL
+ };
+ 
++#ifdef solaris2
++
++/*
++ *  This function has been introduced to reduce the overhead
++ *  of the getmntent() calls used to fetch the details of
++ *  the /etc/mnttab entries in Init_HR_FileSys().
++ *
++ *  We maintain a cache of all the /etc/mnttab entries and
++ *  walk through the cache instead of opening /etc/mnttab and
++ *  walking all the entries for each mountpoint.
++ */
++
++static int 
++load_mnttab_cache_solaris()
++{
++    char buf[MNT_LINE_MAX] = {NULL};
++    int i = 0;
++    struct stat file_stat;
++    const char **cpp;
++    char *ch, *token_ptr;
++    int token_flag = 0;
++    int skip_flag = 0;
++    int ignore_flag = 0;
++    int j = 0;
++    int lines = 0;
++    int ret = 0;
++    int chk_mnt = -1;
++    HRFS_index = 0;
++
++    if(stat(ETC_MNTTAB, &file_stat) != 0)
++    {
++        DEBUGMSGTL(("host/hr_filesys", "stat failed for mnttab.\n"));
++        return -1;
++    }
++    if (last_access == -1 || last_access != file_stat.st_mtime) {
++        fp = fopen(ETC_MNTTAB, "r");
++        if(fp == NULL)
++        {
++            DEBUGMSGTL(("host/hr_filesys", "fopen failed for mnttab.\n"));
++            return -1;
++        }
++        
++        /* find the number of valid entries in mnttab. */
++        
++        while ((fgets((char *) &buf, sizeof(buf), fp)) != NULL) {
++            j = 0;
++            skip_flag = 0;
++            token_flag = 0;
++
++            /* tokenize the mnttab entries to fetch the fstype
++             * which determines the valid entries.
++             */
++
++            ch = strtok_r(buf, " \t", &token_ptr);
++            while (ch != NULL) {
++                j++;
++                if(j == 3) {
++                    for (cpp = HRFS_ignores; *cpp != NULL; ++cpp) {
++                        if(!strncmp(ch, *cpp, strlen(ch))) {
++                            skip_flag = 1;
++                            break;
++                        }
++                    }
++                    token_flag = 1;
++                }
++                if(token_flag)
++                    break;
++                ch = strtok_r(NULL, " \t", &token_ptr);
++             }
++             if(!skip_flag)
++                 lines++;
++        }
++        fclose(fp);
++
++        fscount = lines;
++        HRFS_list = (struct mnttab *) malloc (sizeof(struct mnttab) * fscount);
++        if(HRFS_list == NULL) {
++            DEBUGMSGTL(("host/hr_filesys", "Memory allocation for mnttab cache failed.\n"));
++            return -1;
++        }
++
++        fp = fopen(ETC_MNTTAB, "r");
++        if(fp == NULL) {
++            DEBUGMSGTL(("host/hr_filesys", "fopen failed for mnttab.\n"));
++            free(HRFS_list);
++            return -1;
++        }
++        while ((chk_mnt = getmntent(fp, &HRFS_entry_struct)) != -1) {
++             if(chk_mnt != 0)
++                 continue;
++             for (cpp = HRFS_ignores; *cpp != NULL; ++cpp) {
++                 if (!strcmp(HRFS_entry_struct.mnt_fstype, *cpp)) {
++                     ignore_flag = 1;
++                     break;
++                 }
++             }
++             if(!ignore_flag) {
++                 if(i >= fscount)
++                 {
++                    DEBUGMSGTL(("host/hr_filesys","increasing cachesize from %d to %d",fscount,i+1));
++                    HRFS_list = realloc(HRFS_list, sizeof(struct mnttab) * (i+1));
++                    fscount = i+1;
++                    if(HRFS_list == NULL)
++                    {
++                        DEBUGMSGTL(("host/hr_filesys","\nrealloc failed for mnttab cache.\n"));
++                        return -1;
++                    }
++                 }
++                 HRFS_list[i].mnt_special = strdup(HRFS_entry_struct.mnt_special);
++                 HRFS_list[i].mnt_mountp = strdup(HRFS_entry_struct.mnt_mountp);
++                 HRFS_list[i].mnt_fstype = strdup(HRFS_entry_struct.mnt_fstype);
++                 HRFS_list[i].mnt_mntopts = strdup(HRFS_entry_struct.mnt_mntopts);
++                 i++;
++             }
++             ignore_flag = 0;
++        }
++        if(i < fscount)
++        {
++            DEBUGMSGTL(("host/hr_filesys","\ndecreasing cachesize from %d to %d\n",fscount,i));
++            HRFS_list = realloc(HRFS_list, sizeof(struct mnttab) * i );
++            if(HRFS_list == NULL)
++            {
++                DEBUGMSGTL(("host/hr_filesys","\nrealloc failed for mnttab cache.\n"));
++                return -1;
++            }
++        }
++
++        HRFS_entry = HRFS_list;
++        last_access = file_stat.st_mtime;
++    }
++    return ret;
++}
++#endif
++
+ int
+ Get_Next_HR_FileSys(void)
+ {
+@@ -758,17 +908,18 @@ Get_Next_HR_FileSys(void)
+ #else
+     const char    **cpp;
+ 
+-    if (fp == NULL)
+-        return -1;
+ 
+ #ifdef solaris2
+-    if (getmntent(fp, HRFS_entry) != 0)
++    if (HRFS_index >= fscount)
+         return -1;
++    HRFS_entry = &HRFS_list[HRFS_index];
++        return ++HRFS_index;
+ #else
++    if (fp == NULL)
++        return -1;
+     HRFS_entry = getmntent(fp);
+     if (HRFS_entry == NULL)
+         return -1;
+-#endif                          /* solaris2 */
+ 
+     for (cpp = HRFS_ignores; *cpp != NULL; ++cpp)
+         if (!strcmp(HRFS_entry->HRFS_type, *cpp))
+@@ -787,6 +938,8 @@ Get_Next_HR_FileSys(void)
+     }
+ 
+     return HRFS_index++;
++#endif
++
+ #endif                          /* HAVE_GETFSSTAT */
+ }
+ 
+@@ -857,6 +1010,21 @@ End_HR_FileSys(void)
+     if (fp != NULL)
+         fclose(fp);
+     fp = NULL;
++
++#ifdef solaris2
++    int i = 0;
++    while (i < fscount) {
++        free(HRFS_list[i].mnt_special);
++        free(HRFS_list[i].mnt_mountp);
++        free(HRFS_list[i].mnt_fstype);
++        free(HRFS_list[i].mnt_mntopts);
++        i++;
++    }
++    if (HRFS_list != NULL)
++        free(HRFS_list);
++    last_access = -1;
++#endif
++
+ #endif
+ }
+ 

Added: csw/mgar/pkg/netsnmp/trunk/files/0051-CVE-2014-2285.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0051-CVE-2014-2285.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0051-CVE-2014-2285.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,26 @@
+--- a/perl/TrapReceiver/TrapReceiver.xs
++++ b/perl/TrapReceiver/TrapReceiver.xs
+@@ -81,18 +81,18 @@ int   perl_trapd_handler( netsnmp_pdu           *pdu,
+         STOREPDUi("securitymodel", pdu->securityModel);
+         STOREPDUi("securitylevel", pdu->securityLevel);
+         STOREPDU("contextName",
+-                 newSVpv(pdu->contextName, pdu->contextNameLen));
++                 newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen));
+         STOREPDU("contextEngineID",
+-                 newSVpv((char *) pdu->contextEngineID,
++                 newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "",
+                                     pdu->contextEngineIDLen));
+         STOREPDU("securityEngineID",
+-                 newSVpv((char *) pdu->securityEngineID,
++                 newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "",
+                                     pdu->securityEngineIDLen));
+         STOREPDU("securityName",
+-                 newSVpv((char *) pdu->securityName, pdu->securityNameLen));
++                 newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen));
+     } else {
+         STOREPDU("community",
+-                 newSVpv((char *) pdu->community, pdu->community_len));
++                 newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len));
+     }
+ 
+     if (transport && transport->f_fmtaddr) {

Added: csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,187 @@
+--- a/agent/mibgroup/hardware/cpu/cpu_kstat.c
++++ b/agent/mibgroup/hardware/cpu/cpu_kstat.c
+@@ -17,16 +17,16 @@
+ extern kstat_ctl_t  *kstat_fd;
+ extern int           cpu_num;
+ int _cpu_status(char *state);
+-
++static void add_new_kstat_cpu_entry(kstat_t *ksp);
++static struct cpu_idx * add_cpu_idx(struct cpu_idx * head, int idx);
++ 
+     /*
+      * Initialise the list of CPUs on the system
+      *   (including descriptions)
+      */
+ void init_cpu_kstat( void ) {
+-    int               i = 0, n = 0, clock, state_begin;
+-    char              ctype[15], ftype[15], state[10];
++    int               n = 0;
+     kstat_t          *ksp;
+-    kstat_named_t    *ks_data;
+     netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 1 );
+     strcpy(cpu->name, "Overall CPU statistics");
+ 
+@@ -41,45 +41,61 @@ void init_cpu_kstat( void ) {
+         if ((strcmp(ksp->ks_module, "cpu_info") == 0) &&
+             (strcmp(ksp->ks_class,  "misc"    ) == 0)) {
+             kstat_read(kstat_fd, ksp, NULL );
++            add_new_kstat_cpu_entry(ksp);
+             n++;
+-            clock = 999999;
+-            memset(ctype, 0, sizeof(ctype));
+-            memset(ftype, 0, sizeof(ftype));
+-            memset(state, 0, sizeof(state));
+-            for (i=0, ks_data = ksp->ks_data; i < ksp->ks_ndata; i++, ks_data++) {
+-                if ( strcmp( ks_data->name, "state" ) == 0 ) {
+-                    strlcpy(state, ks_data->value.c, sizeof(state));
+-                } else if ( strcmp( ks_data->name, "state_begin" ) == 0 ) {
+-                    state_begin = ks_data->value.i32;
+-                } else if ( strcmp( ks_data->name, "cpu_type" ) == 0 ) {
+-                    strlcpy(ctype, ks_data->value.c, sizeof(ctype));
+-                } else if ( strcmp( ks_data->name, "fpu_type" ) == 0 ) {
+-                    strlcpy(ftype, ks_data->value.c, sizeof(ftype));
+-                } else if ( strcmp( ks_data->name, "clock_MHz" ) == 0 ) {
+-                    clock = ks_data->value.i32;
+-                }
+-            }
+-            i   = ksp->ks_instance;
+-            cpu = netsnmp_cpu_get_byIdx( i, 1 );
+-            sprintf( cpu->name,  "cpu%d", i );
+-            sprintf( cpu->descr, "CPU %d Sun %d MHz %s with %s FPU %s",
+-                                 i, clock, ctype, ftype, state  );
+-            cpu->status = _cpu_status(state); /* XXX - or in 'n_c_a_load' ? */
+         }
+     }
+-    cpu_num = i;
++    cpu_num = n;
+ }
+ 
++    /*
++     * adds the new cpu entry to the exisitng list
++     */
++static void
++add_new_kstat_cpu_entry( kstat_t *ksp ) {
++    int i, clock, state_begin;
++    char ctype[15], ftype[15], state[10];
++    kstat_named_t    *ks_data;
++    netsnmp_cpu_info *cpu;
++
++    clock = 999999;
++    memset(ctype, 0, sizeof(ctype));
++    memset(ftype, 0, sizeof(ftype));
++    memset(state, 0, sizeof(state));
++
++    for (i=0, ks_data = ksp->ks_data; i < ksp->ks_ndata; i++, ks_data++) {
++        if ( strcmp( ks_data->name, "state" ) == 0 ) {
++            strncpy( state, ks_data->value.c, sizeof(state));
++            state[sizeof(state)-1] = '\0';
++        } else if ( strcmp( ks_data->name, "state_begin" ) == 0 ) {
++            state_begin = ks_data->value.i32;
++        } else if ( strcmp( ks_data->name, "cpu_type" ) == 0 ) {
++            strncpy( ctype, ks_data->value.c, sizeof(ctype));
++            ctype[sizeof(ctype)-1] = '\0';
++        } else if ( strcmp( ks_data->name, "fpu_type" ) == 0 ) {
++            strncpy( ftype, ks_data->value.c, sizeof(ftype));
++            ftype[sizeof(ftype)-1] = '\0';
++        } else if ( strcmp( ks_data->name, "clock_MHz" ) == 0 ) {
++            clock = ks_data->value.i32;
++        }
++    }
++    i   = ksp->ks_instance;
++    cpu = netsnmp_cpu_get_byIdx( i, 1 );
++    sprintf( cpu->name,  "cpu%d", i );
++    sprintf( cpu->descr, "CPU %d Sun %d MHz %s with %s FPU %s", i, clock, ctype, ftype, state  );
++    cpu->status = _cpu_status(state);
++}
+ 
+     /*
+      * Load the latest CPU usage statistics
+      */
+ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
+-    int               i=1;
++    int               i=1, n=0;
+     kstat_t          *ksp;
+     cpu_stat_t        cs;
+     netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
+     netsnmp_cpu_info *cpu2;
++    struct cpu_idx *new_cpu_list = NULL, *temp_cpu_idx;
+ 
+         /* Clear overall stats, ready for summing individual CPUs */
+     cpu->user_ticks = 0;
+@@ -94,6 +110,32 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
+ 
+     kstat_chain_update( kstat_fd );
+     DEBUGMSGTL(("cpu", "cpu_kstat load\n "));
++
++    /*
++     * The stats update is three step.
++     * First - add in the new cpus' info to the linked list
++     */
++    for (ksp = kstat_fd->kc_chain; ksp != NULL; ksp = ksp->ks_next) {
++        if (ksp->ks_flags & KSTAT_FLAG_INVALID)
++            continue;
++        if ((strcmp(ksp->ks_module, "cpu_info") == 0) &&
++            (strcmp(ksp->ks_class,  "misc"    ) == 0)) {
++            kstat_read(kstat_fd, ksp, NULL );
++            i = ksp->ks_instance;
++            new_cpu_list = add_cpu_idx( new_cpu_list, i);
++            cpu2 = netsnmp_cpu_get_byIdx( i, 0 );
++            if ( !cpu2 ) {
++                add_new_kstat_cpu_entry(ksp);
++                n++;
++            }
++        }
++    }
++
++
++    /* Second - update the CPU list to reflect new kernel structures */
++    n -= netsnmp_update_cpu_list( new_cpu_list );
++
++    /* Third - for updating stats for the new CPU set */
+     for (ksp = kstat_fd->kc_chain; ksp != NULL; ksp = ksp->ks_next) {
+         if (ksp->ks_flags & KSTAT_FLAG_INVALID)
+             continue;
+@@ -135,9 +177,43 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
+             cpu->nCtxSwitches += (unsigned long long)cs.cpu_sysinfo.pswitch;
+         }
+     }
++    cpu_num += n;
++    /* Clean up the temporary CPU index list */
++    while(new_cpu_list) {
++        temp_cpu_idx = new_cpu_list;
++        new_cpu_list = new_cpu_list->next;
++        SNMP_FREE(temp_cpu_idx);
++    }
+     return 0;
+ }
+ 
++    /* returns the new head */
++static struct cpu_idx *
++add_cpu_idx(struct cpu_idx * head, int idx)
++{
++    struct cpu_idx *cpu_idx, *current;
++    cpu_idx = SNMP_MALLOC_TYPEDEF( struct cpu_idx );
++    if ( !cpu_idx ) {
++        DEBUGMSG(("cpu", "(cpu_idx creation failed)\n"));
++        return head;
++    }
++
++    cpu_idx->idx = idx;
++    if ( !head || head->idx > idx ) {
++        cpu_idx->next = head;
++        return cpu_idx;
++    }
++
++    for ( current=head; current; current=current->next ) {
++        if ( !current->next || current->next->idx > idx ) {
++            cpu_idx->next = current->next;
++            current->next = cpu_idx;
++            return head;
++        }
++    }
++
++}
++
+ int
+ _cpu_status( char *state)
+ {

Added: csw/mgar/pkg/netsnmp/trunk/files/net-snmp-CVE-2014-3565.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/net-snmp-CVE-2014-3565.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/net-snmp-CVE-2014-3565.patch	2014-12-18 15:42:45 UTC (rev 24479)
@@ -0,0 +1,446 @@
+commit 7f4a7b891332899cea26e95be0337aae01648742
+Author: Jan Safranek <jsafranek at users.sourceforge.net>
+Date:   Thu Jul 31 13:46:49 2014 +0200
+
+    Added checks for printing variables with wrong types.
+    
+    When -OQ command line argument is used, variable formatter preffers the type
+    of the varible parsed from a MIB file instead of checking type of the variable
+    as parsed from SNMP message.
+    
+    This can lead to crashes when incoming packets contains a variable with
+    NULL type, while the MIB says the variable should be non-NULL, like Integer.
+    The formatter then tries to interpret the NULL (from packet) as Integer (from
+    MIB file).
+
+diff --git a/snmplib/mib.c b/snmplib/mib.c
+index 9d3ca41..c6e0010 100644
+--- a/snmplib/mib.c
++++ b/snmplib/mib.c
+@@ -439,17 +439,16 @@ sprint_realloc_octet_string(u_char ** buf, size_t * buf_len,
+     u_char         *cp;
+     int             output_format, cnt;
+ 
+-    if ((var->type != ASN_OCTET_STR) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        const char      str[] = "Wrong Type (should be OCTET STRING): ";
+-        if (snmp_cstrcat
+-            (buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_OCTET_STR) {
++        if (!netsnmp_ds_get_boolean(
++                    NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            const char      str[] = "Wrong Type (should be OCTET STRING): ";
++            if (!snmp_cstrcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+ 
+@@ -702,16 +701,16 @@ sprint_realloc_float(u_char ** buf, size_t * buf_len,
+                      const struct enum_list *enums,
+                      const char *hint, const char *units)
+ {
+-    if ((var->type != ASN_OPAQUE_FLOAT) &&
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, 
+-                         "Wrong Type (should be Float): ")) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_OPAQUE_FLOAT) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Float): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -772,17 +771,16 @@ sprint_realloc_double(u_char ** buf, size_t * buf_len,
+                       const struct enum_list *enums,
+                       const char *hint, const char *units)
+ {
+-    if ((var->type != ASN_OPAQUE_DOUBLE) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        if (snmp_cstrcat
+-            (buf, buf_len, out_len, allow_realloc, 
+-             "Wrong Type (should be Double): ")) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_OPAQUE_DOUBLE) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Double): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -847,20 +845,21 @@ sprint_realloc_counter64(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     char            a64buf[I64CHARSZ + 1];
+ 
+-    if ((var->type != ASN_COUNTER64
++    if (var->type != ASN_COUNTER64
+ #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
+         && var->type != ASN_OPAQUE_COUNTER64
+         && var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_U64
+ #endif
+-        ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, 
+-                        "Wrong Type (should be Counter64): ")) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++        ) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Counter64): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -948,23 +947,25 @@ sprint_realloc_opaque(u_char ** buf, size_t * buf_len,
+                       const struct enum_list *enums,
+                       const char *hint, const char *units)
+ {
+-    if ((var->type != ASN_OPAQUE
++    if (var->type != ASN_OPAQUE
+ #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
+         && var->type != ASN_OPAQUE_COUNTER64
+         && var->type != ASN_OPAQUE_U64
+         && var->type != ASN_OPAQUE_I64
+         && var->type != ASN_OPAQUE_FLOAT && var->type != ASN_OPAQUE_DOUBLE
+ #endif                          /* NETSNMP_WITH_OPAQUE_SPECIAL_TYPES */
+-        ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, 
+-                         "Wrong Type (should be Opaque): ")) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++        ) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Opaque): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
++
+ #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
+     switch (var->type) {
+     case ASN_OPAQUE_COUNTER64:
+@@ -1040,17 +1041,16 @@ sprint_realloc_object_identifier(u_char ** buf, size_t * buf_len,
+ {
+     int             buf_overflow = 0;
+ 
+-    if ((var->type != ASN_OBJECT_ID) &&
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] =
+-            "Wrong Type (should be OBJECT IDENTIFIER): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_OBJECT_ID) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be OBJECT IDENTIFIER): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -1110,16 +1110,16 @@ sprint_realloc_timeticks(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     char            timebuf[40];
+ 
+-    if ((var->type != ASN_TIMETICKS) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be Timeticks): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_TIMETICKS) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Timeticks): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_NUMERIC_TIMETICKS)) {
+@@ -1277,17 +1277,18 @@ sprint_realloc_integer(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     char           *enum_string = NULL;
+ 
+-    if ((var->type != ASN_INTEGER) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be INTEGER): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_INTEGER) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be INTEGER): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
++
+     for (; enums; enums = enums->next) {
+         if (enums->value == *var->val.integer) {
+             enum_string = enums->label;
+@@ -1380,16 +1381,16 @@ sprint_realloc_uinteger(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     char           *enum_string = NULL;
+ 
+-    if ((var->type != ASN_UINTEGER) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be UInteger32): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_UINTEGER) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be UInteger32): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     for (; enums; enums = enums->next) {
+@@ -1477,17 +1478,16 @@ sprint_realloc_gauge(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     char            tmp[32];
+ 
+-    if ((var->type != ASN_GAUGE) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] =
+-            "Wrong Type (should be Gauge32 or Unsigned32): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_GAUGE) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Gauge32 or Unsigned32): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -1550,16 +1550,16 @@ sprint_realloc_counter(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     char            tmp[32];
+ 
+-    if ((var->type != ASN_COUNTER) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be Counter32): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_COUNTER) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be Counter32): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -1613,16 +1613,16 @@ sprint_realloc_networkaddress(u_char ** buf, size_t * buf_len,
+ {
+     size_t          i;
+ 
+-    if ((var->type != ASN_IPADDRESS) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be NetworkAddress): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_IPADDRESS) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be NetworkAddress): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -1679,16 +1679,16 @@ sprint_realloc_ipaddress(u_char ** buf, size_t * buf_len, size_t * out_len,
+ {
+     u_char         *ip = var->val.string;
+ 
+-    if ((var->type != ASN_IPADDRESS) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be IpAddress): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_IPADDRESS) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be IpAddress): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -1737,20 +1737,20 @@ sprint_realloc_null(u_char ** buf, size_t * buf_len, size_t * out_len,
+                     const struct enum_list *enums,
+                     const char *hint, const char *units)
+ {
+-    if ((var->type != ASN_NULL) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be NULL): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_NULL) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be NULL): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+-    } else {
+-        u_char          str[] = "NULL";
+-        return snmp_strcat(buf, buf_len, out_len, allow_realloc, str);
+     }
++
++    u_char          str[] = "NULL";
++    return snmp_strcat(buf, buf_len, out_len, allow_realloc, str);
+ }
+ 
+ 
+@@ -1785,16 +1785,16 @@ sprint_realloc_bitstring(u_char ** buf, size_t * buf_len, size_t * out_len,
+     u_char         *cp;
+     char           *enum_string;
+ 
+-    if ((var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) &&
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be BITS): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be BITS): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
+@@ -1869,16 +1869,16 @@ sprint_realloc_nsapaddress(u_char ** buf, size_t * buf_len,
+                            const struct enum_list *enums, const char *hint,
+                            const char *units)
+ {
+-    if ((var->type != ASN_NSAP) && 
+-        (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
+-        u_char          str[] = "Wrong Type (should be NsapAddress): ";
+-        if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
+-            return sprint_realloc_by_type(buf, buf_len, out_len,
++    if (var->type != ASN_NSAP) {
++        if (!netsnmp_ds_get_boolean(
++                NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
++            u_char          str[] = "Wrong Type (should be NsapAddress): ";
++            if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
++                return 0;
++        }
++        return sprint_realloc_by_type(buf, buf_len, out_len,
+                                           allow_realloc, var, NULL, NULL,
+                                           NULL);
+-        } else {
+-            return 0;
+-        }
+     }
+ 
+     if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {

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


From bonivart at users.sourceforge.net  Thu Dec 18 21:40:07 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 18 Dec 2014 20:40:07 +0000
Subject: SF.net SVN: gar:[24484] csw/mgar/pkg
Message-ID: <3k3Q7j0Gwjz85@mail.opencsw.org>

Revision: 24484
          http://sourceforge.net/p/gar/code/24484
Author:   bonivart
Date:     2014-12-18 20:40:06 +0000 (Thu, 18 Dec 2014)
Log Message:
-----------
logtool/trunk: initial commit

Added Paths:
-----------
    csw/mgar/pkg/logtool/
    csw/mgar/pkg/logtool/Makefile
    csw/mgar/pkg/logtool/branches/
    csw/mgar/pkg/logtool/tags/
    csw/mgar/pkg/logtool/trunk/
    csw/mgar/pkg/logtool/trunk/Makefile
    csw/mgar/pkg/logtool/trunk/checksums
    csw/mgar/pkg/logtool/trunk/files/

Added: csw/mgar/pkg/logtool/Makefile
===================================================================
--- csw/mgar/pkg/logtool/Makefile	                        (rev 0)
+++ csw/mgar/pkg/logtool/Makefile	2014-12-18 20:40:06 UTC (rev 24484)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/logtool/trunk
===================================================================
--- csw/mgar/pkg/logtool/trunk	2014-12-18 17:18:57 UTC (rev 24483)
+++ csw/mgar/pkg/logtool/trunk	2014-12-18 20:40:06 UTC (rev 24484)

Property changes on: csw/mgar/pkg/logtool/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/logtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logtool/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/logtool/trunk/Makefile	2014-12-18 20:40:06 UTC (rev 24484)
@@ -0,0 +1,20 @@
+NAME = logtool
+VERSION = 1.2.8
+GARTYPE = v2
+
+DESCRIPTION = Parse ASCII logfiles into a more palatable format
+define BLURB
+endef
+
+MASTER_SITES = http://xjack.org/logtool/download/
+DISTFILES = $(DISTNAME).tar.gz
+
+GARCOMPILER = GNU
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# There are no tests
+SKIPTEST = 1
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/logtool/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/logtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/logtool/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/logtool/trunk/checksums	2014-12-18 20:40:06 UTC (rev 24484)
@@ -0,0 +1 @@
+f596fd2057fe5f3293ca054dd14a3c10  logtool-1.2.8.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  Fri Dec 19 11:40:55 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Fri, 19 Dec 2014 10:40:55 +0000
Subject: SF.net SVN: gar:[24488]
	csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen. patch
Message-ID: <3k3mnq6RMszP5@mail.opencsw.org>

Revision: 24488
          http://sourceforge.net/p/gar/code/24488
Author:   lblume
Date:     2014-12-19 10:40:55 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
nut/trunk: Typo in patchfile

Modified Paths:
--------------
    csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch

Modified: csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch
===================================================================
--- csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:09:38 UTC (rev 24487)
+++ csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:40:55 UTC (rev 24488)
@@ -33,9 +33,6 @@
  /* type to use in place of socklen_t if not defined */
  #undef socklen_t
 +
-+/* #undef inline */
-+#endif
-+
 +/* type to use in place of socklen_t if not defined */
 +/* #undef socklen_t */
 +

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


From lblume at users.sourceforge.net  Fri Dec 19 11:44:52 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Fri, 19 Dec 2014 10:44:52 +0000
Subject: SF.net SVN: gar:[24489]
	csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen. patch
Message-ID: <3k3mtN1BVVzRV@mail.opencsw.org>

Revision: 24489
          http://sourceforge.net/p/gar/code/24489
Author:   lblume
Date:     2014-12-19 10:44:51 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
nut/trunk: Mumber of lines in patchfile

Modified Paths:
--------------
    csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch

Modified: csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch
===================================================================
--- csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:40:55 UTC (rev 24488)
+++ csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:44:51 UTC (rev 24489)
@@ -28,7 +28,7 @@
 index f255496..f5dc114 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -442,3 +442,14 @@
+@@ -442,3 +442,12 @@
  
  /* type to use in place of socklen_t if not defined */
  #undef socklen_t

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


From lblume at users.sourceforge.net  Fri Dec 19 11:51:05 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Fri, 19 Dec 2014 10:51:05 +0000
Subject: SF.net SVN: gar:[24490]
	csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen. patch
Message-ID: <3k3n1Y6szqzV1@mail.opencsw.org>

Revision: 24490
          http://sourceforge.net/p/gar/code/24490
Author:   lblume
Date:     2014-12-19 10:51:05 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
nut/trunk: One more try to get the patch right

Modified Paths:
--------------
    csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch

Modified: csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch
===================================================================
--- csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:44:51 UTC (rev 24489)
+++ csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:51:05 UTC (rev 24490)
@@ -25,18 +25,16 @@
  AC_CHECK_DECLS(LOG_UPTO, [], [], [#include <syslog.h>])
  
  dnl the following may add stuff to LIBOBJS (is this still needed?)
-index f255496..f5dc114 100644
+index f255496..19e73ee 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -442,3 +442,12 @@
+@@ -442,3 +442,9 @@
  
  /* type to use in place of socklen_t if not defined */
  #undef socklen_t
 +
-+/* type to use in place of socklen_t if not defined */
-+/* #undef socklen_t */
-+
 +/* Missing on Solaris 10*/
 +#ifndef HAVE_STRNLEN
 +size_t strnlen (const char *str, size_t max);
 +#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  Fri Dec 19 11:59:00 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Fri, 19 Dec 2014 10:59:00 +0000
Subject: SF.net SVN: gar:[24491] csw/mgar/pkg/nut/trunk
Message-ID: <3k3nCC0pZ1zXV@mail.opencsw.org>

Revision: 24491
          http://sourceforge.net/p/gar/code/24491
Author:   lblume
Date:     2014-12-19 10:58:59 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
nut/trunk: Try to add an include

Modified Paths:
--------------
    csw/mgar/pkg/nut/trunk/Makefile
    csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch

Modified: csw/mgar/pkg/nut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nut/trunk/Makefile	2014-12-19 10:51:05 UTC (rev 24490)
+++ csw/mgar/pkg/nut/trunk/Makefile	2014-12-19 10:58:59 UTC (rev 24491)
@@ -36,3 +36,7 @@
 
 include gar/category.mk
 
+pre-configure:
+	cd $(WORKSRC) && autoconf
+	$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch
===================================================================
--- csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:51:05 UTC (rev 24490)
+++ csw/mgar/pkg/nut/trunk/files/0001-missing-strnlen.patch	2014-12-19 10:58:59 UTC (rev 24491)
@@ -28,13 +28,14 @@
 index f255496..19e73ee 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -442,3 +442,9 @@
+@@ -442,3 +442,10 @@
  
  /* type to use in place of socklen_t if not defined */
  #undef socklen_t
 +
 +/* Missing on Solaris 10*/
 +#ifndef HAVE_STRNLEN
++#include <strings.h>
 +size_t strnlen (const char *str, size_t max);
 +#endif
 +

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


From cgrzemba at users.sourceforge.net  Fri Dec 19 13:32:23 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 19 Dec 2014 12:32:23 +0000
Subject: SF.net SVN: gar:[24493] csw/mgar/pkg/netsnmp/trunk
Message-ID: <3k3qHH2NGlzc7@mail.opencsw.org>

Revision: 24493
          http://sourceforge.net/p/gar/code/24493
Author:   cgrzemba
Date:     2014-12-19 12:32:22 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
netsnmp/trunk: split off special SunOS5.11 patch

Modified Paths:
--------------
    csw/mgar/pkg/netsnmp/trunk/Makefile
    csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch
    csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch

Added Paths:
-----------
    csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.10.patch
    csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.11.patch

Removed Paths:
-------------
    csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch

Modified: csw/mgar/pkg/netsnmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/Makefile	2014-12-19 12:18:08 UTC (rev 24492)
+++ csw/mgar/pkg/netsnmp/trunk/Makefile	2014-12-19 12:32:22 UTC (rev 24493)
@@ -39,7 +39,7 @@
 PATCHFILES += 0011-Makefile.in.patch
 PATCHFILES += 0012-Makefile.PL.patch
 PATCHFILES += 0015+0016-vmstat_solaris2.patch
-PATCHFILES += 0024-kernel_sunos5.patch
+PATCHFILES += 0024-kernel_sunos5.$(GAROSREL).patch
 PATCHFILES += 0034-manpage-snmptrapd.conf.5.def.patch
 PATCHFILES += 0035-bug-1849903.patch
 PATCHFILES += 0048+0027-mnt-cache-hr_filesys.patch
@@ -51,7 +51,7 @@
 # GARCOMPILER = SOS12U3
 GARCOMPILER = GCC4
 BUILD_DEP_PKGS = CSWpy-setuptools
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386
 
 INITSMF = $(sysconfdir)/init.d/netsnmpd
 INITSMF += $(sysconfdir)/init.d/netsnmptrapd

Added: csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.10.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.10.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.10.patch	2014-12-19 12:32:22 UTC (rev 24493)
@@ -0,0 +1,561 @@
+--- a/agent/mibgroup/kernel_sunos5.c
++++ b/agent/mibgroup/kernel_sunos5.c
+@@ -82,15 +84,15 @@ kstat_ctl_t    *kstat_fd = 0;
+ static
+ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
+     {MIB_SYSTEM, 0, (void *) -1, 0, 0, 0, 0},
+-    {MIB_INTERFACES, 50 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
++    {MIB_INTERFACES, 128 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
+      0},
+     {MIB_AT, 0, (void *) -1, 0, 0, 0, 0},
+     {MIB_IP, sizeof(mib2_ip_t), (void *) -1, 0, 60, 0, 0},
+-    {MIB_IP_ADDR, 20 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
++    {MIB_IP_ADDR, 128 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
+      0},
+-    {MIB_IP_ROUTE, 200 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
++    {MIB_IP_ROUTE, 400 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
+      0, 0},
+-    {MIB_IP_NET, 100 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
++    {MIB_IP_NET, 400 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
+      300, 0, 0},
+     {MIB_ICMP, sizeof(mib2_icmp_t), (void *) -1, 0, 60, 0, 0},
+     {MIB_TCP, sizeof(mib2_tcp_t), (void *) -1, 0, 60, 0, 0},
+@@ -105,13 +107,13 @@ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
+     {MIB_SNMP, 0, (void *) -1, 0, 0, 0, 0},
+ #ifdef SOLARIS_HAVE_IPV6_MIB_SUPPORT
+ #ifdef SOLARIS_HAVE_RFC4293_SUPPORT
+-    {MIB_IP_TRAFFIC_STATS, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
++    {MIB_IP_TRAFFIC_STATS, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
+      30, 0, 0},
+-    {MIB_IP6, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
+ #else
+-    {MIB_IP6, 20 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6, 128 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
+ #endif
+-    {MIB_IP6_ADDR, 20 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6_ADDR, 128 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
+     {MIB_TCP6_CONN, 1000 * sizeof(mib2_tcp6ConnEntry_t), (void *) -1, 0, 30,
+      0, 0},
+     {MIB_UDP6_ENDPOINT, 1000 * sizeof(mib2_udp6Entry_t), (void *) -1, 0, 30,
+@@ -184,7 +186,7 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type, mib2_ifEntry_t *resp,
+       size_t *length, int (*comp)(void *, void *), void *arg);
+ static void 
+ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+-            int mtu);
++            boolean_t flags_unknown, int mtu);
+ static int get_if_stats(mib2_ifEntry_t *ifp);
+
+ #if defined(HAVE_IF_NAMEINDEX) && defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)
+@@ -294,7 +296,9 @@ getKstatInt(const char *classname, const char *statname,
+     kstat_t        *ks;
+     kid_t           kid;
+     kstat_named_t  *named;
++ 
+     int             ret = -1;        /* fail unless ... */
++    int             lookup_stat = 0;	
+ 
+     if (kstat_fd == 0) {
+ 	kstat_fd = kstat_open();
+@@ -305,27 +309,88 @@ getKstatInt(const char *classname, const char *statname,
+     if ((ksc = kstat_fd) == NULL) {
+ 	goto Return;
+     }
+-    ks = kstat_lookup(ksc, classname, -1, statname);
+-    if (ks == NULL) {
+-	DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
+-		classname ? classname : "NULL",
+-		statname ? statname : "NULL"));
+-	goto Return;
+-    }
+-    kid = kstat_read(ksc, ks, NULL);
+-    if (kid == -1) {
+-	DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
+-		classname ? classname : "NULL", statname ? statname : "NULL"));
+-	goto Return;
+-    }
+-    named = kstat_data_lookup(ks, varname);
+-    if (named == NULL) {
+-	DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
+-		varname, classname ? classname : "NULL",
+-		statname ? statname : "NULL"));
+-	goto Return;
++   
++    if ((ks = kstat_lookup(ksc, statname, -1, "link")) != NULL)
++    {
++        kid = kstat_read(ksc, ks, NULL);
++        if (kid == -1) {
++            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
++                    statname ? statname : "NULL", "link"));
++        }
++        else
++        {
++            named = kstat_data_lookup(ks, varname);
++            if (named == NULL) {
++	        DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
++                        varname, statname ? statname : "NULL", "link"));
++            }
++            else {
++                    switch (named->data_type) {
++#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
++                        case KSTAT_DATA_INT32:
++                            if(named->value.i32)
++                                lookup_stat = 1;
++	                    break;
++                        case KSTAT_DATA_UINT32:
++                            if(named->value.ui32)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_INT64:
++                            if(named->value.i64)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_UINT64:
++                            if(named->value.ui64)
++                                lookup_stat = 1;
++                            break;
++#else
++                        case KSTAT_DATA_LONG:
++                            if(named->value.l)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_ULONG:
++                            if(named->value.ul)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_LONGLONG:
++                            if(named->value.ll)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_ULONGLONG:
++                            if(named->value.ull)
++                                lookup_stat = 1;
++                            break;
++#endif
++                    } 
++            }
++        }
+     }
+-
++     
++    if(!lookup_stat) 
++    {
++        ks = kstat_lookup(ksc, classname, -1, statname);
++        if (ks == NULL) {
++        DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
++                   classname ? classname : "NULL",
++                   statname ? statname : "NULL"));
++        goto Return;
++        }
++        
++	kid = kstat_read(ksc, ks, NULL);
++        if (kid == -1) {
++            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
++                   classname ? classname : "NULL", statname ? statname : "NULL"));
++            goto Return;
++        }
++        
++	named = kstat_data_lookup(ks, varname);
++        if (named == NULL) {
++            DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
++                    varname, classname ? classname : "NULL",
++                    statname ? statname : "NULL"));
++            goto Return;
++        }
++    } 
+     ret = 0;                /* maybe successful */
+     switch (named->data_type) {
+ #ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
+@@ -442,11 +507,20 @@ getKstat(const char *statname, const char *varname, void *value)
+     /*
+      * Get the named statistics 
+      */
+-    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL) {
+-	ret = -10;
+-	goto Return;        /* kstat errors */
+-    }
+ 
++    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL)
++    {
++        /*
++         * Try to lookup the kstat module with
++         * modulename = linkname and statname = "link".
++         */
++
++        if ((ks = kstat_lookup(ksc, statname, 0, "link")) == NULL) {
++            ret = -10;
++            goto Return;    /* kstat errors */
++        }
++    }
++   		
+     if (kstat_read(ksc, ks, NULL) <= 0) {
+ 	ret = -10;
+ 	goto Return;        /* kstat errors */
+@@ -1080,18 +1154,21 @@ getmib(int groupname, int subgroupname, void **statbuf, size_t *size,
+ static int
+ _dlpi_open(const char *devname)
+ {
+-    char *devstr;
++    char devstr[255], devstrcpy[255];
+     int fd = -1;
+     int ppa = -1;
++    int ret = -1; 	
+ 
+     DEBUGMSGTL(("kernel_sunos5", "_dlpi_open called\n"));
+ 
+     if (devname == NULL)
+-        return (-1);
++	return (-1);
++    
++    ret = snprintf(devstr, sizeof(devstr), "/dev/%s", devname);
+ 
+-    if ((devstr = malloc(5 + strlen(devname) + 1)) == NULL)
+-        return (-1);
+-    (void) sprintf(devstr, "/dev/%s", devname);
++    if(ret < 0 || ret > sizeof(devstr) - 1)
++	return -1;
++    
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
+     /*
+      * First try opening the device using style 1, if the device does not
+@@ -1102,13 +1179,49 @@ _dlpi_open(const char *devname)
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open(%s)\n", devstr));
+     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
+         DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open failed\n"));
+-        if (_dlpi_parse_devname(devstr, &ppa) == 0) {
+-            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 parse: %s, %d\n", 
+-                       devstr, ppa));
+-            /* try style 2 */
+-            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open(%s)\n", devstr));
++	fd = -1;
++    } else {
++      DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
++    }
++
++    /* Creating a copy of the devname incase style 3 open
++     *  is required
++     */
++    ret = strlcpy(devstrcpy, devstr, sizeof(devstrcpy));
++
++    if(ret > sizeof(devstrcpy) - 1)
++        return -1;
+ 
+-            if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) != -1) {
++    DEBUGMSGTL(("kernel_sunos5:dlpi", "devstrcpy(%s)\n", devstrcpy));
++
++
++    if (fd == -1 ) {
++      ret = snprintf(devstr, sizeof(devstr), "/dev/net/%s", devname);
++      
++      if(ret < 0 || ret > sizeof(devstr) - 1)
++          return -1;
++
++      DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
++      
++      /* try style 2 */
++
++     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
++        DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
++	fd = -1;
++      } else {
++	DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open succeeded\n"));
++      }
++    }
++    
++
++    if (fd == -1 ) {
++        if (_dlpi_parse_devname(devstrcpy, &ppa) == 0) {
++            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 parse: %s, %d\n", 
++                       devstrcpy, ppa));
++            /* try style 3 */
++            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open(%s)\n", devstrcpy));
++
++            if ((fd = open(devstrcpy, O_RDWR | O_NONBLOCK)) != -1) {
+                 if (_dlpi_attach(fd, ppa) == 0) {
+                     DEBUGMSGTL(("kernel_sunos5:dlpi", "attached\n"));
+                 } else {
+@@ -1117,16 +1230,11 @@ _dlpi_open(const char *devname)
+                     fd = -1;
+                 }
+             } else {
+-                DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
++                DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open failed\n"));
+             }
+         } 
+-    } else {
+-        DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
+     }
+ 
+-    /* clean up */
+-    free(devstr);
+-
+     return (fd);
+ }
+ 
+@@ -1141,7 +1249,9 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
+     struct strbuf       ctlbuf;
+     char                buf[MAX(DL_PHYS_ADDR_ACK_SIZE+64, DL_ERROR_ACK_SIZE)];
+     int                 flag = 0;
+-
++    struct pollfd 		pfd;
++    int			timeout = 100;
++	
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_phys_address\n"));
+ 
+     paddr_req.dl_primitive = DL_PHYS_ADDR_REQ;
+@@ -1154,7 +1264,22 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
+     ctlbuf.maxlen = sizeof(buf);
+     ctlbuf.len = 0;
+     ctlbuf.buf = buf;
+-    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
++
++    pfd.fd = fd;
++    pfd.events = POLLIN | POLLPRI;
++
++    switch (poll(&pfd, 1, timeout)) {
++    default:
++	if (pfd.revents & POLLHUP)
++    	    return (-1);
++   	break;
++    case 0:
++    	return (-1);
++    case -1:
++    	return (-1);
++    }
++    
++	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
+         return (-1);
+ 
+     if (ctlbuf.len < sizeof(uint32_t))
+@@ -1196,6 +1321,8 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
+     struct strbuf       ctlbuf;
+     char                buf[MAX(DL_INFO_ACK_SIZE, DL_ERROR_ACK_SIZE)];
+     int                 flag = 0;
++    struct pollfd       pfd;
++    int                 timeout = 100;
+ 
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_iftype\n"));
+ 
+@@ -1210,7 +1337,22 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
+     ctlbuf.maxlen = sizeof(buf);
+     ctlbuf.len = 0;
+     ctlbuf.buf = buf;
+-    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
++   
++    pfd.fd = fd;
++    pfd.events = POLLIN | POLLPRI;
++
++    switch (poll(&pfd, 1, timeout)) {
++    default:
++        if (pfd.revents & POLLHUP)
++            return (-1);
++        break;
++    case 0:
++        return (-1);
++    case -1:
++        return (-1);
++    } 
++
++	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
+         DEBUGMSGTL(("kernel_sunos5:dlpi", "getmsg failed: %d\n", errno));
+         return (-1);
+     }
+@@ -1367,8 +1509,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+     mib2_ifEntry_t *ifp;
+     int             nentries = size / sizeof(mib2_ifEntry_t);
+     found_e         result = NOT_FOUND;
+-    boolean_t       if_isv6;
++    boolean_t       if_isv6, flags_unknown;
+     uint64_t        if_flags;    
++    short           mtu = 0;
+     struct if_nameindex *ifname, *ifnp;
+ 
+     lifrp = &lifreq; 
+@@ -1400,6 +1543,7 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+         memcpy(lifrp->lifr_name, ifnp->if_name, LIFNAMSIZ);
+         if_isv6 = B_FALSE;
+ 
++        flags_unknown = B_FALSE;
+         if (ioctl(ifsd, SIOCGLIFFLAGS, lifrp) < 0) {
+             if (ifsd6 == -1) {
+                 if ((ifsd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+@@ -1408,17 +1552,19 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+                 }
+             }
+             if (ioctl(ifsd6, SIOCGLIFFLAGS, lifrp) < 0) {
+-                snmp_log(LOG_ERR, "SIOCGLIFFLAGS %s: %s\n", 
+-                         lifrp->lifr_name, strerror(errno));
+-                continue;
++                DEBUGMSGTL(("kernel_sunos5",
++                            "...... SIOCGLIFFLAGS failed\n"));
++                flags_unknown = B_TRUE;
+             }
+             if_isv6 = B_TRUE;
+         } 
+         if_flags = lifrp->lifr_flags;
+             
+         if (ioctl(if_isv6?ifsd6:ifsd, SIOCGLIFMTU, lifrp) < 0) {
++            mtu = 0;
+             DEBUGMSGTL(("kernel_sunos5", "...... SIOCGLIFMTU failed\n"));
+-            continue;
++        } else {
++            mtu = lifrp->lifr_mtu;
+         }
+ 
+         memset(ifp, 0, sizeof(mib2_ifEntry_t));
+@@ -1433,11 +1579,12 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+         }
+ 
+         set_if_info(ifp, ifnp->if_index, ifnp->if_name, if_flags, 
+-                    lifrp->lifr_metric);
++                    flags_unknown, mtu);
+ 
+         if (get_if_stats(ifp) < 0) {
++            snmp_log(LOG_ERR, "Failed to get interface statistics for %s\n",
++                     ifnp->if_name);
+             DEBUGMSGTL(("kernel_sunos5", "...... get_if_stats failed\n"));
+-            continue;
+         }
+ 
+         /*
+@@ -1614,11 +1761,109 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+ }
+ #endif /*defined(HAVE_IF_NAMEINDEX)&&defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)*/
+ 
++
++static int getKstatIntInstance(const char *classname, int instance,
++                               const char *statname, const char *varname,
++                               int *value)
++{
++    kstat_ctl_t    *ksc;
++    kstat_t        *ks;
++    kid_t           kid;
++    kstat_named_t  *named;
++
++    int             ret = -1;        /* fail unless ... */
++    int             lookup_stat = 0;
++    
++    DEBUGMSGTL(("kernel_sunos5","\n Inside getKstatIntInstance: variable = %s",
++               varname));
++
++    if (kstat_fd == 0) {
++        kstat_fd = kstat_open();
++        if (kstat_fd == 0) {
++            snmp_log_perror("kstat_open");
++        }
++    }
++    if ((ksc = kstat_fd) == NULL) {
++        goto Return;
++    }
++
++    ks = kstat_lookup(ksc, classname, instance, statname);
++    if (ks == NULL) {
++        DEBUGMSGTL(("kernel_sunos5","\nclass %s, stat %s not found\n",
++                   classname ? classname : "NULL",
++                   statname ? statname : "NULL"));
++        goto Return;
++    }
++
++    kid = kstat_read(ksc, ks, NULL);
++    if (kid == -1) {
++        DEBUGMSGTL(("kernel_sunos5","\ncannot read class %s stats %s\n",
++                   classname ? classname : "NULL", 
++                   statname ? statname : "NULL"));
++        goto Return;
++    }
++
++    named = kstat_data_lookup(ks, varname);
++    if (named == NULL) {
++         DEBUGMSGTL(("kernel_sunos5","\nno var %s for class %s stat %s\n",
++                    varname, classname ? classname : "NULL",
++                    statname ? statname : "NULL"));
++         goto Return;
++    }
++    ret = 0;                /* maybe successful */
++    switch (named->data_type) {
++#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
++    case KSTAT_DATA_INT32:
++        DEBUGMSGTL(("kernel_sunos5"," value: %d\n", named->value.i32));
++        *value = named->value.i32; 
++        break;
++    case KSTAT_DATA_UINT32:
++        DEBUGMSGTL(("kernel_sunos5"," value: %u\n", named->value.ui32));
++        *value = named->value.ui32; 
++        break;
++    case KSTAT_DATA_INT64:
++        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.i64));
++        *value = named->value.i64;
++        break;
++    case KSTAT_DATA_UINT64:
++        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n", named->value.ui64));
++        *value = named->value.ui64; 
++        break;
++#else
++    case KSTAT_DATA_LONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.l));
++        *value = named->value.l; 
++        break;
++    case KSTAT_DATA_ULONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %lu\n", named->value.ul));
++        *value = named->value.ul; 
++        break;
++    case KSTAT_DATA_LONGLONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %lld\n", (long) named->value.ll));
++        *value = (long)named->value.ll;  
++        break;
++    case KSTAT_DATA_ULONGLONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n",
++                   (unsigned long) named->value.ull));
++        *value = (unsigned long)named->value.ull;  
++        break;
++#endif
++    default:
++        ret = -1;            /* fail */
++        break;
++    }
++ Return:
++    return ret;
++}
++
+ static void
+ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+-            int mtu)
++            boolean_t flags_unknown, int mtu)
+ { 
+     boolean_t havespeed = B_FALSE;
++    char phydevname[100];
++    char devbasename[100];
++    int instance = -1;
+ 
+     /*
+      * Set basic information 
+@@ -1627,7 +1918,10 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+     ifp->ifDescr.o_length = strlen(name);
+     strcpy(ifp->ifDescr.o_bytes, name);
+     ifp->ifAdminStatus = (flags & IFF_UP) ? 1 : 2;
+-    ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
++    if (flags_unknown)
++        ifp->ifOperStatus = 4; /* status unknown */
++    else
++        ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
+     ifp->ifLastChange = 0;      /* Who knows ...  */
+     ifp->flags = flags;
+     ifp->ifMtu = mtu;
+@@ -1649,14 +1943,16 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+          * this is good 
+          */
+ 	havespeed = B_TRUE;
++    } else if ((getKstatInt("link", name, "ifspeed", &ifp->ifSpeed) == 0) ||
++               (getKstatInt("link", name, "ifSpeed", &ifp->ifSpeed) == 0)) {
++        havespeed = B_TRUE;
+     }
+-
+     /* make ifOperStatus depend on link status if available */
+     if (ifp->ifAdminStatus == 1) {
+         int i_tmp;
+         /* only UPed interfaces get correct link status - if any */
+         if (getKstatInt(NULL, name,"link_up",&i_tmp) == 0) {
+             ifp->ifOperStatus = i_tmp ? 1 : 2;
+ #ifdef IFF_FAILED
+         } else if (flags & IFF_FAILED) {
+             /*

Added: csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.11.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.11.patch	                        (rev 0)
+++ csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.5.11.patch	2014-12-19 12:32:22 UTC (rev 24493)
@@ -0,0 +1,629 @@
+--- a/agent/mibgroup/kernel_sunos5.c
++++ b/agent/mibgroup/kernel_sunos5.c
+@@ -60,6 +60,8 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+ 
++#include <libdladm.h>
++#include <libdllink.h>
+ /*-
+  * Includes of local application header files 
+  */
+@@ -82,15 +84,15 @@ kstat_ctl_t    *kstat_fd = 0;
+ static
+ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
+     {MIB_SYSTEM, 0, (void *) -1, 0, 0, 0, 0},
+-    {MIB_INTERFACES, 50 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
++    {MIB_INTERFACES, 128 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
+      0},
+     {MIB_AT, 0, (void *) -1, 0, 0, 0, 0},
+     {MIB_IP, sizeof(mib2_ip_t), (void *) -1, 0, 60, 0, 0},
+-    {MIB_IP_ADDR, 20 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
++    {MIB_IP_ADDR, 128 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
+      0},
+-    {MIB_IP_ROUTE, 200 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
++    {MIB_IP_ROUTE, 400 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
+      0, 0},
+-    {MIB_IP_NET, 100 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
++    {MIB_IP_NET, 400 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
+      300, 0, 0},
+     {MIB_ICMP, sizeof(mib2_icmp_t), (void *) -1, 0, 60, 0, 0},
+     {MIB_TCP, sizeof(mib2_tcp_t), (void *) -1, 0, 60, 0, 0},
+@@ -105,13 +107,13 @@ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
+     {MIB_SNMP, 0, (void *) -1, 0, 0, 0, 0},
+ #ifdef SOLARIS_HAVE_IPV6_MIB_SUPPORT
+ #ifdef SOLARIS_HAVE_RFC4293_SUPPORT
+-    {MIB_IP_TRAFFIC_STATS, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
++    {MIB_IP_TRAFFIC_STATS, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
+      30, 0, 0},
+-    {MIB_IP6, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
+ #else
+-    {MIB_IP6, 20 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6, 128 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
+ #endif
+-    {MIB_IP6_ADDR, 20 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
++    {MIB_IP6_ADDR, 128 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
+     {MIB_TCP6_CONN, 1000 * sizeof(mib2_tcp6ConnEntry_t), (void *) -1, 0, 30,
+      0, 0},
+     {MIB_UDP6_ENDPOINT, 1000 * sizeof(mib2_udp6Entry_t), (void *) -1, 0, 30,
+@@ -184,9 +186,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type, mib2_ifEntry_t *resp,
+       size_t *length, int (*comp)(void *, void *), void *arg);
+ static void 
+ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+-            int mtu);
++            boolean_t flags_unknown, int mtu);
+ static int get_if_stats(mib2_ifEntry_t *ifp);
+-
++static int link_to_phydev(char *link, char *phy_devname);
+ #if defined(HAVE_IF_NAMEINDEX) && defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)
+ static int _dlpi_open(const char *devname);
+ static int _dlpi_get_phys_address(int fd, char *paddr, int maxlen,
+@@ -294,7 +296,9 @@ getKstatInt(const char *classname, const char *statname,
+     kstat_t        *ks;
+     kid_t           kid;
+     kstat_named_t  *named;
++ 
+     int             ret = -1;        /* fail unless ... */
++    int             lookup_stat = 0;	
+ 
+     if (kstat_fd == 0) {
+ 	kstat_fd = kstat_open();
+@@ -305,27 +309,88 @@ getKstatInt(const char *classname, const char *statname,
+     if ((ksc = kstat_fd) == NULL) {
+ 	goto Return;
+     }
+-    ks = kstat_lookup(ksc, classname, -1, statname);
+-    if (ks == NULL) {
+-	DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
+-		classname ? classname : "NULL",
+-		statname ? statname : "NULL"));
+-	goto Return;
+-    }
+-    kid = kstat_read(ksc, ks, NULL);
+-    if (kid == -1) {
+-	DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
+-		classname ? classname : "NULL", statname ? statname : "NULL"));
+-	goto Return;
+-    }
+-    named = kstat_data_lookup(ks, varname);
+-    if (named == NULL) {
+-	DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
+-		varname, classname ? classname : "NULL",
+-		statname ? statname : "NULL"));
+-	goto Return;
++   
++    if ((ks = kstat_lookup(ksc, statname, -1, "link")) != NULL)
++    {
++        kid = kstat_read(ksc, ks, NULL);
++        if (kid == -1) {
++            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
++                    statname ? statname : "NULL", "link"));
++        }
++        else
++        {
++            named = kstat_data_lookup(ks, varname);
++            if (named == NULL) {
++	        DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
++                        varname, statname ? statname : "NULL", "link"));
++            }
++            else {
++                    switch (named->data_type) {
++#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
++                        case KSTAT_DATA_INT32:
++                            if(named->value.i32)
++                                lookup_stat = 1;
++	                    break;
++                        case KSTAT_DATA_UINT32:
++                            if(named->value.ui32)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_INT64:
++                            if(named->value.i64)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_UINT64:
++                            if(named->value.ui64)
++                                lookup_stat = 1;
++                            break;
++#else
++                        case KSTAT_DATA_LONG:
++                            if(named->value.l)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_ULONG:
++                            if(named->value.ul)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_LONGLONG:
++                            if(named->value.ll)
++                                lookup_stat = 1;
++                            break;
++                        case KSTAT_DATA_ULONGLONG:
++                            if(named->value.ull)
++                                lookup_stat = 1;
++                            break;
++#endif
++                    } 
++            }
++        }
+     }
+-
++     
++    if(!lookup_stat) 
++    {
++        ks = kstat_lookup(ksc, classname, -1, statname);
++        if (ks == NULL) {
++        DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
++                   classname ? classname : "NULL",
++                   statname ? statname : "NULL"));
++        goto Return;
++        }
++        
++	kid = kstat_read(ksc, ks, NULL);
++        if (kid == -1) {
++            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
++                   classname ? classname : "NULL", statname ? statname : "NULL"));
++            goto Return;
++        }
++        
++	named = kstat_data_lookup(ks, varname);
++        if (named == NULL) {
++            DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
++                    varname, classname ? classname : "NULL",
++                    statname ? statname : "NULL"));
++            goto Return;
++        }
++    } 
+     ret = 0;                /* maybe successful */
+     switch (named->data_type) {
+ #ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
+@@ -442,11 +507,20 @@ getKstat(const char *statname, const char *varname, void *value)
+     /*
+      * Get the named statistics 
+      */
+-    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL) {
+-	ret = -10;
+-	goto Return;        /* kstat errors */
+-    }
+ 
++    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL)
++    {
++        /*
++         * Try to lookup the kstat module with
++         * modulename = linkname and statname = "link".
++         */
++
++        if ((ks = kstat_lookup(ksc, statname, 0, "link")) == NULL) {
++            ret = -10;
++            goto Return;    /* kstat errors */
++        }
++    }
++   		
+     if (kstat_read(ksc, ks, NULL) <= 0) {
+ 	ret = -10;
+ 	goto Return;        /* kstat errors */
+@@ -1080,18 +1154,21 @@ getmib(int groupname, int subgroupname, void **statbuf, size_t *size,
+ static int
+ _dlpi_open(const char *devname)
+ {
+-    char *devstr;
++    char devstr[255], devstrcpy[255];
+     int fd = -1;
+     int ppa = -1;
++    int ret = -1; 	
+ 
+     DEBUGMSGTL(("kernel_sunos5", "_dlpi_open called\n"));
+ 
+     if (devname == NULL)
+-        return (-1);
++	return (-1);
++    
++    ret = snprintf(devstr, sizeof(devstr), "/dev/%s", devname);
+ 
+-    if ((devstr = malloc(5 + strlen(devname) + 1)) == NULL)
+-        return (-1);
+-    (void) sprintf(devstr, "/dev/%s", devname);
++    if(ret < 0 || ret > sizeof(devstr) - 1)
++	return -1;
++    
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
+     /*
+      * First try opening the device using style 1, if the device does not
+@@ -1102,13 +1179,49 @@ _dlpi_open(const char *devname)
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open(%s)\n", devstr));
+     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
+         DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open failed\n"));
+-        if (_dlpi_parse_devname(devstr, &ppa) == 0) {
+-            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 parse: %s, %d\n", 
+-                       devstr, ppa));
+-            /* try style 2 */
+-            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open(%s)\n", devstr));
++	fd = -1;
++    } else {
++      DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
++    }
++
++    /* Creating a copy of the devname incase style 3 open
++     *  is required
++     */
++    ret = strlcpy(devstrcpy, devstr, sizeof(devstrcpy));
++
++    if(ret > sizeof(devstrcpy) - 1)
++        return -1;
+ 
+-            if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) != -1) {
++    DEBUGMSGTL(("kernel_sunos5:dlpi", "devstrcpy(%s)\n", devstrcpy));
++
++
++    if (fd == -1 ) {
++      ret = snprintf(devstr, sizeof(devstr), "/dev/net/%s", devname);
++      
++      if(ret < 0 || ret > sizeof(devstr) - 1)
++          return -1;
++
++      DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
++      
++      /* try style 2 */
++
++     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
++        DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
++	fd = -1;
++      } else {
++	DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open succeeded\n"));
++      }
++    }
++    
++
++    if (fd == -1 ) {
++        if (_dlpi_parse_devname(devstrcpy, &ppa) == 0) {
++            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 parse: %s, %d\n", 
++                       devstrcpy, ppa));
++            /* try style 3 */
++            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open(%s)\n", devstrcpy));
++
++            if ((fd = open(devstrcpy, O_RDWR | O_NONBLOCK)) != -1) {
+                 if (_dlpi_attach(fd, ppa) == 0) {
+                     DEBUGMSGTL(("kernel_sunos5:dlpi", "attached\n"));
+                 } else {
+@@ -1117,16 +1230,11 @@ _dlpi_open(const char *devname)
+                     fd = -1;
+                 }
+             } else {
+-                DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
++                DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open failed\n"));
+             }
+         } 
+-    } else {
+-        DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
+     }
+ 
+-    /* clean up */
+-    free(devstr);
+-
+     return (fd);
+ }
+ 
+@@ -1141,7 +1249,9 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
+     struct strbuf       ctlbuf;
+     char                buf[MAX(DL_PHYS_ADDR_ACK_SIZE+64, DL_ERROR_ACK_SIZE)];
+     int                 flag = 0;
+-
++    struct pollfd 		pfd;
++    int			timeout = 100;
++	
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_phys_address\n"));
+ 
+     paddr_req.dl_primitive = DL_PHYS_ADDR_REQ;
+@@ -1154,7 +1264,22 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
+     ctlbuf.maxlen = sizeof(buf);
+     ctlbuf.len = 0;
+     ctlbuf.buf = buf;
+-    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
++
++    pfd.fd = fd;
++    pfd.events = POLLIN | POLLPRI;
++
++    switch (poll(&pfd, 1, timeout)) {
++    default:
++	if (pfd.revents & POLLHUP)
++    	    return (-1);
++   	break;
++    case 0:
++    	return (-1);
++    case -1:
++    	return (-1);
++    }
++    
++	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
+         return (-1);
+ 
+     if (ctlbuf.len < sizeof(uint32_t))
+@@ -1196,6 +1321,8 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
+     struct strbuf       ctlbuf;
+     char                buf[MAX(DL_INFO_ACK_SIZE, DL_ERROR_ACK_SIZE)];
+     int                 flag = 0;
++    struct pollfd       pfd;
++    int                 timeout = 100;
+ 
+     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_iftype\n"));
+ 
+@@ -1210,7 +1337,22 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
+     ctlbuf.maxlen = sizeof(buf);
+     ctlbuf.len = 0;
+     ctlbuf.buf = buf;
+-    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
++   
++    pfd.fd = fd;
++    pfd.events = POLLIN | POLLPRI;
++
++    switch (poll(&pfd, 1, timeout)) {
++    default:
++        if (pfd.revents & POLLHUP)
++            return (-1);
++        break;
++    case 0:
++        return (-1);
++    case -1:
++        return (-1);
++    } 
++
++	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
+         DEBUGMSGTL(("kernel_sunos5:dlpi", "getmsg failed: %d\n", errno));
+         return (-1);
+     }
+@@ -1367,8 +1509,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+     mib2_ifEntry_t *ifp;
+     int             nentries = size / sizeof(mib2_ifEntry_t);
+     found_e         result = NOT_FOUND;
+-    boolean_t       if_isv6;
++    boolean_t       if_isv6, flags_unknown;
+     uint64_t        if_flags;    
++    short           mtu = 0;
+     struct if_nameindex *ifname, *ifnp;
+ 
+     lifrp = &lifreq; 
+@@ -1400,6 +1543,7 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+         memcpy(lifrp->lifr_name, ifnp->if_name, LIFNAMSIZ);
+         if_isv6 = B_FALSE;
+ 
++        flags_unknown = B_FALSE;
+         if (ioctl(ifsd, SIOCGLIFFLAGS, lifrp) < 0) {
+             if (ifsd6 == -1) {
+                 if ((ifsd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+@@ -1408,17 +1552,19 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+                 }
+             }
+             if (ioctl(ifsd6, SIOCGLIFFLAGS, lifrp) < 0) {
+-                snmp_log(LOG_ERR, "SIOCGLIFFLAGS %s: %s\n", 
+-                         lifrp->lifr_name, strerror(errno));
+-                continue;
++                DEBUGMSGTL(("kernel_sunos5",
++                            "...... SIOCGLIFFLAGS failed\n"));
++                flags_unknown = B_TRUE;
+             }
+             if_isv6 = B_TRUE;
+         } 
+         if_flags = lifrp->lifr_flags;
+             
+         if (ioctl(if_isv6?ifsd6:ifsd, SIOCGLIFMTU, lifrp) < 0) {
++            mtu = 0;
+             DEBUGMSGTL(("kernel_sunos5", "...... SIOCGLIFMTU failed\n"));
+-            continue;
++        } else {
++            mtu = lifrp->lifr_mtu;
+         }
+ 
+         memset(ifp, 0, sizeof(mib2_ifEntry_t));
+@@ -1433,11 +1579,12 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+         }
+ 
+         set_if_info(ifp, ifnp->if_index, ifnp->if_name, if_flags, 
+-                    lifrp->lifr_metric);
++                    flags_unknown, mtu);
+ 
+         if (get_if_stats(ifp) < 0) {
++            snmp_log(LOG_ERR, "Failed to get interface statistics for %s\n",
++                     ifnp->if_name);
+             DEBUGMSGTL(("kernel_sunos5", "...... get_if_stats failed\n"));
+-            continue;
+         }
+ 
+         /*
+@@ -1614,11 +1761,155 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
+ }
+ #endif /*defined(HAVE_IF_NAMEINDEX)&&defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)*/
+ 
++int link_to_phydev(char *link, char *phy_devname)
++{
++        char *key = NULL;
++        datalink_id_t linkid;
++        dladm_phys_attr_t dpa;
++        dladm_handle_t handle;
++
++        if (dladm_open(&handle, NULL) != DLADM_STATUS_OK) {
++            DEBUGMSGTL(("kernel_sunos5","dladm_open failed "
++                       "with errno=%d\n",errno));
++            return (-1);
++        }
++
++        if (dladm_name2info(handle, link, &linkid, NULL, NULL, NULL) !=
++            DLADM_STATUS_OK) {
++                DEBUGMSGTL(("kernel_sunos5","dladm_name2info failed "
++                           "with errno=%d\n",errno));
++                dladm_close(handle);
++                return (-1);
++        }
++
++        /*
++         * Get the device name of the link, which will be used as the door
++         * file name used to communicate with the driver.
++         */
++        if (dladm_phys_info(handle, linkid, &dpa, DLADM_OPT_ACTIVE) !=
++            DLADM_STATUS_OK) {
++                DEBUGMSGTL(("kernel_sunos5","dladm_phys_info failed "
++                           "with errno=%d\n",errno));
++                dladm_close(handle);
++                return (-1);
++        }
++
++        if(dpa.dp_dev == NULL) {
++            DEBUGMSGTL(("kernel_sunos5","device name from "
++                       "dladm_phys_info = NULL\n")); 
++            dladm_close(handle);
++            return -1;
++        
++        }
++        strcpy(phy_devname, dpa.dp_dev);
++        dladm_close(handle); 
++        
++        return 0;
++}
++
++
++static int getKstatIntInstance(const char *classname, int instance,
++                               const char *statname, const char *varname,
++                               int *value)
++{
++    kstat_ctl_t    *ksc;
++    kstat_t        *ks;
++    kid_t           kid;
++    kstat_named_t  *named;
++
++    int             ret = -1;        /* fail unless ... */
++    int             lookup_stat = 0;
++    
++    DEBUGMSGTL(("kernel_sunos5","\n Inside getKstatIntInstance: variable = %s",
++               varname));
++
++    if (kstat_fd == 0) {
++        kstat_fd = kstat_open();
++        if (kstat_fd == 0) {
++            snmp_log_perror("kstat_open");
++        }
++    }
++    if ((ksc = kstat_fd) == NULL) {
++        goto Return;
++    }
++
++    ks = kstat_lookup(ksc, classname, instance, statname);
++    if (ks == NULL) {
++        DEBUGMSGTL(("kernel_sunos5","\nclass %s, stat %s not found\n",
++                   classname ? classname : "NULL",
++                   statname ? statname : "NULL"));
++        goto Return;
++    }
++
++    kid = kstat_read(ksc, ks, NULL);
++    if (kid == -1) {
++        DEBUGMSGTL(("kernel_sunos5","\ncannot read class %s stats %s\n",
++                   classname ? classname : "NULL", 
++                   statname ? statname : "NULL"));
++        goto Return;
++    }
++
++    named = kstat_data_lookup(ks, varname);
++    if (named == NULL) {
++         DEBUGMSGTL(("kernel_sunos5","\nno var %s for class %s stat %s\n",
++                    varname, classname ? classname : "NULL",
++                    statname ? statname : "NULL"));
++         goto Return;
++    }
++    ret = 0;                /* maybe successful */
++    switch (named->data_type) {
++#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
++    case KSTAT_DATA_INT32:
++        DEBUGMSGTL(("kernel_sunos5"," value: %d\n", named->value.i32));
++        *value = named->value.i32; 
++        break;
++    case KSTAT_DATA_UINT32:
++        DEBUGMSGTL(("kernel_sunos5"," value: %u\n", named->value.ui32));
++        *value = named->value.ui32; 
++        break;
++    case KSTAT_DATA_INT64:
++        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.i64));
++        *value = named->value.i64;
++        break;
++    case KSTAT_DATA_UINT64:
++        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n", named->value.ui64));
++        *value = named->value.ui64; 
++        break;
++#else
++    case KSTAT_DATA_LONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.l));
++        *value = named->value.l; 
++        break;
++    case KSTAT_DATA_ULONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %lu\n", named->value.ul));
++        *value = named->value.ul; 
++        break;
++    case KSTAT_DATA_LONGLONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %lld\n", (long) named->value.ll));
++        *value = (long)named->value.ll;  
++        break;
++    case KSTAT_DATA_ULONGLONG:
++        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n",
++                   (unsigned long) named->value.ull));
++        *value = (unsigned long)named->value.ull;  
++        break;
++#endif
++    default:
++        ret = -1;            /* fail */
++        break;
++    }
++ Return:
++    return ret;
++}
++
+ static void
+ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+-            int mtu)
++            boolean_t flags_unknown, int mtu)
+ { 
+     boolean_t havespeed = B_FALSE;
++    char phydevname[100];
++    char devbasename[100];
++    int instance = -1;
+ 
+     /*
+      * Set basic information 
+@@ -1627,7 +1918,10 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+     ifp->ifDescr.o_length = strlen(name);
+     strcpy(ifp->ifDescr.o_bytes, name);
+     ifp->ifAdminStatus = (flags & IFF_UP) ? 1 : 2;
+-    ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
++    if (flags_unknown)
++        ifp->ifOperStatus = 4; /* status unknown */
++    else
++        ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
+     ifp->ifLastChange = 0;      /* Who knows ...  */
+     ifp->flags = flags;
+     ifp->ifMtu = mtu;
+@@ -1649,14 +1943,26 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
+          * this is good 
+          */
+ 	havespeed = B_TRUE;
++    } else if ((getKstatInt("link", name, "ifspeed", &ifp->ifSpeed) == 0) ||
++               (getKstatInt("link", name, "ifSpeed", &ifp->ifSpeed) == 0)) {
++        havespeed = B_TRUE;
+     }
+-
+     /* make ifOperStatus depend on link status if available */
+     if (ifp->ifAdminStatus == 1) {
+         int i_tmp;
+         /* only UPed interfaces get correct link status - if any */
+         if (getKstatInt(NULL, name,"link_up",&i_tmp) == 0) {
+             ifp->ifOperStatus = i_tmp ? 1 : 2;
++        } else if(link_to_phydev(name, phydevname) == 0) {
++                 strcpy(devbasename, phydevname);
++                 DEBUGMSGTL(("kernel_sunos5","phydevname = %s\n", phydevname));
++                 _dlpi_parse_devname(devbasename, &instance);
++                 DEBUGMSGTL(("kernel_sunos5","devbasename = %s, "
++                            "instance= %d\n", devbasename, instance));
++                 if(getKstatIntInstance(devbasename, instance, "phys",
++                                        "link_up", &i_tmp) == 0) {
++                     ifp->ifOperStatus = i_tmp ? 1 : 2;
++                 } 
+ #ifdef IFF_FAILED
+         } else if (flags & IFF_FAILED) {
+             /*

Deleted: csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch	2014-12-19 12:18:08 UTC (rev 24492)
+++ csw/mgar/pkg/netsnmp/trunk/files/0024-kernel_sunos5.patch	2014-12-19 12:32:22 UTC (rev 24493)
@@ -1,629 +0,0 @@
---- a/agent/mibgroup/kernel_sunos5.c
-+++ b/agent/mibgroup/kernel_sunos5.c
-@@ -60,6 +60,8 @@
- #include <net/if.h>
- #include <netinet/in.h>
- 
-+#include <libdladm.h>
-+#include <libdllink.h>
- /*-
-  * Includes of local application header files 
-  */
-@@ -82,15 +84,15 @@ kstat_ctl_t    *kstat_fd = 0;
- static
- mibcache        Mibcache[MIBCACHE_SIZE+1] = {
-     {MIB_SYSTEM, 0, (void *) -1, 0, 0, 0, 0},
--    {MIB_INTERFACES, 50 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
-+    {MIB_INTERFACES, 128 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
-      0},
-     {MIB_AT, 0, (void *) -1, 0, 0, 0, 0},
-     {MIB_IP, sizeof(mib2_ip_t), (void *) -1, 0, 60, 0, 0},
--    {MIB_IP_ADDR, 20 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
-+    {MIB_IP_ADDR, 128 * sizeof(mib2_ipAddrEntry_t), (void *) -1, 0, 60, 0,
-      0},
--    {MIB_IP_ROUTE, 200 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
-+    {MIB_IP_ROUTE, 400 * sizeof(mib2_ipRouteEntry_t), (void *) -1, 0, 30,
-      0, 0},
--    {MIB_IP_NET, 100 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
-+    {MIB_IP_NET, 400 * sizeof(mib2_ipNetToMediaEntry_t), (void *) -1, 0,
-      300, 0, 0},
-     {MIB_ICMP, sizeof(mib2_icmp_t), (void *) -1, 0, 60, 0, 0},
-     {MIB_TCP, sizeof(mib2_tcp_t), (void *) -1, 0, 60, 0, 0},
-@@ -105,13 +107,13 @@ mibcache        Mibcache[MIBCACHE_SIZE+1] = {
-     {MIB_SNMP, 0, (void *) -1, 0, 0, 0, 0},
- #ifdef SOLARIS_HAVE_IPV6_MIB_SUPPORT
- #ifdef SOLARIS_HAVE_RFC4293_SUPPORT
--    {MIB_IP_TRAFFIC_STATS, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
-+    {MIB_IP_TRAFFIC_STATS, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0,
-      30, 0, 0},
--    {MIB_IP6, 20 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
-+    {MIB_IP6, 128 * sizeof(mib2_ipIfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
- #else
--    {MIB_IP6, 20 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
-+    {MIB_IP6, 128 * sizeof(mib2_ipv6IfStatsEntry_t), (void *)-1, 0, 30, 0, 0},
- #endif
--    {MIB_IP6_ADDR, 20 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
-+    {MIB_IP6_ADDR, 128 * sizeof(mib2_ipv6AddrEntry_t), (void *)-1, 0, 30, 0, 0},
-     {MIB_TCP6_CONN, 1000 * sizeof(mib2_tcp6ConnEntry_t), (void *) -1, 0, 30,
-      0, 0},
-     {MIB_UDP6_ENDPOINT, 1000 * sizeof(mib2_udp6Entry_t), (void *) -1, 0, 30,
-@@ -184,9 +186,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type, mib2_ifEntry_t *resp,
-       size_t *length, int (*comp)(void *, void *), void *arg);
- static void 
- set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
--            int mtu);
-+            boolean_t flags_unknown, int mtu);
- static int get_if_stats(mib2_ifEntry_t *ifp);
--
-+static int link_to_phydev(char *link, char *phy_devname);
- #if defined(HAVE_IF_NAMEINDEX) && defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)
- static int _dlpi_open(const char *devname);
- static int _dlpi_get_phys_address(int fd, char *paddr, int maxlen,
-@@ -294,7 +296,9 @@ getKstatInt(const char *classname, const char *statname,
-     kstat_t        *ks;
-     kid_t           kid;
-     kstat_named_t  *named;
-+ 
-     int             ret = -1;        /* fail unless ... */
-+    int             lookup_stat = 0;	
- 
-     if (kstat_fd == 0) {
- 	kstat_fd = kstat_open();
-@@ -305,27 +309,88 @@ getKstatInt(const char *classname, const char *statname,
-     if ((ksc = kstat_fd) == NULL) {
- 	goto Return;
-     }
--    ks = kstat_lookup(ksc, classname, -1, statname);
--    if (ks == NULL) {
--	DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
--		classname ? classname : "NULL",
--		statname ? statname : "NULL"));
--	goto Return;
--    }
--    kid = kstat_read(ksc, ks, NULL);
--    if (kid == -1) {
--	DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
--		classname ? classname : "NULL", statname ? statname : "NULL"));
--	goto Return;
--    }
--    named = kstat_data_lookup(ks, varname);
--    if (named == NULL) {
--	DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
--		varname, classname ? classname : "NULL",
--		statname ? statname : "NULL"));
--	goto Return;
-+   
-+    if ((ks = kstat_lookup(ksc, statname, -1, "link")) != NULL)
-+    {
-+        kid = kstat_read(ksc, ks, NULL);
-+        if (kid == -1) {
-+            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
-+                    statname ? statname : "NULL", "link"));
-+        }
-+        else
-+        {
-+            named = kstat_data_lookup(ks, varname);
-+            if (named == NULL) {
-+	        DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
-+                        varname, statname ? statname : "NULL", "link"));
-+            }
-+            else {
-+                    switch (named->data_type) {
-+#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
-+                        case KSTAT_DATA_INT32:
-+                            if(named->value.i32)
-+                                lookup_stat = 1;
-+	                    break;
-+                        case KSTAT_DATA_UINT32:
-+                            if(named->value.ui32)
-+                                lookup_stat = 1;
-+                            break;
-+                        case KSTAT_DATA_INT64:
-+                            if(named->value.i64)
-+                                lookup_stat = 1;
-+                            break;
-+                        case KSTAT_DATA_UINT64:
-+                            if(named->value.ui64)
-+                                lookup_stat = 1;
-+                            break;
-+#else
-+                        case KSTAT_DATA_LONG:
-+                            if(named->value.l)
-+                                lookup_stat = 1;
-+                            break;
-+                        case KSTAT_DATA_ULONG:
-+                            if(named->value.ul)
-+                                lookup_stat = 1;
-+                            break;
-+                        case KSTAT_DATA_LONGLONG:
-+                            if(named->value.ll)
-+                                lookup_stat = 1;
-+                            break;
-+                        case KSTAT_DATA_ULONGLONG:
-+                            if(named->value.ull)
-+                                lookup_stat = 1;
-+                            break;
-+#endif
-+                    } 
-+            }
-+        }
-     }
--
-+     
-+    if(!lookup_stat) 
-+    {
-+        ks = kstat_lookup(ksc, classname, -1, statname);
-+        if (ks == NULL) {
-+        DEBUGMSGTL(("kernel_sunos5", "class %s, stat %s not found\n",
-+                   classname ? classname : "NULL",
-+                   statname ? statname : "NULL"));
-+        goto Return;
-+        }
-+        
-+	kid = kstat_read(ksc, ks, NULL);
-+        if (kid == -1) {
-+            DEBUGMSGTL(("kernel_sunos5", "cannot read class %s stats %s\n",
-+                   classname ? classname : "NULL", statname ? statname : "NULL"));
-+            goto Return;
-+        }
-+        
-+	named = kstat_data_lookup(ks, varname);
-+        if (named == NULL) {
-+            DEBUGMSGTL(("kernel_sunos5", "no var %s for class %s stat %s\n",
-+                    varname, classname ? classname : "NULL",
-+                    statname ? statname : "NULL"));
-+            goto Return;
-+        }
-+    } 
-     ret = 0;                /* maybe successful */
-     switch (named->data_type) {
- #ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
-@@ -442,11 +507,20 @@ getKstat(const char *statname, const char *varname, void *value)
-     /*
-      * Get the named statistics 
-      */
--    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL) {
--	ret = -10;
--	goto Return;        /* kstat errors */
--    }
- 
-+    if ((ks = kstat_lookup(ksc, module_name, instance, statname)) == NULL)
-+    {
-+        /*
-+         * Try to lookup the kstat module with
-+         * modulename = linkname and statname = "link".
-+         */
-+
-+        if ((ks = kstat_lookup(ksc, statname, 0, "link")) == NULL) {
-+            ret = -10;
-+            goto Return;    /* kstat errors */
-+        }
-+    }
-+   		
-     if (kstat_read(ksc, ks, NULL) <= 0) {
- 	ret = -10;
- 	goto Return;        /* kstat errors */
-@@ -1080,18 +1154,21 @@ getmib(int groupname, int subgroupname, void **statbuf, size_t *size,
- static int
- _dlpi_open(const char *devname)
- {
--    char *devstr;
-+    char devstr[255], devstrcpy[255];
-     int fd = -1;
-     int ppa = -1;
-+    int ret = -1; 	
- 
-     DEBUGMSGTL(("kernel_sunos5", "_dlpi_open called\n"));
- 
-     if (devname == NULL)
--        return (-1);
-+	return (-1);
-+    
-+    ret = snprintf(devstr, sizeof(devstr), "/dev/%s", devname);
- 
--    if ((devstr = malloc(5 + strlen(devname) + 1)) == NULL)
--        return (-1);
--    (void) sprintf(devstr, "/dev/%s", devname);
-+    if(ret < 0 || ret > sizeof(devstr) - 1)
-+	return -1;
-+    
-     DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
-     /*
-      * First try opening the device using style 1, if the device does not
-@@ -1102,13 +1179,49 @@ _dlpi_open(const char *devname)
-     DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open(%s)\n", devstr));
-     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
-         DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open failed\n"));
--        if (_dlpi_parse_devname(devstr, &ppa) == 0) {
--            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 parse: %s, %d\n", 
--                       devstr, ppa));
--            /* try style 2 */
--            DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open(%s)\n", devstr));
-+	fd = -1;
-+    } else {
-+      DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
-+    }
-+
-+    /* Creating a copy of the devname incase style 3 open
-+     *  is required
-+     */
-+    ret = strlcpy(devstrcpy, devstr, sizeof(devstrcpy));
-+
-+    if(ret > sizeof(devstrcpy) - 1)
-+        return -1;
- 
--            if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) != -1) {
-+    DEBUGMSGTL(("kernel_sunos5:dlpi", "devstrcpy(%s)\n", devstrcpy));
-+
-+
-+    if (fd == -1 ) {
-+      ret = snprintf(devstr, sizeof(devstr), "/dev/net/%s", devname);
-+      
-+      if(ret < 0 || ret > sizeof(devstr) - 1)
-+          return -1;
-+
-+      DEBUGMSGTL(("kernel_sunos5:dlpi", "devstr(%s)\n", devstr));
-+      
-+      /* try style 2 */
-+
-+     if ((fd = open(devstr, O_RDWR | O_NONBLOCK)) < 0) {
-+        DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
-+	fd = -1;
-+      } else {
-+	DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open succeeded\n"));
-+      }
-+    }
-+    
-+
-+    if (fd == -1 ) {
-+        if (_dlpi_parse_devname(devstrcpy, &ppa) == 0) {
-+            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 parse: %s, %d\n", 
-+                       devstrcpy, ppa));
-+            /* try style 3 */
-+            DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open(%s)\n", devstrcpy));
-+
-+            if ((fd = open(devstrcpy, O_RDWR | O_NONBLOCK)) != -1) {
-                 if (_dlpi_attach(fd, ppa) == 0) {
-                     DEBUGMSGTL(("kernel_sunos5:dlpi", "attached\n"));
-                 } else {
-@@ -1117,16 +1230,11 @@ _dlpi_open(const char *devname)
-                     fd = -1;
-                 }
-             } else {
--                DEBUGMSGTL(("kernel_sunos5:dlpi", "style2 open failed\n"));
-+                DEBUGMSGTL(("kernel_sunos5:dlpi", "style3 open failed\n"));
-             }
-         } 
--    } else {
--        DEBUGMSGTL(("kernel_sunos5:dlpi", "style1 open succeeded\n"));
-     }
- 
--    /* clean up */
--    free(devstr);
--
-     return (fd);
- }
- 
-@@ -1141,7 +1249,9 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
-     struct strbuf       ctlbuf;
-     char                buf[MAX(DL_PHYS_ADDR_ACK_SIZE+64, DL_ERROR_ACK_SIZE)];
-     int                 flag = 0;
--
-+    struct pollfd 		pfd;
-+    int			timeout = 100;
-+	
-     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_phys_address\n"));
- 
-     paddr_req.dl_primitive = DL_PHYS_ADDR_REQ;
-@@ -1154,7 +1264,22 @@ _dlpi_get_phys_address(int fd, char *addr, int maxlen, int *addrlen)
-     ctlbuf.maxlen = sizeof(buf);
-     ctlbuf.len = 0;
-     ctlbuf.buf = buf;
--    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
-+
-+    pfd.fd = fd;
-+    pfd.events = POLLIN | POLLPRI;
-+
-+    switch (poll(&pfd, 1, timeout)) {
-+    default:
-+	if (pfd.revents & POLLHUP)
-+    	    return (-1);
-+   	break;
-+    case 0:
-+    	return (-1);
-+    case -1:
-+    	return (-1);
-+    }
-+    
-+	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0)
-         return (-1);
- 
-     if (ctlbuf.len < sizeof(uint32_t))
-@@ -1196,6 +1321,8 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
-     struct strbuf       ctlbuf;
-     char                buf[MAX(DL_INFO_ACK_SIZE, DL_ERROR_ACK_SIZE)];
-     int                 flag = 0;
-+    struct pollfd       pfd;
-+    int                 timeout = 100;
- 
-     DEBUGMSGTL(("kernel_sunos5:dlpi", "_dlpi_get_iftype\n"));
- 
-@@ -1210,7 +1337,22 @@ _dlpi_get_iftype(int fd, unsigned int *iftype)
-     ctlbuf.maxlen = sizeof(buf);
-     ctlbuf.len = 0;
-     ctlbuf.buf = buf;
--    if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
-+   
-+    pfd.fd = fd;
-+    pfd.events = POLLIN | POLLPRI;
-+
-+    switch (poll(&pfd, 1, timeout)) {
-+    default:
-+        if (pfd.revents & POLLHUP)
-+            return (-1);
-+        break;
-+    case 0:
-+        return (-1);
-+    case -1:
-+        return (-1);
-+    } 
-+
-+	if (getmsg(fd, &ctlbuf, NULL, &flag) < 0) {
-         DEBUGMSGTL(("kernel_sunos5:dlpi", "getmsg failed: %d\n", errno));
-         return (-1);
-     }
-@@ -1367,8 +1509,9 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
-     mib2_ifEntry_t *ifp;
-     int             nentries = size / sizeof(mib2_ifEntry_t);
-     found_e         result = NOT_FOUND;
--    boolean_t       if_isv6;
-+    boolean_t       if_isv6, flags_unknown;
-     uint64_t        if_flags;    
-+    short           mtu = 0;
-     struct if_nameindex *ifname, *ifnp;
- 
-     lifrp = &lifreq; 
-@@ -1400,6 +1543,7 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
-         memcpy(lifrp->lifr_name, ifnp->if_name, LIFNAMSIZ);
-         if_isv6 = B_FALSE;
- 
-+        flags_unknown = B_FALSE;
-         if (ioctl(ifsd, SIOCGLIFFLAGS, lifrp) < 0) {
-             if (ifsd6 == -1) {
-                 if ((ifsd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-@@ -1408,17 +1552,19 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
-                 }
-             }
-             if (ioctl(ifsd6, SIOCGLIFFLAGS, lifrp) < 0) {
--                snmp_log(LOG_ERR, "SIOCGLIFFLAGS %s: %s\n", 
--                         lifrp->lifr_name, strerror(errno));
--                continue;
-+                DEBUGMSGTL(("kernel_sunos5",
-+                            "...... SIOCGLIFFLAGS failed\n"));
-+                flags_unknown = B_TRUE;
-             }
-             if_isv6 = B_TRUE;
-         } 
-         if_flags = lifrp->lifr_flags;
-             
-         if (ioctl(if_isv6?ifsd6:ifsd, SIOCGLIFMTU, lifrp) < 0) {
-+            mtu = 0;
-             DEBUGMSGTL(("kernel_sunos5", "...... SIOCGLIFMTU failed\n"));
--            continue;
-+        } else {
-+            mtu = lifrp->lifr_mtu;
-         }
- 
-         memset(ifp, 0, sizeof(mib2_ifEntry_t));
-@@ -1433,11 +1579,12 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
-         }
- 
-         set_if_info(ifp, ifnp->if_index, ifnp->if_name, if_flags, 
--                    lifrp->lifr_metric);
-+                    flags_unknown, mtu);
- 
-         if (get_if_stats(ifp) < 0) {
-+            snmp_log(LOG_ERR, "Failed to get interface statistics for %s\n",
-+                     ifnp->if_name);
-             DEBUGMSGTL(("kernel_sunos5", "...... get_if_stats failed\n"));
--            continue;
-         }
- 
-         /*
-@@ -1614,11 +1761,155 @@ getif(mib2_ifEntry_t *ifbuf, size_t size, req_e req_type,
- }
- #endif /*defined(HAVE_IF_NAMEINDEX)&&defined(NETSNMP_INCLUDE_IFTABLE_REWRITES)*/
- 
-+int link_to_phydev(char *link, char *phy_devname)
-+{
-+        char *key = NULL;
-+        datalink_id_t linkid;
-+        dladm_phys_attr_t dpa;
-+        dladm_handle_t handle;
-+
-+        if (dladm_open(&handle, NULL) != DLADM_STATUS_OK) {
-+            DEBUGMSGTL(("kernel_sunos5","dladm_open failed "
-+                       "with errno=%d\n",errno));
-+            return (-1);
-+        }
-+
-+        if (dladm_name2info(handle, link, &linkid, NULL, NULL, NULL) !=
-+            DLADM_STATUS_OK) {
-+                DEBUGMSGTL(("kernel_sunos5","dladm_name2info failed "
-+                           "with errno=%d\n",errno));
-+                dladm_close(handle);
-+                return (-1);
-+        }
-+
-+        /*
-+         * Get the device name of the link, which will be used as the door
-+         * file name used to communicate with the driver.
-+         */
-+        if (dladm_phys_info(handle, linkid, &dpa, DLADM_OPT_ACTIVE) !=
-+            DLADM_STATUS_OK) {
-+                DEBUGMSGTL(("kernel_sunos5","dladm_phys_info failed "
-+                           "with errno=%d\n",errno));
-+                dladm_close(handle);
-+                return (-1);
-+        }
-+
-+        if(dpa.dp_dev == NULL) {
-+            DEBUGMSGTL(("kernel_sunos5","device name from "
-+                       "dladm_phys_info = NULL\n")); 
-+            dladm_close(handle);
-+            return -1;
-+        
-+        }
-+        strcpy(phy_devname, dpa.dp_dev);
-+        dladm_close(handle); 
-+        
-+        return 0;
-+}
-+
-+
-+static int getKstatIntInstance(const char *classname, int instance,
-+                               const char *statname, const char *varname,
-+                               int *value)
-+{
-+    kstat_ctl_t    *ksc;
-+    kstat_t        *ks;
-+    kid_t           kid;
-+    kstat_named_t  *named;
-+
-+    int             ret = -1;        /* fail unless ... */
-+    int             lookup_stat = 0;
-+    
-+    DEBUGMSGTL(("kernel_sunos5","\n Inside getKstatIntInstance: variable = %s",
-+               varname));
-+
-+    if (kstat_fd == 0) {
-+        kstat_fd = kstat_open();
-+        if (kstat_fd == 0) {
-+            snmp_log_perror("kstat_open");
-+        }
-+    }
-+    if ((ksc = kstat_fd) == NULL) {
-+        goto Return;
-+    }
-+
-+    ks = kstat_lookup(ksc, classname, instance, statname);
-+    if (ks == NULL) {
-+        DEBUGMSGTL(("kernel_sunos5","\nclass %s, stat %s not found\n",
-+                   classname ? classname : "NULL",
-+                   statname ? statname : "NULL"));
-+        goto Return;
-+    }
-+
-+    kid = kstat_read(ksc, ks, NULL);
-+    if (kid == -1) {
-+        DEBUGMSGTL(("kernel_sunos5","\ncannot read class %s stats %s\n",
-+                   classname ? classname : "NULL", 
-+                   statname ? statname : "NULL"));
-+        goto Return;
-+    }
-+
-+    named = kstat_data_lookup(ks, varname);
-+    if (named == NULL) {
-+         DEBUGMSGTL(("kernel_sunos5","\nno var %s for class %s stat %s\n",
-+                    varname, classname ? classname : "NULL",
-+                    statname ? statname : "NULL"));
-+         goto Return;
-+    }
-+    ret = 0;                /* maybe successful */
-+    switch (named->data_type) {
-+#ifdef KSTAT_DATA_INT32         /* Solaris 2.6 and up */
-+    case KSTAT_DATA_INT32:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %d\n", named->value.i32));
-+        *value = named->value.i32; 
-+        break;
-+    case KSTAT_DATA_UINT32:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %u\n", named->value.ui32));
-+        *value = named->value.ui32; 
-+        break;
-+    case KSTAT_DATA_INT64:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.i64));
-+        *value = named->value.i64;
-+        break;
-+    case KSTAT_DATA_UINT64:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n", named->value.ui64));
-+        *value = named->value.ui64; 
-+        break;
-+#else
-+    case KSTAT_DATA_LONG:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %ld\n", named->value.l));
-+        *value = named->value.l; 
-+        break;
-+    case KSTAT_DATA_ULONG:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %lu\n", named->value.ul));
-+        *value = named->value.ul; 
-+        break;
-+    case KSTAT_DATA_LONGLONG:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %lld\n", (long) named->value.ll));
-+        *value = (long)named->value.ll;  
-+        break;
-+    case KSTAT_DATA_ULONGLONG:
-+        DEBUGMSGTL(("kernel_sunos5"," value: %llu\n",
-+                   (unsigned long) named->value.ull));
-+        *value = (unsigned long)named->value.ull;  
-+        break;
-+#endif
-+    default:
-+        ret = -1;            /* fail */
-+        break;
-+    }
-+ Return:
-+    return ret;
-+}
-+
- static void
- set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
--            int mtu)
-+            boolean_t flags_unknown, int mtu)
- { 
-     boolean_t havespeed = B_FALSE;
-+    char phydevname[100];
-+    char devbasename[100];
-+    int instance = -1;
- 
-     /*
-      * Set basic information 
-@@ -1627,7 +1918,10 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
-     ifp->ifDescr.o_length = strlen(name);
-     strcpy(ifp->ifDescr.o_bytes, name);
-     ifp->ifAdminStatus = (flags & IFF_UP) ? 1 : 2;
--    ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
-+    if (flags_unknown)
-+        ifp->ifOperStatus = 4; /* status unknown */
-+    else
-+        ifp->ifOperStatus = ((flags & IFF_UP) && (flags & IFF_RUNNING)) ? 1 : 2;
-     ifp->ifLastChange = 0;      /* Who knows ...  */
-     ifp->flags = flags;
-     ifp->ifMtu = mtu;
-@@ -1649,14 +1943,26 @@ set_if_info(mib2_ifEntry_t *ifp, unsigned index, char *name, uint64_t flags,
-          * this is good 
-          */
- 	havespeed = B_TRUE;
-+    } else if ((getKstatInt("link", name, "ifspeed", &ifp->ifSpeed) == 0) ||
-+               (getKstatInt("link", name, "ifSpeed", &ifp->ifSpeed) == 0)) {
-+        havespeed = B_TRUE;
-     }
--
-     /* make ifOperStatus depend on link status if available */
-     if (ifp->ifAdminStatus == 1) {
-         int i_tmp;
-         /* only UPed interfaces get correct link status - if any */
-         if (getKstatInt(NULL, name,"link_up",&i_tmp) == 0) {
-             ifp->ifOperStatus = i_tmp ? 1 : 2;
-+        } else if(link_to_phydev(name, phydevname) == 0) {
-+                 strcpy(devbasename, phydevname);
-+                 DEBUGMSGTL(("kernel_sunos5","phydevname = %s\n", phydevname));
-+                 _dlpi_parse_devname(devbasename, &instance);
-+                 DEBUGMSGTL(("kernel_sunos5","devbasename = %s, "
-+                            "instance= %d\n", devbasename, instance));
-+                 if(getKstatIntInstance(devbasename, instance, "phys",
-+                                        "link_up", &i_tmp) == 0) {
-+                     ifp->ifOperStatus = i_tmp ? 1 : 2;
-+                 } 
- #ifdef IFF_FAILED
-         } else if (flags & IFF_FAILED) {
-             /*

Modified: csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch	2014-12-19 12:18:08 UTC (rev 24492)
+++ csw/mgar/pkg/netsnmp/trunk/files/0035-bug-1849903.patch	2014-12-19 12:32:22 UTC (rev 24493)
@@ -1,18 +1,5 @@
 --- a/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
 +++ b/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
-@@ -14,6 +14,12 @@
- 
- netsnmp_feature_require(container_linked_list)
- 
-+typedef struct cd_container_s {
-+    netsnmp_container *current;
-+    netsnmp_container *deleted;
-+} cd_container;
-+
-+
- /*
-  * include our parent header 
-  */
 @@ -485,8 +491,21 @@ static void
  _add_new_interface(netsnmp_interface_entry *ifentry,
                     netsnmp_container *container)
@@ -37,28 +24,6 @@
      DEBUGMSGTL(("ifTable:access", "creating new entry\n"));
  
      /*
-@@ -533,6 +552,21 @@ _add_new_interface(netsnmp_interface_entry *ifentry,
-         }
-     }
- }
-+ 
-+/**
-+ * delete removed entry
-+ */
-+static void
-+_delete_missing_interface(ifTable_rowreq_ctx *rowreq_ctx,
-+                          netsnmp_container *container)
-+{
-+    DEBUGMSGTL(("ifTable:access", "removing missing entry %s\n",
-+                rowreq_ctx->data.ifName));
-+
-+    CONTAINER_REMOVE(container, rowreq_ctx);
-+
-+    ifTable_release_rowreq_ctx(rowreq_ctx);
-+}
- 
- /**
-  * add new entry
 --- a/agent/mibgroup/if-mib/ifTable/ifTable_data_access.h
 +++ b/agent/mibgroup/if-mib/ifTable/ifTable_data_access.h
 @@ -50,6 +50,8 @@ extern          "C" {

Modified: csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch	2014-12-19 12:18:08 UTC (rev 24492)
+++ csw/mgar/pkg/netsnmp/trunk/files/0052-dyn-cpu-cpu_kstat.patch	2014-12-19 12:32:22 UTC (rev 24493)
@@ -185,3 +185,111 @@
  int
  _cpu_status( char *state)
  {
+--- a/agent/mibgroup/hardware/cpu/cpu.c
++++ b/agent/mibgroup/hardware/cpu/cpu.c
+@@ -271,4 +271,60 @@ void _cpu_copy_stats( netsnmp_cpu_info *cpu )
+     cpu2->pageIn     = cpu->pageIn;
+     cpu2->pageOut    = cpu->pageOut;
+ }
++
++    /*
++     * Updates the cpu list, keeping the cpus whose indices are passed
++     * assumes the passed linked list of indices is sorted in ascending order
++     * returns the number of deleted cpus
++     */
++int netsnmp_update_cpu_list( struct cpu_idx *new_cpu_list )
++{
++    netsnmp_cpu_info *prev, *current, *temp1, *temp2;
++    int n=0;
++    netsnmp_cpu_info *cpu;
++
++    for( prev=current=_cpu_head; current && new_cpu_list ;
++        current=current->next, new_cpu_list=new_cpu_list->next ) {
++        if ( current->idx == new_cpu_list->idx ) {
++            prev=current;
++        } else {
++            current=current->next;
++            while ( current && (current->idx != new_cpu_list->idx) )
++                current = current->next;
++            if ( !current ) {
++                /*This shouldn't happen. Something went really wrong */
++                return -1;
++            }
++
++            temp1 = prev->next;
++            prev->next = current;
++            prev = current;
++                /* remove the unassigned cpus */
++            while ( temp1 != current ) {
++                temp2 = temp1;
++                temp1 = temp1->next;
++                n++;
++                SNMP_FREE(temp2->history);
++                SNMP_FREE(temp2);
++            }
++        }
++    } /*end of for */
++
++    if ( !current && new_cpu_list ) {
++        /* This shouldn't happen. */
++        return -1;
++    }
++
++    /* Delete the unassigned trailing cpus from the list */
++    while ( current ) {
++        temp2 = current;
++        current = current->next;
++        n++;
++        SNMP_FREE(temp2->history);
++        SNMP_FREE(temp2);
++     }
++     prev->next = NULL;
++     return n;
++}
++
+ #endif /* NETSNMP_FEATURE_REMOVE_HARDWARE_CPU_COPY_STATS */
+--- a/agent/mibgroup/hardware/cpu/cpu_kstat.c
++++ b/agent/mibgroup/hardware/cpu/cpu_kstat.c
+@@ -18,7 +18,9 @@ extern kstat_ctl_t  *kstat_fd;
+ extern int           cpu_num;
+ int _cpu_status(char *state);
+ static void add_new_kstat_cpu_entry(kstat_t *ksp);
++
+ static struct cpu_idx * add_cpu_idx(struct cpu_idx * head, int idx);
++int netsnmp_update_cpu_list( struct cpu_idx * ); /* returns the number of deleted cpus */
+  
+     /*
+      * Initialise the list of CPUs on the system
+@@ -49,7 +51,7 @@ void init_cpu_kstat( void ) {
+ }
+ 
+     /*
+-     * adds the new cpu entry to the exisitng list
++     * adds the new cpu entry to the existing list
+      */
+ static void
+ add_new_kstat_cpu_entry( kstat_t *ksp ) {
+@@ -211,7 +213,8 @@ add_cpu_idx(struct cpu_idx * head, int idx)
+             return head;
+         }
+     }
+-
++    DEBUGMSG(("cpu", "(cpu_idx creation failed)\n"));
++    return head; 
+ }
+ 
+ int
+--- a/include/net-snmp/agent/hardware/cpu.h
++++ b/include/net-snmp/agent/hardware/cpu.h
+@@ -66,3 +66,11 @@ netsnmp_cpu_info *netsnmp_cpu_get_byName( char*, int );
+ 
+ netsnmp_cache *netsnmp_cpu_get_cache( void );
+ int netsnmp_cpu_load( void );
++
++   /* Auxilary structure used for updating the new cpu list */
++struct cpu_idx {
++        int idx;
++        struct cpu_idx *next;
++};
++
++

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


From bonivart at users.sourceforge.net  Sat Dec 20 01:29:45 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 20 Dec 2014 00:29:45 +0000
Subject: SF.net SVN: gar:[24495] csw/mgar/pkg/logtool/trunk/Makefile
Message-ID: <3k47BN2SsFzpM@mail.opencsw.org>

Revision: 24495
          http://sourceforge.net/p/gar/code/24495
Author:   bonivart
Date:     2014-12-20 00:29:37 +0000 (Sat, 20 Dec 2014)
Log Message:
-----------
logtool/trunk: fix conf dir

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

Modified: csw/mgar/pkg/logtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logtool/trunk/Makefile	2014-12-19 15:09:36 UTC (rev 24494)
+++ csw/mgar/pkg/logtool/trunk/Makefile	2014-12-20 00:29:37 UTC (rev 24495)
@@ -11,7 +11,8 @@
 
 GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/logtool
 
 # There are no tests
 SKIPTEST = 1

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


From bdwalton at users.sourceforge.net  Sun Dec 21 11:41:35 2014
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 21 Dec 2014 10:41:35 +0000
Subject: SF.net SVN: gar:[24496] csw/mgar/pkg/git/trunk
Message-ID: <3k50jp0j9bz1P4@mail.opencsw.org>

Revision: 24496
          http://sourceforge.net/p/gar/code/24496
Author:   bdwalton
Date:     2014-12-21 10:41:35 +0000 (Sun, 21 Dec 2014)
Log Message:
-----------
git/trunk: version bump for CVE-2014-9390

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2014-12-20 00:29:37 UTC (rev 24495)
+++ csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:41:35 UTC (rev 24496)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 2.1.3
+VERSION = 2.2.1
 #PATCHLEVEL = rc4
 DISTNAME = $(NAME)-$(VERSION)
 GARTYPE = v2

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2014-12-20 00:29:37 UTC (rev 24495)
+++ csw/mgar/pkg/git/trunk/checksums	2014-12-21 10:41:35 UTC (rev 24496)
@@ -1 +1 @@
-9dfb41c1abb4ce0f49c8484a36cadf65  git-2.1.3.tar.gz
+ff41fdb094eed1ec430aed8ee9b9849c  git-2.2.1.tar.gz

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


From bdwalton at users.sourceforge.net  Sun Dec 21 11:58:57 2014
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 21 Dec 2014 10:58:57 +0000
Subject: SF.net SVN: gar:[24498] csw/mgar/pkg/git/trunk
Message-ID: <3k515l4Xvbz1RW@mail.opencsw.org>

Revision: 24498
          http://sourceforge.net/p/gar/code/24498
Author:   bdwalton
Date:     2014-12-21 10:58:57 +0000 (Sun, 21 Dec 2014)
Log Message:
-----------
git/trunk: remove a patch that is now released in the upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:50:37 UTC (rev 24497)
+++ csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:58:57 UTC (rev 24498)
@@ -98,8 +98,6 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
-# TODO(bdwalton) Remove this post 2.1.1
-PATCHFILES += 0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
 
 PATCHFILES += 0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
 PATCHFILES += 0007-Fix-a-hashbang-issue-in-the-test-suite.patch

Deleted: csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch	2014-12-21 10:50:37 UTC (rev 24497)
+++ csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch	2014-12-21 10:58:57 UTC (rev 24498)
@@ -1,26 +0,0 @@
-From b5283517ab288ed1efee604e646894b08e995eae Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 27 Sep 2014 12:01:20 +0100
-Subject: [PATCH] Backport a fix for trace_strbuf from origin/next.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- trace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trace.c b/trace.c
-index e583dc6..17015fd 100644
---- a/trace.c
-+++ b/trace.c
-@@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const char *format, ...)
- 	va_end(ap);
- }
- 
--void trace_strbuf(const char *key, const struct strbuf *data)
-+void trace_strbuf(struct trace_key *key, const struct strbuf *data)
- {
- 	trace_strbuf_fl(NULL, 0, key, data);
- }
--- 
-2.0.3
-

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 Dec 21 12:13:13 2014
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 21 Dec 2014 11:13:13 +0000
Subject: SF.net SVN: gar:[24499] csw/mgar/pkg/git/trunk
Message-ID: <3k51QD4pFsz1V1@mail.opencsw.org>

Revision: 24499
          http://sourceforge.net/p/gar/code/24499
Author:   bdwalton
Date:     2014-12-21 11:13:13 +0000 (Sun, 21 Dec 2014)
Log Message:
-----------
git/trunk: remove two more patches that are now upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
    csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:58:57 UTC (rev 24498)
+++ csw/mgar/pkg/git/trunk/Makefile	2014-12-21 11:13:13 UTC (rev 24499)
@@ -99,9 +99,6 @@
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
 
-PATCHFILES += 0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
-PATCHFILES += 0007-Fix-a-hashbang-issue-in-the-test-suite.patch
-
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch

Deleted: csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch	2014-12-21 10:58:57 UTC (rev 24498)
+++ csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch	2014-12-21 11:13:13 UTC (rev 24499)
@@ -1,35 +0,0 @@
-From 1c56cdfaa14f59af95c73ac1d1ec46200cd47e16 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bdwalton at gmail.com>
-Date: Sat, 27 Sep 2014 19:35:18 +0100
-Subject: [PATCH] Do not make trace.c/getnanotime and inlined function
-
-Oracle Studio compilers don't allow for static variables in functions
-that are defined to be inline. GNU C does permit this. Let's reference
-the C99 standard though, which doesn't allow for inline functions to
-contain modifiable static variables.
-
-As the use of trace.c/getnanotime extends beyond the local translation
-unit, normal object code is generated for it anyway. Remove the inline
-statement from the function definition.
-
-Signed-off-by: Ben Walton <bdwalton at gmail.com>
----
- trace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trace.c b/trace.c
-index b6f25a2..4778608 100644
---- a/trace.c
-+++ b/trace.c
-@@ -385,7 +385,7 @@ static inline uint64_t gettimeofday_nanos(void)
-  * Returns nanoseconds since the epoch (01/01/1970), for performance tracing
-  * (i.e. favoring high precision over wall clock time accuracy).
-  */
--inline uint64_t getnanotime(void)
-+uint64_t getnanotime(void)
- {
- 	static uint64_t offset;
- 	if (offset > 1) {
--- 
-1.9.1
-

Deleted: csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch	2014-12-21 10:58:57 UTC (rev 24498)
+++ csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch	2014-12-21 11:13:13 UTC (rev 24499)
@@ -1,28 +0,0 @@
-From 3a7c0997ccbf33ba136d2ef78827d345f5f37de9 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sun, 28 Sep 2014 23:13:40 +0100
-Subject: [PATCH] Fix a hashbang issue in the test suite.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/lib-credential.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/lib-credential.sh b/t/lib-credential.sh
-index 9e7d796..ca4a6de 100755
---- a/t/lib-credential.sh
-+++ b/t/lib-credential.sh
-@@ -278,8 +278,8 @@ helper_test_timeout() {
- 	'
- }
- 
--cat >askpass <<\EOF
--#!/bin/sh
-+echo "#!$SHELL_PATH" >askpass
-+cat >>askpass <<\EOF
- echo >&2 askpass: $*
- what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
- echo "askpass-$what"
--- 
-2.0.3
-

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


From bdwalton at users.sourceforge.net  Mon Dec 22 18:19:30 2014
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 22 Dec 2014 17:19:30 +0000
Subject: SF.net SVN: gar:[24501] csw/mgar/pkg/git/trunk
Message-ID: <3k5nVW3jh6zyh@mail.opencsw.org>

Revision: 24501
          http://sourceforge.net/p/gar/code/24501
Author:   bdwalton
Date:     2014-12-22 17:19:28 +0000 (Mon, 22 Dec 2014)
Log Message:
-----------
git/trunk: patch around gnu-specific awk in the test suite

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2014-12-22 16:10:43 UTC (rev 24500)
+++ csw/mgar/pkg/git/trunk/Makefile	2014-12-22 17:19:28 UTC (rev 24501)
@@ -98,6 +98,7 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+PATCHFILES += 0005-use-wc-w-instead-of-awk-in-test-suite.patch
 
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.

Added: csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch	2014-12-22 17:19:28 UTC (rev 24501)
@@ -0,0 +1,34 @@
+From f0b7563d0a327d23fe8e6915e3d21059a0fb0d60 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Mon, 22 Dec 2014 17:13:19 +0000
+Subject: [PATCH] use wc -w instead of awk in test suite
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t0090-cache-tree.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
+index 158cf4f..508cce6 100755
+--- a/t/t0090-cache-tree.sh
++++ b/t/t0090-cache-tree.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++set -x
++
+ test_description="Test whether cache-tree is properly updated
+ 
+ Tests whether various commands properly update and/or rewrite the
+@@ -22,7 +24,7 @@ generate_expected_cache_tree_rec () {
+ 	# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
+ 	# We want to count only foo because it's the only direct child
+ 	subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
+-	subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 {++c} END {print c}') &&
++	subtree_count=$(echo "$subtrees"| wc -w) &&
+ 	entries=$(git ls-files|wc -l) &&
+ 	printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
+ 	for subtree in $subtrees
+-- 
+2.1.3
+

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


From bonivart at users.sourceforge.net  Mon Dec 22 20:32:07 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 22 Dec 2014 19:32:07 +0000
Subject: SF.net SVN: gar:[24502] csw/mgar/pkg/openntpd/trunk
Message-ID: <3k5rRh4Bzwz146@mail.opencsw.org>

Revision: 24502
          http://sourceforge.net/p/gar/code/24502
Author:   bonivart
Date:     2014-12-22 19:32:06 +0000 (Mon, 22 Dec 2014)
Log Message:
-----------
openntpd/trunk: smf and more

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

Added Paths:
-----------
    csw/mgar/pkg/openntpd/trunk/files/cswopenntpd
    csw/mgar/pkg/openntpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/openntpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openntpd/trunk/Makefile	2014-12-22 17:19:28 UTC (rev 24501)
+++ csw/mgar/pkg/openntpd/trunk/Makefile	2014-12-22 19:32:06 UTC (rev 24502)
@@ -19,9 +19,14 @@
 
 RUNTIME_DEP_PKGS_CSWopenntpd += CSWlibssl1-0-0
 
+INITSMF = /etc/opt/csw/init.d/cswopenntpd
+USERGROUP = /etc/opt/csw/pkg/CSWopenntpd/cswusergroup
+SAMPLECONF = /etc/opt/csw/ntpd.conf
+
 GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-privsep-user=openntpd
 
 # There are no tests
 SKIPTEST = 1
@@ -31,3 +36,9 @@
 
 include gar/category.mk
 
+post-install:
+	@echo " ==> Post-install of $(NAME)"
+	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d
+	@ginstall -m 755 $(FILEDIR)/cswopenntpd $(DESTDIR)/etc/opt/csw/init.d/cswopenntpd
+	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd
+	@ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd/

Added: csw/mgar/pkg/openntpd/trunk/files/cswopenntpd
===================================================================
--- csw/mgar/pkg/openntpd/trunk/files/cswopenntpd	                        (rev 0)
+++ csw/mgar/pkg/openntpd/trunk/files/cswopenntpd	2014-12-22 19:32:06 UTC (rev 24502)
@@ -0,0 +1,36 @@
+#!/sbin/sh
+
+# rc-script for CSW OpenNTPD
+# Peter Bonivart, 2014-12-22
+
+ZONE= # used for initialization, do not change
+
+case "$1" in
+  start)
+    if [ -f /opt/csw/sbin/ntpd -a -f /etc/opt/csw/ntpd.conf ]; then
+      echo "Starting openntpd."
+      /opt/csw/sbin/ntpd &
+    fi
+    ;;
+  stop)
+    echo "Shutting down openntpd."
+    if [ -x /usr/bin/zonename ]; then
+      if [ "`/usr/bin/zonename`" = "global" ]; then
+        ZONE="-z global"
+      fi
+    fi
+    pkill $ZONE -x ntpd
+    ;;
+  reload|refresh)
+    echo "Reloading openntpd."
+    if [ -x /usr/bin/zonename ]; then
+      if [ "`/usr/bin/zonename`" = "global" ]; then
+        ZONE="-z global"
+      fi
+    fi
+    pkill -HUP $ZONE -x ntpd
+    ;;
+  *)
+    echo "Usage: $0 { start | stop | reload | refresh }"
+    ;;
+esac

Added: csw/mgar/pkg/openntpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/openntpd/trunk/files/cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/openntpd/trunk/files/cswusergroup	2014-12-22 19:32:06 UTC (rev 24502)
@@ -0,0 +1 @@
+openntpd:openntpd:CSW OpenNTPD:/var/opt/csw/openntpd:/bin/false:::NP

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


From bonivart at users.sourceforge.net  Mon Dec 22 21:13:47 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 22 Dec 2014 20:13:47 +0000
Subject: SF.net SVN: gar:[24503] csw/mgar/pkg/openntpd/trunk
Message-ID: <3k5sMn1ly6z177@mail.opencsw.org>

Revision: 24503
          http://sourceforge.net/p/gar/code/24503
Author:   bonivart
Date:     2014-12-22 20:13:46 +0000 (Mon, 22 Dec 2014)
Log Message:
-----------
openntpd/trunk: some more fixes

Modified Paths:
--------------
    csw/mgar/pkg/openntpd/trunk/Makefile
    csw/mgar/pkg/openntpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/openntpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openntpd/trunk/Makefile	2014-12-22 19:32:06 UTC (rev 24502)
+++ csw/mgar/pkg/openntpd/trunk/Makefile	2014-12-22 20:13:46 UTC (rev 24503)
@@ -1,11 +1,3 @@
-# Add user/group, see output below:
-#chown: /home/bonivart/opencsw/openntpd/trunk/work/solaris10-i386/install-isa-pentium_pro/var/empty: Not owner
-#chgrp: /home/bonivart/opencsw/openntpd/trunk/work/solaris10-i386/install-isa-pentium_pro/var/empty: Not owner
-#Please create a dedicated group for ntpd.
-#Please create a dedicated user for ntpd and ensure it can
-#not be used to log in.  This is system-dependant, possibly:
-## useradd -g _ntp -s /sbin/nologin -d /var/empty -c 'OpenNTP daemon' _ntp
-
 NAME = openntpd
 VERSION = 3.9p1
 GARTYPE = v2
@@ -31,14 +23,12 @@
 # There are no tests
 SKIPTEST = 1
 
-# Fix before release, need to test software first to find proper config
-CHECKPKG_OVERRIDES_CSWopenntpd += bad-location-of-file|file=/var/empty
-
 include gar/category.mk
 
 post-install:
 	@echo " ==> Post-install of $(NAME)"
-	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m 755 $(FILEDIR)/cswopenntpd $(DESTDIR)/etc/opt/csw/init.d/cswopenntpd
-	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd
-	@ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd/
+	ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d
+	ginstall -m 755 $(FILEDIR)/cswopenntpd $(DESTDIR)/etc/opt/csw/init.d/cswopenntpd
+	ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd
+	ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd/
+	rm -rf $(DESTDIR)/var

Modified: csw/mgar/pkg/openntpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/openntpd/trunk/files/cswusergroup	2014-12-22 19:32:06 UTC (rev 24502)
+++ csw/mgar/pkg/openntpd/trunk/files/cswusergroup	2014-12-22 20:13:46 UTC (rev 24503)
@@ -1 +1 @@
-openntpd:openntpd:CSW OpenNTPD:/var/opt/csw/openntpd:/bin/false:::NP
+openntpd:openntpd:CSW OpenNTPD:/var/opt/csw/openntpd:/bin/false:m:r:NP

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


From bonivart at users.sourceforge.net  Mon Dec 22 21:21:17 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 22 Dec 2014 20:21:17 +0000
Subject: SF.net SVN: gar:[24504] csw/mgar/pkg/openntpd/trunk
Message-ID: <3k5sXZ1MrRz19f@mail.opencsw.org>

Revision: 24504
          http://sourceforge.net/p/gar/code/24504
Author:   bonivart
Date:     2014-12-22 20:21:17 +0000 (Mon, 22 Dec 2014)
Log Message:
-----------
openntpd/trunk: user fixes

Modified Paths:
--------------
    csw/mgar/pkg/openntpd/trunk/Makefile
    csw/mgar/pkg/openntpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/openntpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openntpd/trunk/Makefile	2014-12-22 20:13:46 UTC (rev 24503)
+++ csw/mgar/pkg/openntpd/trunk/Makefile	2014-12-22 20:21:17 UTC (rev 24504)
@@ -32,3 +32,4 @@
 	ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd
 	ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWopenntpd/
 	rm -rf $(DESTDIR)/var
+	ginstall -m 755 -d $(DESTDIR)/var/opt/csw/openntpd

Modified: csw/mgar/pkg/openntpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/openntpd/trunk/files/cswusergroup	2014-12-22 20:13:46 UTC (rev 24503)
+++ csw/mgar/pkg/openntpd/trunk/files/cswusergroup	2014-12-22 20:21:17 UTC (rev 24504)
@@ -1 +1 @@
-openntpd:openntpd:CSW OpenNTPD:/var/opt/csw/openntpd:/bin/false:m:r:NP
+openntpd:openntpd:CSW OpenNTPD:/var/opt/csw/openntpd:/bin/false:::NP

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 Dec 23 11:02:44 2014
From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net)
Date: Tue, 23 Dec 2014 10:02:44 +0000
Subject: SF.net SVN: gar:[24505] csw/mgar/pkg/fusioninventory-agent/trunk
Message-ID: <3k6CmJ2hJ3z1My@mail.opencsw.org>

Revision: 24505
          http://sourceforge.net/p/gar/code/24505
Author:   guillomovitch
Date:     2014-12-23 10:02:43 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
fusioninventory-agent/trunk: new version 2.3.14

Modified Paths:
--------------
    csw/mgar/pkg/fusioninventory-agent/trunk/Makefile
    csw/mgar/pkg/fusioninventory-agent/trunk/checksums

Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile	2014-12-22 20:21:17 UTC (rev 24504)
+++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile	2014-12-23 10:02:43 UTC (rev 24505)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = fusioninventory-agent
-VERSION = 2.3.13
+VERSION = 2.3.14
 GARTYPE = v2
 CATEGORIES = cpan
 

Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums
===================================================================
--- csw/mgar/pkg/fusioninventory-agent/trunk/checksums	2014-12-22 20:21:17 UTC (rev 24504)
+++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums	2014-12-23 10:02:43 UTC (rev 24505)
@@ -1 +1 @@
-70164fc948dadc2ae725b9c6b4188aef  FusionInventory-Agent-2.3.13.tar.gz
+dd959dac759e2a1ec3bcfb0789be9e5c  FusionInventory-Agent-2.3.14.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  Tue Dec 23 19:16:43 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 23 Dec 2014 18:16:43 +0000
Subject: SF.net SVN: gar:[24506] csw/mgar/pkg/opencsw-manual/trunk
Message-ID: <3k6Qmd1dlzzJ4@mail.opencsw.org>

Revision: 24506
          http://sourceforge.net/p/gar/code/24506
Author:   wahwah
Date:     2014-12-23 18:16:43 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
opencsw-manual/trunk: Simplified 'getting started', additional content moved to separate pages.

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/Makefile
    csw/mgar/pkg/opencsw-manual/trunk/files/check.sh
    csw/mgar/pkg/opencsw-manual/trunk/files/conf.py
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst

Added Paths:
-----------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started-optional-steps.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-behind-proxy.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-old-versions.rst

Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/Makefile	2014-12-23 10:02:43 UTC (rev 24505)
+++ csw/mgar/pkg/opencsw-manual/trunk/Makefile	2014-12-23 18:16:43 UTC (rev 24506)
@@ -30,7 +30,7 @@
 
 BUILD_DEP_PKGS += CSWpy-sphinx
 BUILD_DEP_PKGS += CSWrsync
-BUILD_DEP_PKGS += CSWpysetuptools
+BUILD_DEP_PKGS += CSWpy-setuptools
 
 # This is a documentation package, so references to /usr are fine.
 CHECKPKG_OVERRIDES_CSWopencsw-manual += file-with-bad-content

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/check.sh
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/check.sh	2014-12-23 10:02:43 UTC (rev 24505)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/check.sh	2014-12-23 18:16:43 UTC (rev 24506)
@@ -11,7 +11,9 @@
 if [[ "${DATESTAMP_CONF}" != "${DATESTAMP_CLOCK}" ]]; then
   echo >&2
   echo >&2 '*****'
-  echo >&2 "Please update the version setting in conf.py to ${DATESTAMP_CLOCK}"
+  echo >&2 "Please update the version setting in trunk/files/conf.py to ${DATESTAMP_CLOCK}"
+  echo >&2 'and run "mgar clean package"'
+  echo >&2 'or "mgar clean install copy-to-web" for testing'
   echo >&2 '*****'
   echo >&2
   exit 1

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/conf.py
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/conf.py	2014-12-23 10:02:43 UTC (rev 24505)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/conf.py	2014-12-23 18:16:43 UTC (rev 24506)
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2014.04'
+version = '0.2014.12'
 # The full version, including alpha/beta/rc tags.
-release = '0.2014.04'
+release = '0.2014.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started-optional-steps.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started-optional-steps.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started-optional-steps.rst	2014-12-23 18:16:43 UTC (rev 24506)
@@ -0,0 +1,107 @@
+.. _getting-started-optional-steps:
+
+-------------------------------
+Getting started, optional steps
+-------------------------------
+
+.. _selecting-catalog-release:
+
+Optional: Selecting the catalog release
+=======================================
+
+By default, ``pkgutil`` is configured to use the ``testing`` catalog.  See
+:ref:`catalog releases <catalog-releases>` for information on releases.
+
+You might want change it to ``unstable`` on your development hosts to catch any
+issues before they hit the ``testing`` catalog. Or you can switch it to
+``stable`` if you want no updates (except for new stable releases).
+
+You can verify the setting with ``pkgutil -V`` ::
+
+  ...
+  maxpkglist              10000 (default: 10000)
+  mirror                  http://mirror.opencsw.org/opencsw/unstable
+                          (default: http://mirror.opencsw.org/opencsw/unstable)
+  noncsw                  false (default: false)
+  ...
+
+On the next catalog update with ``pkgutil -U`` the catalogs indexes are
+downloaded from the new mirror.
+
+.. _setting-up-cryptograhic-verification:
+
+Optional: Cryptographic verification
+====================================
+
+The catalog is signed with PGP and it is a good idea to set up your system to
+verify the integrity of the catalog. As the catalog itself contains hashes for
+all packages in the catalog this ensures you actually install the packages
+which were officially released. First you need to install ``cswpki`` (of course
+with pkgutil!)::
+
+  pkgutil -y -i cswpki
+
+Then you need to import the public key::
+
+  root# cswpki --import
+
+The current fingerprint looks like this::
+
+  # gpg --homedir=/var/opt/csw/pki/ --fingerprint board at opencsw.org
+  pub   1024D/9306CC77 2011-08-31
+        Key fingerprint = 4DCE 3C80 AAB2 CAB1 E60C  9A3C 05F4 2D66 9306 CC77
+  uid                  OpenCSW catalog signing <board at opencsw.org>
+  sub   2048g/971EDE93 2011-08-31
+
+You may also trust the key once you verified the fingerprint::
+
+  root# gpg --homedir=/var/opt/csw/pki --edit-key board at opencsw.org trust
+
+Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf``
+and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this::
+
+  use_gpg=true
+  use_md5=true
+
+You can verify that it worked with ``pkgutil -V``::
+
+  root at login [login]:/etc/opt/csw > pkgutil -V
+  ...
+  show_current            true (default: true)
+  stop_on_hook_soft_error not set (default: false)
+  use_gpg                 true (default: false)
+  use_md5                 true (default: false)
+  wgetopts                not set (default: none)
+
+On the next ``pkgutil -U`` you should see a catalog integrity verification wit ``gpg``::
+
+  ...
+  Checking integrity of /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 with gpg.
+  gpg: Signature made Thu Oct 03 00:32:57 2013 CEST using DSA key ID 9306CC77
+  gpg: Good signature from "OpenCSW catalog signing <board at opencsw.org>"
+  gpg: WARNING: This key is not certified with a trusted signature!
+  gpg:          There is no indication that the signature belongs to the owner.
+  Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C  9A3C 05F4 2D66 9306 CC77
+  Looking for packages that can be upgraded ...
+  Solving needed dependencies ...
+  Solving dependency order ...
+  
+  Nothing to do.
+  ...
+
+.. _selecting-mirror:
+
+Optional: Selecting your mirror
+===============================
+
+For faster downloads, you can select a mirror geographically close to you.
+
+  http://www.opencsw.org/get-it/mirrors/
+
+Please uncomment the line with ``mirror`` in ``/etc/opt/csw/pkgutil.conf``
+so it looks similar to this with the URL replaced by the mirror you picked::
+
+  mirror=http://mirror.opencsw.org/opencsw/unstable
+
+
+Continue to :ref:`Full setup <installation-full-setup>`.

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst	2014-12-23 10:02:43 UTC (rev 24505)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst	2014-12-23 18:16:43 UTC (rev 24506)
@@ -4,138 +4,24 @@
 Getting started
 ---------------
 
+Solaris 10 and Solaris 11:
+
 ::
 
   pkgadd -d http://get.opencsw.org/now
   /opt/csw/bin/pkgutil -U
   /opt/csw/bin/pkgutil -a vim
   /opt/csw/bin/pkgutil -y -i vim
+  /opt/csw/bin/vim
 
 Done!
 
-Skip to :ref:`selecting your mirror <selecting-mirror>`.
+Additional, exceptional and/or optional steps:
 
+- :ref:`selecting a local mirror <selecting-mirror>`
+- :ref:`setting up cryptographic verification <setting-up-cryptograhic-verification>`
+- :ref:`selecting the catalog release <selecting-catalog-release>`
+- :ref:`older Solaris versions <old-solaris>`
+- :ref:`behind a HTTP proxy <setup-behind-proxy>`
 
-Behind a proxy
-==============
-
-You may need to specify a proxy with ``-x <proxy>:<port>``, be aware that there
-are known issues with Squid and possibly other proxies::
-
-  pkgadd -x myproxy:3128 -d http://get.opencsw.org/now
-
-Solaris 8 or 9
-==============
-
-``pkgadd`` on Solaris 8 and 9 does not support installation directly via http. In such case
-you need to download pkgutil with a separate tool like wget, and install it
-from disk::
-
-  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
-  pkgadd -d pkgutil.pkg all
-
-.. NOTE::
-   Solaris 9 is on its way to deprecation. Solaris 9 catalogs get very few
-   package updates.
-
-.. NOTE::
-   Solaris 8 does not get any updates any more. As of April 2014, only the dublin release contains Solaris 8 packages. 
-
-.. _selecting-mirror:
-
-Optional: Selecting your mirror
-===============================
-
-For faster downloads, you can select a mirror geographically close to you.
-
-  http://www.opencsw.org/get-it/mirrors/
-
-Please uncomment the line with ``mirror`` in ``/etc/opt/csw/pkgutil.conf``
-so it looks similar to this with the URL replaced by the mirror you picked::
-
-  mirror=http://mirror.opencsw.org/opencsw/unstable
-
-
-Optional: Selecting the catalog release
-=======================================
-
-By default, ``pkgutil`` is configured to use the ``testing`` catalog.  See
-:ref:`catalog releases <catalog-releases>` for information on releases.
-
-You might want change it to ``unstable`` on your development hosts to catch any
-issues before they hit the ``testing`` catalog. Or you can switch it to
-``stable`` if you want no updates (except for new stable releases).
-
-You can verify the setting with ``pkgutil -V`` ::
-
-  ...
-  maxpkglist              10000 (default: 10000)
-  mirror                  http://mirror.opencsw.org/opencsw/unstable
-                          (default: http://mirror.opencsw.org/opencsw/unstable)
-  noncsw                  false (default: false)
-  ...
-
-On the next catalog update with ``pkgutil -U`` the catalogs indexes are
-downloaded from the new mirror.
-
-
-Optional: Cryptographic verification
-====================================
-
-The catalog is signed with PGP and it is a good idea to set up your system to
-verify the integrity of the catalog. As the catalog itself contains hashes for
-all packages in the catalog this ensures you actually install the packages
-which were officially released. First you need to install ``cswpki`` (of course
-with pkgutil!)::
-
-  pkgutil -y -i cswpki
-
-Then you need to import the public key::
-
-  root# cswpki --import
-
-The current fingerprint looks like this::
-
-  # gpg --homedir=/var/opt/csw/pki/ --fingerprint board at opencsw.org
-  pub   1024D/9306CC77 2011-08-31
-        Key fingerprint = 4DCE 3C80 AAB2 CAB1 E60C  9A3C 05F4 2D66 9306 CC77
-  uid                  OpenCSW catalog signing <board at opencsw.org>
-  sub   2048g/971EDE93 2011-08-31
-
-You may also trust the key once you verified the fingerprint::
-
-  root# gpg --homedir=/var/opt/csw/pki --edit-key board at opencsw.org trust
-
-Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf``
-and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this::
-
-  use_gpg=true
-  use_md5=true
-
-You can verify that it worked with ``pkgutil -V``::
-
-  root at login [login]:/etc/opt/csw > pkgutil -V
-  ...
-  show_current            true (default: true)
-  stop_on_hook_soft_error not set (default: false)
-  use_gpg                 true (default: false)
-  use_md5                 true (default: false)
-  wgetopts                not set (default: none)
-
-On the next ``pkgutil -U`` you should see a catalog integrity verification wit ``gpg``::
-
-  ...
-  Checking integrity of /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 with gpg.
-  gpg: Signature made Thu Oct 03 00:32:57 2013 CEST using DSA key ID 9306CC77
-  gpg: Good signature from "OpenCSW catalog signing <board at opencsw.org>"
-  gpg: WARNING: This key is not certified with a trusted signature!
-  gpg:          There is no indication that the signature belongs to the owner.
-  Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C  9A3C 05F4 2D66 9306 CC77
-  Looking for packages that can be upgraded ...
-  Solving needed dependencies ...
-  Solving dependency order ...
-  
-  Nothing to do.
-  ...
-
 Continue to :ref:`Full setup <installation-full-setup>`.

Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-behind-proxy.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-behind-proxy.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-behind-proxy.rst	2014-12-23 18:16:43 UTC (rev 24506)
@@ -0,0 +1,19 @@
+.. _setup-behind-proxy:
+
+Behind a proxy
+==============
+
+You may need to specify a proxy with ``-x <proxy>:<port>``, be aware that there
+are known issues with Squid and possibly other proxies::
+
+  pkgadd -x myproxy:3128 -d http://get.opencsw.org/now
+
+Proxy with a password
+=====================
+
+You will need to configure ``/etc/opt/csw/wgetrc``::
+
+  proxy_user=<user>
+  proxy_password=<password>
+
+Continue to :ref:`Full setup <installation-full-setup>`.

Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-old-versions.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-old-versions.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/setup-old-versions.rst	2014-12-23 18:16:43 UTC (rev 24506)
@@ -0,0 +1,20 @@
+.. _old-solaris:
+
+Solaris 8 or 9
+==============
+
+.. NOTE::
+   OpenCSW no longer offers catalogs for Solaris 8.
+
+.. NOTE::
+   Solaris 9 is on its way to deprecation. Solaris 9 catalogs get very few
+   package updates.
+
+``pkgadd`` on Solaris 8 and 9 does not support installation directly via http. In such case
+you need to download pkgutil with a separate tool like wget, and install it
+from disk::
+
+  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
+  pkgadd -d pkgutil.pkg all
+
+Continue to :ref:`Full setup <installation-full-setup>`.

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


From rthurner at users.sourceforge.net  Tue Dec 23 20:00:28 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 19:00:28 +0000
Subject: SF.net SVN: gar:[24507] csw/mgar/pkg/cmake/trunk
Message-ID: <3k6RhQ3chFzLw@mail.opencsw.org>

Revision: 24507
          http://sourceforge.net/p/gar/code/24507
Author:   rthurner
Date:     2014-12-23 19:00:28 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
cmake/trunk: upgrade to cmake-3.1.0

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

Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2014-12-23 18:16:43 UTC (rev 24506)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2014-12-23 19:00:28 UTC (rev 24507)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = cmake
-VERSION = 3.1.0-rc1-1
+VERSION = 3.1.0
 GARTYPE = v2
 
 DESCRIPTION = Cross-platform make
@@ -17,7 +17,7 @@
 RELVER = $(shell echo $(VERSION) | cut -d. -f1-2)
 SPKG_SOURCEURL = http://cmake.org/
 MASTER_SITES = http://cmake.org/files/v$(RELVER)/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+DISTFILES = $(NAME)-$(VERSION).tar.gz
 LICENSE = Copyright.txt
 # temporary for cmake-2.8.8, see http://public.kitware.com/Bug/view.php?id=13199
 #PATCHFILES += 0001-bootstrap-Port-back-to-old-shells-13199.patch

Modified: csw/mgar/pkg/cmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/cmake/trunk/checksums	2014-12-23 18:16:43 UTC (rev 24506)
+++ csw/mgar/pkg/cmake/trunk/checksums	2014-12-23 19:00:28 UTC (rev 24507)
@@ -1 +1 @@
-2624723cfd7019425fa9869a505797d0  cmake-3.1.0-rc1-1.tar.bz2
+188eb7dc9b1b82b363bc51c0d3f1d461  cmake-3.1.0.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  Tue Dec 23 20:03:47 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 19:03:47 +0000
Subject: SF.net SVN: gar:[24508] csw/mgar/pkg/mercurial/trunk
Message-ID: <3k6RpK0vnzzPR@mail.opencsw.org>

Revision: 24508
          http://sourceforge.net/p/gar/code/24508
Author:   rthurner
Date:     2014-12-23 19:03:45 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
mercurial/trunk: mercurial upgrade to hg-3.2.3, security fix for CVE-2014-9390.

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-12-23 19:00:28 UTC (rev 24507)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2014-12-23 19:03:45 UTC (rev 24508)
@@ -1,5 +1,5 @@
 NAME = mercurial
-VERSION = 3.2.1
+VERSION = 3.2.3
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2014-12-23 19:00:28 UTC (rev 24507)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2014-12-23 19:03:45 UTC (rev 24508)
@@ -1 +1 @@
-8dd4822d5aaee25be4484583ada018c5  mercurial-3.2.1.tar.gz
+ca6d1a0b0fd255fb1b9fb3fa46a856b8  mercurial-3.2.3.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  Tue Dec 23 23:19:15 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 22:19:15 +0000
Subject: SF.net SVN: gar:[24509] csw/mgar/pkg/trac/trunk
Message-ID: <3k6X6336vlz1G9@mail.opencsw.org>

Revision: 24509
          http://sourceforge.net/p/gar/code/24509
Author:   rthurner
Date:     2014-12-23 22:19:15 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
trac/trunk: upgrade to trac-1.0.2

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

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2014-12-23 19:03:45 UTC (rev 24508)
+++ csw/mgar/pkg/trac/trunk/Makefile	2014-12-23 22:19:15 UTC (rev 24509)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = Trac
-VERSION = 1.0.1
+VERSION = 1.0.2
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/trac/trunk/checksums
===================================================================
--- csw/mgar/pkg/trac/trunk/checksums	2014-12-23 19:03:45 UTC (rev 24508)
+++ csw/mgar/pkg/trac/trunk/checksums	2014-12-23 22:19:15 UTC (rev 24509)
@@ -1 +1 @@
-c869fa40e29fa4597e2c9c960de9f2f3  Trac-1.0.1.tar.gz
+392d07ea1d4351c6737b8c51de7dbe0b  Trac-1.0.2.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  Wed Dec 24 00:13:40 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 23:13:40 +0000
Subject: SF.net SVN: gar:[24513] csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <3k6YJZ0lT5z1NX@mail.opencsw.org>

Revision: 24513
          http://sourceforge.net/p/gar/code/24513
Author:   rthurner
Date:     2014-12-23 23:13:39 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
subversion, remove unnecessary dependencies.

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2014-12-23 22:51:14 UTC (rev 24512)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2014-12-23 23:13:39 UTC (rev 24513)
@@ -72,7 +72,6 @@
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-1
-RUNTIME_DEP_PKGS_CSWsvn += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0
 RUNTIME_DEP_PKGS_CSWsvn_5.9 += CSWglib2
 RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0
@@ -124,7 +123,6 @@
 # Override for now as it is not harmful.
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/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|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 
 
@@ -138,14 +136,6 @@
 PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0
 
 PACKAGES += CSWrbsvn
 SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
@@ -209,13 +199,6 @@
 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
@@ -235,7 +218,6 @@
 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 rthurner at users.sourceforge.net  Wed Dec 24 00:18:30 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 23:18:30 +0000
Subject: SF.net SVN: gar:[24514] csw/mgar/pkg/apr-util/trunk
Message-ID: <3k6YQ96TNLz1R1@mail.opencsw.org>

Revision: 24514
          http://sourceforge.net/p/gar/code/24514
Author:   rthurner
Date:     2014-12-23 23:18:30 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
apr-util/trunk: upgrade to apr-util-1.5.4

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile
    csw/mgar/pkg/apr-util/trunk/checksums

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2014-12-23 23:13:39 UTC (rev 24513)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2014-12-23 23:18:30 UTC (rev 24514)
@@ -1,5 +1,5 @@
 NAME = apr-util
-VERSION = 1.5.3
+VERSION = 1.5.4
 GARTYPE = v2
 
 DESCRIPTION = Apache Portable Runtime Utilities

Modified: csw/mgar/pkg/apr-util/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr-util/trunk/checksums	2014-12-23 23:13:39 UTC (rev 24513)
+++ csw/mgar/pkg/apr-util/trunk/checksums	2014-12-23 23:18:30 UTC (rev 24514)
@@ -1 +1 @@
-71a11d037240b292f824ba1eb537b4e3  apr-util-1.5.3.tar.gz
+866825c04da827c6e5f53daff5569f42  apr-util-1.5.4.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  Wed Dec 24 00:33:39 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 23:33:39 +0000
Subject: SF.net SVN: gar:[24515] csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <3k6Yld2F6Wz1Tb@mail.opencsw.org>

Revision: 24515
          http://sourceforge.net/p/gar/code/24515
Author:   rthurner
Date:     2014-12-23 23:33:39 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
subversion/trunk: ignore checkpkg errors.

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2014-12-23 23:18:30 UTC (rev 24514)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2014-12-23 23:33:39 UTC (rev 24515)
@@ -199,6 +199,7 @@
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibapr1-0
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8

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 Dec 24 00:47:45 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 23 Dec 2014 23:47:45 +0000
Subject: SF.net SVN: gar:[24516] csw/mgar/pkg/apr/trunk
Message-ID: <3k6Z3s3lTSz1Xk@mail.opencsw.org>

Revision: 24516
          http://sourceforge.net/p/gar/code/24516
Author:   rthurner
Date:     2014-12-23 23:47:44 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
apr/trunk: upgrade to apr-1.5.1

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

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2014-12-23 23:33:39 UTC (rev 24515)
+++ csw/mgar/pkg/apr/trunk/Makefile	2014-12-23 23:47:44 UTC (rev 24516)
@@ -1,5 +1,5 @@
 NAME = apr
-VERSION = 1.5.0
+VERSION = 1.5.1
 GARTYPE = v2
 
 DESCRIPTION = Apache Portable Runtime

Modified: csw/mgar/pkg/apr/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr/trunk/checksums	2014-12-23 23:33:39 UTC (rev 24515)
+++ csw/mgar/pkg/apr/trunk/checksums	2014-12-23 23:47:44 UTC (rev 24516)
@@ -1 +1 @@
-6419a8f7e89ad51b5bad7b0c84cc818c  apr-1.5.0.tar.gz
+d3538d67e6455f48cc935d8f0a50a1c3  apr-1.5.1.tar.gz

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


From rthurner at users.sourceforge.net  Wed Dec 24 01:15:49 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 24 Dec 2014 00:15:49 +0000
Subject: SF.net SVN: gar:[24517] csw/mgar/pkg/trac/trunk/Makefile
Message-ID: <3k6Zk80nhcz3S@mail.opencsw.org>

Revision: 24517
          http://sourceforge.net/p/gar/code/24517
Author:   rthurner
Date:     2014-12-24 00:15:49 +0000 (Wed, 24 Dec 2014)
Log Message:
-----------
trac/trunk: trac, depend on new packagename

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

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2014-12-23 23:47:44 UTC (rev 24516)
+++ csw/mgar/pkg/trac/trunk/Makefile	2014-12-24 00:15:49 UTC (rev 24517)
@@ -20,7 +20,7 @@
 UFILES_REGEX           = (\d+(?:\.\d+)*).tar.gz
 
 PACKAGES = CSWtrac
-RUNTIME_DEP_PKGS_CSWtrac  = CSWpysetuptools CSWpythonsvn CSWgenshi
+RUNTIME_DEP_PKGS_CSWtrac  = CSWpy-setuptools CSWpythonsvn CSWgenshi
 ARCHALL_CSWtrac = 1
 
 CATALOGNAME_CSWtrac    = trac
@@ -28,7 +28,7 @@
 
 CHECKPKG_OVERRIDES_CSWtrac += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWtrac += catalogname-does-not-start-with-py_
-CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpysetuptools
+CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpy-setuptools
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWgenshi
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpythonsvn
 
@@ -52,7 +52,6 @@
 CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracInstall
 CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracRepositoryAdmin
 CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracRepositoryAdmin
-CHECKPKG_OVERRIDES_CSWtrac += dependency-on-stub|py_setuptools_stub
 
 
 TEST_SCRIPTS           =

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


From dmichelsen at users.sourceforge.net  Mon Dec 29 14:58:41 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 29 Dec 2014 13:58:41 +0000
Subject: SF.net SVN: gar:[24519] csw/mgar/pkg/doxygen/trunk
Message-ID: <3kB0k73v63z2n@mail.opencsw.org>

Revision: 24519
          http://sourceforge.net/p/gar/code/24519
Author:   dmichelsen
Date:     2014-12-29 13:58:40 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
doxygen/trunk: Update to 1.8.9

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

Removed Paths:
-------------
    csw/mgar/pkg/doxygen/trunk/files/attachment-275069

Modified: csw/mgar/pkg/doxygen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/doxygen/trunk/Makefile	2014-12-24 00:59:47 UTC (rev 24518)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2014-12-29 13:58:40 UTC (rev 24519)
@@ -1,5 +1,5 @@
 NAME = doxygen
-VERSION = 1.8.7
+VERSION = 1.8.9
 GARTYPE = v2
 
 DESCRIPTION = A documentation system for programming languages
@@ -11,10 +11,6 @@
 MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/
 DISTFILES  = $(DISTNAME).src.tar.gz
 
-# Replacement for configure script as reported here:
-#   https://bugzilla.gnome.org/show_bug.cgi?id=728654
-DISTFILES += attachment-275069
-
 VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/
 
 LICENSE = LICENSE
@@ -79,8 +75,3 @@
 
 include gar/category.mk
 
-# Replacement for configure script as reported here:
-#   https://bugzilla.gnome.org/show_bug.cgi?id=728654
-post-extract:
-	cp $(WORKDIR)/attachment-275069 $(WORKSRC)/configure
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2014-12-24 00:59:47 UTC (rev 24518)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2014-12-29 13:58:40 UTC (rev 24519)
@@ -1 +1 @@
-ff0529df773301f63db82c25137b7fd8  doxygen-1.8.7.src.tar.gz
+753c1b135086c4771035622532652552  doxygen-1.8.9.src.tar.gz

Deleted: csw/mgar/pkg/doxygen/trunk/files/attachment-275069
===================================================================
--- csw/mgar/pkg/doxygen/trunk/files/attachment-275069	2014-12-24 00:59:47 UTC (rev 24518)
+++ csw/mgar/pkg/doxygen/trunk/files/attachment-275069	2014-12-29 13:58:40 UTC (rev 24519)
@@ -1,973 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-# Copyright (C) 1997-2014 by Dimitri van Heesch.
-# 
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-# 
-# Documents produced by Doxygen are derivative works derived from the
-# input used in their production; they are not affected by this license.
-# 
-# shell script to configure doxygen
-
-doxygen_version_major=1
-doxygen_version_minor=8
-doxygen_version_revision=7
-
-#NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=NO
-
-bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
-
-f_debug=NO
-f_shared=YES
-f_make=NO
-f_dot=NO
-f_perl=NO
-f_python=NO
-f_plf_auto=NO
-f_prefix=/usr/local
-f_insttool=NO
-f_english=NO
-f_wizard=NO
-f_app=NO
-f_doxmlparser=NO
-f_thread=NO
-f_flex=NO
-f_bison=NO
-f_search=NO
-f_sqlite3=NO
-f_sqlite3static=NO
-f_sqlite3_path=NO
-f_libclang=NO
-f_libclangstatic=NO
-
-#
-# first setup the list with availabe languages, so we cannot forget any
-# list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script
-#
-f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ','`
-
-while test -n "$1";  do
-  case $1 in
-    --prefix=*)
-       f_prefix=`echo $1 | sed 's/^--prefix=//'`
-       ;;
-    --prefix | -prefix)
-       shift; f_prefix=$1
-       ;;
-    --docdir=*)
-       f_docdir=`echo $1 | sed 's/^--docdir=//'`
-       ;;
-    --docdir | -docdir)
-       shift; f_docdir=$1
-       ;;
-    --shared | -shared)
-       f_shared=YES
-       ;;
-    --static | -static)
-       f_shared=NO
-       ;;
-    --release | -release)
-       f_debug=NO
-       ;;
-    --debug | -debug)
-       f_debug=YES
-       ;;
-    --english-only | -english-only)
-       f_english=YES
-       ;;
-    --enable-langs=*)
-       f_langs=`echo $1 | sed 's/^--enable-langs=//'`
-       ;;
-    --enable-langs | -enable-langs)
-       shift; f_langs=$1
-       ;;
-    --platform=*)
-       f_platform=`echo $1 | sed 's/^--platform=//'`
-       ;;
-    --platform | -platform)
-       shift; f_platform=$1
-       ;;
-    --make=*)
-       f_make=`echo $1 | sed 's/^--make=//'`
-       ;;
-    --make | -make)
-       shift; f_make=$1
-       ;;
-    --dot=*)
-       f_dot=`echo $1 | sed 's/^--dot=//'`
-       ;;
-    --dot | -dot)
-       shift; f_dot=$1
-       ;;
-    --python=*)
-       f_python=`echo $1 | sed 's/^--python=//'`
-       ;;
-    --python | -python)
-       shift; f_python=$1
-       ;;
-    --perl=*)
-       f_perl=`echo $1 | sed 's/^--perl=//'`
-       ;;
-    --perl | -perl)
-       shift; f_perl=$1
-       ;;
-    --flex=*)
-       f_flex=`echo $1 | sed 's/^--flex=//'`
-       ;;
-    --flex | -flex)
-       shift; f_flex=$1
-       ;;
-    --bison=*)
-       f_bison=`echo $1 | sed 's/^--bison=//'`
-       ;;
-    --bison | -bison)
-       shift; f_bison=$1
-       ;;
-    --install=*)
-       f_insttool=`echo $1 | sed 's/^--install=//'`
-       ;;
-    --install | -install)
-       shift; f_insttool=$1
-       ;;
-    --with-doxywizard | -with-doxywizard)
-       f_wizard=YES
-       ;;
-    --with-doxyapp | -with-doxyapp)
-       f_app=YES
-       ;;
-    --with-doxmlparser | -with-doxmlparser)
-       f_doxmlparser=YES
-       ;;
-    --with-doxysearch | -with-doxysearch)
-       f_search=YES
-       ;;
-    --with-sqlite3 | -with-sqlite3)
-       f_sqlite3=YES
-       ;;
-    --with-sqlite3-static | -with-sqlite3-static)
-       f_sqlite3=YES
-       f_sqlite3static=YES
-       ;;
-    --sqlite3-path=*)
-       f_sqlite3_path=`echo $1 | sed 's/^--sqlite3-path=//'`
-       ;;
-    --sqlite3-path | -sqlite3-path)
-       shift; f_sqlite3_path=$1
-       ;;
-    --with-libclang | -with-libclang)
-       f_libclang=YES
-       ;;
-    --with-libclang-static | -with-libclang-static)
-       f_libclang=YES
-       f_libclangstatic=YES
-       ;;
-    -h | -help | --help)
-       f_help=y
-       ;;
-    *)
-       echo $1: unknown argument
-       f_help=y
-       f_error=y
-       ;;
-  esac
-  shift
-done
-
-if test "$f_help" = y; then
-  cat <<EOF
-Usage: $0 [--help] [--shared] [--static] [--release] [--debug] [--python name]
-          [--perl name] [--flex name] [--bison name] [--make name] 
-          [--dot name] [--platform target] [--prefix dir] [--docdir dir] 
-          [--install name] [--english-only] [--enable-langs list] 
-          [--with-sqlite3] [--with-sqlite3-static] [--sqlite3-path]
-          [--with-libclang] [--with-libclang-static]
-          [--with-doxywizard] [--with-doxysearch] [--with-doxyapp]
-          [--with-doxxmlparser]
-
-Options: 
-
-  --help                Print this help
-  --shared | --static   Build using shared or static linking
-		        [default: shared]
-  --release | --debug   Build for release or debug 
-		        [default: release]
-  --python name         Use \`name' as the name of the python interpreter 
-		        [default: autodetect]
-  --perl name           Use \`name' as the name of the perl interpreter 
-		        [default: autodetect]
-  --flex name           Use \`name' as the name of the GNU lexical scanner 
-		        [default: autodetect]
-  --bison name          Use \`name' as the name of the GNU compiler generator 
-		        [default: autodetect]
-  --make name           Use \`name' as the name of the GNU make tool
-		        [default: autodetect]
-  --dot name            Use \`name' as the name of the dot tool that
-                        is part of the Graphviz package.
-                        [default: autodetect]
-  --platform target     Do not detect platform but use \`target' instead.
-                        See PLATFORMS for a list of possibilities
-  --prefix dir          Installation prefix directory (doxygen will be
-                        put in PREFIX/bin/doxygen)
-                        [default: $f_prefix]
-  --docdir dir          Documentation is installed in DOCDIR/
-                        [default: PREFIX/share/doc/packages/doxygen]
-  --install name        Use \`name' as the name of the GNU install tool
-                        [default: autodetect]
-  --english-only        Include support for English only.
-  --enable-langs list 	Include support for output languages listed in list.
-  			[default: $f_langs]
-  --with-sqlite3        Add support for sqlite3 output [experimental]
-  --with-libclang       Add support for libclang parsing
-  --with-doxywizard     Build the GUI frontend for doxygen. This
-                        requires Qt version 4.
-  --with-doxysearch     Build external search tools (doxysearch and doxyindexer)
-                        requires Xapian library version 1.2
-  --with-doxyapp        Example showing how to embed doxygen in an application.
-  --with-doxmlparser    Example showing how to parse doxygen's XML output.
-
-EOF
-  test "$f_error" = y && exit 1
-  exit 0;
-fi
-
-u_release=`(uname -r) 2>/dev/null` || u_release=unknown
-u_system=`(uname -s) 2>/dev/null` || u_system=unknown
-
-if test -z "$f_platform"; then
-  f_platforms="`cat PLATFORMS`"
-  
-  case "$u_system:$u_release" in
-    AIX*)
-      f_platform=aix-xlc
-      ;;
-    BeOS*)
-      f_platform=beos-g++
-      ;;
-    dgux:*)
-      f_platform=dgux-g++
-      ;;
-    Darwin:*)
-      f_platform=macosx-c++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    FreeBSD:*)
-      f_platform=freebsd-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    NetBSD:*)
-      f_platform=netbsd-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    HP-UX:*)
-      f_platform=hpux-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    IRIX64:*)
-      f_platform=irix-64
-      ;;
-    IRIX:*)
-      f_platform=irix-n32
-      ;;
-    Linux:*|GNU:*|GNU/*:*)
-      f_platform=linux-g++
-      ;;
-    NetBSD:*)
-      f_platform=netbsd-g++
-      ;;
-    OpenBSD:*)
-      f_platform=openbsd-g++
-      ;;
-    OSF1:*)
-      f_platform=osf1-g++
-      ;;
-    QNX:*)
-      f_platform=qnx-g++
-      ;;
-    *:3.2)
-      f_platform=sco-g++
-      ;;
-    SunOS:4*)
-      f_platform=sunos-g++
-      ;;
-    SunOS:5*)
-      f_platform=solaris-g++
-      if test "$f_insttool" = NO; then
-        f_insttool=/usr/bin/install
-      fi
-      ;;
-    ULTRIX:*)
-      f_platform=ultrix-g++
-      ;;
-    UNIX_SV:4.2*)
-      f_platform=unixware-g++
-      ;;
-    Cygwin:*|CYGWIN*)
-      f_platform=win32-g++
-      ;;
-    MINGW32_NT*)
-      f_platform=win32-mingw
-      ;;
-    *MiNT:*)
-      f_platform=m68k-atari-mint-g++
-      ;;
-    *)
-    echo
-    echo "Your platform was not recognised by this configure script"
-    echo "Please use the -platform option to specify one of platforms"
-    echo "in this list:"
-    echo
-    for p in $f_platforms
-    do
-      echo "    $0 $* -platform $p"
-    done
-    echo
-    exit 2
-  esac 
-  echo "  Autodetected platform $f_platform... "
-  f_plf_auto=YES
-fi
-
-if test -z "$f_docdir"; then
-  f_docdir='$(INSTALL)/share/doc/packages/doxygen'
-fi
-
-if test "$f_plf_auto" = NO; then
-  printf "  Checking for platform $f_platform... "
-  if test '!' -d tmake/lib/$f_platform; then
-    echo "not supported!" 
-    echo
-    exit 2
-  fi
-  echo "supported"
-fi
-
-#- check for qt --------------------------------------------------------------
- 
-if test "$f_wizard" = YES; then
-  if test -z "$QTDIR"; then
-    echo "  QTDIR environment variable not set!"
-    printf "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
-      if test -x "$d/bin/qmake"; then
-        QTDIR=$d
-        break 2
-      fi
-    done
-  else
-    if test -e "$QTDIR/bin/qmake"; then
-      printf "  Detected Qt via the QTDIR environment variable..."
-    else
-      printf "ERROR Detected Qt via the QTDIR environment variable..."
-      echo ", but $QTDIR/bin/qmake does not exist."
-      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
-      exit 2
-    fi
-  fi
-  if test -z "$QTDIR"; then
-    echo "QTDIR not set and Qt not found at standard locations!"
-    echo
-    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
-    echo "check the Qt installation instructions!"
-    exit 2
-  fi
-  echo using $QTDIR
-fi
-
-#- check for xapian -----------------------------------------------------------
-
-if test "$f_search" = YES; then
-  if test -z "$XAPIAN"; then
-    printf "  Checking for Xapian..."
-    for d in /usr /usr/local /opt/local; do
-      if test -e "$d/include/xapian.h"; then
-        XAPIAN=$d
-        break 2
-      fi
-    done
-  else
-    if test -e "$XAPIAN/include/xapian.h"; then
-      printf "  Detected Xapian via the XAPIAN environment variable..."
-    else
-      printf "ERROR Detected Xapian via the XAPIAN environment variable..."
-      echo ", but $XAPIAN/include/xapian.h does not exist."
-      echo "      Set the XAPIAN environment variable such that \$XAPIAN/include/xapian.h exists."
-      exit 2
-    fi
-  fi
-  if test -z "$XAPIAN"; then
-    echo "XAPIAN not set and xapian.h not found at standard locations!"
-    exit 2;
-  fi
-  echo using $XAPIAN
-fi
-   
-# - check for make ------------------------------------------------------------
-
-printf "  Checking for GNU make tool... "
-if test "$f_make" = NO; then
-  make_names="gmake make"
-  make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  make_prog=NO
-  for i in $make_names; do
-    for j in $make_dirs; do
-      if test -x "$j/$i"; then
-        if test -n "`$j/$i --version 2>/dev/null | grep GNU`"; then
-          make_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_make="$make_prog" 
-fi
-
-if test "$f_make" = NO; then
-  echo "not found!";
-  echo
-  exit 2
-fi
-echo "using $f_make"
-
-# - check for install ------------------------------------------------------------
-
-printf "  Checking for GNU install tool... "
-if test "$f_insttool" = NO; then
-  install_names="ginstall install"
-  install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
-  install_prog=NO
-  install_found=NO
-  for i in $install_names; do
-    for j in $install_dirs; do
-      if test -x "$j/$i"; then
-        if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then
-          install_found=YES
-          install_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_insttool="$install_prog" 
-fi
-
-if test "$f_insttool" = NO; then
-  if test "$install_found" = YES; then
-    echo;
-  else
-    echo "not found!";
-    echo
-  fi
-  echo "GNU version of install is required: this is part of the fileutils/coreutils package: "
-  echo "see http://www.gnu.org/software/fileutils/fileutils.html"
-  echo
-  exit 2
-fi
-echo "using $f_insttool";
-
-
-# - check for dot ------------------------------------------------------------
-
-printf "  Checking for dot (part of GraphViz)... "
-if test "$f_dot" = NO; then
-  dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  dot_prog=NO
-  for j in $dot_dirs; do
-    if test -x "$j/dot"; then
-      dot_prog="$j/dot"
-      break 2
-    fi
-  done
-  f_dot="$dot_prog" 
-fi
-
-if test "$f_dot" = NO; then
-  echo "not found!";
-else
-  echo "using $f_dot"
-fi
-
-# - check for sqlite3 ---------------------------------------------------------
-
-if test "$f_sqlite3" = YES; then
-  printf "  Checking for sqlite3 ... "
-  if test "$f_sqlite3_path" = NO; then
-    sqlite3_hdr_dir="/usr/include /usr/local/include /opt/local/include"
-    sqlite3_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/x86_64-linux-gnu /usr/lib64"
-  else
-    sqlite3_hdr_dir="$f_sqlite3_path/include"
-    sqlite3_lib_dir="$f_sqlite3_path/lib"
-  fi
-  if test "$f_sqlite3static" = NO; then
-    sqlite3_lib_name="libsqlite3.so libsqlite3.dylib libsqlite3.a libsqlite3.dll.a"
-  else
-    sqlite3_lib_name="libsqlite3.a"
-  fi
-  sqlite3_hdr=NO
-  sqlite3_lib=NO
-  sqlite3_link=
-  for j in $sqlite3_hdr_dir; do
-    if test -f "$j/sqlite3.h"; then
-      sqlite3_hdr="$j/sqlite3.h"
-      break
-    fi
-  done
-  for i in $sqlite3_lib_dir; do
-    if test "$sqlite3_lib" = NO; then
-      for j in $sqlite3_lib_name; do
-        if test -e "$i/$j"; then
-          if test "$f_sqlite3static" = NO; then
-            sqlite3_lib="$i/$j"
-            sqlite3_link="-L$i -lsqlite3"
-          else
-            sqlite3_lib="$i/$j"
-            sqlite3_link="$i/$j -ldl"
-          fi
-          break
-        fi
-      done
-    fi
-  done
-  if test "$sqlite3_hdr" = NO -o "$sqlite3_lib" = NO; then
-    echo "not found!";
-    exit 1
-  else
-    echo "using header $sqlite3_hdr and library $sqlite3_lib...";
-  fi
-fi
-
-# - check for libclang ---------------------------------------------------------
-
-if test "$f_libclang" = YES; then
-  printf "  Checking for libclang ... "
-  libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include"
-  libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm"
-  if test "$f_libclangstatic" = NO; then
-    libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a"
-  else
-    libclang_lib_name="libclang.a"
-  fi
-  libclang_hdr=NO
-  libclang_lib=NO
-  libclang_link=
-  for j in $libclang_hdr_dir; do
-    if test -f "$j/clang-c/Index.h"; then
-      libclang_hdr="$j/clang-c/Index.h"
-      break
-    fi
-  done
-  for i in $libclang_lib_dir; do
-    if test "$libclang_lib" = NO; then
-      for j in $libclang_lib_name; do
-        if test -f "$i/$j"; then
-          libclang_lib="$i/$j"
-          if test "$f_libclangstatic" = NO; then
-            libclang_link="-L $i -lclang"
-          else
-            libclang_link="$i/libclang.a $i/libclangFrontend.a $i/libclangSerialization.a $i/libclangParse.a $i/libclangSema.a $i/libclangAnalysis.a $i/libclangStaticAnalyzerCore.a $i/libclangAST.a $i/libclangBasic.a $i/libclangDriver.a $i/libclangEdit.a $i/libclangLex.a $i/libclangRewriteCore.a $i/libLLVMBitReader.a $i/libLLVMMC.a $i/libLLVMMCParser.a $i/libLLVMSupport.a -ldl -lpthread"
-          fi
-          break
-        fi
-      done
-    fi
-  done
-  if test "$libclang_hdr" = NO -o "$libclang_lib" = NO; then
-    echo "not found!";
-  else
-    echo "using header $libclang_hdr and library $libclang_lib...";
-  fi
-fi
-
-# - check for python ----------------------------------------------------------
-
-printf "  Checking for python... "
-if test "$f_python" = NO; then
-  python_names="python2 python"
-  python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  python_prog=NO
-  python_found=NO
-  for i in $python_names; do
-    for j in $python_dirs; do
-      if test -x "$j/$i"; then
-        python_found=YES
-        if test `$j/$i -c "import sys; print sys.version_info[0]"` = 2; then
-          python_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_python="$python_prog" 
-fi
-
-if test "$f_python" = NO; then
-  if test "$python_found" = YES; then
-    echo "version should be python 2."
-  else
-    echo "not found!";
-  fi
-  echo
-  exit 2
-fi
-echo "using $f_python";
-
-# - check for perl ------------------------------------------------------------
-
-printf "  Checking for perl... "
-if test "$f_perl" = NO; then
-  perl_names="perl perl5"
-  perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-  perl_prog=NO
-  perl_found=NO
-  for i in $perl_names; do
-    for j in $perl_dirs; do
-      if test -x "$j/$i"; then
-        perl_found=YES
-        if $j/$i -e 'require 5.000;' 2>/dev/null ; then
-          perl_prog="$j/$i"
-          break 2
-        fi
-      fi
-    done
-  done
-  f_perl="$perl_prog" 
-fi
-
-if test "$f_perl" = NO; then
-  if test "$perl_found" = YES; then
-    echo "version is too old (5.000 or higher is required)."
-  else
-    echo "not found!";
-  fi
-  echo
-  exit 2
-fi
-echo "using $f_perl";
-
-# - check for flex ------------------------------------------------------------
-
-printf "  Checking for flex... "
-if test "$f_flex" = NO; then
-  flex_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
-  flex_prog=NO
-  flex_found=NO
-  for j in $flex_dirs; do
-    if test -x "$j/flex"; then
-      flex_found=YES
-      flex_prog="$j/flex"
-      break
-    fi
-  done
-  f_flex="$flex_prog" 
-fi
-
-if test "$f_flex" = NO; then
-  echo "not found!";
-  exit 2
-else
-  echo "using $f_flex"
-fi
-
-# - check for bison ------------------------------------------------------------
-
-printf "  Checking for bison... "
-if test "$f_bison" = NO; then
-  bison_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
-  bison_prog=NO
-  bison_found=NO
-  for j in $bison_dirs; do
-    if test -x "$j/bison"; then
-      bison_found=YES
-      bison_prog="$j/bison"
-      break
-    fi
-  done
-  f_bison="$bison_prog" 
-fi
-
-if test "$f_bison" = NO; then
-  echo "not found!";
-  exit 2
-else
-  echo "using $f_bison"
-fi
-
-# -----------------------------------------------------------------------------
-
-mkdir -p generated_src/doxygen
-if test "$f_wizard" = YES; then
-  mkdir -p generated_src/doxywizard
-fi
-
-#
-# Make VERSION file
-#
-test -f "VERSION" && chmod u+w VERSION
-test -f "generated_src/doxygen/version.cpp" && chmod u+w generated_src/doxygen/version.cpp
-echo "  Generating generated_src/doxygen/version.cpp and VERSION..."
-cd src
-$f_python version.py ../generated_src/doxygen
-cd ..
-if test "$f_wizard" = YES; then
-  test -f "VERSION" && chmod u+w VERSION
-  test -f "generated_src/doxywizard/version.cpp" && chmod u+w generated_src/doxywizard/version.cpp
-  echo "  Generating generated_src/doxywizard/version.cpp and VERSION..."
-  cd src
-  $f_python version.py ../generated_src/doxywizard
-  cd ..
-
-fi
-
-test -f .makeconfig && rm .makeconfig
-test -f .tmakeconfig && rm .tmakeconfig
-
-configPWD=`pwd`
-
-cat > .makeconfig <<EOF
-DOXYGEN   = $configPWD
-TMAKEPATH = $configPWD/tmake/lib/$f_platform
-ENV       = env TMAKEPATH="\$(TMAKEPATH)"
-TMAKE     = $configPWD/tmake/bin/tmake
-MAKE      = $f_make
-PYTHON    = $f_python
-LEX       = $f_flex
-RM        = rm -f
-CP        = cp
-VERSION   = `cat VERSION`
-INSTALL   = $f_prefix
-INSTTOOL  = $f_insttool
-DOXYDOCS  = ..
-DOCDIR    = $f_docdir
-QTDIR     = $QTDIR
-EOF
-
-if test "$f_dot" != NO; then
-  cat >> .makeconfig <<EOF
-HAVE_DOT  = $f_dot
-EOF
-fi
-
-
-if test "$f_platform" = "m68k-atari-mint-g++"; then
-  cat >> .makeconfig <<EOF
-TMAKE += -unix
-EOF
-fi
-
-if test "$f_platform" = "macosx-c++"; then
-  cat >> .makeconfig <<EOF
-MKSPECS   = -spec macx-g++
-EOF
-fi
-if test "$f_platform" = "macosx-uni-c++"; then
-  cat >> .makeconfig <<EOF
-MKSPECS   = -spec macx-g++
-EOF
-fi
-
-# Make doxygen.spec...
-#
-echo "  Created doxygen.spec file, for rpm generation."
-
-echo "%define version $doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision" > spec.tmp
-if test "$doxygen_version_mmn" = NO; then
-  echo "%define revision 1" >> spec.tmp
-  echo "%define mmn 1"      >> spec.tmp
-else
-  echo "%define revision $doxygen_version_mmn" >> spec.tmp
-  echo "%define mmn $doxygen_version_mmn"      >> spec.tmp
-fi
-
-mkdir -p packages
-mkdir -p packages/rpm
-
-cat spec.tmp ./packages/rpm/doxygen.spec.in > ./packages/rpm/doxygen.spec
-
-rm -f spec.tmp
-
-
-# make .tmakeconfig
-#
-touch .tmakeconfig
-if test "$f_shared" = NO; then
-  if test "$f_platform" = "osf1-cxx" -o "$f_platform" = "irix-n32"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -non_shared
-EOF
-  elif test "$f_platform" = "solaris-cc"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -Bstatic
-EOF
-  elif test "$f_platform" = "hpux-cc"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -noshared
-EOF
-  else
-  cat >> .tmakeconfig <<EOF
-    TMAKE_LFLAGS += -static
-EOF
-  fi
-fi
-if test "$f_platform" = "hpux-g++" -o "$f_platform" = "linux-g++"; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE
-EOF
-fi
-if test "$f_platform" = "macosx-uni-c++"; then
-  if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk 2>/dev/null`"; then
-    mac_sdk=MacOSX10.4u.sdk
-  fi
-  if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk 2>/dev/null`"; then
-    mac_sdk=MacOSX10.5.sdk
-  fi
-  if test -n $mac_sdk; then
-  cat >> .tmakeconfig <<EOF
-    TMAKE_CFLAGS   += -isysroot /Developer/SDKs/$mac_sdk
-    TMAKE_CXXFLAGS += -isysroot /Developer/SDKs/$mac_sdk
-    TMAKE_LFLAGS   += -Wl,-syslibroot,/Developer/SDKs/$mac_sdk
-EOF
-  fi
-fi
-if test "$f_wizard" = YES; then
-  cat >> .tmakeconfig <<EOF
-TMAKE_MOC = $QTDIR/bin/moc
-EOF
-fi
-
-if test "$f_search" = YES; then
-  cat >> .tmakeconfig <<EOF
-LIBS += -L$XAPIAN/lib
-INCLUDEPATH += $XAPIAN/include
-EOF
-fi
-
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in"
-
-for i in $f_inmakefiles ; do
-     SRC=$i
-     DST=`echo $i|sed 's%\(.*\).in$%\1%'`
-     TIME=`date`
-     cat > $DST <<EOF
-#
-# This file was generated from `basename $i` on $TIME
-#
-
-EOF
-     cat .makeconfig >> $DST
-     if test $i = Makefile.in; then
-       echo "" >> $DST
-       EXTRADEPS=
-       if test $f_wizard = YES; then
-         EXTRADEPS=doxywizard
-       fi
-#       if test $f_search = YES; then
-#         EXTRADEPS="$EXTRADEPS doxysearch"
-#       fi
-       echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
-       echo "	\$(MAKE) -C qtools" >> $DST
-       echo "	\$(MAKE) -C libmd5" >> $DST
-       echo "	\$(MAKE) -C src" >> $DST
-       if test $f_wizard = YES; then
-         echo "	\$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST
-       fi
-       if test $f_search = YES; then
-         echo "	\$(MAKE) -C addon/doxysearch" >> $DST
-       fi
-       if test $f_app = YES; then
-         echo "	\$(MAKE) -C addon/doxyapp" >> $DST
-       fi
-       if test $f_doxmlparser = YES; then
-         echo "	\$(MAKE) -C addon/doxmlparser/src" >> $DST
-         echo "	\$(MAKE) -C addon/doxmlparser/test" >> $DST
-         echo "	\$(MAKE) -C addon/doxmlparser/examples/metrics" >> $DST
-       fi
-       echo "" >> $DST
-       echo "doxywizard_install:" >> $DST
-       if test $f_wizard = YES; then
-         echo "	\$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard install" >> $DST
-       fi
-       echo "doxysearch_install:" >> $DST
-       if test $f_search = YES; then
-         echo "	\$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxysearch install" >> $DST
-       fi
-       echo "" >> $DST
-     fi
-     if test $f_wizard = YES; then
-       sed -e "s/%%WITHDOXYWIZARD%% /--with doxywizard /g" $SRC >> $DST
-     else
-       sed -e "s/%%WITHDOXYWIZARD%% //g" $SRC >> $DST
-     fi
-     echo "  Created $DST from $SRC..."
-done
-
-cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
-cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t
-
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" 
-
-for i in $f_inprofiles ; do
-     SRC=$i
-     DST=`echo $i|sed 's%\(.*\).in$%\1%'`
-     TIME=`date`
-     cat > $DST <<EOF
-#
-# This file was generated from `basename $i` on $TIME
-#
-
-EOF
-     if test "$f_debug" = NO; then
-       realopts="release"
-     else
-       realopts="debug"
-     fi
-     #if test "$f_thread" = YES; then
-     #  realopts="$realopts thread"
-     #fi
-     cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST
-     echo "  Created $DST from $SRC..."
-done
-
-# - generating generated_src/doxygen/doxygen/lang_cfg.h 
-# use consistent method on Linux and Windows
-
-if test -f "generated_src/doxygen/lang_cfg.h"; then
-    chmod u+w generated_src/doxygen/lang_cfg.h   # make sure file can be overwritten
-fi
-echo "  Generating generated_src/doxygen/lang_cfg.h..."
-if test "$f_english" = YES; then
-   $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h
-else
-   f_ulangs=`echo $f_langs | tr '[a-z,]' '[A-Z ]'`
-   $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h
-fi
-
-if test -f "generated_src/doxygen/settings.h"; then
-    chmod u+w generated_src/doxygen/settings.h
-fi
-echo "  Generating generated_src/doxygen/settings.h..."
-$f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxygen
-
-if test "$f_wizard" = YES; then
-  if test -f "generated_src/doxywizard/settings.h"; then
-      chmod u+w generated_src/doxywizard/settings.h
-  fi
-  echo "  Generating generated_src/doxywizard/settings.h..."
-  $f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxywizard
-fi
-
-cd ..
-echo "  Finished"

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  Mon Dec 29 22:07:04 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 29 Dec 2014 21:07:04 +0000
Subject: SF.net SVN: gar:[24520] csw/mgar/pkg/sdlnet/trunk/Makefile
Message-ID: <3kBBCj3LR1zF8@mail.opencsw.org>

Revision: 24520
          http://sourceforge.net/p/gar/code/24520
Author:   jake_goerzen
Date:     2014-12-29 21:07:03 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
sdlnet: switch to GCC4 compiler

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

Modified: csw/mgar/pkg/sdlnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlnet/trunk/Makefile	2014-12-29 13:58:40 UTC (rev 24519)
+++ csw/mgar/pkg/sdlnet/trunk/Makefile	2014-12-29 21:07:03 UTC (rev 24520)
@@ -10,6 +10,8 @@
 MASTER_SITES = http://www.libsdl.org/projects/SDL_net/release/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
+GARCOMPILER = GCC4
+
 PACKAGES += CSWlibsdl-net1-2-0
 CATALOGNAME_CSWlibsdl-net1-2-0 = libsdl_net1_2_0
 SPKG_DESC_CSWlibsdl-net1-2-0 += $(DESCRIPTION), libSDL_net-1.2.so.0
@@ -23,6 +25,7 @@
 PKGFILES_CSWlibsdl-net1-2-0-dev += $(PKGFILES_DEVEL)
 
 RUNTIME_DEP_PKGS_CSWlibsdl-net1-2-0 += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWlibsdl-net1-2-0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsdl-net1-2-0-dev += CSWlibsdl-net1-2-0
 
 # We define upstream file regex so we can be notifed of new upstream software release

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  Mon Dec 29 22:29:08 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 29 Dec 2014 21:29:08 +0000
Subject: SF.net SVN: gar:[24521] csw/mgar/pkg/sdlmixer/trunk/Makefile
Message-ID: <3kBBjD2CjszHr@mail.opencsw.org>

Revision: 24521
          http://sourceforge.net/p/gar/code/24521
Author:   jake_goerzen
Date:     2014-12-29 21:29:07 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
sdlmixer: switch to GCC4 compiler

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

Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlmixer/trunk/Makefile	2014-12-29 21:07:03 UTC (rev 24520)
+++ csw/mgar/pkg/sdlmixer/trunk/Makefile	2014-12-29 21:29:07 UTC (rev 24521)
@@ -10,11 +10,14 @@
 MASTER_SITES = http://www.libsdl.org/projects/SDL_mixer/release/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
+GARCOMPILER = GCC4
+
 PACKAGES += CSWlibsdl-mixer1-2-0
 CATALOGNAME_CSWlibsdl-mixer1-2-0 = libsdl_mixer1_2_0
 OBSOLETED_BY_CSWlibsdl-mixer1-2-0 = CSWsdlmixer
 SPKG_DESC_CSWlibsdl-mixer1-2-0 += $(DESCRIPTION), libSDL_mixer-1.2.so.0
 RUNTIME_DEP_PKGS_CSWlibsdl-mixer1-2-0 += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWlibsdl-mixer1-2-0 += CSWlibgcc-s1
 
 # Split development files into a separate package.
 PACKAGES += CSWlibsdl-mixer1-2-0-dev
@@ -32,7 +35,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-CONFIGURE_ARGS = --prefix=$(prefix) --disable-static
+CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 TEST_SCRIPTS =
 
 include gar/category.mk

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


From jake_goerzen at users.sourceforge.net  Tue Dec 30 17:20:29 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Tue, 30 Dec 2014 16:20:29 +0000
Subject: SF.net SVN: gar:[24522] csw/mgar/pkg/sdlttf/trunk/Makefile
Message-ID: <3kBgpj58qDzV7@mail.opencsw.org>

Revision: 24522
          http://sourceforge.net/p/gar/code/24522
Author:   jake_goerzen
Date:     2014-12-30 16:20:29 +0000 (Tue, 30 Dec 2014)
Log Message:
-----------
sdlttf: fix naming of -dev package

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

Modified: csw/mgar/pkg/sdlttf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-29 21:29:07 UTC (rev 24521)
+++ csw/mgar/pkg/sdlttf/trunk/Makefile	2014-12-30 16:20:29 UTC (rev 24522)
@@ -23,16 +23,16 @@
 OBSOLETED_BY_CSWlibsdl-ttf2-0-0 = CSWsdlttf
 
 # Split the development files into a separate package.
-PACKAGES += CSWlibsdl-ttf2-0-0-dev
-CATALOGNAME_CSWlibsdl-ttf2-0-0-dev = libsdl_ttf2_0_0_dev
-SPKG_DESC_CSWlibsdl-ttf2-0-0-dev += $(DESCRIPTION), development files
-PKGFILES_CSWlibsdl-ttf2-0-0-dev += /opt/csw/lib/libSDL_net.so
-PKGFILES_CSWlibsdl-ttf2-0-0-dev += $(PKGFILES_DEVEL)
+PACKAGES += CSWlibsdl-ttf-dev
+CATALOGNAME_CSWlibsdl-ttf-dev = libsdl_ttf_dev
+SPKG_DESC_CSWlibsdl-ttf-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibsdl-ttf-dev += /opt/csw/lib/libSDL_net.so
+PKGFILES_CSWlibsdl-ttf-dev += $(PKGFILES_DEVEL)
 
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsdl-ttf2-0-0-dev += CSWlibsdl-ttf2-0-0
+RUNTIME_DEP_PKGS_CSWlibsdl-ttf-dev += CSWlibsdl-ttf2-0-0
 
 EXTRA_LDFLAGS = -lm -L/opt/csw/lib -liconv
 

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  Tue Dec 30 17:29:28 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Tue, 30 Dec 2014 16:29:28 +0000
Subject: SF.net SVN: gar:[24523] csw/mgar/pkg/sdlnet/trunk/Makefile
Message-ID: <3kBh0x2zlvzXd@mail.opencsw.org>

Revision: 24523
          http://sourceforge.net/p/gar/code/24523
Author:   jake_goerzen
Date:     2014-12-30 16:29:28 +0000 (Tue, 30 Dec 2014)
Log Message:
-----------
sdlnet: fix naming of -dev package

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

Modified: csw/mgar/pkg/sdlnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlnet/trunk/Makefile	2014-12-30 16:20:29 UTC (rev 24522)
+++ csw/mgar/pkg/sdlnet/trunk/Makefile	2014-12-30 16:29:28 UTC (rev 24523)
@@ -18,15 +18,15 @@
 OBSOLETED_BY_CSWlibsdl-net1-2-0 = CSWsdlnet
 
 # Split the development files into a separate package.
-PACKAGES += CSWlibsdl-net1-2-0-dev
-CATALOGNAME_CSWlibsdl-net1-2-0-dev = libsdl_net1_2_0_dev
-SPKG_DESC_CSWlibsdl-net1-2-0-dev += $(DESCRIPTION), development files
-PKGFILES_CSWlibsdl-net1-2-0-dev += /opt/csw/lib/libSDL_net.so
-PKGFILES_CSWlibsdl-net1-2-0-dev += $(PKGFILES_DEVEL)
+PACKAGES += CSWlibsdl-net-dev
+CATALOGNAME_CSWlibsdl-net-dev = libsdl_net_dev
+SPKG_DESC_CSWlibsdl-net-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibsdl-net-dev += /opt/csw/lib/libSDL_net.so
+PKGFILES_CSWlibsdl-net-dev += $(PKGFILES_DEVEL)
 
 RUNTIME_DEP_PKGS_CSWlibsdl-net1-2-0 += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWlibsdl-net1-2-0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsdl-net1-2-0-dev += CSWlibsdl-net1-2-0
+RUNTIME_DEP_PKGS_CSWlibsdl-net-dev += CSWlibsdl-net1-2-0
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz

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