From dmichelsen at users.sourceforge.net Fri Mar 1 13:51:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Mar 2013 12:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20353] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 20353 http://gar.svn.sourceforge.net/gar/?rev=20353&view=rev Author: dmichelsen Date: 2013-03-01 12:51:24 +0000 (Fri, 01 Mar 2013) Log Message: ----------- sudo/trunk: Rework overrides Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2013-02-28 17:32:45 UTC (rev 20352) +++ csw/mgar/pkg/sudo/trunk/Makefile 2013-03-01 12:51:24 UTC (rev 20353) @@ -44,7 +44,6 @@ # These are just docs CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers @@ -84,14 +83,7 @@ # This is a private library CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-not-part-of-filename|soname=sudoers.so|filename=sudoers-ldap.so -#New check but this is ok -CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudoers-ldap.so|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudoers.so|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/sbin/visudo|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo_noexec.so|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sudoreplay|but|never|used - LOGPATH = $(localstatedir)/log/sudo TIMEPATH = $(localstatedir)/sudo IOLOGPATH = $(LOGPATH)/io This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 1 14:15:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Mar 2013 13:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[20354] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 20354 http://gar.svn.sourceforge.net/gar/?rev=20354&view=rev Author: dmichelsen Date: 2013-03-01 13:15:10 +0000 (Fri, 01 Mar 2013) Log Message: ----------- sudo/trunk: Re-add s9_preload.so.1 overrides again Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2013-03-01 12:51:24 UTC (rev 20353) +++ csw/mgar/pkg/sudo/trunk/Makefile 2013-03-01 13:15:10 UTC (rev 20354) @@ -83,6 +83,12 @@ # This is a private library CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-not-part-of-filename|soname=sudoers.so|filename=sudoers-ldap.so +# Looks like these are still needed +CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/sbin/visudo|but|never|used +CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudoers.so|but|never|used +CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo_noexec.so|but|never|used +CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sudoreplay|but|never|used +CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudoers-ldap.so|but|never|used LOGPATH = $(localstatedir)/log/sudo TIMEPATH = $(localstatedir)/sudo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 1 15:33:15 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Mar 2013 14:33:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20355] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 20355 http://gar.svn.sourceforge.net/gar/?rev=20355&view=rev Author: dmichelsen Date: 2013-03-01 14:33:14 +0000 (Fri, 01 Mar 2013) Log Message: ----------- sudo/trunk: Update to 1.8.6p7 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2013-03-01 13:15:10 UTC (rev 20354) +++ csw/mgar/pkg/sudo/trunk/Makefile 2013-03-01 14:33:14 UTC (rev 20355) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.6p6 +VERSION = 1.8.6p7 GARTYPE = v2 EXTRA_MODULATORS = LDAP Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2013-03-01 13:15:10 UTC (rev 20354) +++ csw/mgar/pkg/sudo/trunk/checksums 2013-03-01 14:33:14 UTC (rev 20355) @@ -1 +1 @@ -394efcbfedb200ba188958f047ce76d2 sudo-1.8.6p6.tar.gz +126abfa2e841139e774d4c67d80f0e5b sudo-1.8.6p7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 3 15:11:43 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Mar 2013 14:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20356] csw/mgar/pkg/vlc/trunk Message-ID: Revision: 20356 http://gar.svn.sourceforge.net/gar/?rev=20356&view=rev Author: wahwah Date: 2013-03-03 14:11:40 +0000 (Sun, 03 Mar 2013) Log Message: ----------- vlc/trunk: cleanup; attempt the 2.0.5 version instead of git Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile csw/mgar/pkg/vlc/trunk/checksums Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2013-03-01 14:33:14 UTC (rev 20355) +++ csw/mgar/pkg/vlc/trunk/Makefile 2013-03-03 14:11:40 UTC (rev 20356) @@ -2,29 +2,18 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = vlc -VERSION = 2.1-git +VERSION = 2.0.5 GARTYPE = v2 DESCRIPTION = VideoLAN Client, the cross-platform media player and streaming server define BLURB endef -# MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/ -# DISTFILES = $(DISTNAME).tar.bz2 +MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/ +DISTFILES = $(DISTNAME).tar.xz -# Building from the git master which has patches submitted by Maciej -MASTER_SITES = http://repo.or.cz/w/vlc/solaris.git/snapshot/ -DISTFILES = d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz - -NOTGITPATCH = 1 - -DISTNAME = solaris - PATCHFILES += 0006-Define-Encoding-in-vlc.desktop.patch -# We need e.g. stdbool.h -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - VENDOR_URL = http://www.videolan.org/vlc/ BUILD_DEP_PKGS += CSWliba52 @@ -32,20 +21,15 @@ BUILD_DEP_PKGS += CSWlibxaudevel BUILD_DEP_PKGS += CSWlibxdmcpdevel BUILD_DEP_PKGS += CSWlibx11devel +BUILD_DEP_PKGS += CSWautoconf +BUILD_DEP_PKGS += CSWautomake +BUILD_DEP_PKGS += CSWlibtool -# This is for libxcb -# EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -# EXTRA_LIB = /opt/csw/X11/lib -# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - # Sun Studio implements packed attributes differently and compilations bails out: # "include/vlc_codecs.h", line 36: #error: FIXME # GARCOMPILER = SOS12U2 GARCOMPILER = GNU -# Taken from http://wiki.videolan.org/Solaris -# EXTRA_CFLAGS = -D _XPG4_2 -D __SunOS -D __STDC_ISO_10646__ -D __EXTENSIONS__ -features=extensions -fast - # Solaris has MAXNAMELEN instead of NAME_MAX EXTRA_CFLAGS += -DNAME_MAX=MAXNAMLEN # Necessary to include _Xglobal_lock @@ -175,10 +159,6 @@ RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibiconv2 -# Doesn't work...? -# CONFIG_SHELL = /opt/csw/bin/bash -# EXTRA_EXPORTS += CONFIG_SHELL - include gar/category.mk pre-configure-modulated: Modified: csw/mgar/pkg/vlc/trunk/checksums =================================================================== --- csw/mgar/pkg/vlc/trunk/checksums 2013-03-01 14:33:14 UTC (rev 20355) +++ csw/mgar/pkg/vlc/trunk/checksums 2013-03-03 14:11:40 UTC (rev 20356) @@ -1,2 +1 @@ -bd09bc490ecb8d19f1561a438c48043b 0006-Work-around-the-lack-of-dirfd.patch -3857b512a3f1683178adef7e3c56e059 d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz +4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 3 16:18:50 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Mar 2013 15:18:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[20357] csw/mgar/pkg/vlc/trunk/Makefile Message-ID: Revision: 20357 http://gar.svn.sourceforge.net/gar/?rev=20357&view=rev Author: wahwah Date: 2013-03-03 15:18:50 +0000 (Sun, 03 Mar 2013) Log Message: ----------- vlc/trunk: more build time deps, compilation fails Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2013-03-03 14:11:40 UTC (rev 20356) +++ csw/mgar/pkg/vlc/trunk/Makefile 2013-03-03 15:18:50 UTC (rev 20357) @@ -1,6 +1,12 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # +# Compilations fails: +# +# ! In file included from libvlc.c:39:0: +# ../include/vlc_common.h: In function 'vlc_memalign': +# ../include/vlc_common.h:940:5: error: implicit declaration of function 'posix_memalign' [-Werror=implicit-function-declaration] + NAME = vlc VERSION = 2.0.5 GARTYPE = v2 @@ -24,6 +30,9 @@ BUILD_DEP_PKGS += CSWautoconf BUILD_DEP_PKGS += CSWautomake BUILD_DEP_PKGS += CSWlibtool +BUILD_DEP_PKGS += CSWggettext +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWffmpeg-dev # Sun Studio implements packed attributes differently and compilations bails out: # "include/vlc_codecs.h", line 36: #error: FIXME @@ -56,20 +65,31 @@ CONFIGURE_ARGS += --disable-mmx CONFIGURE_ARGS += --disable-sse +CONFIGURE_ARGS += --disable-mad +# There's a problem with the library not being found even though it's +# installed. +# BUILD_DEP_PKGS += CSWlibtheora-dev +# CONFIGURE_ARGS += --enable-theora +CONFIGURE_ARGS += --disable-theora + # Taken from http://wiki.videolan.org/Solaris # CONFIGURE_ARGS += --disable-libgcrypt # CONFIGURE_ARGS += --disable-remoteosd # CONFIGURE_ARGS += --disable-glx -# CONFIGURE_ARGS += --disable-lua -# CONFIGURE_ARGS += --disable-mad + +# Trouble building with lua. +# /opt/csw/bin/luac: lua/playlist/appletrailers.lua:70: invalid escape sequence near '\.' +CONFIGURE_ARGS += --disable-lua +# BUILD_DEP_PKGS += CSWlua-dev +# RUNTIME_DEP_PKGS_CSWvlc += CSWlua + # CONFIGURE_ARGS += --disable-swscale # CONFIGURE_ARGS += --disable-postproc # CONFIGURE_ARGS += --disable-a52 # CONFIGURE_ARGS += --disable-fribidi # CONFIGURE_ARGS += --with-gnu-ld=no CONFIGURE_ARGS += --disable-xcb -CONFIGURE_ARGS += --enable-theora CONFIGURE_ARGS += --enable-sqlite SKIPTEST = 1 @@ -122,7 +142,6 @@ RUNTIME_DEP_PKGS_CSWvlc += CSWlibx264-120 RUNTIME_DEP_PKGS_CSWvlc += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWvlc += CSWlibz1 -RUNTIME_DEP_PKGS_CSWvlc += CSWlua RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage # Only needed on Sparc. Not sure why, to be investigated. 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 Mar 4 14:21:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Mar 2013 13:21:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20358] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 20358 http://gar.svn.sourceforge.net/gar/?rev=20358&view=rev Author: dmichelsen Date: 2013-03-04 13:21:41 +0000 (Mon, 04 Mar 2013) Log Message: ----------- pigz/trunk: Update to 2.3, 64 bit isaexec and upstream Makefile Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2013-03-03 15:18:50 UTC (rev 20357) +++ csw/mgar/pkg/pigz/trunk/Makefile 2013-03-04 13:21:41 UTC (rev 20358) @@ -1,5 +1,5 @@ NAME = pigz -VERSION = 2.2.4 +VERSION = 2.3 GARTYPE = v2 DESCRIPTION = A parallel implementation of gzip @@ -28,21 +28,28 @@ # Optimization show effects < 5% #REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) +REINPLACEMENTS += which +REINPLACE_MATCH_which = whereis +REINPLACE_WITH_which = which +REINPLACE_FILES_which += Makefile + EXTRA_CFLAGS = -mt +BUILD64 = 1 +ISAEXEC = 1 + CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = custom + +BUILD_OVERRIDE_VARS += CC CFLAGS +BUILD_OVERRIDE_VAR_CC += $(CC) $(LDFLAGS) -lm -lpthread +BUILD_OVERRIDE_VAR_CFLAGS += $(CFLAGS) + +TEST_TARGET = test + INSTALL_SCRIPTS = custom -TEST_SCRIPTS = include gar/category.mk -build-custom: - cd $(WORKSRC) && $(CC) $(CPPFLAGS) $(CFLAGS) -c yarn.c - cd $(WORKSRC) && $(CC) $(CPPFLAGS) $(CFLAGS) -c pigz.c - cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(LDFLAGS) -o pigz yarn.o pigz.o -lpthread -lz - @$(MAKECOOKIE) - install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKDIR)/pigz-wrapper $(DESTDIR)$(bindir)/pigz Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2013-03-03 15:18:50 UTC (rev 20357) +++ csw/mgar/pkg/pigz/trunk/checksums 2013-03-04 13:21:41 UTC (rev 20358) @@ -1 +1 @@ -9df2a3c742524446fa4e797c17e8fd85 pigz-2.2.4.tar.gz +042e3322534f2c3d761736350cac303f pigz-2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 5 13:07:12 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Mar 2013 12:07:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[20359] csw/mgar/pkg/pound/trunk/Makefile Message-ID: Revision: 20359 http://gar.svn.sourceforge.net/gar/?rev=20359&view=rev Author: dmichelsen Date: 2013-03-05 12:07:10 +0000 (Tue, 05 Mar 2013) Log Message: ----------- pound/trunk: Adjust overrides Modified Paths: -------------- csw/mgar/pkg/pound/trunk/Makefile Modified: csw/mgar/pkg/pound/trunk/Makefile =================================================================== --- csw/mgar/pkg/pound/trunk/Makefile 2013-03-04 13:21:41 UTC (rev 20358) +++ csw/mgar/pkg/pound/trunk/Makefile 2013-03-05 12:07:10 UTC (rev 20359) @@ -36,7 +36,8 @@ OBSOLETED_BY_CSWpound = CSWpound2 # This is just for example scripts -CHECKPKG_OVERRIDES_CSWpound2 += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpound += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpound += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound/README EXTRA_DOCS += README EXTRA_DOCS += FAQ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Mar 5 13:37:27 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 05 Mar 2013 12:37:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20360] csw/mgar/pkg/asymptote/trunk/Makefile Message-ID: Revision: 20360 http://gar.svn.sourceforge.net/gar/?rev=20360&view=rev Author: pfelecan Date: 2013-03-05 12:37:26 +0000 (Tue, 05 Mar 2013) Log Message: ----------- asymptote/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/asymptote/trunk/Makefile Modified: csw/mgar/pkg/asymptote/trunk/Makefile =================================================================== --- csw/mgar/pkg/asymptote/trunk/Makefile 2013-03-05 12:07:10 UTC (rev 20359) +++ csw/mgar/pkg/asymptote/trunk/Makefile 2013-03-05 12:37:26 UTC (rev 20360) @@ -71,7 +71,8 @@ BUILD_DEP_PKGS += CSWlibsigsegv-dev BUILD_DEP_PKGS += CSWlibz-dev BUILD_DEP_PKGS += CSWmesa -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive +BUILD_DEP_PKGS += CSWtexlive-generic-recommended CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-gc @@ -103,7 +104,7 @@ CHECKPKG_OVERRIDES_CSWasymptote += surplus-dependency|CSWpython-tk RUNTIME_DEP_PKGS += CSWpy-pil CHECKPKG_OVERRIDES_CSWasymptote += surplus-dependency|CSWpy-pil -RUNTIME_DEP_PKGS += CSWtetex +RUNTIME_DEP_PKGS += CSWtexlive RUNTIME_DEP_PKGS += CSWxpdf CHECKPKG_OVERRIDES_CSWasymptote += surplus-dependency|CSWxpdf CHECKPKG_OVERRIDES_CSWasymptote += file-with-bad-content|/usr/local|root/opt/csw/share/info/asymptote/asymptote.info This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Mar 5 14:42:18 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 05 Mar 2013 13:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[20361] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 20361 http://gar.svn.sourceforge.net/gar/?rev=20361&view=rev Author: janholzh Date: 2013-03-05 13:42:17 +0000 (Tue, 05 Mar 2013) Log Message: ----------- ffmpeg/trunk: rebuild against libx264-130 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-03-05 12:37:26 UTC (rev 20360) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-03-05 13:42:17 UTC (rev 20361) @@ -46,7 +46,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-129 +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-130 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibgcc-s1 PACKAGES += CSWlibavdevice54 @@ -66,7 +66,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-129 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-130 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibgcc-s1 PACKAGES += CSWlibavfilter3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Mar 5 21:56:53 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 05 Mar 2013 20:56:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20362] csw/mgar/pkg/openssl1/trunk/files Message-ID: Revision: 20362 http://gar.svn.sourceforge.net/gar/?rev=20362&view=rev Author: chninkel Date: 2013-03-05 20:56:52 +0000 (Tue, 05 Mar 2013) Log Message: ----------- openssl1/trunk: updated to 1.0.0d Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch Modified: csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto 2013-03-05 13:42:17 UTC (rev 20361) +++ csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto 2013-03-05 20:56:52 UTC (rev 20362) @@ -3734,3 +3734,8 @@ OPENSSL_showfatal = DIRECT; } OPENSSL_1.0.0; +OPENSSL_1.0.1d { + global: + CRYPTO_memcmp = DIRECT; +} OPENSSL_1.0.1; + Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-05 13:42:17 UTC (rev 20361) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-05 20:56:52 UTC (rev 20362) @@ -1,17 +1,17 @@ -From 73d77bb7163ec2f73ae80fee416ee0f490aa56cf Mon Sep 17 00:00:00 2001 +From 71b64c5da0b3279ffbe23a76641c40d4ee8972ee Mon Sep 17 00:00:00 2001 From: Yann Rouillard -Date: Sat, 12 May 2012 22:30:48 +0200 +Date: Thu, 7 Feb 2013 21:56:04 +0100 Subject: [PATCH] Tune and add configure targets --- - Configure | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) + Configure | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Configure b/Configure -index cbbf4de..7f41c40 100755 +index 5c92282..2e0344f 100755 --- a/Configure +++ b/Configure -@@ -223,8 +223,9 @@ my %table=( +@@ -224,8 +224,9 @@ my %table=( "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", #### Solaris x86 with Sun C setups @@ -23,18 +23,16 @@ #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -242,8 +243,9 @@ my %table=( +@@ -243,7 +244,8 @@ my %table=( # SC5.0 note: Compiler common patch 107357-01 or later is required! "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", +"solaris-sparcv9-cc","cc:-m32 -xtarget=ultra -xarch=sparc -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9+vis-cc","cc:-m32 -xtarget=ultra -xarch=sparcvis -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-sparcv9-cc","cc:-m64 -xtarget=ultra -xarch=sparc -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", + "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", #### "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -- -1.7.8.2 +1.8.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Mar 5 21:57:59 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 05 Mar 2013 20:57:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[20363] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20363 http://gar.svn.sourceforge.net/gar/?rev=20363&view=rev Author: chninkel Date: 2013-03-05 20:57:58 +0000 (Tue, 05 Mar 2013) Log Message: ----------- openssl1/trunk: updated to 1.0.0e Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-05 20:56:52 UTC (rev 20362) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-05 20:57:58 UTC (rev 20363) @@ -17,7 +17,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.1d +VERSION = 1.0.1e GARTYPE = v2 SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2013-03-05 20:56:52 UTC (rev 20362) +++ csw/mgar/pkg/openssl1/trunk/checksums 2013-03-05 20:57:58 UTC (rev 20363) @@ -1 +1 @@ -b92fc634f0f1f31a67ed4175adc5ba33 openssl-1.0.1d.tar.gz +66bf6f10f060d561929de96f9dfe5b8c openssl-1.0.1e.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 Mar 5 23:50:25 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 05 Mar 2013 22:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20364] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 20364 http://gar.svn.sourceforge.net/gar/?rev=20364&view=rev Author: rthurner Date: 2013-03-05 22:50:24 +0000 (Tue, 05 Mar 2013) Log Message: ----------- mercurial: upgrade to hg-2.5.2 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 2013-03-05 20:57:58 UTC (rev 20363) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-03-05 22:50:24 UTC (rev 20364) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.5.1 +VERSION = 2.5.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-03-05 20:57:58 UTC (rev 20363) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-03-05 22:50:24 UTC (rev 20364) @@ -1 +1 @@ -18bee60e0cb3aa9c0c59bb11930f5f51 mercurial-2.5.1.tar.gz +6b467f41a262e2537cf927ed42d0fdda mercurial-2.5.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 Tue Mar 5 23:56:32 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 05 Mar 2013 22:56:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[20365] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 20365 http://gar.svn.sourceforge.net/gar/?rev=20365&view=rev Author: rthurner Date: 2013-03-05 22:56:32 +0000 (Tue, 05 Mar 2013) Log Message: ----------- serf: update to libserf-1.2.0 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-03-05 22:50:24 UTC (rev 20364) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-03-05 22:56:32 UTC (rev 20365) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.1.1 +VERSION = 1.2.0 DISTNAME = serf-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2013-03-05 22:50:24 UTC (rev 20364) +++ csw/mgar/pkg/libserf/trunk/checksums 2013-03-05 22:56:32 UTC (rev 20365) @@ -1 +1 @@ -4571ff3c104f90f0adb51aa28c0935e5 serf-1.1.1.tar.bz2 +e0055adfb422f30bb5daae29d15df607 serf-1.2.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 08:59:52 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 07:59:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20366] csw/mgar/pkg/asymptote/trunk/Makefile Message-ID: Revision: 20366 http://gar.svn.sourceforge.net/gar/?rev=20366&view=rev Author: pfelecan Date: 2013-03-06 07:59:51 +0000 (Wed, 06 Mar 2013) Log Message: ----------- asymptote/trunk: verify and validate proposed overrides Modified Paths: -------------- csw/mgar/pkg/asymptote/trunk/Makefile Modified: csw/mgar/pkg/asymptote/trunk/Makefile =================================================================== --- csw/mgar/pkg/asymptote/trunk/Makefile 2013-03-05 22:56:32 UTC (rev 20365) +++ csw/mgar/pkg/asymptote/trunk/Makefile 2013-03-06 07:59:51 UTC (rev 20366) @@ -92,7 +92,6 @@ RUNTIME_DEP_PKGS += CSWlibfftw3-3 RUNTIME_DEP_PKGS += CSWlibgcc-s1 RUNTIME_DEP_PKGS += CSWlibgsl0 -RUNTIME_DEP_PKGS += CSWlibgslcblas0 RUNTIME_DEP_PKGS += CSWlibncurses5 RUNTIME_DEP_PKGS += CSWlibreadline6 RUNTIME_DEP_PKGS += CSWlibsigsegv2 @@ -105,6 +104,7 @@ RUNTIME_DEP_PKGS += CSWpy-pil CHECKPKG_OVERRIDES_CSWasymptote += surplus-dependency|CSWpy-pil RUNTIME_DEP_PKGS += CSWtexlive +CHECKPKG_OVERRIDES_CSWasymptote += surplus-dependency|CSWtexlive RUNTIME_DEP_PKGS += CSWxpdf CHECKPKG_OVERRIDES_CSWasymptote += surplus-dependency|CSWxpdf CHECKPKG_OVERRIDES_CSWasymptote += file-with-bad-content|/usr/local|root/opt/csw/share/info/asymptote/asymptote.info This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 10:56:51 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 09:56:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20367] csw/mgar/pkg/auctex/trunk/Makefile Message-ID: Revision: 20367 http://gar.svn.sourceforge.net/gar/?rev=20367&view=rev Author: pfelecan Date: 2013-03-06 09:56:50 +0000 (Wed, 06 Mar 2013) Log Message: ----------- auctex/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2013-03-06 07:59:51 UTC (rev 20366) +++ csw/mgar/pkg/auctex/trunk/Makefile 2013-03-06 09:56:50 UTC (rev 20367) @@ -32,11 +32,11 @@ ARCHALL = 1 BUILD_DEP_PKGS = CSWemacs -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive BUILD_DEP_PKGS += CSWtexinfo RUNTIME_DEP_PKGS = CSWemacs -RUNTIME_DEP_PKGS += CSWtetex +RUNTIME_DEP_PKGS += CSWtexlive RUNTIME_DEP_PKGS += CSWgs # all the "bad content"s are innocuous: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 11:24:03 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 10:24:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20368] csw/mgar/pkg/auctex/trunk/Makefile Message-ID: Revision: 20368 http://gar.svn.sourceforge.net/gar/?rev=20368&view=rev Author: pfelecan Date: 2013-03-06 10:24:01 +0000 (Wed, 06 Mar 2013) Log Message: ----------- auctex/trunk: verified and validated proposed overrides Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2013-03-06 09:56:50 UTC (rev 20367) +++ csw/mgar/pkg/auctex/trunk/Makefile 2013-03-06 10:24:01 UTC (rev 20368) @@ -51,12 +51,13 @@ CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.elc CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.ps CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.dvi -# depends on CSWemacs wich depends on CSWemacscommon: +# depends on CSWemacs wich depends on CSWemacs-common: CHECKPKG_OVERRIDES_CSWauctex += missing-dependency|CSWemacscommon # preview-latex depends on the existence at run-time: CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWgs # the preview-latex can be used only with a graphical Emacs: CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWemacs +CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWtexlive include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 13:02:46 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 12:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20369] csw/mgar/pkg/bibtex2html/trunk/Makefile Message-ID: Revision: 20369 http://gar.svn.sourceforge.net/gar/?rev=20369&view=rev Author: pfelecan Date: 2013-03-06 12:02:45 +0000 (Wed, 06 Mar 2013) Log Message: ----------- bibtex2html/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/bibtex2html/trunk/Makefile Modified: csw/mgar/pkg/bibtex2html/trunk/Makefile =================================================================== --- csw/mgar/pkg/bibtex2html/trunk/Makefile 2013-03-06 10:24:01 UTC (rev 20368) +++ csw/mgar/pkg/bibtex2html/trunk/Makefile 2013-03-06 12:02:45 UTC (rev 20369) @@ -26,10 +26,11 @@ DISTFILES = $(DISTNAME).tar.gz BUILD_DEP_PKGS = CSWocaml -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive BUILD_DEP_PKGS += CSWhevea +BUILD_DEP_PKGS += CSWtexlive-latex-extra -RUNTIME_DEP_PKGS = CSWtetex +RUNTIME_DEP_PKGS = CSWtexlive RUNTIME_DEP_PKGS += CSWperl PATCHFILES += 0001-installation-desination-directories.patch @@ -49,7 +50,7 @@ REINPLACE_WHEN_USRSHARE = postinstall CHECKPKG_OVERRIDES_CSWbibtex2html += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWbibtex2html += surplus-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWbibtex2html += surplus-dependency|CSWtexlive include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 14:09:29 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 13:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20370] csw/mgar/pkg/hevea/trunk/Makefile Message-ID: Revision: 20370 http://gar.svn.sourceforge.net/gar/?rev=20370&view=rev Author: pfelecan Date: 2013-03-06 13:09:28 +0000 (Wed, 06 Mar 2013) Log Message: ----------- hevea/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/Makefile Modified: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile 2013-03-06 12:02:45 UTC (rev 20369) +++ csw/mgar/pkg/hevea/trunk/Makefile 2013-03-06 13:09:28 UTC (rev 20370) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = hevea -VERSION = 1.10 +VERSION = 2.03 GARTYPE = v2 DESCRIPTION = A fast LaTeX to HTML translator @@ -32,9 +32,9 @@ LICENSE = LICENSE BUILD_DEP_PKGS = CSWocaml -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive -RUNTIME_DEP_PKGS = CSWtetex +RUNTIME_DEP_PKGS = CSWtexlive RUNTIME_DEP_PKGS += CSWnetpbm PATCHFILES = 0001-Fix-installation-paths.patch @@ -44,7 +44,7 @@ SKIPTEST = 1 # these are overrides for binaries called internally: -CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWtexlive CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWnetpbm # innocuous: CHECKPKG_OVERRIDES_CSWhevea += file-with-bad-content|/usr/local|root/opt/csw/share/doc/hevea/README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 14:10:08 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 13:10:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20371] csw/mgar/pkg/hevea/trunk/ 0001-Fix-installation-paths.patch Message-ID: Revision: 20371 http://gar.svn.sourceforge.net/gar/?rev=20371&view=rev Author: pfelecan Date: 2013-03-06 13:10:08 +0000 (Wed, 06 Mar 2013) Log Message: ----------- hevea/trunk: patch for the version bump Added Paths: ----------- csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch Added: csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch =================================================================== --- csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch (rev 0) +++ csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch 2013-03-06 13:10:08 UTC (rev 20371) @@ -0,0 +1,34 @@ +From ba2ad3d8fe7ba4fadfaccfa708e38cc541702bd0 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 11 Jun 2012 15:37:21 +0200 +Subject: [PATCH] Fix installation paths + +--- + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index dd90bcb..fc69107 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,15 +2,14 @@ + # Compile using ocamlopt, to use ocamlc set TARGET=byte + TARGET=opt + # Install prefix +-PREFIX=/usr/local ++PREFIX=$(prefix) + # Library directory of hevea + LIBDIR=$(PREFIX)/lib/hevea + # Where to install programms + BINDIR=$(PREFIX)/bin + # Install prefix prefix +-DESTDIR= + #Where to install hevea.sty +-LATEXLIBDIR=$(PREFIX)/lib/hevea ++LATEXLIBDIR=$(PREFIX)/share/texmf-local/tex/latex/hevea + ##### Advanced configuration parameters + SUF= + DIR= +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 14:10:54 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 13:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20372] csw/mgar/pkg/hevea/trunk Message-ID: Revision: 20372 http://gar.svn.sourceforge.net/gar/?rev=20372&view=rev Author: pfelecan Date: 2013-03-06 13:10:54 +0000 (Wed, 06 Mar 2013) Log Message: ----------- hevea/trunk: patch for the version bump Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/checksums csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch Modified: csw/mgar/pkg/hevea/trunk/checksums =================================================================== --- csw/mgar/pkg/hevea/trunk/checksums 2013-03-06 13:10:08 UTC (rev 20371) +++ csw/mgar/pkg/hevea/trunk/checksums 2013-03-06 13:10:54 UTC (rev 20372) @@ -1 +1 @@ -24a631570bee3cc4b8350e9db39be62b hevea-1.10.tar.gz +1ff070baebc1e969fc89ef420bbe96f2 hevea-2.03.tar.gz Modified: csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch =================================================================== --- csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2013-03-06 13:10:08 UTC (rev 20371) +++ csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2013-03-06 13:10:54 UTC (rev 20372) @@ -1,17 +1,17 @@ -From ba2ad3d8fe7ba4fadfaccfa708e38cc541702bd0 Mon Sep 17 00:00:00 2001 +From 8795f71f0d7a9b6ab49f7b921c869920cf5277c3 Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Mon, 11 Jun 2012 15:37:21 +0200 +Date: Thu, 21 Feb 2013 15:13:08 +0100 Subject: [PATCH] Fix installation paths --- - Makefile | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index dd90bcb..fc69107 100644 +index e52e0f6..aa93904 100644 --- a/Makefile +++ b/Makefile -@@ -2,15 +2,14 @@ +@@ -2,13 +2,14 @@ # Compile using ocamlopt, to use ocamlc set TARGET=byte TARGET=opt # Install prefix @@ -21,14 +21,13 @@ LIBDIR=$(PREFIX)/lib/hevea # Where to install programms BINDIR=$(PREFIX)/bin - # Install prefix prefix --DESTDIR= #Where to install hevea.sty -LATEXLIBDIR=$(PREFIX)/lib/hevea +LATEXLIBDIR=$(PREFIX)/share/texmf-local/tex/latex/hevea ++ ##### Advanced configuration parameters SUF= DIR= -- -1.7.10.3 +1.8.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 14:11:33 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 13:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20373] csw/mgar/pkg/hevea/trunk/ 0001-Fix-installation-paths.patch Message-ID: Revision: 20373 http://gar.svn.sourceforge.net/gar/?rev=20373&view=rev Author: pfelecan Date: 2013-03-06 13:11:33 +0000 (Wed, 06 Mar 2013) Log Message: ----------- hevea/trunk: erroneous addition Removed Paths: ------------- csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch Deleted: csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch =================================================================== --- csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch 2013-03-06 13:10:54 UTC (rev 20372) +++ csw/mgar/pkg/hevea/trunk/0001-Fix-installation-paths.patch 2013-03-06 13:11:33 UTC (rev 20373) @@ -1,34 +0,0 @@ -From ba2ad3d8fe7ba4fadfaccfa708e38cc541702bd0 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 11 Jun 2012 15:37:21 +0200 -Subject: [PATCH] Fix installation paths - ---- - Makefile | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index dd90bcb..fc69107 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,15 +2,14 @@ - # Compile using ocamlopt, to use ocamlc set TARGET=byte - TARGET=opt - # Install prefix --PREFIX=/usr/local -+PREFIX=$(prefix) - # Library directory of hevea - LIBDIR=$(PREFIX)/lib/hevea - # Where to install programms - BINDIR=$(PREFIX)/bin - # Install prefix prefix --DESTDIR= - #Where to install hevea.sty --LATEXLIBDIR=$(PREFIX)/lib/hevea -+LATEXLIBDIR=$(PREFIX)/share/texmf-local/tex/latex/hevea - ##### Advanced configuration parameters - SUF= - DIR= --- -1.7.10.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 14:14:44 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 13:14:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20374] csw/mgar/pkg/tex4ht/trunk/Makefile Message-ID: Revision: 20374 http://gar.svn.sourceforge.net/gar/?rev=20374&view=rev Author: pfelecan Date: 2013-03-06 13:14:44 +0000 (Wed, 06 Mar 2013) Log Message: ----------- tex4ht/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/tex4ht/trunk/Makefile Modified: csw/mgar/pkg/tex4ht/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex4ht/trunk/Makefile 2013-03-06 13:11:33 UTC (rev 20373) +++ csw/mgar/pkg/tex4ht/trunk/Makefile 2013-03-06 13:14:44 UTC (rev 20374) @@ -26,7 +26,8 @@ PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive +BUILD_DEP_PKGS += CSWtexlive-dev GARCOMPILER = GNU @@ -49,8 +50,8 @@ CHECKPKG_OVERRIDES_CSWtex4ht-common += surplus-dependency|CSWperl RUNTIME_DEP_PKGS_CSWtex4ht-common += CSWpstoedit CHECKPKG_OVERRIDES_CSWtex4ht-common += surplus-dependency|CSWpstoedit -RUNTIME_DEP_PKGS_CSWtex4ht-common += CSWtetex -CHECKPKG_OVERRIDES_CSWtex4ht-common += surplus-dependency|CSWtetex +RUNTIME_DEP_PKGS_CSWtex4ht-common += CSWtexlive +CHECKPKG_OVERRIDES_CSWtex4ht-common += surplus-dependency|CSWtexlive PACKAGES += CSWtex4ht CATALOGNAME_CSWtex4ht = tex4ht This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 14:36:17 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 13:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20375] csw/mgar/pkg/tex4ht/trunk/Makefile Message-ID: Revision: 20375 http://gar.svn.sourceforge.net/gar/?rev=20375&view=rev Author: pfelecan Date: 2013-03-06 13:36:17 +0000 (Wed, 06 Mar 2013) Log Message: ----------- tex4ht/trunk: - verify and validate proposed overrides - addition of a new run-time dependency Modified Paths: -------------- csw/mgar/pkg/tex4ht/trunk/Makefile Modified: csw/mgar/pkg/tex4ht/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex4ht/trunk/Makefile 2013-03-06 13:14:44 UTC (rev 20374) +++ csw/mgar/pkg/tex4ht/trunk/Makefile 2013-03-06 13:36:17 UTC (rev 20375) @@ -60,6 +60,9 @@ PKGFILES_CSWtex4ht += /opt/csw/bin/t4ht RUNTIME_DEP_PKGS += CSWtex4ht-common CHECKPKG_OVERRIDES_CSWtex4ht += surplus-dependency|CSWtex4ht-common +RUNTIME_DEP_PKGS_CSWtex4ht += CSWlibkpathsea6 +CHECKPKG_OVERRIDES_CSWtex4ht += no-direct-binding|/opt/csw/bin/t4ht|is|not|directly|bound|to|soname|libkpathsea.so.6 +CHECKPKG_OVERRIDES_CSWtex4ht += no-direct-binding|/opt/csw/bin/tex4ht|is|not|directly|bound|to|soname|libkpathsea.so.6 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 16:03:01 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 15:03:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[20376] csw/mgar/pkg/tex_dirtree/trunk/Makefile Message-ID: Revision: 20376 http://gar.svn.sourceforge.net/gar/?rev=20376&view=rev Author: pfelecan Date: 2013-03-06 15:03:00 +0000 (Wed, 06 Mar 2013) Log Message: ----------- tex_dirtree/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2013-03-06 13:36:17 UTC (rev 20375) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2013-03-06 15:03:00 UTC (rev 20376) @@ -17,9 +17,10 @@ DISTFILES += README.CSW DISTFILES += COPYING -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive +BUILD_DEP_PKGS += CSWtexlive-pstricks -RUNTIME_DEP_PKGS += CSWtetex +RUNTIME_DEP_PKGS += CSWtexlive PACKAGES = CSWtex-dirtree SPKG_DESC_CSWtex-dirtree = $(DESCRIPTION) @@ -27,7 +28,7 @@ OBSOLETED_BY_CSWtex-dirtree = CSWtexdirtree CATALOGNAME_CSWtexdirtree = tex_dirtree_stub ARCHALL_CSWtex-dirtree = 1 -CHECKPKG_OVERRIDES_CSWtex-dirtree += surplus-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWtex-dirtree += surplus-dependency|CSWtexlive CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 6 16:54:42 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 06 Mar 2013 15:54:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20377] csw/mgar/pkg/tex_dirtree/trunk Message-ID: Revision: 20377 http://gar.svn.sourceforge.net/gar/?rev=20377&view=rev Author: pfelecan Date: 2013-03-06 15:54:42 +0000 (Wed, 06 Mar 2013) Log Message: ----------- tex_dirtree/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile csw/mgar/pkg/tex_dirtree/trunk/checksums Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2013-03-06 15:03:00 UTC (rev 20376) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2013-03-06 15:54:42 UTC (rev 20377) @@ -1,7 +1,7 @@ # $Id$ NAME = tex_dirtree -VERSION = 0.2 +VERSION = 0.32 GARTYPE = v2 DESCRIPTION = Draws Windows Explorer style trees for Plain TeX and LaTeX Modified: csw/mgar/pkg/tex_dirtree/trunk/checksums =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/checksums 2013-03-06 15:03:00 UTC (rev 20376) +++ csw/mgar/pkg/tex_dirtree/trunk/checksums 2013-03-06 15:54:42 UTC (rev 20377) @@ -1 +1 @@ -2b7dcb51abbd515d5a9a2032e04f1853 dirtree.zip +ac491377b6c120381af9eec6b005384a dirtree.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 6 20:00:19 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 06 Mar 2013 19:00:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[20378] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 20378 http://gar.svn.sourceforge.net/gar/?rev=20378&view=rev Author: chninkel Date: 2013-03-06 19:00:17 +0000 (Wed, 06 Mar 2013) Log Message: ----------- openssl/trunk: updated to 0.9.8y Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/0007-enables-symbols-versioning.patch csw/mgar/pkg/openssl/trunk/files/map.openssl.engines csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-03-06 15:54:42 UTC (rev 20377) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-03-06 19:00:17 UTC (rev 20378) @@ -1,9 +1,6 @@ ##################################################################### # OpenCSW build recipe for OpenSSL # -# Copyright 2009 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# # Redistribution and/or use, with or without modification, is # permitted. This software is without warranty of any kind. The # author(s) shall not be liable in the event that use of the @@ -16,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 0.9.8x +VERSION = 0.9.8y GARTYPE = v2 DESCRIPTION = The Open Source toolkit for SSL and TLS @@ -82,6 +79,8 @@ endif # we will not recompile old 0.9.7 version for now +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/pentium_pro/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 ifeq ($(shell /usr/bin/uname -p),sparc) #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis @@ -139,6 +138,7 @@ DISTFILES += CSWlibssl-dev.prototype-i386 CSWlibssl-dev.prototype-sparc DISTFILES += CSWopenssl-utils.prototype DISTFILES += changelog.CSW README.CSW +DISTFILES += map.openssl.libcrypto map.openssl.libssl map.openssl.engines DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE @@ -153,6 +153,9 @@ # (patchs taken from Debian Package) PATCHFILES += block_bad_certificates.patch +PATCHFILES += 0007-enables-symbols-versioning.patch + + LICENSE=LICENSE ##### Build and installation information ##### @@ -231,6 +234,11 @@ pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure + ln -nf $(WORKDIR)/map.openssl.libcrypto $(WORKSRC)/map.openssl.libcrypto + ln -nf $(WORKDIR)/map.openssl.libssl $(WORKSRC)/map.openssl.libssl + for ENGINE in 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi; do \ + ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/map.openssl.lib$$ENGINE; \ + done @$(MAKECOOKIE) # we remove every debug information except symbol table Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2013-03-06 15:54:42 UTC (rev 20377) +++ csw/mgar/pkg/openssl/trunk/checksums 2013-03-06 19:00:17 UTC (rev 20378) @@ -1 +1 @@ -ee17e9bc805c8cc7d0afac3b0ef78eda openssl-0.9.8x.tar.gz +47c7fb37f78c970f1d30aa2f9e9e26d8 openssl-0.9.8y.tar.gz Added: csw/mgar/pkg/openssl/trunk/files/0007-enables-symbols-versioning.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/0007-enables-symbols-versioning.patch (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/0007-enables-symbols-versioning.patch 2013-03-06 19:00:17 UTC (rev 20378) @@ -0,0 +1,34 @@ +From 01a8e2d2112b81204bc13771008884296917ba44 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Fri, 20 Jul 2012 23:25:25 +0200 +Subject: [PATCH] enables symbols versioning + +--- + Makefile.shared | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.shared b/Makefile.shared +index e753f44..a52ac8c 100644 +--- a/Makefile.shared ++++ b/Makefile.shared +@@ -372,7 +372,7 @@ link_o.solaris: + SHLIB_SUFFIX=; \ + ALLSYMSFLAGS="$${MINUSZ}allextract"; \ + NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -M map.openssl.lib$(LIBNAME) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ + fi; \ + $(LINK_SO_O) + link_a.solaris: +@@ -386,7 +386,7 @@ link_a.solaris: + SHLIB_SUFFIX=;\ + ALLSYMSFLAGS="$${MINUSZ}allextract"; \ + NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -M map.openssl.lib$(LIBNAME) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ + fi; \ + $(LINK_SO_A) + link_app.solaris: +-- +1.7.10.2 + Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2013-03-06 15:54:42 UTC (rev 20377) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2013-03-06 19:00:17 UTC (rev 20378) @@ -1,3 +1,10 @@ +openssl (0.9.8y,REV=2013.03.06) unstable + + * New upstream release. + * Enabled symbol versioning and direct binding. + + -- Yann Rouillard Wed, 06 Mar 2013 07:14:14 +0100 + openssl (0.9.8x,REV=2012.05.11) unstable * New upstream release. Added: csw/mgar/pkg/openssl/trunk/files/map.openssl.engines =================================================================== --- csw/mgar/pkg/openssl/trunk/files/map.openssl.engines (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/map.openssl.engines 2013-03-06 19:00:17 UTC (rev 20378) @@ -0,0 +1,8 @@ +OPENSSL_1.0.0 { + global: + bind_engine; + v_check; + local: + *; +}; + Added: csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto =================================================================== --- csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto 2013-03-06 19:00:17 UTC (rev 20378) @@ -0,0 +1,3043 @@ +OPENSSL_0.9.8 { + global: + SSLeay = DIRECT; + SSLeay_version = DIRECT; + ASN1_INTEGER_get = DIRECT; + ASN1_INTEGER_set = DIRECT; + ASN1_INTEGER_to_BN = DIRECT; + ASN1_OBJECT_create = DIRECT; + ASN1_OBJECT_free = DIRECT; + ASN1_OBJECT_new = DIRECT; + ASN1_PRINTABLE_type = DIRECT; + ASN1_STRING_cmp = DIRECT; + ASN1_STRING_dup = DIRECT; + ASN1_STRING_free = DIRECT; + ASN1_STRING_new = DIRECT; + ASN1_STRING_print = DIRECT; + ASN1_STRING_set = DIRECT; + ASN1_STRING_type_new = DIRECT; + ASN1_TYPE_free = DIRECT; + ASN1_TYPE_new = DIRECT; + ASN1_UNIVERSALSTRING_to_string = DIRECT; + ASN1_UTCTIME_check = DIRECT; + ASN1_UTCTIME_print = DIRECT; + ASN1_UTCTIME_set = DIRECT; + ASN1_check_infinite_end = DIRECT; + ASN1_d2i_bio = DIRECT; + ASN1_d2i_fp = DIRECT; + ASN1_digest = DIRECT; + ASN1_dup = DIRECT; + ASN1_get_object = DIRECT; + ASN1_i2d_bio = DIRECT; + ASN1_i2d_fp = DIRECT; + ASN1_object_size = DIRECT; + ASN1_parse = DIRECT; + ASN1_put_object = DIRECT; + ASN1_sign = DIRECT; + ASN1_verify = DIRECT; + BF_cbc_encrypt = DIRECT; + BF_cfb64_encrypt = DIRECT; + BF_ecb_encrypt = DIRECT; + BF_encrypt = DIRECT; + BF_ofb64_encrypt = DIRECT; + BF_options = DIRECT; + BF_set_key = DIRECT; + BIO_CONNECT_free = DIRECT; + BIO_CONNECT_new = DIRECT; + BIO_accept = DIRECT; + BIO_ctrl = DIRECT; + BIO_int_ctrl = DIRECT; + BIO_debug_callback = DIRECT; + BIO_dump = DIRECT; + BIO_dup_chain = DIRECT; + BIO_f_base64 = DIRECT; + BIO_f_buffer = DIRECT; + BIO_f_cipher = DIRECT; + BIO_f_md = DIRECT; + BIO_f_null = DIRECT; + BIO_fd_non_fatal_error = DIRECT; + BIO_fd_should_retry = DIRECT; + BIO_find_type = DIRECT; + BIO_free = DIRECT; + BIO_free_all = DIRECT; + BIO_get_accept_socket = DIRECT; + BIO_get_host_ip = DIRECT; + BIO_get_port = DIRECT; + BIO_get_retry_BIO = DIRECT; + BIO_get_retry_reason = DIRECT; + BIO_gethostbyname = DIRECT; + BIO_gets = DIRECT; + BIO_new = DIRECT; + BIO_new_accept = DIRECT; + BIO_new_connect = DIRECT; + BIO_new_fd = DIRECT; + BIO_new_file = DIRECT; + BIO_new_fp = DIRECT; + BIO_new_socket = DIRECT; + BIO_pop = DIRECT; + BIO_printf = DIRECT; + BIO_push = DIRECT; + BIO_puts = DIRECT; + BIO_read = DIRECT; + BIO_s_accept = DIRECT; + BIO_s_connect = DIRECT; + BIO_s_fd = DIRECT; + BIO_s_file = DIRECT; + BIO_s_mem = DIRECT; + BIO_s_null = DIRECT; + BIO_s_socket = DIRECT; + BIO_set = DIRECT; + BIO_set_cipher = DIRECT; + BIO_set_tcp_ndelay = DIRECT; + BIO_sock_cleanup = DIRECT; + BIO_sock_error = DIRECT; + BIO_sock_init = DIRECT; + BIO_sock_non_fatal_error = DIRECT; + BIO_sock_should_retry = DIRECT; + BIO_socket_ioctl = DIRECT; + BIO_write = DIRECT; + BN_CTX_free = DIRECT; + BN_CTX_new = DIRECT; + BN_MONT_CTX_free = DIRECT; + BN_MONT_CTX_new = DIRECT; + BN_MONT_CTX_set = DIRECT; + BN_add = DIRECT; + BN_add_word = DIRECT; + BN_hex2bn = DIRECT; + BN_bin2bn = DIRECT; + BN_bn2hex = DIRECT; + BN_bn2bin = DIRECT; + BN_clear = DIRECT; + BN_clear_bit = DIRECT; + BN_clear_free = DIRECT; + BN_cmp = DIRECT; + BN_copy = DIRECT; + BN_div = DIRECT; + BN_div_word = DIRECT; + BN_dup = DIRECT; + BN_free = DIRECT; + BN_from_montgomery = DIRECT; + BN_gcd = DIRECT; + BN_generate_prime = DIRECT; + BN_get_word = DIRECT; + BN_is_bit_set = DIRECT; + BN_is_prime = DIRECT; + BN_lshift = DIRECT; + BN_lshift1 = DIRECT; + BN_mask_bits = DIRECT; + BN_mod_exp = DIRECT; + BN_mod_exp_mont = DIRECT; + BN_mod_exp_simple = DIRECT; + BN_mod_inverse = DIRECT; + BN_mod_mul = DIRECT; + BN_mod_mul_montgomery = DIRECT; + BN_mod_word = DIRECT; + BN_mul = DIRECT; + BN_new = DIRECT; + BN_num_bits = DIRECT; + BN_num_bits_word = DIRECT; + BN_options = DIRECT; + BN_print = DIRECT; + BN_print_fp = DIRECT; + BN_rand = DIRECT; + BN_reciprocal = DIRECT; + BN_rshift = DIRECT; + BN_rshift1 = DIRECT; + BN_set_bit = DIRECT; + BN_set_word = DIRECT; + BN_sqr = DIRECT; + BN_sub = DIRECT; + BN_to_ASN1_INTEGER = DIRECT; + BN_ucmp = DIRECT; + BN_value_one = DIRECT; + BUF_MEM_free = DIRECT; + BUF_MEM_grow = DIRECT; + BUF_MEM_new = DIRECT; + BUF_strdup = DIRECT; + CONF_free = DIRECT; + CONF_get_number = DIRECT; + CONF_get_section = DIRECT; + CONF_get_string = DIRECT; + CONF_load = DIRECT; + CRYPTO_add_lock = DIRECT; + CRYPTO_dbg_free = DIRECT; + CRYPTO_dbg_malloc = DIRECT; + CRYPTO_dbg_realloc = DIRECT; + CRYPTO_free = DIRECT; + CRYPTO_get_add_lock_callback = DIRECT; + CRYPTO_get_id_callback = DIRECT; + CRYPTO_get_lock_name = DIRECT; + CRYPTO_get_locking_callback = DIRECT; + CRYPTO_get_mem_functions = DIRECT; + CRYPTO_lock = DIRECT; + CRYPTO_malloc = DIRECT; + CRYPTO_mem_ctrl = DIRECT; + CRYPTO_mem_leaks = DIRECT; + CRYPTO_mem_leaks_cb = DIRECT; + CRYPTO_mem_leaks_fp = DIRECT; + CRYPTO_realloc = DIRECT; + CRYPTO_remalloc = DIRECT; + CRYPTO_set_add_lock_callback = DIRECT; + CRYPTO_set_id_callback = DIRECT; + CRYPTO_set_locking_callback = DIRECT; + CRYPTO_set_mem_functions = DIRECT; + CRYPTO_thread_id = DIRECT; + DH_check = DIRECT; + DH_compute_key = DIRECT; + DH_free = DIRECT; + DH_generate_key = DIRECT; + DH_generate_parameters = DIRECT; + DH_new = DIRECT; + DH_size = DIRECT; + DHparams_print = DIRECT; + DHparams_print_fp = DIRECT; + DSA_free = DIRECT; + DSA_generate_key = DIRECT; + DSA_generate_parameters = DIRECT; + DSA_new = DIRECT; + DSA_print = DIRECT; + DSA_print_fp = DIRECT; + DSA_sign = DIRECT; + DSA_sign_setup = DIRECT; + DSA_size = DIRECT; + DSA_verify = DIRECT; + DSAparams_print = DIRECT; + DSAparams_print_fp = DIRECT; + ERR_clear_error = DIRECT; + ERR_error_string = DIRECT; + ERR_free_strings = DIRECT; + ERR_func_error_string = DIRECT; + ERR_get_err_state_table = DIRECT; + ERR_get_error = DIRECT; + ERR_get_error_line = DIRECT; + ERR_get_state = DIRECT; + ERR_get_string_table = DIRECT; + ERR_lib_error_string = DIRECT; + ERR_load_ASN1_strings = DIRECT; + ERR_load_BIO_strings = DIRECT; + ERR_load_BN_strings = DIRECT; + ERR_load_BUF_strings = DIRECT; + ERR_load_CONF_strings = DIRECT; + ERR_load_DH_strings = DIRECT; + ERR_load_DSA_strings = DIRECT; + ERR_load_ERR_strings = DIRECT; + ERR_load_EVP_strings = DIRECT; + ERR_load_OBJ_strings = DIRECT; + ERR_load_PEM_strings = DIRECT; + ERR_load_RSA_strings = DIRECT; + ERR_load_X509_strings = DIRECT; + ERR_load_crypto_strings = DIRECT; + ERR_load_strings = DIRECT; + ERR_peek_error = DIRECT; + ERR_peek_error_line = DIRECT; + ERR_print_errors = DIRECT; + ERR_print_errors_fp = DIRECT; + ERR_put_error = DIRECT; + ERR_reason_error_string = DIRECT; + ERR_remove_state = DIRECT; + EVP_BytesToKey = DIRECT; + EVP_CIPHER_CTX_cleanup = DIRECT; + EVP_CipherFinal = DIRECT; + EVP_CipherInit = DIRECT; + EVP_CipherUpdate = DIRECT; + EVP_DecodeBlock = DIRECT; + EVP_DecodeFinal = DIRECT; + EVP_DecodeInit = DIRECT; + EVP_DecodeUpdate = DIRECT; + EVP_DecryptFinal = DIRECT; + EVP_DecryptInit = DIRECT; + EVP_DecryptUpdate = DIRECT; + EVP_DigestFinal = DIRECT; + EVP_DigestInit = DIRECT; + EVP_DigestUpdate = DIRECT; + EVP_EncodeBlock = DIRECT; + EVP_EncodeFinal = DIRECT; + EVP_EncodeInit = DIRECT; + EVP_EncodeUpdate = DIRECT; + EVP_EncryptFinal = DIRECT; + EVP_EncryptInit = DIRECT; + EVP_EncryptUpdate = DIRECT; + EVP_OpenFinal = DIRECT; + EVP_OpenInit = DIRECT; + EVP_PKEY_assign = DIRECT; + EVP_PKEY_copy_parameters = DIRECT; + EVP_PKEY_free = DIRECT; + EVP_PKEY_missing_parameters = DIRECT; + EVP_PKEY_new = DIRECT; + EVP_PKEY_save_parameters = DIRECT; + EVP_PKEY_size = DIRECT; + EVP_PKEY_type = DIRECT; + EVP_SealFinal = DIRECT; + EVP_SealInit = DIRECT; + EVP_SignFinal = DIRECT; + EVP_VerifyFinal = DIRECT; + EVP_add_cipher = DIRECT; + EVP_add_digest = DIRECT; + EVP_bf_cbc = DIRECT; + EVP_bf_cfb64 = DIRECT; + EVP_bf_ecb = DIRECT; + EVP_bf_ofb = DIRECT; + EVP_cleanup = DIRECT; + EVP_des_cbc = DIRECT; + EVP_des_cfb64 = DIRECT; + EVP_des_ecb = DIRECT; + EVP_des_ede = DIRECT; + EVP_des_ede3 = DIRECT; + EVP_des_ede3_cbc = DIRECT; + EVP_des_ede3_cfb64 = DIRECT; + EVP_des_ede3_ofb = DIRECT; + EVP_des_ede_cbc = DIRECT; + EVP_des_ede_cfb64 = DIRECT; + EVP_des_ede_ofb = DIRECT; + EVP_des_ofb = DIRECT; + EVP_desx_cbc = DIRECT; + EVP_dss = DIRECT; + EVP_dss1 = DIRECT; + EVP_enc_null = DIRECT; + EVP_get_cipherbyname = DIRECT; + EVP_get_digestbyname = DIRECT; + EVP_get_pw_prompt = DIRECT; + EVP_idea_cbc = DIRECT; + EVP_idea_cfb64 = DIRECT; + EVP_idea_ecb = DIRECT; + EVP_idea_ofb = DIRECT; + EVP_md5 = DIRECT; + EVP_md_null = DIRECT; + EVP_rc2_cbc = DIRECT; + EVP_rc2_cfb64 = DIRECT; + EVP_rc2_ecb = DIRECT; + EVP_rc2_ofb = DIRECT; + EVP_rc4 = DIRECT; + EVP_read_pw_string = DIRECT; + EVP_set_pw_prompt = DIRECT; + EVP_sha = DIRECT; + EVP_sha1 = DIRECT; + MD2_options = DIRECT; + MD5 = DIRECT; + MD5_Final = DIRECT; + MD5_Init = DIRECT; + MD5_Update = DIRECT; + NETSCAPE_SPKAC_free = DIRECT; + NETSCAPE_SPKAC_new = DIRECT; + NETSCAPE_SPKI_free = DIRECT; + NETSCAPE_SPKI_new = DIRECT; + NETSCAPE_SPKI_sign = DIRECT; + NETSCAPE_SPKI_verify = DIRECT; + OBJ_add_object = DIRECT; + OBJ_cleanup = DIRECT; + OBJ_cmp = DIRECT; + OBJ_create = DIRECT; + OBJ_dup = DIRECT; + OBJ_ln2nid = DIRECT; + OBJ_new_nid = DIRECT; + OBJ_nid2ln = DIRECT; + OBJ_nid2obj = DIRECT; + OBJ_nid2sn = DIRECT; + OBJ_obj2nid = DIRECT; + OBJ_sn2nid = DIRECT; + OBJ_txt2nid = DIRECT; + PEM_ASN1_read = DIRECT; + PEM_ASN1_read_bio = DIRECT; + PEM_ASN1_write = DIRECT; + PEM_ASN1_write_bio = DIRECT; + PEM_SealFinal = DIRECT; + PEM_SealInit = DIRECT; + PEM_SealUpdate = DIRECT; + PEM_SignFinal = DIRECT; + PEM_SignInit = DIRECT; + PEM_SignUpdate = DIRECT; + PEM_X509_INFO_read = DIRECT; + PEM_X509_INFO_read_bio = DIRECT; + PEM_X509_INFO_write_bio = DIRECT; + PEM_dek_info = DIRECT; + PEM_do_header = DIRECT; + PEM_get_EVP_CIPHER_INFO = DIRECT; + PEM_proc_type = DIRECT; + PEM_read = DIRECT; + PEM_read_DHparams = DIRECT; + PEM_read_DSAPrivateKey = DIRECT; + PEM_read_DSAparams = DIRECT; + PEM_read_PKCS7 = DIRECT; + PEM_read_PrivateKey = DIRECT; + PEM_read_RSAPrivateKey = DIRECT; + PEM_read_X509 = DIRECT; + PEM_read_X509_CRL = DIRECT; + PEM_read_X509_REQ = DIRECT; + PEM_read_bio = DIRECT; + PEM_read_bio_DHparams = DIRECT; + PEM_read_bio_DSAPrivateKey = DIRECT; + PEM_read_bio_DSAparams = DIRECT; + PEM_read_bio_PKCS7 = DIRECT; + PEM_read_bio_PrivateKey = DIRECT; + PEM_read_bio_RSAPrivateKey = DIRECT; + PEM_read_bio_X509 = DIRECT; + PEM_read_bio_X509_CRL = DIRECT; + PEM_read_bio_X509_REQ = DIRECT; + PEM_write = DIRECT; + PEM_write_DHparams = DIRECT; + PEM_write_DSAPrivateKey = DIRECT; + PEM_write_DSAparams = DIRECT; + PEM_write_PKCS7 = DIRECT; + PEM_write_PrivateKey = DIRECT; + PEM_write_RSAPrivateKey = DIRECT; + PEM_write_X509 = DIRECT; + PEM_write_X509_CRL = DIRECT; + PEM_write_X509_REQ = DIRECT; + PEM_write_bio = DIRECT; + PEM_write_bio_DHparams = DIRECT; + PEM_write_bio_DSAPrivateKey = DIRECT; + PEM_write_bio_DSAparams = DIRECT; + PEM_write_bio_PKCS7 = DIRECT; + PEM_write_bio_PrivateKey = DIRECT; + PEM_write_bio_RSAPrivateKey = DIRECT; + PEM_write_bio_X509 = DIRECT; + PEM_write_bio_X509_CRL = DIRECT; + PEM_write_bio_X509_REQ = DIRECT; + PKCS7_DIGEST_free = DIRECT; + PKCS7_DIGEST_new = DIRECT; + PKCS7_ENCRYPT_free = DIRECT; + PKCS7_ENCRYPT_new = DIRECT; + PKCS7_ENC_CONTENT_free = DIRECT; + PKCS7_ENC_CONTENT_new = DIRECT; + PKCS7_ENVELOPE_free = DIRECT; + PKCS7_ENVELOPE_new = DIRECT; + PKCS7_ISSUER_AND_SERIAL_digest = DIRECT; + PKCS7_ISSUER_AND_SERIAL_free = DIRECT; + PKCS7_ISSUER_AND_SERIAL_new = DIRECT; + PKCS7_RECIP_INFO_free = DIRECT; + PKCS7_RECIP_INFO_new = DIRECT; + PKCS7_SIGNED_free = DIRECT; + PKCS7_SIGNED_new = DIRECT; + PKCS7_SIGNER_INFO_free = DIRECT; + PKCS7_SIGNER_INFO_new = DIRECT; + PKCS7_SIGN_ENVELOPE_free = DIRECT; + PKCS7_SIGN_ENVELOPE_new = DIRECT; + PKCS7_dup = DIRECT; + PKCS7_free = DIRECT; + PKCS7_new = DIRECT; + RAND_bytes = DIRECT; + RAND_cleanup = DIRECT; + RAND_file_name = DIRECT; + RAND_load_file = DIRECT; + RAND_seed = DIRECT; + RAND_write_file = DIRECT; + RC2_cbc_encrypt = DIRECT; + RC2_cfb64_encrypt = DIRECT; + RC2_ecb_encrypt = DIRECT; + RC2_encrypt = DIRECT; + RC2_ofb64_encrypt = DIRECT; + RC2_set_key = DIRECT; + RC4 = DIRECT; + RC4_options = DIRECT; + RC4_set_key = DIRECT; + RSAPrivateKey_dup = DIRECT; + RSAPublicKey_dup = DIRECT; + RSA_PKCS1_SSLeay = DIRECT; + RSA_free = DIRECT; + RSA_generate_key = DIRECT; + RSA_new = DIRECT; + RSA_new_method = DIRECT; + RSA_print = DIRECT; + RSA_print_fp = DIRECT; + RSA_private_decrypt = DIRECT; + RSA_private_encrypt = DIRECT; + RSA_public_decrypt = DIRECT; + RSA_public_encrypt = DIRECT; + RSA_set_default_method = DIRECT; + RSA_sign = DIRECT; + RSA_sign_ASN1_OCTET_STRING = DIRECT; + RSA_size = DIRECT; + RSA_verify = DIRECT; + RSA_verify_ASN1_OCTET_STRING = DIRECT; + SHA = DIRECT; + SHA1 = DIRECT; + SHA1_Final = DIRECT; + SHA1_Init = DIRECT; + SHA1_Update = DIRECT; + SHA_Final = DIRECT; + SHA_Init = DIRECT; + SHA_Update = DIRECT; + OpenSSL_add_all_ciphers = DIRECT; + OpenSSL_add_all_digests = DIRECT; + TXT_DB_create_index = DIRECT; + TXT_DB_free = DIRECT; + TXT_DB_get_by_index = DIRECT; + TXT_DB_insert = DIRECT; + TXT_DB_read = DIRECT; + TXT_DB_write = DIRECT; + X509_ALGOR_free = DIRECT; + X509_ALGOR_new = DIRECT; + X509_ATTRIBUTE_free = DIRECT; + X509_ATTRIBUTE_new = DIRECT; + X509_CINF_free = DIRECT; + X509_CINF_new = DIRECT; + X509_CRL_INFO_free = DIRECT; + X509_CRL_INFO_new = DIRECT; + X509_CRL_add_ext = DIRECT; + X509_CRL_cmp = DIRECT; + X509_CRL_delete_ext = DIRECT; + X509_CRL_dup = DIRECT; + X509_CRL_free = DIRECT; + X509_CRL_get_ext = DIRECT; + X509_CRL_get_ext_by_NID = DIRECT; + X509_CRL_get_ext_by_OBJ = DIRECT; + X509_CRL_get_ext_by_critical = DIRECT; + X509_CRL_get_ext_count = DIRECT; + X509_CRL_new = DIRECT; + X509_CRL_sign = DIRECT; + X509_CRL_verify = DIRECT; + X509_EXTENSION_create_by_NID = DIRECT; + X509_EXTENSION_create_by_OBJ = DIRECT; + X509_EXTENSION_dup = DIRECT; + X509_EXTENSION_free = DIRECT; + X509_EXTENSION_get_critical = DIRECT; + X509_EXTENSION_get_data = DIRECT; + X509_EXTENSION_get_object = DIRECT; + X509_EXTENSION_new = DIRECT; + X509_EXTENSION_set_critical = DIRECT; + X509_EXTENSION_set_data = DIRECT; + X509_EXTENSION_set_object = DIRECT; + X509_INFO_free = DIRECT; + X509_INFO_new = DIRECT; + X509_LOOKUP_by_alias = DIRECT; + X509_LOOKUP_by_fingerprint = DIRECT; + X509_LOOKUP_by_issuer_serial = DIRECT; + X509_LOOKUP_by_subject = DIRECT; + X509_LOOKUP_ctrl = DIRECT; + X509_LOOKUP_file = DIRECT; + X509_LOOKUP_free = DIRECT; + X509_LOOKUP_hash_dir = DIRECT; + X509_LOOKUP_init = DIRECT; + X509_LOOKUP_new = DIRECT; + X509_LOOKUP_shutdown = DIRECT; + X509_NAME_ENTRY_create_by_NID = DIRECT; + X509_NAME_ENTRY_create_by_OBJ = DIRECT; + X509_NAME_ENTRY_dup = DIRECT; + X509_NAME_ENTRY_free = DIRECT; + X509_NAME_ENTRY_get_data = DIRECT; + X509_NAME_ENTRY_get_object = DIRECT; + X509_NAME_ENTRY_new = DIRECT; + X509_NAME_ENTRY_set_data = DIRECT; + X509_NAME_ENTRY_set_object = DIRECT; + X509_NAME_add_entry = DIRECT; + X509_NAME_cmp = DIRECT; + X509_NAME_delete_entry = DIRECT; + X509_NAME_digest = DIRECT; + X509_NAME_dup = DIRECT; + X509_NAME_entry_count = DIRECT; + X509_NAME_free = DIRECT; + X509_NAME_get_entry = DIRECT; + X509_NAME_get_index_by_NID = DIRECT; + X509_NAME_get_index_by_OBJ = DIRECT; + X509_NAME_get_text_by_NID = DIRECT; + X509_NAME_get_text_by_OBJ = DIRECT; + X509_NAME_hash = DIRECT; + X509_NAME_new = DIRECT; + X509_NAME_oneline = DIRECT; + X509_NAME_print = DIRECT; + X509_NAME_set = DIRECT; + X509_OBJECT_free_contents = DIRECT; + X509_OBJECT_retrieve_by_subject = DIRECT; + X509_OBJECT_up_ref_count = DIRECT; + X509_PKEY_free = DIRECT; + X509_PKEY_new = DIRECT; + X509_PUBKEY_free = DIRECT; + X509_PUBKEY_get = DIRECT; + X509_PUBKEY_new = DIRECT; + X509_PUBKEY_set = DIRECT; + X509_REQ_INFO_free = DIRECT; + X509_REQ_INFO_new = DIRECT; + X509_REQ_dup = DIRECT; + X509_REQ_free = DIRECT; + X509_REQ_get_pubkey = DIRECT; + X509_REQ_new = DIRECT; + X509_REQ_print = DIRECT; + X509_REQ_print_fp = DIRECT; + X509_REQ_set_pubkey = DIRECT; + X509_REQ_set_subject_name = DIRECT; + X509_REQ_set_version = DIRECT; + X509_REQ_sign = DIRECT; + X509_REQ_to_X509 = DIRECT; + X509_REQ_verify = DIRECT; + X509_REVOKED_add_ext = DIRECT; + X509_REVOKED_delete_ext = DIRECT; + X509_REVOKED_free = DIRECT; + X509_REVOKED_get_ext = DIRECT; + X509_REVOKED_get_ext_by_NID = DIRECT; + X509_REVOKED_get_ext_by_OBJ = DIRECT; + X509_REVOKED_get_ext_by_critical = DIRECT; + X509_REVOKED_get_ext_count = DIRECT; + X509_REVOKED_new = DIRECT; + X509_SIG_free = DIRECT; + X509_SIG_new = DIRECT; + X509_STORE_CTX_cleanup = DIRECT; + X509_STORE_CTX_init = DIRECT; + X509_STORE_add_cert = DIRECT; + X509_STORE_add_lookup = DIRECT; + X509_STORE_get_by_subject = DIRECT; + X509_STORE_load_locations = DIRECT; + X509_STORE_new = DIRECT; + X509_STORE_free = DIRECT; + X509_STORE_set_default_paths = DIRECT; + X509_VAL_free = DIRECT; + X509_VAL_new = DIRECT; + X509_add_ext = DIRECT; + X509_certificate_type = DIRECT; + X509_check_private_key = DIRECT; + X509_cmp_current_time = DIRECT; + X509_delete_ext = DIRECT; + X509_digest = DIRECT; + X509_dup = DIRECT; + X509_free = DIRECT; + X509_get_default_cert_area = DIRECT; + X509_get_default_cert_dir = DIRECT; + X509_get_default_cert_dir_env = DIRECT; + X509_get_default_cert_file = DIRECT; + X509_get_default_cert_file_env = DIRECT; + X509_get_default_private_dir = DIRECT; + X509_get_ext = DIRECT; + X509_get_ext_by_NID = DIRECT; + X509_get_ext_by_OBJ = DIRECT; + X509_get_ext_by_critical = DIRECT; + X509_get_ext_count = DIRECT; + X509_get_issuer_name = DIRECT; + X509_get_pubkey = DIRECT; + X509_get_pubkey_parameters = DIRECT; + X509_get_serialNumber = DIRECT; + X509_get_subject_name = DIRECT; + X509_gmtime_adj = DIRECT; + X509_issuer_and_serial_cmp = DIRECT; + X509_issuer_and_serial_hash = DIRECT; + X509_issuer_name_cmp = DIRECT; + X509_issuer_name_hash = DIRECT; + X509_load_cert_file = DIRECT; + X509_new = DIRECT; + X509_print = DIRECT; + X509_print_fp = DIRECT; + X509_set_issuer_name = DIRECT; + X509_set_notAfter = DIRECT; + X509_set_notBefore = DIRECT; + X509_set_pubkey = DIRECT; + X509_set_serialNumber = DIRECT; + X509_set_subject_name = DIRECT; + X509_set_version = DIRECT; + X509_sign = DIRECT; + X509_subject_name_cmp = DIRECT; + X509_subject_name_hash = DIRECT; + X509_to_X509_REQ = DIRECT; + X509_verify = DIRECT; + X509_verify_cert = DIRECT; + X509_verify_cert_error_string = DIRECT; + X509v3_add_ext = DIRECT; + X509v3_delete_ext = DIRECT; + X509v3_get_ext = DIRECT; + X509v3_get_ext_by_NID = DIRECT; + X509v3_get_ext_by_OBJ = DIRECT; + X509v3_get_ext_by_critical = DIRECT; + X509v3_get_ext_count = DIRECT; + _des_crypt = DIRECT; + a2d_ASN1_OBJECT = DIRECT; + a2i_ASN1_INTEGER = DIRECT; + a2i_ASN1_STRING = DIRECT; + asn1_Finish = DIRECT; + asn1_GetSequence = DIRECT; + bn_div_words = DIRECT; + bn_expand2 = DIRECT; + bn_mul_add_words = DIRECT; + bn_mul_words = DIRECT; + BN_uadd = DIRECT; + BN_usub = DIRECT; + bn_sqr_words = DIRECT; + _ossl_old_crypt = DIRECT; + d2i_ASN1_BIT_STRING = DIRECT; + d2i_ASN1_BOOLEAN = DIRECT; + d2i_ASN1_IA5STRING = DIRECT; + d2i_ASN1_INTEGER = DIRECT; + d2i_ASN1_OBJECT = DIRECT; + d2i_ASN1_OCTET_STRING = DIRECT; + d2i_ASN1_PRINTABLE = DIRECT; + d2i_ASN1_PRINTABLESTRING = DIRECT; + d2i_ASN1_SET = DIRECT; + d2i_ASN1_T61STRING = DIRECT; + d2i_ASN1_TYPE = DIRECT; + d2i_ASN1_UTCTIME = DIRECT; + d2i_ASN1_bytes = DIRECT; + d2i_ASN1_type_bytes = DIRECT; + d2i_DHparams = DIRECT; + d2i_DSAPrivateKey = DIRECT; + d2i_DSAPrivateKey_bio = DIRECT; + d2i_DSAPrivateKey_fp = DIRECT; + d2i_DSAPublicKey = DIRECT; + d2i_DSAparams = DIRECT; + d2i_NETSCAPE_SPKAC = DIRECT; + d2i_NETSCAPE_SPKI = DIRECT; + d2i_Netscape_RSA = DIRECT; + d2i_PKCS7 = DIRECT; + d2i_PKCS7_DIGEST = DIRECT; + d2i_PKCS7_ENCRYPT = DIRECT; + d2i_PKCS7_ENC_CONTENT = DIRECT; + d2i_PKCS7_ENVELOPE = DIRECT; + d2i_PKCS7_ISSUER_AND_SERIAL = DIRECT; + d2i_PKCS7_RECIP_INFO = DIRECT; + d2i_PKCS7_SIGNED = DIRECT; + d2i_PKCS7_SIGNER_INFO = DIRECT; + d2i_PKCS7_SIGN_ENVELOPE = DIRECT; + d2i_PKCS7_bio = DIRECT; + d2i_PKCS7_fp = DIRECT; + d2i_PrivateKey = DIRECT; + d2i_PublicKey = DIRECT; + d2i_RSAPrivateKey = DIRECT; + d2i_RSAPrivateKey_bio = DIRECT; + d2i_RSAPrivateKey_fp = DIRECT; + d2i_RSAPublicKey = DIRECT; + d2i_X509 = DIRECT; + d2i_X509_ALGOR = DIRECT; + d2i_X509_ATTRIBUTE = DIRECT; + d2i_X509_CINF = DIRECT; + d2i_X509_CRL = DIRECT; + d2i_X509_CRL_INFO = DIRECT; + d2i_X509_CRL_bio = DIRECT; + d2i_X509_CRL_fp = DIRECT; + d2i_X509_EXTENSION = DIRECT; + d2i_X509_NAME = DIRECT; + d2i_X509_NAME_ENTRY = DIRECT; + d2i_X509_PKEY = DIRECT; + d2i_X509_PUBKEY = DIRECT; + d2i_X509_REQ = DIRECT; + d2i_X509_REQ_INFO = DIRECT; + d2i_X509_REQ_bio = DIRECT; + d2i_X509_REQ_fp = DIRECT; + d2i_X509_REVOKED = DIRECT; + d2i_X509_SIG = DIRECT; + d2i_X509_VAL = DIRECT; + d2i_X509_bio = DIRECT; + d2i_X509_fp = DIRECT; + DES_cbc_cksum = DIRECT; + DES_cbc_encrypt = DIRECT; + DES_cfb64_encrypt = DIRECT; + DES_cfb_encrypt = DIRECT; + DES_decrypt3 = DIRECT; + DES_ecb3_encrypt = DIRECT; + DES_ecb_encrypt = DIRECT; + DES_ede3_cbc_encrypt = DIRECT; + DES_ede3_cfb64_encrypt = DIRECT; + DES_ede3_ofb64_encrypt = DIRECT; + DES_enc_read = DIRECT; + DES_enc_write = DIRECT; + DES_encrypt1 = DIRECT; + DES_encrypt2 = DIRECT; + DES_encrypt3 = DIRECT; + DES_fcrypt = DIRECT; + DES_is_weak_key = DIRECT; + DES_key_sched = DIRECT; + DES_ncbc_encrypt = DIRECT; + DES_ofb64_encrypt = DIRECT; + DES_ofb_encrypt = DIRECT; + DES_options = DIRECT; + DES_pcbc_encrypt = DIRECT; + DES_quad_cksum = DIRECT; + DES_random_key = DIRECT; + _ossl_old_des_random_seed = DIRECT; + _ossl_old_des_read_2passwords = DIRECT; + _ossl_old_des_read_password = DIRECT; + _ossl_old_des_read_pw = DIRECT; + _ossl_old_des_read_pw_string = DIRECT; + DES_set_key = DIRECT; + DES_set_odd_parity = DIRECT; + DES_string_to_2keys = DIRECT; + DES_string_to_key = DIRECT; + DES_xcbc_encrypt = DIRECT; + fcrypt_body = DIRECT; + i2a_ASN1_INTEGER = DIRECT; + i2a_ASN1_OBJECT = DIRECT; + i2a_ASN1_STRING = DIRECT; + i2d_ASN1_BIT_STRING = DIRECT; + i2d_ASN1_BOOLEAN = DIRECT; + i2d_ASN1_IA5STRING = DIRECT; + i2d_ASN1_INTEGER = DIRECT; + i2d_ASN1_OBJECT = DIRECT; + i2d_ASN1_OCTET_STRING = DIRECT; + i2d_ASN1_PRINTABLE = DIRECT; + i2d_ASN1_SET = DIRECT; + i2d_ASN1_TYPE = DIRECT; + i2d_ASN1_UTCTIME = DIRECT; + i2d_ASN1_bytes = DIRECT; + i2d_DHparams = DIRECT; + i2d_DSAPrivateKey = DIRECT; + i2d_DSAPrivateKey_bio = DIRECT; + i2d_DSAPrivateKey_fp = DIRECT; + i2d_DSAPublicKey = DIRECT; + i2d_DSAparams = DIRECT; + i2d_NETSCAPE_SPKAC = DIRECT; + i2d_NETSCAPE_SPKI = DIRECT; + i2d_Netscape_RSA = DIRECT; + i2d_PKCS7 = DIRECT; + i2d_PKCS7_DIGEST = DIRECT; + i2d_PKCS7_ENCRYPT = DIRECT; + i2d_PKCS7_ENC_CONTENT = DIRECT; + i2d_PKCS7_ENVELOPE = DIRECT; + i2d_PKCS7_ISSUER_AND_SERIAL = DIRECT; + i2d_PKCS7_RECIP_INFO = DIRECT; + i2d_PKCS7_SIGNED = DIRECT; + i2d_PKCS7_SIGNER_INFO = DIRECT; + i2d_PKCS7_SIGN_ENVELOPE = DIRECT; + i2d_PKCS7_bio = DIRECT; + i2d_PKCS7_fp = DIRECT; + i2d_PrivateKey = DIRECT; + i2d_PublicKey = DIRECT; + i2d_RSAPrivateKey = DIRECT; + i2d_RSAPrivateKey_bio = DIRECT; + i2d_RSAPrivateKey_fp = DIRECT; + i2d_RSAPublicKey = DIRECT; + i2d_X509 = DIRECT; + i2d_X509_ALGOR = DIRECT; + i2d_X509_ATTRIBUTE = DIRECT; + i2d_X509_CINF = DIRECT; + i2d_X509_CRL = DIRECT; + i2d_X509_CRL_INFO = DIRECT; + i2d_X509_CRL_bio = DIRECT; + i2d_X509_CRL_fp = DIRECT; + i2d_X509_EXTENSION = DIRECT; + i2d_X509_NAME = DIRECT; + i2d_X509_NAME_ENTRY = DIRECT; + i2d_X509_PKEY = DIRECT; + i2d_X509_PUBKEY = DIRECT; + i2d_X509_REQ = DIRECT; + i2d_X509_REQ_INFO = DIRECT; + i2d_X509_REQ_bio = DIRECT; + i2d_X509_REQ_fp = DIRECT; + i2d_X509_REVOKED = DIRECT; + i2d_X509_SIG = DIRECT; + i2d_X509_VAL = DIRECT; + i2d_X509_bio = DIRECT; + i2d_X509_fp = DIRECT; + idea_cbc_encrypt = DIRECT; + idea_cfb64_encrypt = DIRECT; + idea_ecb_encrypt = DIRECT; + idea_encrypt = DIRECT; + idea_ofb64_encrypt = DIRECT; + idea_options = DIRECT; + idea_set_decrypt_key = DIRECT; + idea_set_encrypt_key = DIRECT; + lh_delete = DIRECT; + lh_doall = DIRECT; + lh_doall_arg = DIRECT; + lh_free = DIRECT; + lh_insert = DIRECT; + lh_new = DIRECT; + lh_node_stats = DIRECT; + lh_node_stats_bio = DIRECT; + lh_node_usage_stats = DIRECT; + lh_node_usage_stats_bio = DIRECT; + lh_retrieve = DIRECT; + lh_stats = DIRECT; + lh_stats_bio = DIRECT; + lh_strhash = DIRECT; + sk_delete = DIRECT; + sk_delete_ptr = DIRECT; + sk_dup = DIRECT; + sk_find = DIRECT; + sk_free = DIRECT; + sk_insert = DIRECT; + sk_new = DIRECT; + sk_pop = DIRECT; + sk_pop_free = DIRECT; + sk_push = DIRECT; + sk_set_cmp_func = DIRECT; + sk_shift = DIRECT; + sk_unshift = DIRECT; + sk_zero = DIRECT; + BIO_f_nbio_test = DIRECT; + ASN1_TYPE_get = DIRECT; + ASN1_TYPE_set = DIRECT; + ERR_load_PKCS7_strings = DIRECT; + X509_find_by_issuer_and_serial = DIRECT; + X509_find_by_subject = DIRECT; + PKCS7_ctrl = DIRECT; + PKCS7_set_type = DIRECT; + PKCS7_set_content = DIRECT; + PKCS7_SIGNER_INFO_set = DIRECT; + PKCS7_add_signer = DIRECT; + PKCS7_add_certificate = DIRECT; + PKCS7_add_crl = DIRECT; + PKCS7_content_new = DIRECT; + PKCS7_dataVerify = DIRECT; + PKCS7_dataInit = DIRECT; + PKCS7_add_signature = DIRECT; + PKCS7_cert_from_signer_info = DIRECT; + PKCS7_get_signer_info = DIRECT; + PEM_read_bio_RSAPublicKey = DIRECT; + PEM_write_bio_RSAPublicKey = DIRECT; + d2i_RSAPublicKey_bio = DIRECT; + i2d_RSAPublicKey_bio = DIRECT; + PEM_read_RSAPublicKey = DIRECT; + PEM_write_RSAPublicKey = DIRECT; + d2i_RSAPublicKey_fp = DIRECT; + i2d_RSAPublicKey_fp = DIRECT; + BIO_copy_next_retry = DIRECT; + RSA_flags = DIRECT; + X509_STORE_add_crl = DIRECT; + X509_load_crl_file = DIRECT; + EVP_rc2_40_cbc = DIRECT; + EVP_rc4_40 = DIRECT; + EVP_CIPHER_CTX_init = DIRECT; + HMAC = DIRECT; + HMAC_Init = DIRECT; + HMAC_Update = DIRECT; + HMAC_Final = DIRECT; + ERR_get_next_error_library = DIRECT; + EVP_PKEY_cmp_parameters = DIRECT; + BIO_ptr_ctrl = DIRECT; + BN_BLINDING_convert = DIRECT; + BN_BLINDING_invert = DIRECT; + BN_BLINDING_update = DIRECT; + RSA_blinding_on = DIRECT; + RSA_blinding_off = DIRECT; + i2t_ASN1_OBJECT = DIRECT; + BN_BLINDING_new = DIRECT; + BN_BLINDING_free = DIRECT; + EVP_cast5_cbc = DIRECT; + EVP_cast5_cfb64 = DIRECT; + EVP_cast5_ecb = DIRECT; + EVP_cast5_ofb = DIRECT; + BF_decrypt = DIRECT; + CAST_set_key = DIRECT; + CAST_encrypt = DIRECT; + CAST_decrypt = DIRECT; + CAST_ecb_encrypt = DIRECT; + CAST_cbc_encrypt = DIRECT; + CAST_cfb64_encrypt = DIRECT; + CAST_ofb64_encrypt = DIRECT; + RC2_decrypt = DIRECT; + OBJ_create_objects = DIRECT; + BN_exp = DIRECT; + BN_mul_word = DIRECT; + BN_sub_word = DIRECT; + BN_dec2bn = DIRECT; + BN_bn2dec = DIRECT; + CRYPTO_free_ex_data = DIRECT; + CRYPTO_get_ex_data = DIRECT; + CRYPTO_set_ex_data = DIRECT; + ERR_load_CRYPTO_strings = DIRECT; + EVP_PKEY_bits = DIRECT; + MD5_Transform = DIRECT; + SHA1_Transform = DIRECT; + SHA_Transform = DIRECT; + X509_STORE_CTX_get_chain = DIRECT; + X509_STORE_CTX_get_current_cert = DIRECT; + X509_STORE_CTX_get_error = DIRECT; + X509_STORE_CTX_get_error_depth = DIRECT; + X509_STORE_CTX_get_ex_data = DIRECT; + X509_STORE_CTX_set_cert = DIRECT; + X509_STORE_CTX_set_chain = DIRECT; + X509_STORE_CTX_set_error = DIRECT; + X509_STORE_CTX_set_ex_data = DIRECT; + CRYPTO_dup_ex_data = DIRECT; + CRYPTO_get_new_lockid = DIRECT; + CRYPTO_new_ex_data = DIRECT; + RSA_set_ex_data = DIRECT; + RSA_get_ex_data = DIRECT; + RSA_get_ex_new_index = DIRECT; + RSA_padding_add_PKCS1_type_1 = DIRECT; + RSA_padding_add_PKCS1_type_2 = DIRECT; + RSA_padding_add_SSLv23 = DIRECT; + RSA_padding_add_none = DIRECT; + RSA_padding_check_PKCS1_type_1 = DIRECT; + RSA_padding_check_PKCS1_type_2 = DIRECT; + RSA_padding_check_SSLv23 = DIRECT; + RSA_padding_check_none = DIRECT; + bn_add_words = DIRECT; + CRYPTO_get_ex_new_index = DIRECT; + RIPEMD160_Init = DIRECT; + RIPEMD160_Update = DIRECT; + RIPEMD160_Final = DIRECT; + RIPEMD160 = DIRECT; + RIPEMD160_Transform = DIRECT; + BN_bn2mpi = DIRECT; + BN_mpi2bn = DIRECT; + ASN1_BIT_STRING_get_bit = DIRECT; + ASN1_BIT_STRING_set_bit = DIRECT; + BIO_get_ex_data = DIRECT; + BIO_get_ex_new_index = DIRECT; + BIO_set_ex_data = DIRECT; + EVP_PKEY_decrypt = DIRECT; + EVP_PKEY_encrypt = DIRECT; + PKCS7_RECIP_INFO_set = DIRECT; + PKCS7_add_recipient = DIRECT; + PKCS7_add_recipient_info = DIRECT; + PKCS7_set_cipher = DIRECT; + ASN1_TYPE_get_int_octetstring = DIRECT; + ASN1_TYPE_get_octetstring = DIRECT; + ASN1_TYPE_set_int_octetstring = DIRECT; + ASN1_TYPE_set_octetstring = DIRECT; + ASN1_UTCTIME_set_string = DIRECT; + ERR_add_error_data = DIRECT; + ERR_set_error_data = DIRECT; + EVP_CIPHER_asn1_to_param = DIRECT; + EVP_CIPHER_param_to_asn1 = DIRECT; + EVP_CIPHER_get_asn1_iv = DIRECT; + EVP_CIPHER_set_asn1_iv = DIRECT; + asn1_add_error = DIRECT; + d2i_ASN1_BMPSTRING = DIRECT; + i2d_ASN1_BMPSTRING = DIRECT; + BN_init = DIRECT; + COMP_CTX_new = DIRECT; + COMP_CTX_free = DIRECT; + X509_STORE_CTX_get_ex_new_index = DIRECT; + OBJ_NAME_add = DIRECT; + BIO_socket_nbio = DIRECT; + EVP_rc2_64_cbc = DIRECT; + OBJ_NAME_cleanup = DIRECT; + OBJ_NAME_get = DIRECT; + OBJ_NAME_init = DIRECT; + OBJ_NAME_new_index = DIRECT; + OBJ_NAME_remove = DIRECT; + BN_MONT_CTX_copy = DIRECT; + RAND_SSLeay = DIRECT; + RAND_set_rand_method = DIRECT; + RSA_memory_lock = DIRECT; + bn_sub_words = DIRECT; + bn_mul_normal = DIRECT; + bn_mul_comba8 = DIRECT; + bn_mul_comba4 = DIRECT; + bn_sqr_normal = DIRECT; + bn_sqr_comba8 = DIRECT; + bn_sqr_comba4 = DIRECT; + bn_cmp_words = DIRECT; + bn_mul_recursive = DIRECT; + bn_mul_part_recursive = DIRECT; + bn_sqr_recursive = DIRECT; + bn_mul_low_normal = DIRECT; + BN_RECP_CTX_init = DIRECT; + BN_RECP_CTX_new = DIRECT; + BN_RECP_CTX_free = DIRECT; + BN_RECP_CTX_set = DIRECT; + BN_mod_mul_reciprocal = DIRECT; + BN_mod_exp_recp = DIRECT; + BN_div_recp = DIRECT; + BN_CTX_init = DIRECT; + BN_MONT_CTX_init = DIRECT; + RAND_get_rand_method = DIRECT; + PKCS7_add_attribute = DIRECT; + PKCS7_add_signed_attribute = DIRECT; + PKCS7_digest_from_attributes = DIRECT; + PKCS7_get_attribute = DIRECT; + PKCS7_get_issuer_and_serial = DIRECT; + PKCS7_get_signed_attribute = DIRECT; + COMP_compress_block = DIRECT; + COMP_expand_block = DIRECT; + COMP_rle = DIRECT; + COMP_zlib = DIRECT; + PKCS7_set_attributes = DIRECT; + PKCS7_set_signed_attributes = DIRECT; + X509_ATTRIBUTE_create = DIRECT; + X509_ATTRIBUTE_dup = DIRECT; + ASN1_GENERALIZEDTIME_check = DIRECT; + ASN1_GENERALIZEDTIME_print = DIRECT; + ASN1_GENERALIZEDTIME_set = DIRECT; + ASN1_GENERALIZEDTIME_set_string = DIRECT; + ASN1_TIME_print = DIRECT; + BASIC_CONSTRAINTS_free = DIRECT; + BASIC_CONSTRAINTS_new = DIRECT; + ERR_load_X509V3_strings = DIRECT; + NETSCAPE_CERT_SEQUENCE_free = DIRECT; + NETSCAPE_CERT_SEQUENCE_new = DIRECT; + OBJ_txt2obj = DIRECT; + PEM_read_NETSCAPE_CERT_SEQUENCE = DIRECT; + PEM_read_bio_NETSCAPE_CERT_SEQUENCE = DIRECT; + PEM_write_NETSCAPE_CERT_SEQUENCE = DIRECT; + PEM_write_bio_NETSCAPE_CERT_SEQUENCE = DIRECT; + X509V3_EXT_add = DIRECT; + X509V3_EXT_add_alias = DIRECT; + X509V3_EXT_add_conf = DIRECT; + X509V3_EXT_cleanup = DIRECT; + X509V3_EXT_conf = DIRECT; + X509V3_EXT_conf_nid = DIRECT; + X509V3_EXT_get = DIRECT; + X509V3_EXT_get_nid = DIRECT; + X509V3_EXT_print = DIRECT; + X509V3_EXT_print_fp = DIRECT; + X509V3_add_standard_extensions = DIRECT; + X509V3_add_value = DIRECT; + X509V3_add_value_bool = DIRECT; + X509V3_add_value_int = DIRECT; + X509V3_conf_free = DIRECT; + X509V3_get_value_bool = DIRECT; + X509V3_get_value_int = DIRECT; + X509V3_parse_list = DIRECT; + d2i_ASN1_GENERALIZEDTIME = DIRECT; + d2i_ASN1_TIME = DIRECT; + d2i_BASIC_CONSTRAINTS = DIRECT; + d2i_NETSCAPE_CERT_SEQUENCE = DIRECT; + i2d_ASN1_GENERALIZEDTIME = DIRECT; + i2d_ASN1_TIME = DIRECT; + i2d_BASIC_CONSTRAINTS = DIRECT; + i2d_NETSCAPE_CERT_SEQUENCE = DIRECT; + EVP_MD_CTX_copy = DIRECT; + i2d_ASN1_ENUMERATED = DIRECT; + d2i_ASN1_ENUMERATED = DIRECT; + ASN1_ENUMERATED_set = DIRECT; + ASN1_ENUMERATED_get = DIRECT; + BN_to_ASN1_ENUMERATED = DIRECT; + ASN1_ENUMERATED_to_BN = DIRECT; + i2a_ASN1_ENUMERATED = DIRECT; + a2i_ASN1_ENUMERATED = DIRECT; + i2d_GENERAL_NAME = DIRECT; + d2i_GENERAL_NAME = DIRECT; + GENERAL_NAME_new = DIRECT; + GENERAL_NAME_free = DIRECT; + GENERAL_NAMES_new = DIRECT; + GENERAL_NAMES_free = DIRECT; + d2i_GENERAL_NAMES = DIRECT; + i2d_GENERAL_NAMES = DIRECT; + i2v_GENERAL_NAMES = DIRECT; + i2s_ASN1_OCTET_STRING = DIRECT; + s2i_ASN1_OCTET_STRING = DIRECT; + hex_to_string = DIRECT; + string_to_hex = DIRECT; + DES_ede3_cbcm_encrypt = DIRECT; + RSA_padding_add_PKCS1_OAEP = DIRECT; + RSA_padding_check_PKCS1_OAEP = DIRECT; + X509_CRL_print_fp = DIRECT; + X509_CRL_print = DIRECT; + i2v_GENERAL_NAME = DIRECT; + v2i_GENERAL_NAME = DIRECT; + i2d_PKEY_USAGE_PERIOD = DIRECT; + d2i_PKEY_USAGE_PERIOD = DIRECT; + PKEY_USAGE_PERIOD_new = DIRECT; + PKEY_USAGE_PERIOD_free = DIRECT; + v2i_GENERAL_NAMES = DIRECT; + i2s_ASN1_INTEGER = DIRECT; + X509V3_EXT_d2i = DIRECT; + name_cmp = DIRECT; + i2s_ASN1_ENUMERATED = DIRECT; + i2s_ASN1_ENUMERATED_TABLE = DIRECT; + BIO_s_log = DIRECT; + BIO_f_reliable = DIRECT; + PKCS7_dataFinal = DIRECT; + PKCS7_dataDecode = DIRECT; + X509V3_EXT_CRL_add_conf = DIRECT; + BN_set_params = DIRECT; + BN_get_params = DIRECT; + EVP_ripemd160 = DIRECT; + ASN1_TIME_set = DIRECT; + i2d_AUTHORITY_KEYID = DIRECT; + d2i_AUTHORITY_KEYID = DIRECT; + AUTHORITY_KEYID_new = DIRECT; + AUTHORITY_KEYID_free = DIRECT; + ASN1_seq_unpack = DIRECT; + ASN1_seq_pack = DIRECT; + ASN1_unpack_string = DIRECT; + ASN1_pack_string = DIRECT; + PKCS12_MAKE_KEYBAG = DIRECT; + PKCS8_encrypt = DIRECT; + PKCS12_MAKE_SHKEYBAG = DIRECT; + PKCS12_pack_p7data = DIRECT; + PKCS12_pack_p7encdata = DIRECT; + PKCS12_add_localkeyid = DIRECT; + PKCS12_add_friendlyname_asc = DIRECT; + PKCS12_add_friendlyname_uni = DIRECT; + PKCS12_get_friendlyname = DIRECT; + PKCS12_pbe_crypt = DIRECT; + PKCS12_init = DIRECT; + PKCS12_key_gen_asc = DIRECT; + PKCS12_key_gen_uni = DIRECT; + PKCS12_gen_mac = DIRECT; + PKCS12_verify_mac = DIRECT; + PKCS12_set_mac = DIRECT; + PKCS12_setup_mac = DIRECT; + i2d_PKCS12_BAGS = DIRECT; + PKCS12_BAGS_new = DIRECT; + d2i_PKCS12_BAGS = DIRECT; + PKCS12_BAGS_free = DIRECT; + i2d_PKCS12 = DIRECT; + d2i_PKCS12 = DIRECT; + PKCS12_new = DIRECT; + PKCS12_free = DIRECT; + i2d_PKCS12_MAC_DATA = DIRECT; + PKCS12_MAC_DATA_new = DIRECT; + d2i_PKCS12_MAC_DATA = DIRECT; + PKCS12_MAC_DATA_free = DIRECT; + i2d_PKCS12_SAFEBAG = DIRECT; + PKCS12_SAFEBAG_new = DIRECT; + d2i_PKCS12_SAFEBAG = DIRECT; + PKCS12_SAFEBAG_free = DIRECT; + ERR_load_PKCS12_strings = DIRECT; + PKCS12_PBE_add = DIRECT; + PKCS8_add_keyusage = DIRECT; + PKCS12_get_attr_gen = DIRECT; + PKCS12_parse = DIRECT; + PKCS12_create = DIRECT; + i2d_PKCS12_bio = DIRECT; + i2d_PKCS12_fp = DIRECT; + d2i_PKCS12_bio = DIRECT; + d2i_PKCS12_fp = DIRECT; + i2d_PBEPARAM = DIRECT; + PBEPARAM_new = DIRECT; + d2i_PBEPARAM = DIRECT; + PBEPARAM_free = DIRECT; + i2d_PKCS8_PRIV_KEY_INFO = DIRECT; + PKCS8_PRIV_KEY_INFO_new = DIRECT; + d2i_PKCS8_PRIV_KEY_INFO = DIRECT; + PKCS8_PRIV_KEY_INFO_free = DIRECT; + EVP_PKCS82PKEY = DIRECT; + EVP_PKEY2PKCS8 = DIRECT; + PKCS8_set_broken = DIRECT; + EVP_PBE_alg_add = DIRECT; + PKCS5_pbe_set = DIRECT; + EVP_PBE_cleanup = DIRECT; + i2d_SXNET = DIRECT; + d2i_SXNET = DIRECT; + SXNET_new = DIRECT; + SXNET_free = DIRECT; + i2d_SXNETID = DIRECT; + d2i_SXNETID = DIRECT; + SXNETID_new = DIRECT; + SXNETID_free = DIRECT; + DSA_SIG_new = DIRECT; + DSA_SIG_free = DIRECT; + DSA_do_sign = DIRECT; + DSA_do_verify = DIRECT; + d2i_DSA_SIG = DIRECT; + i2d_DSA_SIG = DIRECT; + i2d_ASN1_VISIBLESTRING = DIRECT; + d2i_ASN1_VISIBLESTRING = DIRECT; + i2d_ASN1_UTF8STRING = DIRECT; + d2i_ASN1_UTF8STRING = DIRECT; + i2d_DIRECTORYSTRING = DIRECT; + d2i_DIRECTORYSTRING = DIRECT; + i2d_DISPLAYTEXT = DIRECT; + d2i_DISPLAYTEXT = DIRECT; + i2d_PBKDF2PARAM = DIRECT; + PBKDF2PARAM_new = DIRECT; + d2i_PBKDF2PARAM = DIRECT; + PBKDF2PARAM_free = DIRECT; + i2d_PBE2PARAM = DIRECT; + PBE2PARAM_new = DIRECT; + d2i_PBE2PARAM = DIRECT; + PBE2PARAM_free = DIRECT; + SXNET_add_id_asc = DIRECT; + SXNET_add_id_ulong = DIRECT; + SXNET_add_id_INTEGER = DIRECT; + SXNET_get_id_asc = DIRECT; + SXNET_get_id_ulong = DIRECT; + SXNET_get_id_INTEGER = DIRECT; + X509V3_set_conf_lhash = DIRECT; + i2d_CERTIFICATEPOLICIES = DIRECT; + CERTIFICATEPOLICIES_new = DIRECT; + CERTIFICATEPOLICIES_free = DIRECT; + d2i_CERTIFICATEPOLICIES = DIRECT; + i2d_POLICYINFO = DIRECT; + POLICYINFO_new = DIRECT; + d2i_POLICYINFO = DIRECT; + POLICYINFO_free = DIRECT; + i2d_POLICYQUALINFO = DIRECT; + POLICYQUALINFO_new = DIRECT; + d2i_POLICYQUALINFO = DIRECT; + POLICYQUALINFO_free = DIRECT; + i2d_USERNOTICE = DIRECT; + USERNOTICE_new = DIRECT; + d2i_USERNOTICE = DIRECT; + USERNOTICE_free = DIRECT; + i2d_NOTICEREF = DIRECT; + NOTICEREF_new = DIRECT; + d2i_NOTICEREF = DIRECT; + NOTICEREF_free = DIRECT; + X509V3_get_string = DIRECT; + X509V3_get_section = DIRECT; + X509V3_string_free = DIRECT; + X509V3_section_free = DIRECT; + X509V3_set_ctx = DIRECT; + s2i_ASN1_INTEGER = DIRECT; + CRYPTO_set_locked_mem_functions = DIRECT; + CRYPTO_get_locked_mem_functions = DIRECT; + CRYPTO_malloc_locked = DIRECT; + CRYPTO_free_locked = DIRECT; + BN_mod_exp2_mont = DIRECT; + ERR_get_error_line_data = DIRECT; + ERR_peek_error_line_data = DIRECT; + PKCS12_PBE_keyivgen = DIRECT; + X509_ALGOR_dup = DIRECT; + i2d_CRL_DIST_POINTS = DIRECT; + CRL_DIST_POINTS_new = DIRECT; + CRL_DIST_POINTS_free = DIRECT; + d2i_CRL_DIST_POINTS = DIRECT; + i2d_DIST_POINT = DIRECT; + DIST_POINT_new = DIRECT; + d2i_DIST_POINT = DIRECT; + DIST_POINT_free = DIRECT; + i2d_DIST_POINT_NAME = DIRECT; + DIST_POINT_NAME_new = DIRECT; + DIST_POINT_NAME_free = DIRECT; + d2i_DIST_POINT_NAME = DIRECT; + X509V3_add_value_uchar = DIRECT; + X509V3_EXT_i2d = DIRECT; + X509V3_EXT_val_prn = DIRECT; + X509V3_EXT_add_list = DIRECT; + EVP_CIPHER_type = DIRECT; + EVP_PBE_CipherInit = DIRECT; + X509V3_add_value_bool_nf = DIRECT; + d2i_ASN1_UINTEGER = DIRECT; + sk_value = DIRECT; + sk_num = DIRECT; + sk_set = DIRECT; + sk_sort = DIRECT; + PKCS5_PBE_add = DIRECT; + PEM_write_bio_PKCS8 = DIRECT; + i2d_PKCS8_fp = DIRECT; + PEM_read_bio_PKCS8_PRIV_KEY_INFO = DIRECT; + d2i_PKCS8_bio = DIRECT; + d2i_PKCS8_PRIV_KEY_INFO_fp = DIRECT; + PEM_write_bio_PKCS8_PRIV_KEY_INFO = DIRECT; + PEM_read_PKCS8 = DIRECT; + d2i_PKCS8_PRIV_KEY_INFO_bio = DIRECT; + d2i_PKCS8_fp = DIRECT; + PEM_write_PKCS8 = DIRECT; + PEM_read_PKCS8_PRIV_KEY_INFO = DIRECT; + PEM_read_bio_PKCS8 = DIRECT; + PEM_write_PKCS8_PRIV_KEY_INFO = DIRECT; + PKCS5_PBE_keyivgen = DIRECT; + i2d_PKCS8_bio = DIRECT; + i2d_PKCS8_PRIV_KEY_INFO_fp = DIRECT; + i2d_PKCS8_PRIV_KEY_INFO_bio = DIRECT; + BIO_s_bio = DIRECT; + PKCS5_pbe2_set = DIRECT; + PKCS5_v2_PBE_keyivgen = DIRECT; + PEM_write_bio_PKCS8PrivateKey = DIRECT; + PEM_write_PKCS8PrivateKey = DIRECT; + BIO_ctrl_get_read_request = DIRECT; + BIO_ctrl_pending = DIRECT; + BIO_ctrl_wpending = DIRECT; + BIO_new_bio_pair = DIRECT; + BIO_ctrl_get_write_guarantee = DIRECT; + CRYPTO_num_locks = DIRECT; + CONF_load_bio = DIRECT; + CONF_load_fp = DIRECT; + PKCS7_signatureVerify = DIRECT; + RSA_set_method = DIRECT; + RSA_get_method = DIRECT; + RSA_get_default_method = DIRECT; + RSA_check_key = DIRECT; + OBJ_obj2txt = DIRECT; + DSA_dup_DH = DIRECT; + X509_REQ_get_extensions = DIRECT; + X509_REQ_set_extension_nids = DIRECT; + BIO_nwrite = DIRECT; + X509_REQ_extension_nid = DIRECT; + BIO_nread = DIRECT; + X509_REQ_get_extension_nids = DIRECT; + BIO_nwrite0 = DIRECT; + X509_REQ_add_extensions_nid = DIRECT; + BIO_nread0 = DIRECT; + X509_REQ_add_extensions = DIRECT; + BIO_new_mem_buf = DIRECT; + DH_set_ex_data = DIRECT; + DH_set_method = DIRECT; + DSA_OpenSSL = DIRECT; + DH_get_ex_data = DIRECT; + DH_get_ex_new_index = DIRECT; + DSA_new_method = DIRECT; + DH_new_method = DIRECT; + DH_OpenSSL = DIRECT; + DSA_get_ex_new_index = DIRECT; + DH_get_default_method = DIRECT; + DSA_set_ex_data = DIRECT; + DH_set_default_method = DIRECT; + DSA_get_ex_data = DIRECT; + X509V3_EXT_REQ_add_conf = DIRECT; + NETSCAPE_SPKI_print = DIRECT; + NETSCAPE_SPKI_set_pubkey = DIRECT; + NETSCAPE_SPKI_b64_encode = DIRECT; + NETSCAPE_SPKI_get_pubkey = DIRECT; + NETSCAPE_SPKI_b64_decode = DIRECT; + UTF8_putc = DIRECT; + UTF8_getc = DIRECT; + RSA_null_method = DIRECT; + ASN1_tag2str = DIRECT; + BIO_ctrl_reset_read_request = DIRECT; + DISPLAYTEXT_new = DIRECT; + ASN1_GENERALIZEDTIME_free = DIRECT; + X509_REVOKED_get_ext_d2i = DIRECT; + X509_set_ex_data = DIRECT; + X509_NAME_add_entry_by_txt = DIRECT; + X509_NAME_add_entry_by_NID = DIRECT; + X509_PURPOSE_get0 = DIRECT; + PEM_read_X509_AUX = DIRECT; + d2i_AUTHORITY_INFO_ACCESS = DIRECT; + PEM_write_PUBKEY = DIRECT; + ACCESS_DESCRIPTION_new = DIRECT; + X509_CERT_AUX_free = DIRECT; + d2i_ACCESS_DESCRIPTION = DIRECT; + X509_trust_clear = DIRECT; + X509_TRUST_add = DIRECT; + ASN1_VISIBLESTRING_new = DIRECT; + X509_alias_set1 = DIRECT; + ASN1_PRINTABLESTRING_free = DIRECT; + EVP_PKEY_get1_DSA = DIRECT; + ASN1_BMPSTRING_new = DIRECT; + ASN1_mbstring_copy = DIRECT; + ASN1_UTF8STRING_new = DIRECT; + DSA_get_default_method = DIRECT; + ASN1_T61STRING_free = DIRECT; + DSA_set_method = DIRECT; + X509_get_ex_data = DIRECT; + ASN1_STRING_type = DIRECT; + X509_PURPOSE_get_by_sname = DIRECT; + ASN1_TIME_free = DIRECT; + ASN1_OCTET_STRING_cmp = DIRECT; + ASN1_BIT_STRING_new = DIRECT; + X509_get_ext_d2i = DIRECT; + PEM_read_bio_X509_AUX = DIRECT; + ASN1_STRING_set_default_mask_asc = DIRECT; + PEM_write_bio_RSA_PUBKEY = DIRECT; + ASN1_INTEGER_cmp = DIRECT; + d2i_RSA_PUBKEY_fp = DIRECT; + PEM_write_bio_DSA_PUBKEY = DIRECT; + X509_STORE_CTX_free = DIRECT; + EVP_PKEY_set1_DSA = DIRECT; + i2d_DSA_PUBKEY_fp = DIRECT; + X509_load_cert_crl_file = DIRECT; + ASN1_TIME_new = DIRECT; + i2d_RSA_PUBKEY = DIRECT; + X509_STORE_CTX_purpose_inherit = DIRECT; + PEM_read_RSA_PUBKEY = DIRECT; + d2i_X509_AUX = DIRECT; + i2d_DSA_PUBKEY = DIRECT; + X509_CERT_AUX_print = DIRECT; + PEM_read_DSA_PUBKEY = DIRECT; + i2d_RSA_PUBKEY_bio = DIRECT; + ASN1_BIT_STRING_num_asc = DIRECT; + i2d_PUBKEY = DIRECT; + ASN1_UTCTIME_free = DIRECT; + DSA_set_default_method = DIRECT; + X509_PURPOSE_get_by_id = DIRECT; + ACCESS_DESCRIPTION_free = DIRECT; + PEM_read_bio_PUBKEY = DIRECT; + ASN1_STRING_set_by_NID = DIRECT; + X509_PURPOSE_get_id = DIRECT; + DISPLAYTEXT_free = DIRECT; + OTHERNAME_new = DIRECT; + X509_CERT_AUX_new = DIRECT; + X509_TRUST_cleanup = DIRECT; + X509_NAME_add_entry_by_OBJ = DIRECT; + X509_CRL_get_ext_d2i = DIRECT; + X509_PURPOSE_get0_name = DIRECT; + PEM_read_PUBKEY = DIRECT; + i2d_DSA_PUBKEY_bio = DIRECT; + i2d_OTHERNAME = DIRECT; + ASN1_OCTET_STRING_free = DIRECT; + ASN1_BIT_STRING_set_asc = DIRECT; + X509_get_ex_new_index = DIRECT; + ASN1_STRING_TABLE_cleanup = DIRECT; + X509_TRUST_get_by_id = DIRECT; + X509_PURPOSE_get_trust = DIRECT; + ASN1_STRING_length = DIRECT; + ASN1_PRINTABLESTRING_new = DIRECT; + X509V3_get_d2i = DIRECT; + ASN1_ENUMERATED_free = DIRECT; + i2d_X509_CERT_AUX = DIRECT; + X509_STORE_CTX_set_trust = DIRECT; + ASN1_STRING_set_default_mask = DIRECT; + X509_STORE_CTX_new = DIRECT; + EVP_PKEY_get1_RSA = DIRECT; + DIRECTORYSTRING_free = DIRECT; + PEM_write_X509_AUX = DIRECT; + ASN1_OCTET_STRING_set = DIRECT; + d2i_DSA_PUBKEY_fp = DIRECT; + d2i_RSA_PUBKEY = DIRECT; + X509_TRUST_get0_name = DIRECT; + X509_TRUST_get0 = DIRECT; + AUTHORITY_INFO_ACCESS_free = DIRECT; + ASN1_IA5STRING_new = DIRECT; + d2i_DSA_PUBKEY = DIRECT; + X509_check_purpose = DIRECT; + ASN1_ENUMERATED_new = DIRECT; + d2i_RSA_PUBKEY_bio = DIRECT; + d2i_PUBKEY = DIRECT; + X509_TRUST_get_trust = DIRECT; + X509_TRUST_get_flags = DIRECT; + ASN1_BMPSTRING_free = DIRECT; + ASN1_T61STRING_new = DIRECT; + ASN1_UTCTIME_new = DIRECT; + i2d_AUTHORITY_INFO_ACCESS = DIRECT; + EVP_PKEY_set1_RSA = DIRECT; + X509_STORE_CTX_set_purpose = DIRECT; + ASN1_IA5STRING_free = DIRECT; + PEM_write_bio_X509_AUX = DIRECT; + X509_PURPOSE_get_count = DIRECT; + X509_NAME_ENTRY_create_by_txt = DIRECT; + ASN1_STRING_get_default_mask = DIRECT; + X509_alias_get0 = DIRECT; + ASN1_STRING_data = DIRECT; + i2d_ACCESS_DESCRIPTION = DIRECT; + ASN1_BIT_STRING_free = DIRECT; + PEM_read_bio_RSA_PUBKEY = DIRECT; + X509_add1_reject_object = DIRECT; + X509_check_trust = DIRECT; + PEM_read_bio_DSA_PUBKEY = DIRECT; + X509_PURPOSE_add = DIRECT; + ASN1_STRING_TABLE_get = DIRECT; + ASN1_UTF8STRING_free = DIRECT; + d2i_DSA_PUBKEY_bio = DIRECT; + PEM_write_RSA_PUBKEY = DIRECT; + d2i_OTHERNAME = DIRECT; + PEM_write_DSA_PUBKEY = DIRECT; + X509_PURPOSE_get0_sname = DIRECT; + EVP_PKEY_set1_DH = DIRECT; + ASN1_OCTET_STRING_dup = DIRECT; + ASN1_BIT_STRING_set = DIRECT; + X509_TRUST_get_count = DIRECT; + ASN1_INTEGER_free = DIRECT; + OTHERNAME_free = DIRECT; + i2d_RSA_PUBKEY_fp = DIRECT; + ASN1_INTEGER_dup = DIRECT; + d2i_X509_CERT_AUX = DIRECT; + PEM_write_bio_PUBKEY = DIRECT; + ASN1_VISIBLESTRING_free = DIRECT; + X509_PURPOSE_cleanup = DIRECT; + ASN1_mbstring_ncopy = DIRECT; + ASN1_GENERALIZEDTIME_new = DIRECT; + EVP_PKEY_get1_DH = DIRECT; + ASN1_OCTET_STRING_new = DIRECT; + ASN1_INTEGER_new = DIRECT; + i2d_X509_AUX = DIRECT; + ASN1_BIT_STRING_name_print = DIRECT; + X509_cmp = DIRECT; + ASN1_STRING_length_set = DIRECT; + DIRECTORYSTRING_new = DIRECT; + X509_add1_trust_object = DIRECT; + PKCS12_newpass = DIRECT; + SMIME_write_PKCS7 = DIRECT; + SMIME_read_PKCS7 = DIRECT; + DES_set_key_checked = DIRECT; + PKCS7_verify = DIRECT; + PKCS7_encrypt = DIRECT; + DES_set_key_unchecked = DIRECT; + SMIME_crlf_copy = DIRECT; + i2d_ASN1_PRINTABLESTRING = DIRECT; + PKCS7_get0_signers = DIRECT; + PKCS7_decrypt = DIRECT; + SMIME_text = DIRECT; + PKCS7_simple_smimecap = DIRECT; + PKCS7_get_smimecap = DIRECT; + PKCS7_sign = DIRECT; + PKCS7_add_attrib_smimecap = DIRECT; + CRYPTO_dbg_set_options = DIRECT; + CRYPTO_remove_all_info = DIRECT; + CRYPTO_get_mem_debug_functions = DIRECT; + CRYPTO_is_mem_check_on = DIRECT; + CRYPTO_set_mem_debug_functions = DIRECT; + CRYPTO_pop_info = DIRECT; + CRYPTO_push_info_ = DIRECT; + CRYPTO_set_mem_debug_options = DIRECT; + PEM_write_PKCS8PrivateKey_nid = DIRECT; + PEM_write_bio_PKCS8PrivateKey_nid = DIRECT; + d2i_PKCS8PrivateKey_bio = DIRECT; + ASN1_NULL_free = DIRECT; + d2i_ASN1_NULL = DIRECT; + ASN1_NULL_new = DIRECT; + i2d_PKCS8PrivateKey_bio = DIRECT; + i2d_PKCS8PrivateKey_fp = DIRECT; + i2d_ASN1_NULL = DIRECT; + i2d_PKCS8PrivateKey_nid_fp = DIRECT; + d2i_PKCS8PrivateKey_fp = DIRECT; + i2d_PKCS8PrivateKey_nid_bio = DIRECT; + i2d_PKCS8PrivateKeyInfo_fp = DIRECT; + i2d_PKCS8PrivateKeyInfo_bio = DIRECT; + i2d_PrivateKey_fp = DIRECT; + d2i_PrivateKey_bio = DIRECT; + d2i_PrivateKey_fp = DIRECT; + i2d_PrivateKey_bio = DIRECT; + X509_reject_clear = DIRECT; + X509_TRUST_set_default = DIRECT; + d2i_AutoPrivateKey = DIRECT; + X509_ATTRIBUTE_get0_type = DIRECT; + X509_ATTRIBUTE_set1_data = DIRECT; + X509at_get_attr = DIRECT; + X509at_get_attr_count = DIRECT; + X509_ATTRIBUTE_create_by_NID = DIRECT; + X509_ATTRIBUTE_set1_object = DIRECT; + X509_ATTRIBUTE_count = DIRECT; + X509_ATTRIBUTE_create_by_OBJ = DIRECT; + X509_ATTRIBUTE_get0_object = DIRECT; + X509at_get_attr_by_NID = DIRECT; + X509at_add1_attr = DIRECT; + X509_ATTRIBUTE_get0_data = DIRECT; + X509at_delete_attr = DIRECT; + X509at_get_attr_by_OBJ = DIRECT; + RAND_add = DIRECT; + BIO_number_written = DIRECT; + BIO_number_read = DIRECT; + X509_STORE_CTX_get1_chain = DIRECT; + ERR_load_RAND_strings = DIRECT; + RAND_pseudo_bytes = DIRECT; + X509_REQ_get_attr_by_NID = DIRECT; + X509_REQ_get_attr = DIRECT; + X509_REQ_add1_attr_by_NID = DIRECT; + X509_REQ_get_attr_by_OBJ = DIRECT; + X509at_add1_attr_by_NID = DIRECT; + X509_REQ_add1_attr_by_OBJ = DIRECT; + X509_REQ_get_attr_count = DIRECT; + X509_REQ_add1_attr = DIRECT; + X509_REQ_delete_attr = DIRECT; + X509at_add1_attr_by_OBJ = DIRECT; + X509_REQ_add1_attr_by_txt = DIRECT; + X509_ATTRIBUTE_create_by_txt = DIRECT; + X509at_add1_attr_by_txt = DIRECT; + BN_pseudo_rand = DIRECT; + BN_is_prime_fasttest = DIRECT; + BN_CTX_end = DIRECT; + BN_CTX_start = DIRECT; + BN_CTX_get = DIRECT; + EVP_PKEY2PKCS8_broken = DIRECT; + ASN1_STRING_TABLE_add = DIRECT; + CRYPTO_dbg_get_options = DIRECT; + AUTHORITY_INFO_ACCESS_new = DIRECT; + CRYPTO_get_mem_debug_options = DIRECT; + DES_crypt = DIRECT; + PEM_write_bio_X509_REQ_NEW = DIRECT; + PEM_write_X509_REQ_NEW = DIRECT; + BIO_callback_ctrl = DIRECT; + RAND_egd = DIRECT; + RAND_status = DIRECT; + DES_check_key_parity = DIRECT; + lh_num_items = DIRECT; + DSO_new = DIRECT; + DSO_new_method = DIRECT; + DSO_free = DIRECT; + DSO_flags = DIRECT; + DSO_set_default_method = DIRECT; + DSO_get_default_method = DIRECT; + DSO_get_method = DIRECT; + DSO_set_method = DIRECT; + DSO_load = DIRECT; + DSO_bind_var = DIRECT; + DSO_METHOD_null = DIRECT; + DSO_METHOD_openssl = DIRECT; + DSO_METHOD_dlfcn = DIRECT; + DSO_METHOD_win32 = DIRECT; + ERR_load_DSO_strings = DIRECT; + DSO_METHOD_dl = DIRECT; + NCONF_load = DIRECT; + NCONF_load_fp = DIRECT; + NCONF_new = DIRECT; + NCONF_get_string = DIRECT; + NCONF_free = DIRECT; + CONF_dump_fp = DIRECT; + NCONF_load_bio = DIRECT; + NCONF_dump_fp = DIRECT; + NCONF_get_section = DIRECT; + NCONF_dump_bio = DIRECT; + CONF_dump_bio = DIRECT; + NCONF_free_data = DIRECT; + CONF_set_default_method = DIRECT; + ERR_error_string_n = DIRECT; + BIO_snprintf = DIRECT; + DSO_ctrl = DIRECT; + BIO_vfree = DIRECT; + X509_REQ_digest = DIRECT; + X509_CRL_digest = DIRECT; + EVP_CIPHER_CTX_set_key_length = DIRECT; + EVP_CIPHER_CTX_ctrl = DIRECT; + BN_mod_exp_mont_word = DIRECT; + RAND_egd_bytes = DIRECT; + X509_REQ_get1_email = DIRECT; + X509_get1_email = DIRECT; + X509_email_free = DIRECT; + i2d_RSA_NET = DIRECT; + d2i_RSA_NET = DIRECT; + DSO_bind_func = DIRECT; + CRYPTO_get_new_dynlockid = DIRECT; + sk_new_null = DIRECT; + CRYPTO_set_dynlock_destroy_callback = DIRECT; + CRYPTO_destroy_dynlockid = DIRECT; + CRYPTO_set_dynlock_create_callback = DIRECT; + CRYPTO_set_dynlock_lock_callback = DIRECT; + CRYPTO_get_dynlock_lock_callback = DIRECT; + CRYPTO_get_dynlock_destroy_callback = DIRECT; + CRYPTO_get_dynlock_value = DIRECT; + CRYPTO_get_dynlock_create_callback = DIRECT; + c2i_ASN1_BIT_STRING = DIRECT; + i2c_ASN1_BIT_STRING = DIRECT; + RAND_poll = DIRECT; + c2i_ASN1_INTEGER = DIRECT; + i2c_ASN1_INTEGER = DIRECT; + BIO_dump_indent = DIRECT; + ASN1_parse_dump = DIRECT; + c2i_ASN1_OBJECT = DIRECT; + X509_NAME_print_ex_fp = DIRECT; + ASN1_STRING_print_ex_fp = DIRECT; + X509_NAME_print_ex = DIRECT; + ASN1_STRING_print_ex = DIRECT; + MD4 = DIRECT; + MD4_Transform = DIRECT; + MD4_Final = DIRECT; + MD4_Update = DIRECT; + MD4_Init = DIRECT; + EVP_md4 = DIRECT; + i2d_PUBKEY_bio = DIRECT; + i2d_PUBKEY_fp = DIRECT; + d2i_PUBKEY_bio = DIRECT; + ASN1_STRING_to_UTF8 = DIRECT; + BIO_vprintf = DIRECT; + BIO_vsnprintf = DIRECT; + d2i_PUBKEY_fp = DIRECT; + X509_cmp_time = DIRECT; + X509_STORE_CTX_set_time = DIRECT; + X509_STORE_CTX_get1_issuer = DIRECT; + X509_OBJECT_retrieve_match = DIRECT; + X509_OBJECT_idx_by_subject = DIRECT; + X509_STORE_CTX_set_flags = DIRECT; + X509_STORE_CTX_trusted_stack = DIRECT; + X509_time_adj = DIRECT; + X509_check_issued = DIRECT; + ASN1_UTCTIME_cmp_time_t = DIRECT; + X509_keyid_set1 = DIRECT; + BIO_next = DIRECT; + DSO_METHOD_vms = DIRECT; + BN_bntest_rand = DIRECT; + OPENSSL_issetugid = DIRECT; + BN_rand_range = DIRECT; + ERR_load_ENGINE_strings = DIRECT; + ENGINE_set_DSA = DIRECT; + ENGINE_get_finish_function = DIRECT; + ENGINE_get_default_RSA = DIRECT; + ENGINE_set_DH = DIRECT; + ENGINE_init = DIRECT; + ENGINE_finish = DIRECT; + ENGINE_load_public_key = DIRECT; + ENGINE_get_DH = DIRECT; + ENGINE_ctrl = DIRECT; + ENGINE_get_init_function = DIRECT; + ENGINE_set_init_function = DIRECT; + ENGINE_set_default_DSA = DIRECT; + ENGINE_get_name = DIRECT; + ENGINE_get_last = DIRECT; + ENGINE_get_prev = DIRECT; + ENGINE_get_default_DH = DIRECT; + ENGINE_get_RSA = DIRECT; + ENGINE_set_default = DIRECT; + ENGINE_get_RAND = DIRECT; + ENGINE_get_first = DIRECT; + ENGINE_by_id = DIRECT; + ENGINE_set_finish_function = DIRECT; + ENGINE_set_RSA = DIRECT; + ENGINE_load_private_key = DIRECT; + ENGINE_set_default_RAND = DIRECT; + ENGINE_remove = DIRECT; + ENGINE_free = DIRECT; + ENGINE_get_next = DIRECT; + ENGINE_set_name = DIRECT; + ENGINE_get_default_DSA = DIRECT; + ENGINE_set_default_RSA = DIRECT; + ENGINE_get_default_RAND = DIRECT; + ENGINE_set_RAND = DIRECT; + ENGINE_set_id = DIRECT; + ENGINE_set_default_DH = DIRECT; + ENGINE_new = DIRECT; + ENGINE_get_id = DIRECT; + ENGINE_add = DIRECT; + ENGINE_get_DSA = DIRECT; + ENGINE_get_ctrl_function = DIRECT; + ENGINE_set_ctrl_function = DIRECT; + BN_pseudo_rand_range = DIRECT; + X509_STORE_CTX_set_verify_cb = DIRECT; + ERR_load_COMP_strings = DIRECT; + PKCS12_item_decrypt_d2i = DIRECT; + ASN1_UTF8STRING_it = DIRECT; + ASN1_UTF8STRING_it = DIRECT; + ENGINE_unregister_ciphers = DIRECT; + ENGINE_get_ciphers = DIRECT; + d2i_OCSP_BASICRESP = DIRECT; + KRB5_CHECKSUM_it = DIRECT; + KRB5_CHECKSUM_it = DIRECT; + EC_POINT_add = DIRECT; + ASN1_item_ex_i2d = DIRECT; + OCSP_CERTID_it = DIRECT; + OCSP_CERTID_it = DIRECT; + d2i_OCSP_RESPBYTES = DIRECT; + X509V3_add1_i2d = DIRECT; + PKCS7_ENVELOPE_it = DIRECT; + PKCS7_ENVELOPE_it = DIRECT; + UI_add_input_boolean = DIRECT; + ENGINE_unregister_RSA = DIRECT; + X509V3_EXT_nconf = DIRECT; + ASN1_GENERALSTRING_free = DIRECT; + d2i_OCSP_CERTSTATUS = DIRECT; + X509_REVOKED_set_serialNumber = DIRECT; + X509_print_ex = DIRECT; + OCSP_ONEREQ_get1_ext_d2i = DIRECT; + ENGINE_register_all_RAND = DIRECT; + ENGINE_load_dynamic = DIRECT; + PBKDF2PARAM_it = DIRECT; + PBKDF2PARAM_it = DIRECT; + EXTENDED_KEY_USAGE_new = DIRECT; + EC_GROUP_clear_free = DIRECT; + OCSP_sendreq_bio = DIRECT; + ASN1_item_digest = DIRECT; + OCSP_BASICRESP_delete_ext = DIRECT; + OCSP_SIGNATURE_it = DIRECT; + OCSP_SIGNATURE_it = DIRECT; + X509_CRL_it = DIRECT; + X509_CRL_it = DIRECT; + OCSP_BASICRESP_add_ext = DIRECT; + KRB5_ENCKEY_it = DIRECT; + KRB5_ENCKEY_it = DIRECT; + UI_method_set_closer = DIRECT; + X509_STORE_set_purpose = DIRECT; + i2d_ASN1_GENERALSTRING = DIRECT; + OCSP_response_status = DIRECT; + i2d_OCSP_SERVICELOC = DIRECT; + ENGINE_get_digest_engine = DIRECT; + EC_GROUP_set_curve_GFp = DIRECT; + OCSP_REQUEST_get_ext_by_OBJ = DIRECT; + _ossl_old_des_random_key = DIRECT; + ASN1_T61STRING_it = DIRECT; + ASN1_T61STRING_it = DIRECT; + EC_GROUP_method_of = DIRECT; + i2d_KRB5_APREQ = DIRECT; + _ossl_old_des_encrypt = DIRECT; + ASN1_PRINTABLE_new = DIRECT; + HMAC_Init_ex = DIRECT; + d2i_KRB5_AUTHENT = DIRECT; + OCSP_archive_cutoff_new = DIRECT; + EC_POINT_set_Jprojective_coordinates_GFp = DIRECT; + _ossl_old_des_is_weak_key = DIRECT; + OCSP_BASICRESP_get_ext_by_OBJ = DIRECT; + EC_POINT_oct2point = DIRECT; + OCSP_SINGLERESP_get_ext_count = DIRECT; + UI_ctrl = DIRECT; + asn1_do_adb = DIRECT; + ASN1_template_i2d = DIRECT; + ENGINE_register_DH = DIRECT; + UI_construct_prompt = DIRECT; + X509_STORE_set_trust = DIRECT; + UI_dup_input_string = DIRECT; + d2i_KRB5_APREQ = DIRECT; + EVP_MD_CTX_copy_ex = DIRECT; + OCSP_request_is_signed = DIRECT; + i2d_OCSP_REQINFO = DIRECT; + KRB5_ENCKEY_free = DIRECT; + OCSP_resp_get0 = DIRECT; + GENERAL_NAME_it = DIRECT; + GENERAL_NAME_it = DIRECT; + ASN1_GENERALIZEDTIME_it = DIRECT; + ASN1_GENERALIZEDTIME_it = DIRECT; + X509_STORE_set_flags = DIRECT; + EC_POINT_set_compressed_coordinates_GFp = DIRECT; + OCSP_response_status_str = DIRECT; + d2i_OCSP_REVOKEDINFO = DIRECT; + OCSP_basic_add1_cert = DIRECT; + ERR_get_implementation = DIRECT; + EVP_CipherFinal_ex = DIRECT; + OCSP_CERTSTATUS_new = DIRECT; + CRYPTO_cleanup_all_ex_data = DIRECT; + OCSP_resp_find = DIRECT; + BN_nnmod = DIRECT; + X509_CRL_sort = DIRECT; + X509_REVOKED_set_revocationDate = DIRECT; + ENGINE_register_RAND = DIRECT; + OCSP_SERVICELOC_new = DIRECT; + EC_POINT_set_affine_coordinates_GFp = DIRECT; + _ossl_old_des_options = DIRECT; + SXNET_it = DIRECT; + SXNET_it = DIRECT; + UI_dup_input_boolean = DIRECT; + PKCS12_add_CSPName_asc = DIRECT; + EC_POINT_is_at_infinity = DIRECT; + ENGINE_load_cryptodev = DIRECT; + DSO_convert_filename = DIRECT; + POLICYQUALINFO_it = DIRECT; + POLICYQUALINFO_it = DIRECT; + ENGINE_register_ciphers = DIRECT; + BN_mod_lshift_quick = DIRECT; + DSO_set_filename = DIRECT; + ASN1_item_free = DIRECT; + KRB5_TKTBODY_free = DIRECT; + AUTHORITY_KEYID_it = DIRECT; + AUTHORITY_KEYID_it = DIRECT; + KRB5_APREQBODY_new = DIRECT; + X509V3_EXT_REQ_add_nconf = DIRECT; + ENGINE_ctrl_cmd_string = DIRECT; + i2d_OCSP_RESPDATA = DIRECT; + EVP_MD_CTX_init = DIRECT; + EXTENDED_KEY_USAGE_free = DIRECT; + PKCS7_ATTR_SIGN_it = DIRECT; + PKCS7_ATTR_SIGN_it = DIRECT; + UI_add_error_string = DIRECT; + KRB5_CHECKSUM_free = DIRECT; + OCSP_REQUEST_get_ext = DIRECT; + ENGINE_register_all_digests = DIRECT; + PKEY_USAGE_PERIOD_it = DIRECT; + PKEY_USAGE_PERIOD_it = DIRECT; + PKCS12_unpack_authsafes = DIRECT; + ASN1_item_unpack = DIRECT; + NETSCAPE_SPKAC_it = DIRECT; + NETSCAPE_SPKAC_it = DIRECT; + X509_REVOKED_it = DIRECT; + X509_REVOKED_it = DIRECT; + EVP_aes_128_ecb = DIRECT; + KRB5_AUTHENT_free = DIRECT; + OCSP_BASICRESP_get_ext_by_critical = DIRECT; + OCSP_cert_status_str = DIRECT; + d2i_OCSP_REQUEST = DIRECT; + UI_dup_info_string = DIRECT; + PKCS12_it = DIRECT; + PKCS12_it = DIRECT; + OCSP_SINGLERESP_get_ext_by_critical = DIRECT; + OCSP_CERTSTATUS_free = DIRECT; + _ossl_old_des_crypt = DIRECT; + ASN1_item_i2d = DIRECT; + EVP_DecryptFinal_ex = DIRECT; + ENGINE_load_openssl = DIRECT; + ENGINE_get_cmd_defns = DIRECT; + ENGINE_set_load_privkey_function = DIRECT; + EVP_EncryptFinal_ex = DIRECT; + ENGINE_set_default_digests = DIRECT; + X509_get0_pubkey_bitstr = DIRECT; + asn1_ex_i2c = DIRECT; + ENGINE_register_RSA = DIRECT; + ENGINE_unregister_DSA = DIRECT; + _ossl_old_des_key_sched = DIRECT; + X509_EXTENSION_it = DIRECT; + X509_EXTENSION_it = DIRECT; + i2d_KRB5_AUTHENT = DIRECT; + SXNETID_it = DIRECT; + SXNETID_it = DIRECT; + d2i_OCSP_SINGLERESP = DIRECT; + EDIPARTYNAME_new = DIRECT; + PKCS12_certbag2x509 = DIRECT; + _ossl_old_des_ofb64_encrypt = DIRECT; + d2i_EXTENDED_KEY_USAGE = DIRECT; + ERR_print_errors_cb = DIRECT; + ENGINE_set_ciphers = DIRECT; + d2i_KRB5_APREQBODY = DIRECT; + UI_method_get_flusher = DIRECT; + X509_PUBKEY_it = DIRECT; + X509_PUBKEY_it = DIRECT; + _ossl_old_des_enc_read = DIRECT; + PKCS7_ENCRYPT_it = DIRECT; + PKCS7_ENCRYPT_it = DIRECT; + i2d_OCSP_RESPONSE = DIRECT; + EC_GROUP_get_cofactor = DIRECT; + PKCS12_unpack_p7data = DIRECT; + d2i_KRB5_AUTHDATA = DIRECT; + OCSP_copy_nonce = DIRECT; + KRB5_AUTHDATA_new = DIRECT; + OCSP_RESPDATA_new = DIRECT; + EC_GFp_mont_method = DIRECT; + OCSP_REVOKEDINFO_free = DIRECT; + UI_get_ex_data = DIRECT; + KRB5_APREQBODY_free = DIRECT; + EC_GROUP_get0_generator = DIRECT; + UI_get_default_method = DIRECT; + X509V3_set_nconf = DIRECT; + PKCS12_item_i2d_encrypt = DIRECT; + X509_add1_ext_i2d = DIRECT; + PKCS7_SIGNER_INFO_it = DIRECT; + PKCS7_SIGNER_INFO_it = DIRECT; + KRB5_PRINCNAME_new = DIRECT; + PKCS12_SAFEBAG_it = DIRECT; + PKCS12_SAFEBAG_it = DIRECT; + EC_GROUP_get_order = DIRECT; + d2i_OCSP_RESPID = DIRECT; + OCSP_request_verify = DIRECT; + NCONF_get_number_e = DIRECT; + _ossl_old_des_decrypt3 = DIRECT; + X509_signature_print = DIRECT; + OCSP_SINGLERESP_free = DIRECT; + ENGINE_load_builtin_engines = DIRECT; + i2d_OCSP_ONEREQ = DIRECT; + OCSP_REQUEST_add_ext = DIRECT; + OCSP_RESPBYTES_new = DIRECT; + EVP_MD_CTX_create = DIRECT; + OCSP_resp_find_status = DIRECT; + X509_ALGOR_it = DIRECT; + X509_ALGOR_it = DIRECT; + ASN1_TIME_it = DIRECT; + ASN1_TIME_it = DIRECT; + OCSP_request_set1_name = DIRECT; + OCSP_ONEREQ_get_ext_count = DIRECT; + UI_get0_result = DIRECT; + PKCS12_AUTHSAFES_it = DIRECT; + PKCS12_AUTHSAFES_it = DIRECT; + EVP_aes_256_ecb = DIRECT; + PKCS12_pack_authsafes = DIRECT; + ASN1_IA5STRING_it = DIRECT; + ASN1_IA5STRING_it = DIRECT; + UI_get_input_flags = DIRECT; + EC_GROUP_set_generator = DIRECT; + _ossl_old_des_string_to_2keys = DIRECT; + OCSP_CERTID_free = DIRECT; + X509_CERT_AUX_it = DIRECT; + X509_CERT_AUX_it = DIRECT; + CERTIFICATEPOLICIES_it = DIRECT; + CERTIFICATEPOLICIES_it = DIRECT; + _ossl_old_des_ede3_cbc_encrypt = DIRECT; + RAND_set_rand_engine = DIRECT; + DSO_get_loaded_filename = DIRECT; + X509_ATTRIBUTE_it = DIRECT; + X509_ATTRIBUTE_it = DIRECT; + OCSP_ONEREQ_get_ext_by_NID = DIRECT; + PKCS12_decrypt_skey = DIRECT; + KRB5_AUTHENT_it = DIRECT; + KRB5_AUTHENT_it = DIRECT; + UI_dup_error_string = DIRECT; + RSAPublicKey_it = DIRECT; + RSAPublicKey_it = DIRECT; + i2d_OCSP_REQUEST = DIRECT; + PKCS12_x509crl2certbag = DIRECT; + OCSP_SERVICELOC_it = DIRECT; + OCSP_SERVICELOC_it = DIRECT; + ASN1_item_sign = DIRECT; + X509_CRL_set_issuer_name = DIRECT; + OBJ_NAME_do_all_sorted = DIRECT; + i2d_OCSP_BASICRESP = DIRECT; + i2d_OCSP_RESPBYTES = DIRECT; + PKCS12_unpack_p7encdata = DIRECT; + HMAC_CTX_init = DIRECT; + ENGINE_get_digest = DIRECT; + OCSP_RESPONSE_print = DIRECT; + KRB5_TKTBODY_it = DIRECT; + KRB5_TKTBODY_it = DIRECT; + ACCESS_DESCRIPTION_it = DIRECT; + ACCESS_DESCRIPTION_it = DIRECT; + PKCS7_ISSUER_AND_SERIAL_it = DIRECT; + PKCS7_ISSUER_AND_SERIAL_it = DIRECT; + PBE2PARAM_it = DIRECT; + PBE2PARAM_it = DIRECT; + PKCS12_certbag2x509crl = DIRECT; + PKCS7_SIGNED_it = DIRECT; + PKCS7_SIGNED_it = DIRECT; + ENGINE_get_cipher = DIRECT; + i2d_OCSP_CRLID = DIRECT; + OCSP_SINGLERESP_new = DIRECT; + ENGINE_cmd_is_executable = DIRECT; + RSA_up_ref = DIRECT; + ASN1_GENERALSTRING_it = DIRECT; + ASN1_GENERALSTRING_it = DIRECT; + ENGINE_register_DSA = DIRECT; + X509V3_EXT_add_nconf_sk = DIRECT; + ENGINE_set_load_pubkey_function = DIRECT; + PKCS8_decrypt = DIRECT; + PEM_bytes_read_bio = DIRECT; + DIRECTORYSTRING_it = DIRECT; + DIRECTORYSTRING_it = DIRECT; + d2i_OCSP_CRLID = DIRECT; + EC_POINT_is_on_curve = DIRECT; + CRYPTO_set_locked_mem_ex_functions = DIRECT; + d2i_KRB5_CHECKSUM = DIRECT; + ASN1_item_dup = DIRECT; + X509_it = DIRECT; + X509_it = DIRECT; + BN_mod_add = DIRECT; + KRB5_AUTHDATA_free = DIRECT; + _ossl_old_des_cbc_cksum = DIRECT; + ASN1_item_verify = DIRECT; + CRYPTO_set_mem_ex_functions = DIRECT; + EC_POINT_get_Jprojective_coordinates_GFp = DIRECT; + ZLONG_it = DIRECT; + ZLONG_it = DIRECT; + CRYPTO_get_locked_mem_ex_functions = DIRECT; + ASN1_TIME_check = DIRECT; + UI_get0_user_data = DIRECT; + HMAC_CTX_cleanup = DIRECT; + DSA_up_ref = DIRECT; + _ossl_old_des_ede3_cfb64_encrypt = DIRECT; + ASN1_BMPSTRING_it = DIRECT; + ASN1_BMPSTRING_it = DIRECT; + ASN1_tag2bit = DIRECT; + UI_method_set_flusher = DIRECT; + X509_ocspid_print = DIRECT; + KRB5_ENCDATA_it = DIRECT; + KRB5_ENCDATA_it = DIRECT; + ENGINE_get_load_pubkey_function = DIRECT; + UI_add_user_data = DIRECT; + OCSP_REQUEST_delete_ext = DIRECT; + UI_get_method = DIRECT; + OCSP_ONEREQ_free = DIRECT; + ASN1_PRINTABLESTRING_it = DIRECT; + ASN1_PRINTABLESTRING_it = DIRECT; + X509_CRL_set_nextUpdate = DIRECT; + OCSP_REQUEST_it = DIRECT; + OCSP_REQUEST_it = DIRECT; + OCSP_BASICRESP_it = DIRECT; + OCSP_BASICRESP_it = DIRECT; + AES_ecb_encrypt = DIRECT; + BN_mod_sqr = DIRECT; + NETSCAPE_CERT_SEQUENCE_it = DIRECT; + NETSCAPE_CERT_SEQUENCE_it = DIRECT; + GENERAL_NAMES_it = DIRECT; + GENERAL_NAMES_it = DIRECT; + AUTHORITY_INFO_ACCESS_it = DIRECT; + AUTHORITY_INFO_ACCESS_it = DIRECT; + ASN1_FBOOLEAN_it = DIRECT; + ASN1_FBOOLEAN_it = DIRECT; + UI_set_ex_data = DIRECT; + _ossl_old_des_string_to_key = DIRECT; + ENGINE_register_all_RSA = DIRECT; + d2i_KRB5_PRINCNAME = DIRECT; + OCSP_RESPBYTES_it = DIRECT; + OCSP_RESPBYTES_it = DIRECT; + X509_CINF_it = DIRECT; + X509_CINF_it = DIRECT; + ENGINE_unregister_digests = DIRECT; + d2i_EDIPARTYNAME = DIRECT; + d2i_OCSP_SERVICELOC = DIRECT; + ENGINE_get_digests = DIRECT; + _ossl_old_des_set_odd_parity = DIRECT; + OCSP_RESPDATA_free = DIRECT; + d2i_KRB5_TICKET = DIRECT; + OTHERNAME_it = DIRECT; + OTHERNAME_it = DIRECT; + EVP_MD_CTX_cleanup = DIRECT; + d2i_ASN1_GENERALSTRING = DIRECT; + X509_CRL_set_version = DIRECT; + BN_mod_sub = DIRECT; + OCSP_SINGLERESP_get_ext_by_NID = DIRECT; + ENGINE_get_ex_new_index = DIRECT; + OCSP_REQUEST_free = DIRECT; + OCSP_REQUEST_add1_ext_i2d = DIRECT; + X509_VAL_it = DIRECT; + X509_VAL_it = DIRECT; + EC_POINTs_make_affine = DIRECT; + EC_POINT_mul = DIRECT; + X509V3_EXT_add_nconf = DIRECT; + X509_TRUST_set = DIRECT; + X509_CRL_add1_ext_i2d = DIRECT; + _ossl_old_des_fcrypt = DIRECT; + DISPLAYTEXT_it = DIRECT; + DISPLAYTEXT_it = DIRECT; + X509_CRL_set_lastUpdate = DIRECT; + OCSP_BASICRESP_free = DIRECT; + OCSP_BASICRESP_add1_ext_i2d = DIRECT; + d2i_KRB5_AUTHENTBODY = DIRECT; + CRYPTO_set_ex_data_implementation = DIRECT; + KRB5_ENCDATA_new = DIRECT; + DSO_up_ref = DIRECT; + OCSP_crl_reason_str = DIRECT; + UI_get0_result_string = DIRECT; + ASN1_GENERALSTRING_new = DIRECT; + X509_SIG_it = DIRECT; + X509_SIG_it = DIRECT; + ERR_set_implementation = DIRECT; + ERR_load_EC_strings = DIRECT; + UI_get0_action_string = DIRECT; + OCSP_ONEREQ_get_ext = DIRECT; + EC_POINT_method_of = DIRECT; + i2d_KRB5_APREQBODY = DIRECT; + _ossl_old_des_ecb3_encrypt = DIRECT; + CRYPTO_get_mem_ex_functions = DIRECT; + ENGINE_get_ex_data = DIRECT; + UI_destroy_method = DIRECT; + ASN1_item_i2d_bio = DIRECT; + OCSP_ONEREQ_get_ext_by_OBJ = DIRECT; + ASN1_primitive_new = DIRECT; + ASN1_PRINTABLE_it = DIRECT; + ASN1_PRINTABLE_it = DIRECT; + EVP_aes_192_ecb = DIRECT; + OCSP_SIGNATURE_new = DIRECT; + LONG_it = DIRECT; + LONG_it = DIRECT; + ASN1_VISIBLESTRING_it = DIRECT; + ASN1_VISIBLESTRING_it = DIRECT; + OCSP_SINGLERESP_add1_ext_i2d = DIRECT; + d2i_OCSP_CERTID = DIRECT; + ASN1_item_d2i_fp = DIRECT; + CRL_DIST_POINTS_it = DIRECT; + CRL_DIST_POINTS_it = DIRECT; + GENERAL_NAME_print = DIRECT; + OCSP_SINGLERESP_delete_ext = DIRECT; + PKCS12_SAFEBAGS_it = DIRECT; + PKCS12_SAFEBAGS_it = DIRECT; + d2i_OCSP_SIGNATURE = DIRECT; + OCSP_request_add1_nonce = DIRECT; + ENGINE_set_cmd_defns = DIRECT; + OCSP_SERVICELOC_free = DIRECT; + EC_GROUP_free = DIRECT; + ASN1_BIT_STRING_it = DIRECT; + ASN1_BIT_STRING_it = DIRECT; + X509_REQ_it = DIRECT; + X509_REQ_it = DIRECT; + _ossl_old_des_cbc_encrypt = DIRECT; + ERR_unload_strings = DIRECT; + PKCS7_SIGN_ENVELOPE_it = DIRECT; + PKCS7_SIGN_ENVELOPE_it = DIRECT; + EDIPARTYNAME_free = DIRECT; + OCSP_REQINFO_free = DIRECT; + EC_GROUP_new_curve_GFp = DIRECT; + OCSP_REQUEST_get1_ext_d2i = DIRECT; + PKCS12_item_pack_safebag = DIRECT; + asn1_ex_c2i = DIRECT; + ENGINE_register_digests = DIRECT; + i2d_OCSP_REVOKEDINFO = DIRECT; + asn1_enc_restore = DIRECT; + UI_free = DIRECT; + UI_new_method = DIRECT; + EVP_EncryptInit_ex = DIRECT; + X509_pubkey_digest = DIRECT; + EC_POINT_invert = DIRECT; + OCSP_basic_sign = DIRECT; + i2d_OCSP_RESPID = DIRECT; + OCSP_check_nonce = DIRECT; + ENGINE_ctrl_cmd = DIRECT; + d2i_KRB5_ENCKEY = DIRECT; + OCSP_parse_url = DIRECT; + OCSP_SINGLERESP_get_ext = DIRECT; + OCSP_CRLID_free = DIRECT; + OCSP_BASICRESP_get1_ext_d2i = DIRECT; + RSAPrivateKey_it = DIRECT; + RSAPrivateKey_it = DIRECT; + ENGINE_register_all_DH = DIRECT; + i2d_EDIPARTYNAME = DIRECT; + EC_POINT_get_affine_coordinates_GFp = DIRECT; + OCSP_CRLID_new = DIRECT; + ENGINE_get_flags = DIRECT; + OCSP_ONEREQ_it = DIRECT; + OCSP_ONEREQ_it = DIRECT; + UI_process = DIRECT; + ASN1_INTEGER_it = DIRECT; + ASN1_INTEGER_it = DIRECT; + EVP_CipherInit_ex = DIRECT; + UI_get_string_type = DIRECT; + ENGINE_unregister_DH = DIRECT; + ENGINE_register_all_DSA = DIRECT; + OCSP_ONEREQ_get_ext_by_critical = DIRECT; + bn_dup_expand = DIRECT; + OCSP_cert_id_new = DIRECT; + BASIC_CONSTRAINTS_it = DIRECT; + BASIC_CONSTRAINTS_it = DIRECT; + BN_mod_add_quick = DIRECT; + EC_POINT_new = DIRECT; + EVP_MD_CTX_destroy = DIRECT; + OCSP_RESPBYTES_free = DIRECT; + EVP_aes_128_cbc = DIRECT; + OCSP_SINGLERESP_get1_ext_d2i = DIRECT; + EC_POINT_free = DIRECT; + DH_up_ref = DIRECT; + X509_NAME_ENTRY_it = DIRECT; + X509_NAME_ENTRY_it = DIRECT; + UI_get_ex_new_index = DIRECT; + BN_mod_sub_quick = DIRECT; + OCSP_ONEREQ_add_ext = DIRECT; + OCSP_request_sign = DIRECT; + EVP_DigestFinal_ex = DIRECT; + ENGINE_set_digests = DIRECT; + OCSP_id_issuer_cmp = DIRECT; + OBJ_NAME_do_all = DIRECT; + EC_POINTs_mul = DIRECT; + ENGINE_register_complete = DIRECT; + X509V3_EXT_nconf_nid = DIRECT; + ASN1_SEQUENCE_it = DIRECT; + ASN1_SEQUENCE_it = DIRECT; + UI_set_default_method = DIRECT; + RAND_query_egd_bytes = DIRECT; + UI_method_get_writer = DIRECT; + UI_OpenSSL = DIRECT; + PEM_def_callback = DIRECT; + ENGINE_cleanup = DIRECT; + DIST_POINT_it = DIRECT; + DIST_POINT_it = DIRECT; + OCSP_SINGLERESP_it = DIRECT; + OCSP_SINGLERESP_it = DIRECT; + d2i_KRB5_TKTBODY = DIRECT; + EC_POINT_cmp = DIRECT; + OCSP_REVOKEDINFO_new = DIRECT; + i2d_OCSP_CERTSTATUS = DIRECT; + OCSP_basic_add1_nonce = DIRECT; + ASN1_item_ex_d2i = DIRECT; + BN_mod_lshift1_quick = DIRECT; + UI_set_method = DIRECT; + OCSP_id_get0_info = DIRECT; + BN_mod_sqrt = DIRECT; + EC_GROUP_copy = DIRECT; + KRB5_ENCDATA_free = DIRECT; + _ossl_old_des_cfb_encrypt = DIRECT; + OCSP_SINGLERESP_get_ext_by_OBJ = DIRECT; + OCSP_cert_to_id = DIRECT; + OCSP_RESPID_new = DIRECT; + OCSP_RESPDATA_it = DIRECT; + OCSP_RESPDATA_it = DIRECT; + d2i_OCSP_RESPDATA = DIRECT; + ENGINE_register_all_complete = DIRECT; + OCSP_check_validity = DIRECT; + PKCS12_BAGS_it = DIRECT; + PKCS12_BAGS_it = DIRECT; + OCSP_url_svcloc_new = DIRECT; + ASN1_template_free = DIRECT; + OCSP_SINGLERESP_add_ext = DIRECT; + KRB5_AUTHENTBODY_it = DIRECT; + KRB5_AUTHENTBODY_it = DIRECT; + X509_supported_extension = DIRECT; + i2d_KRB5_AUTHDATA = DIRECT; + UI_method_get_opener = DIRECT; + ENGINE_set_ex_data = DIRECT; + OCSP_REQUEST_print = DIRECT; + CBIGNUM_it = DIRECT; + CBIGNUM_it = DIRECT; + KRB5_TICKET_new = DIRECT; + KRB5_APREQ_new = DIRECT; + EC_GROUP_get_curve_GFp = DIRECT; + KRB5_ENCKEY_new = DIRECT; + ASN1_template_d2i = DIRECT; + _ossl_old_des_quad_cksum = DIRECT; + OCSP_single_get0_status = DIRECT; + BN_swap = DIRECT; + POLICYINFO_it = DIRECT; + POLICYINFO_it = DIRECT; + ENGINE_set_destroy_function = DIRECT; + asn1_enc_free = DIRECT; + OCSP_RESPID_it = DIRECT; + OCSP_RESPID_it = DIRECT; + EC_GROUP_new = DIRECT; + EVP_aes_256_cbc = DIRECT; + i2d_KRB5_PRINCNAME = DIRECT; + _ossl_old_des_encrypt2 = DIRECT; + _ossl_old_des_encrypt3 = DIRECT; + PKCS8_PRIV_KEY_INFO_it = DIRECT; + PKCS8_PRIV_KEY_INFO_it = DIRECT; + OCSP_REQINFO_it = DIRECT; + OCSP_REQINFO_it = DIRECT; + PBEPARAM_it = DIRECT; + PBEPARAM_it = DIRECT; + KRB5_AUTHENTBODY_new = DIRECT; + X509_CRL_add0_revoked = DIRECT; + EDIPARTYNAME_it = DIRECT; + EDIPARTYNAME_it = DIRECT; + NETSCAPE_SPKI_it = DIRECT; + NETSCAPE_SPKI_it = DIRECT; + UI_get0_test_string = DIRECT; + ENGINE_get_cipher_engine = DIRECT; + ENGINE_register_all_ciphers = DIRECT; + EC_POINT_copy = DIRECT; + BN_kronecker = DIRECT; + _ossl_old_des_ede3_ofb64_encrypt = DIRECT; + UI_method_get_reader = DIRECT; + OCSP_BASICRESP_get_ext_count = DIRECT; + ASN1_ENUMERATED_it = DIRECT; + ASN1_ENUMERATED_it = DIRECT; + UI_set_result = DIRECT; + i2d_KRB5_TICKET = DIRECT; + X509_print_ex_fp = DIRECT; + EVP_CIPHER_CTX_set_padding = DIRECT; + d2i_OCSP_RESPONSE = DIRECT; + ASN1_UTCTIME_it = DIRECT; + ASN1_UTCTIME_it = DIRECT; + _ossl_old_des_enc_write = DIRECT; + OCSP_RESPONSE_new = DIRECT; + AES_set_encrypt_key = DIRECT; + OCSP_resp_count = DIRECT; + KRB5_CHECKSUM_new = DIRECT; + OCSP_onereq_get0_id = DIRECT; + ENGINE_set_default_ciphers = DIRECT; + NOTICEREF_it = DIRECT; + NOTICEREF_it = DIRECT; + X509V3_EXT_CRL_add_nconf = DIRECT; + OCSP_REVOKEDINFO_it = DIRECT; + OCSP_REVOKEDINFO_it = DIRECT; + AES_encrypt = DIRECT; + OCSP_REQUEST_new = DIRECT; + ASN1_ANY_it = DIRECT; + ASN1_ANY_it = DIRECT; + CRYPTO_ex_data_new_class = DIRECT; + _ossl_old_des_ncbc_encrypt = DIRECT; + i2d_KRB5_TKTBODY = DIRECT; + EC_POINT_clear_free = DIRECT; + AES_decrypt = DIRECT; + asn1_enc_init = DIRECT; + UI_get_result_maxsize = DIRECT; + OCSP_CERTID_new = DIRECT; + ENGINE_unregister_RAND = DIRECT; + UI_method_get_closer = DIRECT; + d2i_KRB5_ENCDATA = DIRECT; + OCSP_request_onereq_count = DIRECT; + OCSP_basic_verify = DIRECT; + KRB5_AUTHENTBODY_free = DIRECT; + ASN1_item_d2i = DIRECT; + ASN1_primitive_free = DIRECT; + i2d_EXTENDED_KEY_USAGE = DIRECT; + i2d_OCSP_SIGNATURE = DIRECT; + asn1_enc_save = DIRECT; + _ossl_old_des_pcbc_encrypt = DIRECT; + PKCS12_MAC_DATA_it = DIRECT; + PKCS12_MAC_DATA_it = DIRECT; + OCSP_accept_responses_new = DIRECT; + asn1_do_lock = DIRECT; + PKCS7_ATTR_VERIFY_it = DIRECT; + PKCS7_ATTR_VERIFY_it = DIRECT; + KRB5_APREQBODY_it = DIRECT; + KRB5_APREQBODY_it = DIRECT; + i2d_OCSP_SINGLERESP = DIRECT; + ASN1_item_ex_new = DIRECT; + UI_add_verify_string = DIRECT; + _ossl_old_des_set_key = DIRECT; + KRB5_PRINCNAME_it = DIRECT; + KRB5_PRINCNAME_it = DIRECT; + EVP_DecryptInit_ex = DIRECT; + i2d_OCSP_CERTID = DIRECT; + ASN1_item_d2i_bio = DIRECT; + EC_POINT_dbl = DIRECT; + asn1_get_choice_selector = DIRECT; + i2d_KRB5_CHECKSUM = DIRECT; + ENGINE_set_table_flags = DIRECT; + AES_options = DIRECT; + OCSP_id_cmp = DIRECT; + OCSP_BASICRESP_new = DIRECT; + OCSP_REQUEST_get_ext_by_NID = DIRECT; + KRB5_APREQ_it = DIRECT; + KRB5_APREQ_it = DIRECT; + ENGINE_get_destroy_function = DIRECT; + CONF_set_nconf = DIRECT; + ASN1_PRINTABLE_free = DIRECT; + OCSP_BASICRESP_get_ext_by_NID = DIRECT; + DIST_POINT_NAME_it = DIRECT; + DIST_POINT_NAME_it = DIRECT; + X509V3_extensions_print = DIRECT; + _ossl_old_des_cfb64_encrypt = DIRECT; + X509_REVOKED_add1_ext_i2d = DIRECT; + _ossl_old_des_ofb_encrypt = DIRECT; + KRB5_TKTBODY_new = DIRECT; + ASN1_OCTET_STRING_it = DIRECT; + ASN1_OCTET_STRING_it = DIRECT; + ERR_load_UI_strings = DIRECT; + i2d_KRB5_ENCKEY = DIRECT; + ASN1_template_new = DIRECT; + OCSP_SIGNATURE_free = DIRECT; + ASN1_item_i2d_fp = DIRECT; + KRB5_PRINCNAME_free = DIRECT; + PKCS7_RECIP_INFO_it = DIRECT; + PKCS7_RECIP_INFO_it = DIRECT; + EXTENDED_KEY_USAGE_it = DIRECT; + EXTENDED_KEY_USAGE_it = DIRECT; + EC_GFp_simple_method = DIRECT; + EC_GROUP_precompute_mult = DIRECT; + OCSP_request_onereq_get0 = DIRECT; + UI_method_set_writer = DIRECT; + KRB5_AUTHENT_new = DIRECT; + X509_CRL_INFO_it = DIRECT; + X509_CRL_INFO_it = DIRECT; + DSO_set_name_converter = DIRECT; + AES_set_decrypt_key = DIRECT; + PKCS7_DIGEST_it = DIRECT; + PKCS7_DIGEST_it = DIRECT; + PKCS12_x5092certbag = DIRECT; + EVP_DigestInit_ex = DIRECT; + i2a_ACCESS_DESCRIPTION = DIRECT; + OCSP_RESPONSE_it = DIRECT; + OCSP_RESPONSE_it = DIRECT; + PKCS7_ENC_CONTENT_it = DIRECT; + PKCS7_ENC_CONTENT_it = DIRECT; + OCSP_request_add0_id = DIRECT; + EC_POINT_make_affine = DIRECT; + DSO_get_filename = DIRECT; + OCSP_CERTSTATUS_it = DIRECT; + OCSP_CERTSTATUS_it = DIRECT; + OCSP_request_add1_cert = DIRECT; + UI_get0_output_string = DIRECT; + UI_dup_verify_string = DIRECT; + BN_mod_lshift = DIRECT; + KRB5_AUTHDATA_it = DIRECT; + KRB5_AUTHDATA_it = DIRECT; + asn1_set_choice_selector = DIRECT; + OCSP_basic_add1_status = DIRECT; + OCSP_RESPID_free = DIRECT; + asn1_get_field_ptr = DIRECT; + UI_add_input_string = DIRECT; + OCSP_CRLID_it = DIRECT; + OCSP_CRLID_it = DIRECT; + i2d_KRB5_AUTHENTBODY = DIRECT; + OCSP_REQUEST_get_ext_count = DIRECT; + X509_NAME_it = DIRECT; + X509_NAME_it = DIRECT; + USERNOTICE_it = DIRECT; + USERNOTICE_it = DIRECT; + OCSP_REQINFO_new = DIRECT; + OCSP_BASICRESP_get_ext = DIRECT; + CRYPTO_get_ex_data_implementation = DIRECT; + ASN1_item_pack = DIRECT; + i2d_KRB5_ENCDATA = DIRECT; + X509_PURPOSE_set = DIRECT; + X509_REQ_INFO_it = DIRECT; + X509_REQ_INFO_it = DIRECT; + UI_method_set_opener = DIRECT; + ASN1_item_ex_free = DIRECT; + ASN1_BOOLEAN_it = DIRECT; + ASN1_BOOLEAN_it = DIRECT; + ENGINE_get_table_flags = DIRECT; + UI_create_method = DIRECT; + OCSP_ONEREQ_add1_ext_i2d = DIRECT; + d2i_OCSP_REQINFO = DIRECT; + UI_add_info_string = DIRECT; + UI_get_result_minsize = DIRECT; + ASN1_NULL_it = DIRECT; + ASN1_NULL_it = DIRECT; + BN_mod_lshift1 = DIRECT; + d2i_OCSP_ONEREQ = DIRECT; + OCSP_ONEREQ_new = DIRECT; + KRB5_TICKET_it = DIRECT; + KRB5_TICKET_it = DIRECT; + EVP_aes_192_cbc = DIRECT; + KRB5_TICKET_free = DIRECT; + UI_new = DIRECT; + OCSP_response_create = DIRECT; + _ossl_old_des_xcbc_encrypt = DIRECT; + PKCS7_it = DIRECT; + PKCS7_it = DIRECT; + OCSP_REQUEST_get_ext_by_critical = DIRECT; + ENGINE_set_flags = DIRECT; + _ossl_old_des_ecb_encrypt = DIRECT; + OCSP_response_get1_basic = DIRECT; + EVP_Digest = DIRECT; + OCSP_ONEREQ_delete_ext = DIRECT; + ASN1_TBOOLEAN_it = DIRECT; + ASN1_TBOOLEAN_it = DIRECT; + ASN1_item_new = DIRECT; + ASN1_TIME_to_generalizedtime = DIRECT; + BIGNUM_it = DIRECT; + BIGNUM_it = DIRECT; + AES_cbc_encrypt = DIRECT; + ENGINE_get_load_privkey_function = DIRECT; + OCSP_RESPONSE_free = DIRECT; + UI_method_set_reader = DIRECT; + i2d_ASN1_T61STRING = DIRECT; + EC_POINT_set_to_infinity = DIRECT; + ERR_load_OCSP_strings = DIRECT; + EC_POINT_point2oct = DIRECT; + KRB5_APREQ_free = DIRECT; + ASN1_OBJECT_it = DIRECT; + ASN1_OBJECT_it = DIRECT; + OCSP_crlID_new = DIRECT; + CONF_modules_load_file = DIRECT; + CONF_imodule_set_usr_data = DIRECT; + ENGINE_set_default_string = DIRECT; + CONF_module_get_usr_data = DIRECT; + ASN1_add_oid_module = DIRECT; + CONF_modules_finish = DIRECT; + OPENSSL_config = DIRECT; + CONF_modules_unload = DIRECT; + CONF_imodule_get_value = DIRECT; + CONF_module_set_usr_data = DIRECT; + CONF_parse_list = DIRECT; + CONF_module_add = DIRECT; + CONF_get1_default_config_file = DIRECT; + CONF_imodule_get_flags = DIRECT; + CONF_imodule_get_module = DIRECT; + CONF_modules_load = DIRECT; + CONF_imodule_get_name = DIRECT; + CONF_imodule_get_usr_data = DIRECT; + CONF_imodule_set_flags = DIRECT; + ENGINE_add_conf_module = DIRECT; + ERR_peek_last_error_line = DIRECT; + ERR_peek_last_error_line_data = DIRECT; + ERR_peek_last_error = DIRECT; + DES_read_2passwords = DIRECT; + DES_read_password = DIRECT; + UI_UTIL_read_pw = DIRECT; + UI_UTIL_read_pw_string = DIRECT; + OPENSSL_add_all_algorithms_noconf = DIRECT; + OPENSSL_add_all_algorithms_conf = DIRECT; + OPENSSL_load_builtin_modules = DIRECT; + AES_ofb128_encrypt = DIRECT; + AES_ctr128_encrypt = DIRECT; + AES_cfb128_encrypt = DIRECT; + _ossl_096_des_random_seed = DIRECT; + EVP_aes_256_ofb = DIRECT; + EVP_aes_192_ofb = DIRECT; + EVP_aes_128_cfb128 = DIRECT; + EVP_aes_256_cfb128 = DIRECT; + EVP_aes_128_ofb = DIRECT; + EVP_aes_192_cfb128 = DIRECT; + CONF_modules_free = DIRECT; + NCONF_default = DIRECT; + OPENSSL_no_config = DIRECT; + NCONF_WIN32 = DIRECT; + ASN1_UNIVERSALSTRING_new = DIRECT; + EVP_des_ede_ecb = DIRECT; + i2d_ASN1_UNIVERSALSTRING = DIRECT; + ASN1_UNIVERSALSTRING_free = DIRECT; + ASN1_UNIVERSALSTRING_it = DIRECT; + ASN1_UNIVERSALSTRING_it = DIRECT; + d2i_ASN1_UNIVERSALSTRING = DIRECT; + EVP_des_ede3_ecb = DIRECT; + X509_REQ_print_ex = DIRECT; + ENGINE_up_ref = DIRECT; + BUF_MEM_grow_clean = DIRECT; + CRYPTO_realloc_clean = DIRECT; + BUF_strlcat = DIRECT; + BIO_indent = DIRECT; + BUF_strlcpy = DIRECT; + OpenSSLDie = DIRECT; + OPENSSL_cleanse = DIRECT; + ERR_release_err_state_table = DIRECT; + EVP_aes_128_cfb8 = DIRECT; + EVP_aes_128_cfb1 = DIRECT; + EVP_aes_192_cfb8 = DIRECT; + EVP_aes_256_cfb8 = DIRECT; + DES_ede3_cfb_encrypt = DIRECT; + EVP_des_ede3_cfb8 = DIRECT; + AES_cfb8_encrypt = DIRECT; + EVP_aes_192_cfb1 = DIRECT; + EVP_des_cfb8 = DIRECT; + EVP_aes_256_cfb1 = DIRECT; + EVP_des_cfb1 = DIRECT; + AES_cfb1_encrypt = DIRECT; + EVP_des_ede3_cfb1 = DIRECT; + sk_is_sorted = DIRECT; + X509_check_ca = DIRECT; + HMAC_CTX_set_flags = DIRECT; + d2i_PROXY_CERT_INFO_EXTENSION = DIRECT; + PROXY_POLICY_it = DIRECT; + PROXY_POLICY_it = DIRECT; + i2d_PROXY_POLICY = DIRECT; + i2d_PROXY_CERT_INFO_EXTENSION = DIRECT; + d2i_PROXY_POLICY = DIRECT; + PROXY_CERT_INFO_EXTENSION_new = DIRECT; + PROXY_CERT_INFO_EXTENSION_free = DIRECT; + PROXY_CERT_INFO_EXTENSION_it = DIRECT; + PROXY_CERT_INFO_EXTENSION_it = DIRECT; + PROXY_POLICY_free = DIRECT; + PROXY_POLICY_new = DIRECT; + BN_MONT_CTX_set_locked = DIRECT; + EVP_sha384 = DIRECT; + EVP_sha512 = DIRECT; + EVP_sha224 = DIRECT; + EVP_sha256 = DIRECT; + BN_mod_exp_mont_consttime = DIRECT; + RSA_X931_hash_id = DIRECT; + RSA_padding_check_X931 = DIRECT; + RSA_verify_PKCS1_PSS = DIRECT; + RSA_padding_add_X931 = DIRECT; + RSA_padding_add_PKCS1_PSS = DIRECT; + PKCS1_MGF1 = DIRECT; + BN_X931_generate_Xpq = DIRECT; + BIO_new_dgram = DIRECT; + BN_get0_nist_prime_384 = DIRECT; + ERR_set_mark = DIRECT; + X509_STORE_CTX_set0_crls = DIRECT; + ENGINE_set_STORE = DIRECT; + ENGINE_register_ECDSA = DIRECT; + BN_BLINDING_invert_ex = DIRECT; + NAME_CONSTRAINTS_free = DIRECT; + BN_BLINDING_get_thread_id = DIRECT; + X509_STORE_CTX_set0_param = DIRECT; + POLICY_MAPPING_it = DIRECT; + POLICY_MAPPING_it = DIRECT; + POLICY_CONSTRAINTS_free = DIRECT; + EVP_PKEY_add1_attr_by_NID = DIRECT; + BN_nist_mod_192 = DIRECT; + EC_GROUP_get_trinomial_basis = DIRECT; + GENERAL_SUBTREE_free = DIRECT; + NAME_CONSTRAINTS_it = DIRECT; + NAME_CONSTRAINTS_it = DIRECT; + ECDH_get_default_method = DIRECT; + PKCS12_add_safe = DIRECT; + EC_KEY_new_by_curve_name = DIRECT; + ENGINE_register_ECDH = DIRECT; + SHA512_Update = DIRECT; + i2d_ECPrivateKey = DIRECT; + BN_get0_nist_prime_192 = DIRECT; + EC_POINT_set_affine_coordinates_GF2m = DIRECT; + BN_GF2m_mod_exp_arr = DIRECT; + X509_keyid_get0 = DIRECT; + pitem_new = DIRECT; + BN_GF2m_mod_mul_arr = DIRECT; + o2i_ECPublicKey = DIRECT; + EC_KEY_copy = DIRECT; + BIO_dump_fp = DIRECT; + X509_policy_node_get0_parent = DIRECT; + EC_GROUP_check_discriminant = DIRECT; + i2o_ECPublicKey = DIRECT; + EC_KEY_precompute_mult = DIRECT; + a2i_IPADDRESS = DIRECT; + X509_STORE_CTX_set_depth = DIRECT; + X509_VERIFY_PARAM_inherit = DIRECT; + EC_POINT_point2bn = DIRECT; + X509_policy_tree_get0_policies = DIRECT; + EC_GROUP_new_curve_GF2m = DIRECT; + ENGINE_unregister_STORE = DIRECT; + EVP_PKEY_get1_EC_KEY = DIRECT; + ENGINE_get_default_ECDH = DIRECT; + EC_KEY_get_conv_form = DIRECT; + ASN1_OCTET_STRING_NDEF_it = DIRECT; + ASN1_OCTET_STRING_NDEF_it = DIRECT; + ENGINE_get_static_state = DIRECT; + pqueue_iterator = DIRECT; + ECDSA_SIG_new = DIRECT; + OPENSSL_DIR_end = DIRECT; + BN_GF2m_mod_sqr = DIRECT; + EC_POINT_bn2point = DIRECT; + X509_VERIFY_PARAM_set_depth = DIRECT; + EC_KEY_set_asn1_flag = DIRECT; + EC_KEY_get_key_method_data = DIRECT; + ECDSA_sign_ex = DIRECT; + EC_GROUP_get_point_conversion_form = DIRECT; + PEM_read_bio_ECPKParameters = DIRECT; + EC_GROUP_get_pentanomial_basis = DIRECT; + EVP_PKEY_add1_attr_by_txt = DIRECT; + BN_BLINDING_set_flags = DIRECT; + X509_VERIFY_PARAM_set1_policies = DIRECT; + X509_VERIFY_PARAM_set1_name = DIRECT; + X509_VERIFY_PARAM_set_purpose = DIRECT; + ECDSA_sign_setup = DIRECT; + BN_GF2m_mod_solve_quad_arr = DIRECT; + EC_KEY_up_ref = DIRECT; + POLICY_MAPPING_free = DIRECT; + BN_GF2m_mod_div = DIRECT; + X509_VERIFY_PARAM_set_flags = DIRECT; + EC_KEY_free = DIRECT; + PEM_write_bio_ECPrivateKey = DIRECT; + d2i_EC_PUBKEY = DIRECT; + pqueue_print = DIRECT; + EC_GROUP_have_precompute_mult = DIRECT; + EC_KEY_print_fp = DIRECT; + BN_GF2m_mod_arr = DIRECT; + PEM_write_bio_X509_CERT_PAIR = DIRECT; + EVP_PKEY_cmp = DIRECT; + X509_policy_level_node_count = DIRECT; + X509_VERIFY_PARAM_new = DIRECT; + ECDH_get_ex_data = DIRECT; + EVP_PKEY_get_attr = DIRECT; + ECDSA_do_sign = DIRECT; + ENGINE_unregister_ECDH = DIRECT; + ECDH_OpenSSL = DIRECT; + EC_KEY_set_conv_form = DIRECT; + EC_POINT_dup = DIRECT; + GENERAL_SUBTREE_new = DIRECT; + EC_get_builtin_curves = DIRECT; + X509_policy_node_get0_qualifiers = DIRECT; + EVP_PKEY_set1_EC_KEY = DIRECT; + BN_GF2m_mod_sqrt_arr = DIRECT; + i2d_ECPrivateKey_bio = DIRECT; + ECPKParameters_print_fp = DIRECT; + pqueue_find = DIRECT; + ECDSA_SIG_free = DIRECT; + PEM_write_bio_ECPKParameters = DIRECT; + EC_KEY_set_private_key = DIRECT; + pqueue_peek = DIRECT; + X509_policy_node_get0_policy = DIRECT; + PKCS12_add_safes = DIRECT; + BN_BLINDING_convert_ex = DIRECT; + X509_policy_tree_free = DIRECT; + OPENSSL_ia32cap_loc = DIRECT; + BN_GF2m_poly2arr = DIRECT; + BN_get0_nist_prime_224 = DIRECT; + i2d_ECParameters = DIRECT; + i2d_ECPKParameters = DIRECT; + BN_GENCB_call = DIRECT; + d2i_ECPKParameters = DIRECT; + ENGINE_set_ECDH = DIRECT; + NAME_CONSTRAINTS_new = DIRECT; + SHA256_Init = DIRECT; + EC_KEY_get0_public_key = DIRECT; + PEM_write_bio_EC_PUBKEY = DIRECT; + ECParameters_print = DIRECT; + ASN1_generate_nconf = DIRECT; + BUF_memdup = DIRECT; + BN_GF2m_mod_mul = DIRECT; + EC_GROUP_set_seed = DIRECT; + X509_VERIFY_PARAM_set_trust = DIRECT; + EVP_PKEY_get_attr_count = DIRECT; + EC_GROUP_get_curve_GF2m = DIRECT; + BN_is_prime_ex = DIRECT; + X509_STORE_CTX_get0_param = DIRECT; + PEM_read_X509_CERT_PAIR = DIRECT; + X509_STORE_set_depth = DIRECT; + ECDSA_get_ex_data = DIRECT; + SHA224 = DIRECT; + BIO_dump_indent_fp = DIRECT; + EC_KEY_set_group = DIRECT; + BUF_strndup = DIRECT; + BN_GF2m_mod = DIRECT; + X509_REQ_check_private_key = DIRECT; + EC_GROUP_get_seed_len = DIRECT; + PEM_read_bio_EC_PUBKEY = DIRECT; + i2d_EC_PUBKEY = DIRECT; + ECDSA_get_default_method = DIRECT; + ASN1_put_eoc = DIRECT; + X509_STORE_CTX_get_explicit_policy = DIRECT; + X509_VERIFY_PARAM_table_cleanup = DIRECT; + X509_VERIFY_PARAM_free = DIRECT; + EC_METHOD_get_field_type = DIRECT; + EC_GFp_nist_method = DIRECT; + EC_GROUP_set_curve_name = DIRECT; + X509_CERT_PAIR_it = DIRECT; + X509_CERT_PAIR_it = DIRECT; + BN_GF2m_mod_sqr_arr = DIRECT; + RSA_setup_blinding = DIRECT; + BIO_s_datagram = DIRECT; + sk_find_ex = DIRECT; + EC_GROUP_set_curve_GF2m = DIRECT; + ENGINE_set_default_ECDSA = DIRECT; + POLICY_CONSTRAINTS_new = DIRECT; + BN_GF2m_mod_sqrt = DIRECT; + ECDH_set_default_method = DIRECT; + EC_KEY_generate_key = DIRECT; + SHA384_Update = DIRECT; + BN_GF2m_arr2poly = DIRECT; + EC_GROUP_check = DIRECT; + d2i_ECPrivateKey_bio = DIRECT; + EC_KEY_insert_key_method_data = DIRECT; + X509_VERIFY_PARAM_get_depth = DIRECT; + SHA224_Final = DIRECT; + SHA224_Update = DIRECT; + d2i_ECPrivateKey = DIRECT; + ASN1_item_ndef_i2d = DIRECT; + ERR_pop_to_mark = DIRECT; + ENGINE_register_all_STORE = DIRECT; + X509_policy_level_get0_node = DIRECT; + i2d_PKCS7_NDEF = DIRECT; + EC_GROUP_get_degree = DIRECT; + ASN1_generate_v3 = DIRECT; + X509_policy_tree_level_count = DIRECT; + BN_GF2m_add = DIRECT; + EC_KEY_get0_group = DIRECT; + X509_CERT_PAIR_free = DIRECT; + BN_nist_mod_224 = DIRECT; + SHA512_Final = DIRECT; + i2d_EC_PUBKEY_bio = DIRECT; + BIO_dgram_non_fatal_error = DIRECT; + EC_GROUP_get_asn1_flag = DIRECT; + ECDH_get_ex_new_index = DIRECT; + v2i_ASN1_BIT_STRING = DIRECT; + X509_STORE_CTX_set_default = DIRECT; + BN_GF2m_mod_inv = DIRECT; + BN_GF2m_mod_exp = DIRECT; + EC_GROUP_get0_seed = DIRECT; + BN_GF2m_mod_div_arr = DIRECT; + ENGINE_set_ECDSA = DIRECT; + ECPKParameters_print = DIRECT; + EC_KEY_get0_private_key = DIRECT; + PEM_write_EC_PUBKEY = DIRECT; + X509_VERIFY_PARAM_set1 = DIRECT; + ECDH_set_method = DIRECT; + v2i_GENERAL_NAME_ex = DIRECT; + ECDH_set_ex_data = DIRECT; + BN_nist_mod_521 = DIRECT; + X509_policy_tree_get0_level = DIRECT; + EC_GROUP_set_point_conversion_form = DIRECT; + PEM_read_EC_PUBKEY = DIRECT; + i2d_ECDSA_SIG = DIRECT; + ECDSA_OpenSSL = DIRECT; + EC_KEY_get_enc_flags = DIRECT; + ASN1_const_check_infinite_end = DIRECT; + EVP_PKEY_delete_attr = DIRECT; + ECDSA_set_default_method = DIRECT; + EC_POINT_set_compressed_coordinates_GF2m = DIRECT; + EC_GROUP_cmp = DIRECT; + BN_get0_nist_prime_256 = DIRECT; + SHA224_Init = DIRECT; + PEM_read_ECPrivateKey = DIRECT; + SHA512_Init = DIRECT; + BN_set_negative = DIRECT; + ERR_load_ECDSA_strings = DIRECT; + EC_GROUP_get_basis_type = DIRECT; + i2v_ASN1_BIT_STRING = DIRECT; + BN_nist_mod_384 = DIRECT; + i2d_X509_CERT_PAIR = DIRECT; + PEM_write_ECPKParameters = DIRECT; + ECDH_compute_key = DIRECT; + ENGINE_register_all_ECDH = DIRECT; + pqueue_pop = DIRECT; + POLICY_CONSTRAINTS_it = DIRECT; + POLICY_CONSTRAINTS_it = DIRECT; + EVP_PKEY_get_attr_by_OBJ = DIRECT; + X509_VERIFY_PARAM_add0_policy = DIRECT; + BN_GF2m_mod_solve_quad = DIRECT; + SHA256 = DIRECT; + i2d_ECPrivateKey_fp = DIRECT; + X509_policy_tree_get0_user_policies = DIRECT; + OPENSSL_DIR_read = DIRECT; + ENGINE_register_all_ECDSA = DIRECT; + X509_VERIFY_PARAM_lookup = DIRECT; + EC_POINT_get_affine_coordinates_GF2m = DIRECT; + EC_GROUP_dup = DIRECT; + ENGINE_get_default_ECDSA = DIRECT; + EC_KEY_new = DIRECT; + SHA256_Transform = DIRECT; + EC_KEY_set_enc_flags = DIRECT; + ECDSA_verify = DIRECT; + EC_POINT_point2hex = DIRECT; + ENGINE_get_STORE = DIRECT; + SHA512 = DIRECT; + ECDSA_do_sign_ex = DIRECT; + ECDSA_do_verify = DIRECT; + d2i_ECPrivateKey_fp = DIRECT; + SHA512_Transform = DIRECT; + X509_STORE_set1_param = DIRECT; + PEM_write_ECPrivateKey = DIRECT; + EC_KEY_set_public_key = DIRECT; + PEM_read_ECPKParameters = DIRECT; + X509_CERT_PAIR_new = DIRECT; + ENGINE_register_STORE = DIRECT; + RSA_generate_key_ex = DIRECT; + DSA_generate_parameters_ex = DIRECT; + ECParameters_print_fp = DIRECT; + X509V3_NAME_from_section = DIRECT; + EVP_PKEY_add1_attr = DIRECT; + POLICY_MAPPINGS_it = DIRECT; + POLICY_MAPPINGS_it = DIRECT; + GENERAL_SUBTREE_it = DIRECT; + GENERAL_SUBTREE_it = DIRECT; + EC_GROUP_get_curve_name = DIRECT; + PEM_write_X509_CERT_PAIR = DIRECT; + BIO_dump_indent_cb = DIRECT; + d2i_X509_CERT_PAIR = DIRECT; + asn1_const_Finish = DIRECT; + i2d_EC_PUBKEY_fp = DIRECT; + BN_nist_mod_256 = DIRECT; + X509_VERIFY_PARAM_add0_table = DIRECT; + pqueue_free = DIRECT; + BN_BLINDING_create_param = DIRECT; + ECDSA_size = DIRECT; + d2i_EC_PUBKEY_bio = DIRECT; + BN_get0_nist_prime_521 = DIRECT; + BN_generate_prime_ex = DIRECT; + EC_GROUP_new_by_curve_name = DIRECT; + SHA256_Final = DIRECT; + DH_generate_parameters_ex = DIRECT; + PEM_read_bio_ECPrivateKey = DIRECT; + ENGINE_get_ECDH = DIRECT; + d2i_ECDSA_SIG = DIRECT; + BN_is_prime_fasttest_ex = DIRECT; + ECDSA_sign = DIRECT; + X509_policy_check = DIRECT; + EVP_PKEY_get_attr_by_NID = DIRECT; + ENGINE_get_ECDSA = DIRECT; + EVP_ecdsa = DIRECT; + BN_BLINDING_get_flags = DIRECT; + PKCS12_add_cert = DIRECT; + ERR_load_ECDH_strings = DIRECT; + EC_KEY_dup = DIRECT; + EVP_CIPHER_CTX_rand_key = DIRECT; + ECDSA_set_method = DIRECT; + a2i_IPADDRESS_NC = DIRECT; + d2i_ECParameters = DIRECT; + X509_POLICY_NODE_print = DIRECT; + SHA384_Init = DIRECT; + EC_GF2m_simple_method = DIRECT; + ECDSA_set_ex_data = DIRECT; + SHA384_Final = DIRECT; + PKCS7_set_digest = DIRECT; + EC_KEY_print = DIRECT; + ECDSA_get_ex_new_index = DIRECT; + SHA384 = DIRECT; + POLICY_MAPPING_new = DIRECT; + X509_STORE_CTX_get0_policy_tree = DIRECT; + EC_GROUP_set_asn1_flag = DIRECT; + EC_KEY_check_key = DIRECT; + d2i_EC_PUBKEY_fp = DIRECT; + PKCS7_set0_type_other = DIRECT; + PEM_read_bio_X509_CERT_PAIR = DIRECT; + pqueue_next = DIRECT; + EVP_PKEY_add1_attr_by_OBJ = DIRECT; + X509_VERIFY_PARAM_set_time = DIRECT; + pqueue_new = DIRECT; + ENGINE_set_default_ECDH = DIRECT; + PKCS12_add_key = DIRECT; + DSO_merge = DIRECT; + EC_POINT_hex2point = DIRECT; + BIO_dump_cb = DIRECT; + SHA256_Update = DIRECT; + pqueue_insert = DIRECT; + pitem_free = DIRECT; + BN_GF2m_mod_inv_arr = DIRECT; + ENGINE_unregister_ECDSA = DIRECT; + BN_BLINDING_set_thread_id = DIRECT; + get_rfc3526_prime_8192 = DIRECT; + X509_VERIFY_PARAM_clear_flags = DIRECT; + get_rfc2409_prime_1024 = DIRECT; + DH_check_pub_key = DIRECT; + get_rfc3526_prime_2048 = DIRECT; + get_rfc3526_prime_6144 = DIRECT; + get_rfc3526_prime_1536 = DIRECT; + get_rfc3526_prime_3072 = DIRECT; + get_rfc3526_prime_4096 = DIRECT; + get_rfc2409_prime_768 = DIRECT; + X509_VERIFY_PARAM_get_flags = DIRECT; + EVP_CIPHER_CTX_new = DIRECT; + EVP_CIPHER_CTX_free = DIRECT; + a2i_ipadd = DIRECT; + EVP_CIPHER_block_size = DIRECT; + EVP_CIPHER_CTX_set_app_data = DIRECT; + BIO_set_callback_arg = DIRECT; + BIO_set_flags = DIRECT; + BIO_method_type = DIRECT; + AES_ige_encrypt = DIRECT; + EVP_CIPHER_CTX_nid = DIRECT; + EVP_CIPHER_iv_length = DIRECT; + EVP_MD_type = DIRECT; + EVP_CIPHER_CTX_key_length = DIRECT; + EVP_MD_size = DIRECT; + EVP_MD_CTX_test_flags = DIRECT; + BIO_clear_flags = DIRECT; + EVP_MD_pkey_type = DIRECT; + EVP_MD_CTX_clear_flags = DIRECT; + EVP_CIPHER_flags = DIRECT; + AES_bi_ige_encrypt = DIRECT; + BIO_get_callback = DIRECT; + BIO_test_flags = DIRECT; + EVP_CIPHER_key_length = DIRECT; + EVP_Cipher = DIRECT; + EVP_CIPHER_nid = DIRECT; + EVP_CIPHER_CTX_block_size = DIRECT; + EVP_MD_CTX_set_flags = DIRECT; + EVP_CIPHER_CTX_cipher = DIRECT; + EVP_CIPHER_CTX_get_app_data = DIRECT; + EVP_MD_block_size = DIRECT; + EVP_CIPHER_CTX_flags = DIRECT; + EVP_MD_CTX_md = DIRECT; + BIO_method_name = DIRECT; + EVP_CIPHER_CTX_iv_length = DIRECT; + BIO_get_callback_arg = DIRECT; + BIO_set_callback = DIRECT; + X509_EXTENSIONS_it = DIRECT; + X509_EXTENSIONS_it = DIRECT; + X509_get1_ocsp = DIRECT; + OCSP_REQ_CTX_free = DIRECT; + i2d_X509_EXTENSIONS = DIRECT; + OCSP_sendreq_nbio = DIRECT; + OCSP_sendreq_new = DIRECT; + d2i_X509_EXTENSIONS = DIRECT; + X509_ALGORS_it = DIRECT; + X509_ALGORS_it = DIRECT; + X509_ALGOR_get0 = DIRECT; + X509_ALGOR_set0 = DIRECT; + AES_unwrap_key = DIRECT; + AES_wrap_key = DIRECT; + X509at_get0_data_by_OBJ = DIRECT; + ASN1_TYPE_set1 = DIRECT; + ASN1_STRING_set0 = DIRECT; + i2d_X509_ALGORS = DIRECT; + COMP_zlib_cleanup = DIRECT; + d2i_X509_ALGORS = DIRECT; + SMIME_read_ASN1 = DIRECT; + ENGINE_set_load_ssl_client_cert_function = DIRECT; + ENGINE_get_ssl_client_cert_function = DIRECT; + ENGINE_load_ssl_client_cert = DIRECT; + OPENSSL_isservice = DIRECT; + EVP_CIPHER_CTX_clear_flags = DIRECT; + EVP_CIPHER_CTX_set_flags = DIRECT; + BN_X931_generate_prime_ex = DIRECT; + EVP_CIPHER_CTX_test_flags = DIRECT; + BN_X931_derive_prime_ex = DIRECT; + OPENSSL_init = DIRECT; + CRYPTO_strdup = DIRECT; + pqueue_size = DIRECT; + X509_asn1_meth = DIRECT; + RSA_X931_generate_key_ex = DIRECT; + OBJ_bsearch = DIRECT; + i2d_ASN1_HEADER = DIRECT; + EVP_md2 = DIRECT; + uni2asc = DIRECT; + d2i_ASN1_HEADER = DIRECT; + ASN1_HEADER_free = DIRECT; + CRYPTO_malloc_debug_init = DIRECT; + local: + *; +}; + +OPENSSL_0.9.8y { + global: + CRYPTO_memcmp = DIRECT; +} OPENSSL_0.9.8; + Added: csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl =================================================================== --- csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl 2013-03-06 19:00:17 UTC (rev 20378) @@ -0,0 +1,226 @@ +OPENSSL_0.9.8 { + global: + BIO_f_ssl = DIRECT; + BIO_new_buffer_ssl_connect = DIRECT; + BIO_new_ssl = DIRECT; + BIO_new_ssl_connect = DIRECT; + BIO_ssl_copy_session_id = DIRECT; + BIO_ssl_shutdown = DIRECT; + d2i_SSL_SESSION = DIRECT; + DTLSv1_client_method = DIRECT; + DTLSv1_method = DIRECT; + DTLSv1_server_method = DIRECT; + ERR_load_SSL_strings = DIRECT; + i2d_SSL_SESSION = DIRECT; + SSL_accept = DIRECT; + SSL_add_client_CA = DIRECT; + SSL_add_dir_cert_subjects_to_stack = DIRECT; + SSL_add_file_cert_subjects_to_stack = DIRECT; + SSL_alert_desc_string = DIRECT; + SSL_alert_desc_string_long = DIRECT; + SSL_alert_type_string = DIRECT; + SSL_alert_type_string_long = DIRECT; + SSL_callback_ctrl = DIRECT; + SSL_check_private_key = DIRECT; + SSL_CIPHER_description = DIRECT; + SSL_CIPHER_get_bits = DIRECT; + SSL_CIPHER_get_name = DIRECT; + SSL_CIPHER_get_version = DIRECT; + SSL_clear = DIRECT; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 7 00:00:28 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 06 Mar 2013 23:00:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[20379] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 20379 http://gar.svn.sourceforge.net/gar/?rev=20379&view=rev Author: chninkel Date: 2013-03-06 23:00:26 +0000 (Wed, 06 Mar 2013) Log Message: ----------- openssl/trunk: removed symbol versioning, it introduced a strange elf header bug and is not useful for this deprecated library Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/map.openssl.engines csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-03-06 19:00:17 UTC (rev 20378) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-03-06 23:00:26 UTC (rev 20379) @@ -153,9 +153,7 @@ # (patchs taken from Debian Package) PATCHFILES += block_bad_certificates.patch -PATCHFILES += 0007-enables-symbols-versioning.patch - LICENSE=LICENSE ##### Build and installation information ##### Deleted: csw/mgar/pkg/openssl/trunk/files/map.openssl.engines =================================================================== --- csw/mgar/pkg/openssl/trunk/files/map.openssl.engines 2013-03-06 19:00:17 UTC (rev 20378) +++ csw/mgar/pkg/openssl/trunk/files/map.openssl.engines 2013-03-06 23:00:26 UTC (rev 20379) @@ -1,8 +0,0 @@ -OPENSSL_1.0.0 { - global: - bind_engine; - v_check; - local: - *; -}; - Deleted: csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto =================================================================== --- csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto 2013-03-06 19:00:17 UTC (rev 20378) +++ csw/mgar/pkg/openssl/trunk/files/map.openssl.libcrypto 2013-03-06 23:00:26 UTC (rev 20379) @@ -1,3043 +0,0 @@ -OPENSSL_0.9.8 { - global: - SSLeay = DIRECT; - SSLeay_version = DIRECT; - ASN1_INTEGER_get = DIRECT; - ASN1_INTEGER_set = DIRECT; - ASN1_INTEGER_to_BN = DIRECT; - ASN1_OBJECT_create = DIRECT; - ASN1_OBJECT_free = DIRECT; - ASN1_OBJECT_new = DIRECT; - ASN1_PRINTABLE_type = DIRECT; - ASN1_STRING_cmp = DIRECT; - ASN1_STRING_dup = DIRECT; - ASN1_STRING_free = DIRECT; - ASN1_STRING_new = DIRECT; - ASN1_STRING_print = DIRECT; - ASN1_STRING_set = DIRECT; - ASN1_STRING_type_new = DIRECT; - ASN1_TYPE_free = DIRECT; - ASN1_TYPE_new = DIRECT; - ASN1_UNIVERSALSTRING_to_string = DIRECT; - ASN1_UTCTIME_check = DIRECT; - ASN1_UTCTIME_print = DIRECT; - ASN1_UTCTIME_set = DIRECT; - ASN1_check_infinite_end = DIRECT; - ASN1_d2i_bio = DIRECT; - ASN1_d2i_fp = DIRECT; - ASN1_digest = DIRECT; - ASN1_dup = DIRECT; - ASN1_get_object = DIRECT; - ASN1_i2d_bio = DIRECT; - ASN1_i2d_fp = DIRECT; - ASN1_object_size = DIRECT; - ASN1_parse = DIRECT; - ASN1_put_object = DIRECT; - ASN1_sign = DIRECT; - ASN1_verify = DIRECT; - BF_cbc_encrypt = DIRECT; - BF_cfb64_encrypt = DIRECT; - BF_ecb_encrypt = DIRECT; - BF_encrypt = DIRECT; - BF_ofb64_encrypt = DIRECT; - BF_options = DIRECT; - BF_set_key = DIRECT; - BIO_CONNECT_free = DIRECT; - BIO_CONNECT_new = DIRECT; - BIO_accept = DIRECT; - BIO_ctrl = DIRECT; - BIO_int_ctrl = DIRECT; - BIO_debug_callback = DIRECT; - BIO_dump = DIRECT; - BIO_dup_chain = DIRECT; - BIO_f_base64 = DIRECT; - BIO_f_buffer = DIRECT; - BIO_f_cipher = DIRECT; - BIO_f_md = DIRECT; - BIO_f_null = DIRECT; - BIO_fd_non_fatal_error = DIRECT; - BIO_fd_should_retry = DIRECT; - BIO_find_type = DIRECT; - BIO_free = DIRECT; - BIO_free_all = DIRECT; - BIO_get_accept_socket = DIRECT; - BIO_get_host_ip = DIRECT; - BIO_get_port = DIRECT; - BIO_get_retry_BIO = DIRECT; - BIO_get_retry_reason = DIRECT; - BIO_gethostbyname = DIRECT; - BIO_gets = DIRECT; - BIO_new = DIRECT; - BIO_new_accept = DIRECT; - BIO_new_connect = DIRECT; - BIO_new_fd = DIRECT; - BIO_new_file = DIRECT; - BIO_new_fp = DIRECT; - BIO_new_socket = DIRECT; - BIO_pop = DIRECT; - BIO_printf = DIRECT; - BIO_push = DIRECT; - BIO_puts = DIRECT; - BIO_read = DIRECT; - BIO_s_accept = DIRECT; - BIO_s_connect = DIRECT; - BIO_s_fd = DIRECT; - BIO_s_file = DIRECT; - BIO_s_mem = DIRECT; - BIO_s_null = DIRECT; - BIO_s_socket = DIRECT; - BIO_set = DIRECT; - BIO_set_cipher = DIRECT; - BIO_set_tcp_ndelay = DIRECT; - BIO_sock_cleanup = DIRECT; - BIO_sock_error = DIRECT; - BIO_sock_init = DIRECT; - BIO_sock_non_fatal_error = DIRECT; - BIO_sock_should_retry = DIRECT; - BIO_socket_ioctl = DIRECT; - BIO_write = DIRECT; - BN_CTX_free = DIRECT; - BN_CTX_new = DIRECT; - BN_MONT_CTX_free = DIRECT; - BN_MONT_CTX_new = DIRECT; - BN_MONT_CTX_set = DIRECT; - BN_add = DIRECT; - BN_add_word = DIRECT; - BN_hex2bn = DIRECT; - BN_bin2bn = DIRECT; - BN_bn2hex = DIRECT; - BN_bn2bin = DIRECT; - BN_clear = DIRECT; - BN_clear_bit = DIRECT; - BN_clear_free = DIRECT; - BN_cmp = DIRECT; - BN_copy = DIRECT; - BN_div = DIRECT; - BN_div_word = DIRECT; - BN_dup = DIRECT; - BN_free = DIRECT; - BN_from_montgomery = DIRECT; - BN_gcd = DIRECT; - BN_generate_prime = DIRECT; - BN_get_word = DIRECT; - BN_is_bit_set = DIRECT; - BN_is_prime = DIRECT; - BN_lshift = DIRECT; - BN_lshift1 = DIRECT; - BN_mask_bits = DIRECT; - BN_mod_exp = DIRECT; - BN_mod_exp_mont = DIRECT; - BN_mod_exp_simple = DIRECT; - BN_mod_inverse = DIRECT; - BN_mod_mul = DIRECT; - BN_mod_mul_montgomery = DIRECT; - BN_mod_word = DIRECT; - BN_mul = DIRECT; - BN_new = DIRECT; - BN_num_bits = DIRECT; - BN_num_bits_word = DIRECT; - BN_options = DIRECT; - BN_print = DIRECT; - BN_print_fp = DIRECT; - BN_rand = DIRECT; - BN_reciprocal = DIRECT; - BN_rshift = DIRECT; - BN_rshift1 = DIRECT; - BN_set_bit = DIRECT; - BN_set_word = DIRECT; - BN_sqr = DIRECT; - BN_sub = DIRECT; - BN_to_ASN1_INTEGER = DIRECT; - BN_ucmp = DIRECT; - BN_value_one = DIRECT; - BUF_MEM_free = DIRECT; - BUF_MEM_grow = DIRECT; - BUF_MEM_new = DIRECT; - BUF_strdup = DIRECT; - CONF_free = DIRECT; - CONF_get_number = DIRECT; - CONF_get_section = DIRECT; - CONF_get_string = DIRECT; - CONF_load = DIRECT; - CRYPTO_add_lock = DIRECT; - CRYPTO_dbg_free = DIRECT; - CRYPTO_dbg_malloc = DIRECT; - CRYPTO_dbg_realloc = DIRECT; - CRYPTO_free = DIRECT; - CRYPTO_get_add_lock_callback = DIRECT; - CRYPTO_get_id_callback = DIRECT; - CRYPTO_get_lock_name = DIRECT; - CRYPTO_get_locking_callback = DIRECT; - CRYPTO_get_mem_functions = DIRECT; - CRYPTO_lock = DIRECT; - CRYPTO_malloc = DIRECT; - CRYPTO_mem_ctrl = DIRECT; - CRYPTO_mem_leaks = DIRECT; - CRYPTO_mem_leaks_cb = DIRECT; - CRYPTO_mem_leaks_fp = DIRECT; - CRYPTO_realloc = DIRECT; - CRYPTO_remalloc = DIRECT; - CRYPTO_set_add_lock_callback = DIRECT; - CRYPTO_set_id_callback = DIRECT; - CRYPTO_set_locking_callback = DIRECT; - CRYPTO_set_mem_functions = DIRECT; - CRYPTO_thread_id = DIRECT; - DH_check = DIRECT; - DH_compute_key = DIRECT; - DH_free = DIRECT; - DH_generate_key = DIRECT; - DH_generate_parameters = DIRECT; - DH_new = DIRECT; - DH_size = DIRECT; - DHparams_print = DIRECT; - DHparams_print_fp = DIRECT; - DSA_free = DIRECT; - DSA_generate_key = DIRECT; - DSA_generate_parameters = DIRECT; - DSA_new = DIRECT; - DSA_print = DIRECT; - DSA_print_fp = DIRECT; - DSA_sign = DIRECT; - DSA_sign_setup = DIRECT; - DSA_size = DIRECT; - DSA_verify = DIRECT; - DSAparams_print = DIRECT; - DSAparams_print_fp = DIRECT; - ERR_clear_error = DIRECT; - ERR_error_string = DIRECT; - ERR_free_strings = DIRECT; - ERR_func_error_string = DIRECT; - ERR_get_err_state_table = DIRECT; - ERR_get_error = DIRECT; - ERR_get_error_line = DIRECT; - ERR_get_state = DIRECT; - ERR_get_string_table = DIRECT; - ERR_lib_error_string = DIRECT; - ERR_load_ASN1_strings = DIRECT; - ERR_load_BIO_strings = DIRECT; - ERR_load_BN_strings = DIRECT; - ERR_load_BUF_strings = DIRECT; - ERR_load_CONF_strings = DIRECT; - ERR_load_DH_strings = DIRECT; - ERR_load_DSA_strings = DIRECT; - ERR_load_ERR_strings = DIRECT; - ERR_load_EVP_strings = DIRECT; - ERR_load_OBJ_strings = DIRECT; - ERR_load_PEM_strings = DIRECT; - ERR_load_RSA_strings = DIRECT; - ERR_load_X509_strings = DIRECT; - ERR_load_crypto_strings = DIRECT; - ERR_load_strings = DIRECT; - ERR_peek_error = DIRECT; - ERR_peek_error_line = DIRECT; - ERR_print_errors = DIRECT; - ERR_print_errors_fp = DIRECT; - ERR_put_error = DIRECT; - ERR_reason_error_string = DIRECT; - ERR_remove_state = DIRECT; - EVP_BytesToKey = DIRECT; - EVP_CIPHER_CTX_cleanup = DIRECT; - EVP_CipherFinal = DIRECT; - EVP_CipherInit = DIRECT; - EVP_CipherUpdate = DIRECT; - EVP_DecodeBlock = DIRECT; - EVP_DecodeFinal = DIRECT; - EVP_DecodeInit = DIRECT; - EVP_DecodeUpdate = DIRECT; - EVP_DecryptFinal = DIRECT; - EVP_DecryptInit = DIRECT; - EVP_DecryptUpdate = DIRECT; - EVP_DigestFinal = DIRECT; - EVP_DigestInit = DIRECT; - EVP_DigestUpdate = DIRECT; - EVP_EncodeBlock = DIRECT; - EVP_EncodeFinal = DIRECT; - EVP_EncodeInit = DIRECT; - EVP_EncodeUpdate = DIRECT; - EVP_EncryptFinal = DIRECT; - EVP_EncryptInit = DIRECT; - EVP_EncryptUpdate = DIRECT; - EVP_OpenFinal = DIRECT; - EVP_OpenInit = DIRECT; - EVP_PKEY_assign = DIRECT; - EVP_PKEY_copy_parameters = DIRECT; - EVP_PKEY_free = DIRECT; - EVP_PKEY_missing_parameters = DIRECT; - EVP_PKEY_new = DIRECT; - EVP_PKEY_save_parameters = DIRECT; - EVP_PKEY_size = DIRECT; - EVP_PKEY_type = DIRECT; - EVP_SealFinal = DIRECT; - EVP_SealInit = DIRECT; - EVP_SignFinal = DIRECT; - EVP_VerifyFinal = DIRECT; - EVP_add_cipher = DIRECT; - EVP_add_digest = DIRECT; - EVP_bf_cbc = DIRECT; - EVP_bf_cfb64 = DIRECT; - EVP_bf_ecb = DIRECT; - EVP_bf_ofb = DIRECT; - EVP_cleanup = DIRECT; - EVP_des_cbc = DIRECT; - EVP_des_cfb64 = DIRECT; - EVP_des_ecb = DIRECT; - EVP_des_ede = DIRECT; - EVP_des_ede3 = DIRECT; - EVP_des_ede3_cbc = DIRECT; - EVP_des_ede3_cfb64 = DIRECT; - EVP_des_ede3_ofb = DIRECT; - EVP_des_ede_cbc = DIRECT; - EVP_des_ede_cfb64 = DIRECT; - EVP_des_ede_ofb = DIRECT; - EVP_des_ofb = DIRECT; - EVP_desx_cbc = DIRECT; - EVP_dss = DIRECT; - EVP_dss1 = DIRECT; - EVP_enc_null = DIRECT; - EVP_get_cipherbyname = DIRECT; - EVP_get_digestbyname = DIRECT; - EVP_get_pw_prompt = DIRECT; - EVP_idea_cbc = DIRECT; - EVP_idea_cfb64 = DIRECT; - EVP_idea_ecb = DIRECT; - EVP_idea_ofb = DIRECT; - EVP_md5 = DIRECT; - EVP_md_null = DIRECT; - EVP_rc2_cbc = DIRECT; - EVP_rc2_cfb64 = DIRECT; - EVP_rc2_ecb = DIRECT; - EVP_rc2_ofb = DIRECT; - EVP_rc4 = DIRECT; - EVP_read_pw_string = DIRECT; - EVP_set_pw_prompt = DIRECT; - EVP_sha = DIRECT; - EVP_sha1 = DIRECT; - MD2_options = DIRECT; - MD5 = DIRECT; - MD5_Final = DIRECT; - MD5_Init = DIRECT; - MD5_Update = DIRECT; - NETSCAPE_SPKAC_free = DIRECT; - NETSCAPE_SPKAC_new = DIRECT; - NETSCAPE_SPKI_free = DIRECT; - NETSCAPE_SPKI_new = DIRECT; - NETSCAPE_SPKI_sign = DIRECT; - NETSCAPE_SPKI_verify = DIRECT; - OBJ_add_object = DIRECT; - OBJ_cleanup = DIRECT; - OBJ_cmp = DIRECT; - OBJ_create = DIRECT; - OBJ_dup = DIRECT; - OBJ_ln2nid = DIRECT; - OBJ_new_nid = DIRECT; - OBJ_nid2ln = DIRECT; - OBJ_nid2obj = DIRECT; - OBJ_nid2sn = DIRECT; - OBJ_obj2nid = DIRECT; - OBJ_sn2nid = DIRECT; - OBJ_txt2nid = DIRECT; - PEM_ASN1_read = DIRECT; - PEM_ASN1_read_bio = DIRECT; - PEM_ASN1_write = DIRECT; - PEM_ASN1_write_bio = DIRECT; - PEM_SealFinal = DIRECT; - PEM_SealInit = DIRECT; - PEM_SealUpdate = DIRECT; - PEM_SignFinal = DIRECT; - PEM_SignInit = DIRECT; - PEM_SignUpdate = DIRECT; - PEM_X509_INFO_read = DIRECT; - PEM_X509_INFO_read_bio = DIRECT; - PEM_X509_INFO_write_bio = DIRECT; - PEM_dek_info = DIRECT; - PEM_do_header = DIRECT; - PEM_get_EVP_CIPHER_INFO = DIRECT; - PEM_proc_type = DIRECT; - PEM_read = DIRECT; - PEM_read_DHparams = DIRECT; - PEM_read_DSAPrivateKey = DIRECT; - PEM_read_DSAparams = DIRECT; - PEM_read_PKCS7 = DIRECT; - PEM_read_PrivateKey = DIRECT; - PEM_read_RSAPrivateKey = DIRECT; - PEM_read_X509 = DIRECT; - PEM_read_X509_CRL = DIRECT; - PEM_read_X509_REQ = DIRECT; - PEM_read_bio = DIRECT; - PEM_read_bio_DHparams = DIRECT; - PEM_read_bio_DSAPrivateKey = DIRECT; - PEM_read_bio_DSAparams = DIRECT; - PEM_read_bio_PKCS7 = DIRECT; - PEM_read_bio_PrivateKey = DIRECT; - PEM_read_bio_RSAPrivateKey = DIRECT; - PEM_read_bio_X509 = DIRECT; - PEM_read_bio_X509_CRL = DIRECT; - PEM_read_bio_X509_REQ = DIRECT; - PEM_write = DIRECT; - PEM_write_DHparams = DIRECT; - PEM_write_DSAPrivateKey = DIRECT; - PEM_write_DSAparams = DIRECT; - PEM_write_PKCS7 = DIRECT; - PEM_write_PrivateKey = DIRECT; - PEM_write_RSAPrivateKey = DIRECT; - PEM_write_X509 = DIRECT; - PEM_write_X509_CRL = DIRECT; - PEM_write_X509_REQ = DIRECT; - PEM_write_bio = DIRECT; - PEM_write_bio_DHparams = DIRECT; - PEM_write_bio_DSAPrivateKey = DIRECT; - PEM_write_bio_DSAparams = DIRECT; - PEM_write_bio_PKCS7 = DIRECT; - PEM_write_bio_PrivateKey = DIRECT; - PEM_write_bio_RSAPrivateKey = DIRECT; - PEM_write_bio_X509 = DIRECT; - PEM_write_bio_X509_CRL = DIRECT; - PEM_write_bio_X509_REQ = DIRECT; - PKCS7_DIGEST_free = DIRECT; - PKCS7_DIGEST_new = DIRECT; - PKCS7_ENCRYPT_free = DIRECT; - PKCS7_ENCRYPT_new = DIRECT; - PKCS7_ENC_CONTENT_free = DIRECT; - PKCS7_ENC_CONTENT_new = DIRECT; - PKCS7_ENVELOPE_free = DIRECT; - PKCS7_ENVELOPE_new = DIRECT; - PKCS7_ISSUER_AND_SERIAL_digest = DIRECT; - PKCS7_ISSUER_AND_SERIAL_free = DIRECT; - PKCS7_ISSUER_AND_SERIAL_new = DIRECT; - PKCS7_RECIP_INFO_free = DIRECT; - PKCS7_RECIP_INFO_new = DIRECT; - PKCS7_SIGNED_free = DIRECT; - PKCS7_SIGNED_new = DIRECT; - PKCS7_SIGNER_INFO_free = DIRECT; - PKCS7_SIGNER_INFO_new = DIRECT; - PKCS7_SIGN_ENVELOPE_free = DIRECT; - PKCS7_SIGN_ENVELOPE_new = DIRECT; - PKCS7_dup = DIRECT; - PKCS7_free = DIRECT; - PKCS7_new = DIRECT; - RAND_bytes = DIRECT; - RAND_cleanup = DIRECT; - RAND_file_name = DIRECT; - RAND_load_file = DIRECT; - RAND_seed = DIRECT; - RAND_write_file = DIRECT; - RC2_cbc_encrypt = DIRECT; - RC2_cfb64_encrypt = DIRECT; - RC2_ecb_encrypt = DIRECT; - RC2_encrypt = DIRECT; - RC2_ofb64_encrypt = DIRECT; - RC2_set_key = DIRECT; - RC4 = DIRECT; - RC4_options = DIRECT; - RC4_set_key = DIRECT; - RSAPrivateKey_dup = DIRECT; - RSAPublicKey_dup = DIRECT; - RSA_PKCS1_SSLeay = DIRECT; - RSA_free = DIRECT; - RSA_generate_key = DIRECT; - RSA_new = DIRECT; - RSA_new_method = DIRECT; - RSA_print = DIRECT; - RSA_print_fp = DIRECT; - RSA_private_decrypt = DIRECT; - RSA_private_encrypt = DIRECT; - RSA_public_decrypt = DIRECT; - RSA_public_encrypt = DIRECT; - RSA_set_default_method = DIRECT; - RSA_sign = DIRECT; - RSA_sign_ASN1_OCTET_STRING = DIRECT; - RSA_size = DIRECT; - RSA_verify = DIRECT; - RSA_verify_ASN1_OCTET_STRING = DIRECT; - SHA = DIRECT; - SHA1 = DIRECT; - SHA1_Final = DIRECT; - SHA1_Init = DIRECT; - SHA1_Update = DIRECT; - SHA_Final = DIRECT; - SHA_Init = DIRECT; - SHA_Update = DIRECT; - OpenSSL_add_all_ciphers = DIRECT; - OpenSSL_add_all_digests = DIRECT; - TXT_DB_create_index = DIRECT; - TXT_DB_free = DIRECT; - TXT_DB_get_by_index = DIRECT; - TXT_DB_insert = DIRECT; - TXT_DB_read = DIRECT; - TXT_DB_write = DIRECT; - X509_ALGOR_free = DIRECT; - X509_ALGOR_new = DIRECT; - X509_ATTRIBUTE_free = DIRECT; - X509_ATTRIBUTE_new = DIRECT; - X509_CINF_free = DIRECT; - X509_CINF_new = DIRECT; - X509_CRL_INFO_free = DIRECT; - X509_CRL_INFO_new = DIRECT; - X509_CRL_add_ext = DIRECT; - X509_CRL_cmp = DIRECT; - X509_CRL_delete_ext = DIRECT; - X509_CRL_dup = DIRECT; - X509_CRL_free = DIRECT; - X509_CRL_get_ext = DIRECT; - X509_CRL_get_ext_by_NID = DIRECT; - X509_CRL_get_ext_by_OBJ = DIRECT; - X509_CRL_get_ext_by_critical = DIRECT; - X509_CRL_get_ext_count = DIRECT; - X509_CRL_new = DIRECT; - X509_CRL_sign = DIRECT; - X509_CRL_verify = DIRECT; - X509_EXTENSION_create_by_NID = DIRECT; - X509_EXTENSION_create_by_OBJ = DIRECT; - X509_EXTENSION_dup = DIRECT; - X509_EXTENSION_free = DIRECT; - X509_EXTENSION_get_critical = DIRECT; - X509_EXTENSION_get_data = DIRECT; - X509_EXTENSION_get_object = DIRECT; - X509_EXTENSION_new = DIRECT; - X509_EXTENSION_set_critical = DIRECT; - X509_EXTENSION_set_data = DIRECT; - X509_EXTENSION_set_object = DIRECT; - X509_INFO_free = DIRECT; - X509_INFO_new = DIRECT; - X509_LOOKUP_by_alias = DIRECT; - X509_LOOKUP_by_fingerprint = DIRECT; - X509_LOOKUP_by_issuer_serial = DIRECT; - X509_LOOKUP_by_subject = DIRECT; - X509_LOOKUP_ctrl = DIRECT; - X509_LOOKUP_file = DIRECT; - X509_LOOKUP_free = DIRECT; - X509_LOOKUP_hash_dir = DIRECT; - X509_LOOKUP_init = DIRECT; - X509_LOOKUP_new = DIRECT; - X509_LOOKUP_shutdown = DIRECT; - X509_NAME_ENTRY_create_by_NID = DIRECT; - X509_NAME_ENTRY_create_by_OBJ = DIRECT; - X509_NAME_ENTRY_dup = DIRECT; - X509_NAME_ENTRY_free = DIRECT; - X509_NAME_ENTRY_get_data = DIRECT; - X509_NAME_ENTRY_get_object = DIRECT; - X509_NAME_ENTRY_new = DIRECT; - X509_NAME_ENTRY_set_data = DIRECT; - X509_NAME_ENTRY_set_object = DIRECT; - X509_NAME_add_entry = DIRECT; - X509_NAME_cmp = DIRECT; - X509_NAME_delete_entry = DIRECT; - X509_NAME_digest = DIRECT; - X509_NAME_dup = DIRECT; - X509_NAME_entry_count = DIRECT; - X509_NAME_free = DIRECT; - X509_NAME_get_entry = DIRECT; - X509_NAME_get_index_by_NID = DIRECT; - X509_NAME_get_index_by_OBJ = DIRECT; - X509_NAME_get_text_by_NID = DIRECT; - X509_NAME_get_text_by_OBJ = DIRECT; - X509_NAME_hash = DIRECT; - X509_NAME_new = DIRECT; - X509_NAME_oneline = DIRECT; - X509_NAME_print = DIRECT; - X509_NAME_set = DIRECT; - X509_OBJECT_free_contents = DIRECT; - X509_OBJECT_retrieve_by_subject = DIRECT; - X509_OBJECT_up_ref_count = DIRECT; - X509_PKEY_free = DIRECT; - X509_PKEY_new = DIRECT; - X509_PUBKEY_free = DIRECT; - X509_PUBKEY_get = DIRECT; - X509_PUBKEY_new = DIRECT; - X509_PUBKEY_set = DIRECT; - X509_REQ_INFO_free = DIRECT; - X509_REQ_INFO_new = DIRECT; - X509_REQ_dup = DIRECT; - X509_REQ_free = DIRECT; - X509_REQ_get_pubkey = DIRECT; - X509_REQ_new = DIRECT; - X509_REQ_print = DIRECT; - X509_REQ_print_fp = DIRECT; - X509_REQ_set_pubkey = DIRECT; - X509_REQ_set_subject_name = DIRECT; - X509_REQ_set_version = DIRECT; - X509_REQ_sign = DIRECT; - X509_REQ_to_X509 = DIRECT; - X509_REQ_verify = DIRECT; - X509_REVOKED_add_ext = DIRECT; - X509_REVOKED_delete_ext = DIRECT; - X509_REVOKED_free = DIRECT; - X509_REVOKED_get_ext = DIRECT; - X509_REVOKED_get_ext_by_NID = DIRECT; - X509_REVOKED_get_ext_by_OBJ = DIRECT; - X509_REVOKED_get_ext_by_critical = DIRECT; - X509_REVOKED_get_ext_count = DIRECT; - X509_REVOKED_new = DIRECT; - X509_SIG_free = DIRECT; - X509_SIG_new = DIRECT; - X509_STORE_CTX_cleanup = DIRECT; - X509_STORE_CTX_init = DIRECT; - X509_STORE_add_cert = DIRECT; - X509_STORE_add_lookup = DIRECT; - X509_STORE_get_by_subject = DIRECT; - X509_STORE_load_locations = DIRECT; - X509_STORE_new = DIRECT; - X509_STORE_free = DIRECT; - X509_STORE_set_default_paths = DIRECT; - X509_VAL_free = DIRECT; - X509_VAL_new = DIRECT; - X509_add_ext = DIRECT; - X509_certificate_type = DIRECT; - X509_check_private_key = DIRECT; - X509_cmp_current_time = DIRECT; - X509_delete_ext = DIRECT; - X509_digest = DIRECT; - X509_dup = DIRECT; - X509_free = DIRECT; - X509_get_default_cert_area = DIRECT; - X509_get_default_cert_dir = DIRECT; - X509_get_default_cert_dir_env = DIRECT; - X509_get_default_cert_file = DIRECT; - X509_get_default_cert_file_env = DIRECT; - X509_get_default_private_dir = DIRECT; - X509_get_ext = DIRECT; - X509_get_ext_by_NID = DIRECT; - X509_get_ext_by_OBJ = DIRECT; - X509_get_ext_by_critical = DIRECT; - X509_get_ext_count = DIRECT; - X509_get_issuer_name = DIRECT; - X509_get_pubkey = DIRECT; - X509_get_pubkey_parameters = DIRECT; - X509_get_serialNumber = DIRECT; - X509_get_subject_name = DIRECT; - X509_gmtime_adj = DIRECT; - X509_issuer_and_serial_cmp = DIRECT; - X509_issuer_and_serial_hash = DIRECT; - X509_issuer_name_cmp = DIRECT; - X509_issuer_name_hash = DIRECT; - X509_load_cert_file = DIRECT; - X509_new = DIRECT; - X509_print = DIRECT; - X509_print_fp = DIRECT; - X509_set_issuer_name = DIRECT; - X509_set_notAfter = DIRECT; - X509_set_notBefore = DIRECT; - X509_set_pubkey = DIRECT; - X509_set_serialNumber = DIRECT; - X509_set_subject_name = DIRECT; - X509_set_version = DIRECT; - X509_sign = DIRECT; - X509_subject_name_cmp = DIRECT; - X509_subject_name_hash = DIRECT; - X509_to_X509_REQ = DIRECT; - X509_verify = DIRECT; - X509_verify_cert = DIRECT; - X509_verify_cert_error_string = DIRECT; - X509v3_add_ext = DIRECT; - X509v3_delete_ext = DIRECT; - X509v3_get_ext = DIRECT; - X509v3_get_ext_by_NID = DIRECT; - X509v3_get_ext_by_OBJ = DIRECT; - X509v3_get_ext_by_critical = DIRECT; - X509v3_get_ext_count = DIRECT; - _des_crypt = DIRECT; - a2d_ASN1_OBJECT = DIRECT; - a2i_ASN1_INTEGER = DIRECT; - a2i_ASN1_STRING = DIRECT; - asn1_Finish = DIRECT; - asn1_GetSequence = DIRECT; - bn_div_words = DIRECT; - bn_expand2 = DIRECT; - bn_mul_add_words = DIRECT; - bn_mul_words = DIRECT; - BN_uadd = DIRECT; - BN_usub = DIRECT; - bn_sqr_words = DIRECT; - _ossl_old_crypt = DIRECT; - d2i_ASN1_BIT_STRING = DIRECT; - d2i_ASN1_BOOLEAN = DIRECT; - d2i_ASN1_IA5STRING = DIRECT; - d2i_ASN1_INTEGER = DIRECT; - d2i_ASN1_OBJECT = DIRECT; - d2i_ASN1_OCTET_STRING = DIRECT; - d2i_ASN1_PRINTABLE = DIRECT; - d2i_ASN1_PRINTABLESTRING = DIRECT; - d2i_ASN1_SET = DIRECT; - d2i_ASN1_T61STRING = DIRECT; - d2i_ASN1_TYPE = DIRECT; - d2i_ASN1_UTCTIME = DIRECT; - d2i_ASN1_bytes = DIRECT; - d2i_ASN1_type_bytes = DIRECT; - d2i_DHparams = DIRECT; - d2i_DSAPrivateKey = DIRECT; - d2i_DSAPrivateKey_bio = DIRECT; - d2i_DSAPrivateKey_fp = DIRECT; - d2i_DSAPublicKey = DIRECT; - d2i_DSAparams = DIRECT; - d2i_NETSCAPE_SPKAC = DIRECT; - d2i_NETSCAPE_SPKI = DIRECT; - d2i_Netscape_RSA = DIRECT; - d2i_PKCS7 = DIRECT; - d2i_PKCS7_DIGEST = DIRECT; - d2i_PKCS7_ENCRYPT = DIRECT; - d2i_PKCS7_ENC_CONTENT = DIRECT; - d2i_PKCS7_ENVELOPE = DIRECT; - d2i_PKCS7_ISSUER_AND_SERIAL = DIRECT; - d2i_PKCS7_RECIP_INFO = DIRECT; - d2i_PKCS7_SIGNED = DIRECT; - d2i_PKCS7_SIGNER_INFO = DIRECT; - d2i_PKCS7_SIGN_ENVELOPE = DIRECT; - d2i_PKCS7_bio = DIRECT; - d2i_PKCS7_fp = DIRECT; - d2i_PrivateKey = DIRECT; - d2i_PublicKey = DIRECT; - d2i_RSAPrivateKey = DIRECT; - d2i_RSAPrivateKey_bio = DIRECT; - d2i_RSAPrivateKey_fp = DIRECT; - d2i_RSAPublicKey = DIRECT; - d2i_X509 = DIRECT; - d2i_X509_ALGOR = DIRECT; - d2i_X509_ATTRIBUTE = DIRECT; - d2i_X509_CINF = DIRECT; - d2i_X509_CRL = DIRECT; - d2i_X509_CRL_INFO = DIRECT; - d2i_X509_CRL_bio = DIRECT; - d2i_X509_CRL_fp = DIRECT; - d2i_X509_EXTENSION = DIRECT; - d2i_X509_NAME = DIRECT; - d2i_X509_NAME_ENTRY = DIRECT; - d2i_X509_PKEY = DIRECT; - d2i_X509_PUBKEY = DIRECT; - d2i_X509_REQ = DIRECT; - d2i_X509_REQ_INFO = DIRECT; - d2i_X509_REQ_bio = DIRECT; - d2i_X509_REQ_fp = DIRECT; - d2i_X509_REVOKED = DIRECT; - d2i_X509_SIG = DIRECT; - d2i_X509_VAL = DIRECT; - d2i_X509_bio = DIRECT; - d2i_X509_fp = DIRECT; - DES_cbc_cksum = DIRECT; - DES_cbc_encrypt = DIRECT; - DES_cfb64_encrypt = DIRECT; - DES_cfb_encrypt = DIRECT; - DES_decrypt3 = DIRECT; - DES_ecb3_encrypt = DIRECT; - DES_ecb_encrypt = DIRECT; - DES_ede3_cbc_encrypt = DIRECT; - DES_ede3_cfb64_encrypt = DIRECT; - DES_ede3_ofb64_encrypt = DIRECT; - DES_enc_read = DIRECT; - DES_enc_write = DIRECT; - DES_encrypt1 = DIRECT; - DES_encrypt2 = DIRECT; - DES_encrypt3 = DIRECT; - DES_fcrypt = DIRECT; - DES_is_weak_key = DIRECT; - DES_key_sched = DIRECT; - DES_ncbc_encrypt = DIRECT; - DES_ofb64_encrypt = DIRECT; - DES_ofb_encrypt = DIRECT; - DES_options = DIRECT; - DES_pcbc_encrypt = DIRECT; - DES_quad_cksum = DIRECT; - DES_random_key = DIRECT; - _ossl_old_des_random_seed = DIRECT; - _ossl_old_des_read_2passwords = DIRECT; - _ossl_old_des_read_password = DIRECT; - _ossl_old_des_read_pw = DIRECT; - _ossl_old_des_read_pw_string = DIRECT; - DES_set_key = DIRECT; - DES_set_odd_parity = DIRECT; - DES_string_to_2keys = DIRECT; - DES_string_to_key = DIRECT; - DES_xcbc_encrypt = DIRECT; - fcrypt_body = DIRECT; - i2a_ASN1_INTEGER = DIRECT; - i2a_ASN1_OBJECT = DIRECT; - i2a_ASN1_STRING = DIRECT; - i2d_ASN1_BIT_STRING = DIRECT; - i2d_ASN1_BOOLEAN = DIRECT; - i2d_ASN1_IA5STRING = DIRECT; - i2d_ASN1_INTEGER = DIRECT; - i2d_ASN1_OBJECT = DIRECT; - i2d_ASN1_OCTET_STRING = DIRECT; - i2d_ASN1_PRINTABLE = DIRECT; - i2d_ASN1_SET = DIRECT; - i2d_ASN1_TYPE = DIRECT; - i2d_ASN1_UTCTIME = DIRECT; - i2d_ASN1_bytes = DIRECT; - i2d_DHparams = DIRECT; - i2d_DSAPrivateKey = DIRECT; - i2d_DSAPrivateKey_bio = DIRECT; - i2d_DSAPrivateKey_fp = DIRECT; - i2d_DSAPublicKey = DIRECT; - i2d_DSAparams = DIRECT; - i2d_NETSCAPE_SPKAC = DIRECT; - i2d_NETSCAPE_SPKI = DIRECT; - i2d_Netscape_RSA = DIRECT; - i2d_PKCS7 = DIRECT; - i2d_PKCS7_DIGEST = DIRECT; - i2d_PKCS7_ENCRYPT = DIRECT; - i2d_PKCS7_ENC_CONTENT = DIRECT; - i2d_PKCS7_ENVELOPE = DIRECT; - i2d_PKCS7_ISSUER_AND_SERIAL = DIRECT; - i2d_PKCS7_RECIP_INFO = DIRECT; - i2d_PKCS7_SIGNED = DIRECT; - i2d_PKCS7_SIGNER_INFO = DIRECT; - i2d_PKCS7_SIGN_ENVELOPE = DIRECT; - i2d_PKCS7_bio = DIRECT; - i2d_PKCS7_fp = DIRECT; - i2d_PrivateKey = DIRECT; - i2d_PublicKey = DIRECT; - i2d_RSAPrivateKey = DIRECT; - i2d_RSAPrivateKey_bio = DIRECT; - i2d_RSAPrivateKey_fp = DIRECT; - i2d_RSAPublicKey = DIRECT; - i2d_X509 = DIRECT; - i2d_X509_ALGOR = DIRECT; - i2d_X509_ATTRIBUTE = DIRECT; - i2d_X509_CINF = DIRECT; - i2d_X509_CRL = DIRECT; - i2d_X509_CRL_INFO = DIRECT; - i2d_X509_CRL_bio = DIRECT; - i2d_X509_CRL_fp = DIRECT; - i2d_X509_EXTENSION = DIRECT; - i2d_X509_NAME = DIRECT; - i2d_X509_NAME_ENTRY = DIRECT; - i2d_X509_PKEY = DIRECT; - i2d_X509_PUBKEY = DIRECT; - i2d_X509_REQ = DIRECT; - i2d_X509_REQ_INFO = DIRECT; - i2d_X509_REQ_bio = DIRECT; - i2d_X509_REQ_fp = DIRECT; - i2d_X509_REVOKED = DIRECT; - i2d_X509_SIG = DIRECT; - i2d_X509_VAL = DIRECT; - i2d_X509_bio = DIRECT; - i2d_X509_fp = DIRECT; - idea_cbc_encrypt = DIRECT; - idea_cfb64_encrypt = DIRECT; - idea_ecb_encrypt = DIRECT; - idea_encrypt = DIRECT; - idea_ofb64_encrypt = DIRECT; - idea_options = DIRECT; - idea_set_decrypt_key = DIRECT; - idea_set_encrypt_key = DIRECT; - lh_delete = DIRECT; - lh_doall = DIRECT; - lh_doall_arg = DIRECT; - lh_free = DIRECT; - lh_insert = DIRECT; - lh_new = DIRECT; - lh_node_stats = DIRECT; - lh_node_stats_bio = DIRECT; - lh_node_usage_stats = DIRECT; - lh_node_usage_stats_bio = DIRECT; - lh_retrieve = DIRECT; - lh_stats = DIRECT; - lh_stats_bio = DIRECT; - lh_strhash = DIRECT; - sk_delete = DIRECT; - sk_delete_ptr = DIRECT; - sk_dup = DIRECT; - sk_find = DIRECT; - sk_free = DIRECT; - sk_insert = DIRECT; - sk_new = DIRECT; - sk_pop = DIRECT; - sk_pop_free = DIRECT; - sk_push = DIRECT; - sk_set_cmp_func = DIRECT; - sk_shift = DIRECT; - sk_unshift = DIRECT; - sk_zero = DIRECT; - BIO_f_nbio_test = DIRECT; - ASN1_TYPE_get = DIRECT; - ASN1_TYPE_set = DIRECT; - ERR_load_PKCS7_strings = DIRECT; - X509_find_by_issuer_and_serial = DIRECT; - X509_find_by_subject = DIRECT; - PKCS7_ctrl = DIRECT; - PKCS7_set_type = DIRECT; - PKCS7_set_content = DIRECT; - PKCS7_SIGNER_INFO_set = DIRECT; - PKCS7_add_signer = DIRECT; - PKCS7_add_certificate = DIRECT; - PKCS7_add_crl = DIRECT; - PKCS7_content_new = DIRECT; - PKCS7_dataVerify = DIRECT; - PKCS7_dataInit = DIRECT; - PKCS7_add_signature = DIRECT; - PKCS7_cert_from_signer_info = DIRECT; - PKCS7_get_signer_info = DIRECT; - PEM_read_bio_RSAPublicKey = DIRECT; - PEM_write_bio_RSAPublicKey = DIRECT; - d2i_RSAPublicKey_bio = DIRECT; - i2d_RSAPublicKey_bio = DIRECT; - PEM_read_RSAPublicKey = DIRECT; - PEM_write_RSAPublicKey = DIRECT; - d2i_RSAPublicKey_fp = DIRECT; - i2d_RSAPublicKey_fp = DIRECT; - BIO_copy_next_retry = DIRECT; - RSA_flags = DIRECT; - X509_STORE_add_crl = DIRECT; - X509_load_crl_file = DIRECT; - EVP_rc2_40_cbc = DIRECT; - EVP_rc4_40 = DIRECT; - EVP_CIPHER_CTX_init = DIRECT; - HMAC = DIRECT; - HMAC_Init = DIRECT; - HMAC_Update = DIRECT; - HMAC_Final = DIRECT; - ERR_get_next_error_library = DIRECT; - EVP_PKEY_cmp_parameters = DIRECT; - BIO_ptr_ctrl = DIRECT; - BN_BLINDING_convert = DIRECT; - BN_BLINDING_invert = DIRECT; - BN_BLINDING_update = DIRECT; - RSA_blinding_on = DIRECT; - RSA_blinding_off = DIRECT; - i2t_ASN1_OBJECT = DIRECT; - BN_BLINDING_new = DIRECT; - BN_BLINDING_free = DIRECT; - EVP_cast5_cbc = DIRECT; - EVP_cast5_cfb64 = DIRECT; - EVP_cast5_ecb = DIRECT; - EVP_cast5_ofb = DIRECT; - BF_decrypt = DIRECT; - CAST_set_key = DIRECT; - CAST_encrypt = DIRECT; - CAST_decrypt = DIRECT; - CAST_ecb_encrypt = DIRECT; - CAST_cbc_encrypt = DIRECT; - CAST_cfb64_encrypt = DIRECT; - CAST_ofb64_encrypt = DIRECT; - RC2_decrypt = DIRECT; - OBJ_create_objects = DIRECT; - BN_exp = DIRECT; - BN_mul_word = DIRECT; - BN_sub_word = DIRECT; - BN_dec2bn = DIRECT; - BN_bn2dec = DIRECT; - CRYPTO_free_ex_data = DIRECT; - CRYPTO_get_ex_data = DIRECT; - CRYPTO_set_ex_data = DIRECT; - ERR_load_CRYPTO_strings = DIRECT; - EVP_PKEY_bits = DIRECT; - MD5_Transform = DIRECT; - SHA1_Transform = DIRECT; - SHA_Transform = DIRECT; - X509_STORE_CTX_get_chain = DIRECT; - X509_STORE_CTX_get_current_cert = DIRECT; - X509_STORE_CTX_get_error = DIRECT; - X509_STORE_CTX_get_error_depth = DIRECT; - X509_STORE_CTX_get_ex_data = DIRECT; - X509_STORE_CTX_set_cert = DIRECT; - X509_STORE_CTX_set_chain = DIRECT; - X509_STORE_CTX_set_error = DIRECT; - X509_STORE_CTX_set_ex_data = DIRECT; - CRYPTO_dup_ex_data = DIRECT; - CRYPTO_get_new_lockid = DIRECT; - CRYPTO_new_ex_data = DIRECT; - RSA_set_ex_data = DIRECT; - RSA_get_ex_data = DIRECT; - RSA_get_ex_new_index = DIRECT; - RSA_padding_add_PKCS1_type_1 = DIRECT; - RSA_padding_add_PKCS1_type_2 = DIRECT; - RSA_padding_add_SSLv23 = DIRECT; - RSA_padding_add_none = DIRECT; - RSA_padding_check_PKCS1_type_1 = DIRECT; - RSA_padding_check_PKCS1_type_2 = DIRECT; - RSA_padding_check_SSLv23 = DIRECT; - RSA_padding_check_none = DIRECT; - bn_add_words = DIRECT; - CRYPTO_get_ex_new_index = DIRECT; - RIPEMD160_Init = DIRECT; - RIPEMD160_Update = DIRECT; - RIPEMD160_Final = DIRECT; - RIPEMD160 = DIRECT; - RIPEMD160_Transform = DIRECT; - BN_bn2mpi = DIRECT; - BN_mpi2bn = DIRECT; - ASN1_BIT_STRING_get_bit = DIRECT; - ASN1_BIT_STRING_set_bit = DIRECT; - BIO_get_ex_data = DIRECT; - BIO_get_ex_new_index = DIRECT; - BIO_set_ex_data = DIRECT; - EVP_PKEY_decrypt = DIRECT; - EVP_PKEY_encrypt = DIRECT; - PKCS7_RECIP_INFO_set = DIRECT; - PKCS7_add_recipient = DIRECT; - PKCS7_add_recipient_info = DIRECT; - PKCS7_set_cipher = DIRECT; - ASN1_TYPE_get_int_octetstring = DIRECT; - ASN1_TYPE_get_octetstring = DIRECT; - ASN1_TYPE_set_int_octetstring = DIRECT; - ASN1_TYPE_set_octetstring = DIRECT; - ASN1_UTCTIME_set_string = DIRECT; - ERR_add_error_data = DIRECT; - ERR_set_error_data = DIRECT; - EVP_CIPHER_asn1_to_param = DIRECT; - EVP_CIPHER_param_to_asn1 = DIRECT; - EVP_CIPHER_get_asn1_iv = DIRECT; - EVP_CIPHER_set_asn1_iv = DIRECT; - asn1_add_error = DIRECT; - d2i_ASN1_BMPSTRING = DIRECT; - i2d_ASN1_BMPSTRING = DIRECT; - BN_init = DIRECT; - COMP_CTX_new = DIRECT; - COMP_CTX_free = DIRECT; - X509_STORE_CTX_get_ex_new_index = DIRECT; - OBJ_NAME_add = DIRECT; - BIO_socket_nbio = DIRECT; - EVP_rc2_64_cbc = DIRECT; - OBJ_NAME_cleanup = DIRECT; - OBJ_NAME_get = DIRECT; - OBJ_NAME_init = DIRECT; - OBJ_NAME_new_index = DIRECT; - OBJ_NAME_remove = DIRECT; - BN_MONT_CTX_copy = DIRECT; - RAND_SSLeay = DIRECT; - RAND_set_rand_method = DIRECT; - RSA_memory_lock = DIRECT; - bn_sub_words = DIRECT; - bn_mul_normal = DIRECT; - bn_mul_comba8 = DIRECT; - bn_mul_comba4 = DIRECT; - bn_sqr_normal = DIRECT; - bn_sqr_comba8 = DIRECT; - bn_sqr_comba4 = DIRECT; - bn_cmp_words = DIRECT; - bn_mul_recursive = DIRECT; - bn_mul_part_recursive = DIRECT; - bn_sqr_recursive = DIRECT; - bn_mul_low_normal = DIRECT; - BN_RECP_CTX_init = DIRECT; - BN_RECP_CTX_new = DIRECT; - BN_RECP_CTX_free = DIRECT; - BN_RECP_CTX_set = DIRECT; - BN_mod_mul_reciprocal = DIRECT; - BN_mod_exp_recp = DIRECT; - BN_div_recp = DIRECT; - BN_CTX_init = DIRECT; - BN_MONT_CTX_init = DIRECT; - RAND_get_rand_method = DIRECT; - PKCS7_add_attribute = DIRECT; - PKCS7_add_signed_attribute = DIRECT; - PKCS7_digest_from_attributes = DIRECT; - PKCS7_get_attribute = DIRECT; - PKCS7_get_issuer_and_serial = DIRECT; - PKCS7_get_signed_attribute = DIRECT; - COMP_compress_block = DIRECT; - COMP_expand_block = DIRECT; - COMP_rle = DIRECT; - COMP_zlib = DIRECT; - PKCS7_set_attributes = DIRECT; - PKCS7_set_signed_attributes = DIRECT; - X509_ATTRIBUTE_create = DIRECT; - X509_ATTRIBUTE_dup = DIRECT; - ASN1_GENERALIZEDTIME_check = DIRECT; - ASN1_GENERALIZEDTIME_print = DIRECT; - ASN1_GENERALIZEDTIME_set = DIRECT; - ASN1_GENERALIZEDTIME_set_string = DIRECT; - ASN1_TIME_print = DIRECT; - BASIC_CONSTRAINTS_free = DIRECT; - BASIC_CONSTRAINTS_new = DIRECT; - ERR_load_X509V3_strings = DIRECT; - NETSCAPE_CERT_SEQUENCE_free = DIRECT; - NETSCAPE_CERT_SEQUENCE_new = DIRECT; - OBJ_txt2obj = DIRECT; - PEM_read_NETSCAPE_CERT_SEQUENCE = DIRECT; - PEM_read_bio_NETSCAPE_CERT_SEQUENCE = DIRECT; - PEM_write_NETSCAPE_CERT_SEQUENCE = DIRECT; - PEM_write_bio_NETSCAPE_CERT_SEQUENCE = DIRECT; - X509V3_EXT_add = DIRECT; - X509V3_EXT_add_alias = DIRECT; - X509V3_EXT_add_conf = DIRECT; - X509V3_EXT_cleanup = DIRECT; - X509V3_EXT_conf = DIRECT; - X509V3_EXT_conf_nid = DIRECT; - X509V3_EXT_get = DIRECT; - X509V3_EXT_get_nid = DIRECT; - X509V3_EXT_print = DIRECT; - X509V3_EXT_print_fp = DIRECT; - X509V3_add_standard_extensions = DIRECT; - X509V3_add_value = DIRECT; - X509V3_add_value_bool = DIRECT; - X509V3_add_value_int = DIRECT; - X509V3_conf_free = DIRECT; - X509V3_get_value_bool = DIRECT; - X509V3_get_value_int = DIRECT; - X509V3_parse_list = DIRECT; - d2i_ASN1_GENERALIZEDTIME = DIRECT; - d2i_ASN1_TIME = DIRECT; - d2i_BASIC_CONSTRAINTS = DIRECT; - d2i_NETSCAPE_CERT_SEQUENCE = DIRECT; - i2d_ASN1_GENERALIZEDTIME = DIRECT; - i2d_ASN1_TIME = DIRECT; - i2d_BASIC_CONSTRAINTS = DIRECT; - i2d_NETSCAPE_CERT_SEQUENCE = DIRECT; - EVP_MD_CTX_copy = DIRECT; - i2d_ASN1_ENUMERATED = DIRECT; - d2i_ASN1_ENUMERATED = DIRECT; - ASN1_ENUMERATED_set = DIRECT; - ASN1_ENUMERATED_get = DIRECT; - BN_to_ASN1_ENUMERATED = DIRECT; - ASN1_ENUMERATED_to_BN = DIRECT; - i2a_ASN1_ENUMERATED = DIRECT; - a2i_ASN1_ENUMERATED = DIRECT; - i2d_GENERAL_NAME = DIRECT; - d2i_GENERAL_NAME = DIRECT; - GENERAL_NAME_new = DIRECT; - GENERAL_NAME_free = DIRECT; - GENERAL_NAMES_new = DIRECT; - GENERAL_NAMES_free = DIRECT; - d2i_GENERAL_NAMES = DIRECT; - i2d_GENERAL_NAMES = DIRECT; - i2v_GENERAL_NAMES = DIRECT; - i2s_ASN1_OCTET_STRING = DIRECT; - s2i_ASN1_OCTET_STRING = DIRECT; - hex_to_string = DIRECT; - string_to_hex = DIRECT; - DES_ede3_cbcm_encrypt = DIRECT; - RSA_padding_add_PKCS1_OAEP = DIRECT; - RSA_padding_check_PKCS1_OAEP = DIRECT; - X509_CRL_print_fp = DIRECT; - X509_CRL_print = DIRECT; - i2v_GENERAL_NAME = DIRECT; - v2i_GENERAL_NAME = DIRECT; - i2d_PKEY_USAGE_PERIOD = DIRECT; - d2i_PKEY_USAGE_PERIOD = DIRECT; - PKEY_USAGE_PERIOD_new = DIRECT; - PKEY_USAGE_PERIOD_free = DIRECT; - v2i_GENERAL_NAMES = DIRECT; - i2s_ASN1_INTEGER = DIRECT; - X509V3_EXT_d2i = DIRECT; - name_cmp = DIRECT; - i2s_ASN1_ENUMERATED = DIRECT; - i2s_ASN1_ENUMERATED_TABLE = DIRECT; - BIO_s_log = DIRECT; - BIO_f_reliable = DIRECT; - PKCS7_dataFinal = DIRECT; - PKCS7_dataDecode = DIRECT; - X509V3_EXT_CRL_add_conf = DIRECT; - BN_set_params = DIRECT; - BN_get_params = DIRECT; - EVP_ripemd160 = DIRECT; - ASN1_TIME_set = DIRECT; - i2d_AUTHORITY_KEYID = DIRECT; - d2i_AUTHORITY_KEYID = DIRECT; - AUTHORITY_KEYID_new = DIRECT; - AUTHORITY_KEYID_free = DIRECT; - ASN1_seq_unpack = DIRECT; - ASN1_seq_pack = DIRECT; - ASN1_unpack_string = DIRECT; - ASN1_pack_string = DIRECT; - PKCS12_MAKE_KEYBAG = DIRECT; - PKCS8_encrypt = DIRECT; - PKCS12_MAKE_SHKEYBAG = DIRECT; - PKCS12_pack_p7data = DIRECT; - PKCS12_pack_p7encdata = DIRECT; - PKCS12_add_localkeyid = DIRECT; - PKCS12_add_friendlyname_asc = DIRECT; - PKCS12_add_friendlyname_uni = DIRECT; - PKCS12_get_friendlyname = DIRECT; - PKCS12_pbe_crypt = DIRECT; - PKCS12_init = DIRECT; - PKCS12_key_gen_asc = DIRECT; - PKCS12_key_gen_uni = DIRECT; - PKCS12_gen_mac = DIRECT; - PKCS12_verify_mac = DIRECT; - PKCS12_set_mac = DIRECT; - PKCS12_setup_mac = DIRECT; - i2d_PKCS12_BAGS = DIRECT; - PKCS12_BAGS_new = DIRECT; - d2i_PKCS12_BAGS = DIRECT; - PKCS12_BAGS_free = DIRECT; - i2d_PKCS12 = DIRECT; - d2i_PKCS12 = DIRECT; - PKCS12_new = DIRECT; - PKCS12_free = DIRECT; - i2d_PKCS12_MAC_DATA = DIRECT; - PKCS12_MAC_DATA_new = DIRECT; - d2i_PKCS12_MAC_DATA = DIRECT; - PKCS12_MAC_DATA_free = DIRECT; - i2d_PKCS12_SAFEBAG = DIRECT; - PKCS12_SAFEBAG_new = DIRECT; - d2i_PKCS12_SAFEBAG = DIRECT; - PKCS12_SAFEBAG_free = DIRECT; - ERR_load_PKCS12_strings = DIRECT; - PKCS12_PBE_add = DIRECT; - PKCS8_add_keyusage = DIRECT; - PKCS12_get_attr_gen = DIRECT; - PKCS12_parse = DIRECT; - PKCS12_create = DIRECT; - i2d_PKCS12_bio = DIRECT; - i2d_PKCS12_fp = DIRECT; - d2i_PKCS12_bio = DIRECT; - d2i_PKCS12_fp = DIRECT; - i2d_PBEPARAM = DIRECT; - PBEPARAM_new = DIRECT; - d2i_PBEPARAM = DIRECT; - PBEPARAM_free = DIRECT; - i2d_PKCS8_PRIV_KEY_INFO = DIRECT; - PKCS8_PRIV_KEY_INFO_new = DIRECT; - d2i_PKCS8_PRIV_KEY_INFO = DIRECT; - PKCS8_PRIV_KEY_INFO_free = DIRECT; - EVP_PKCS82PKEY = DIRECT; - EVP_PKEY2PKCS8 = DIRECT; - PKCS8_set_broken = DIRECT; - EVP_PBE_alg_add = DIRECT; - PKCS5_pbe_set = DIRECT; - EVP_PBE_cleanup = DIRECT; - i2d_SXNET = DIRECT; - d2i_SXNET = DIRECT; - SXNET_new = DIRECT; - SXNET_free = DIRECT; - i2d_SXNETID = DIRECT; - d2i_SXNETID = DIRECT; - SXNETID_new = DIRECT; - SXNETID_free = DIRECT; - DSA_SIG_new = DIRECT; - DSA_SIG_free = DIRECT; - DSA_do_sign = DIRECT; - DSA_do_verify = DIRECT; - d2i_DSA_SIG = DIRECT; - i2d_DSA_SIG = DIRECT; - i2d_ASN1_VISIBLESTRING = DIRECT; - d2i_ASN1_VISIBLESTRING = DIRECT; - i2d_ASN1_UTF8STRING = DIRECT; - d2i_ASN1_UTF8STRING = DIRECT; - i2d_DIRECTORYSTRING = DIRECT; - d2i_DIRECTORYSTRING = DIRECT; - i2d_DISPLAYTEXT = DIRECT; - d2i_DISPLAYTEXT = DIRECT; - i2d_PBKDF2PARAM = DIRECT; - PBKDF2PARAM_new = DIRECT; - d2i_PBKDF2PARAM = DIRECT; - PBKDF2PARAM_free = DIRECT; - i2d_PBE2PARAM = DIRECT; - PBE2PARAM_new = DIRECT; - d2i_PBE2PARAM = DIRECT; - PBE2PARAM_free = DIRECT; - SXNET_add_id_asc = DIRECT; - SXNET_add_id_ulong = DIRECT; - SXNET_add_id_INTEGER = DIRECT; - SXNET_get_id_asc = DIRECT; - SXNET_get_id_ulong = DIRECT; - SXNET_get_id_INTEGER = DIRECT; - X509V3_set_conf_lhash = DIRECT; - i2d_CERTIFICATEPOLICIES = DIRECT; - CERTIFICATEPOLICIES_new = DIRECT; - CERTIFICATEPOLICIES_free = DIRECT; - d2i_CERTIFICATEPOLICIES = DIRECT; - i2d_POLICYINFO = DIRECT; - POLICYINFO_new = DIRECT; - d2i_POLICYINFO = DIRECT; - POLICYINFO_free = DIRECT; - i2d_POLICYQUALINFO = DIRECT; - POLICYQUALINFO_new = DIRECT; - d2i_POLICYQUALINFO = DIRECT; - POLICYQUALINFO_free = DIRECT; - i2d_USERNOTICE = DIRECT; - USERNOTICE_new = DIRECT; - d2i_USERNOTICE = DIRECT; - USERNOTICE_free = DIRECT; - i2d_NOTICEREF = DIRECT; - NOTICEREF_new = DIRECT; - d2i_NOTICEREF = DIRECT; - NOTICEREF_free = DIRECT; - X509V3_get_string = DIRECT; - X509V3_get_section = DIRECT; - X509V3_string_free = DIRECT; - X509V3_section_free = DIRECT; - X509V3_set_ctx = DIRECT; - s2i_ASN1_INTEGER = DIRECT; - CRYPTO_set_locked_mem_functions = DIRECT; - CRYPTO_get_locked_mem_functions = DIRECT; - CRYPTO_malloc_locked = DIRECT; - CRYPTO_free_locked = DIRECT; - BN_mod_exp2_mont = DIRECT; - ERR_get_error_line_data = DIRECT; - ERR_peek_error_line_data = DIRECT; - PKCS12_PBE_keyivgen = DIRECT; - X509_ALGOR_dup = DIRECT; - i2d_CRL_DIST_POINTS = DIRECT; - CRL_DIST_POINTS_new = DIRECT; - CRL_DIST_POINTS_free = DIRECT; - d2i_CRL_DIST_POINTS = DIRECT; - i2d_DIST_POINT = DIRECT; - DIST_POINT_new = DIRECT; - d2i_DIST_POINT = DIRECT; - DIST_POINT_free = DIRECT; - i2d_DIST_POINT_NAME = DIRECT; - DIST_POINT_NAME_new = DIRECT; - DIST_POINT_NAME_free = DIRECT; - d2i_DIST_POINT_NAME = DIRECT; - X509V3_add_value_uchar = DIRECT; - X509V3_EXT_i2d = DIRECT; - X509V3_EXT_val_prn = DIRECT; - X509V3_EXT_add_list = DIRECT; - EVP_CIPHER_type = DIRECT; - EVP_PBE_CipherInit = DIRECT; - X509V3_add_value_bool_nf = DIRECT; - d2i_ASN1_UINTEGER = DIRECT; - sk_value = DIRECT; - sk_num = DIRECT; - sk_set = DIRECT; - sk_sort = DIRECT; - PKCS5_PBE_add = DIRECT; - PEM_write_bio_PKCS8 = DIRECT; - i2d_PKCS8_fp = DIRECT; - PEM_read_bio_PKCS8_PRIV_KEY_INFO = DIRECT; - d2i_PKCS8_bio = DIRECT; - d2i_PKCS8_PRIV_KEY_INFO_fp = DIRECT; - PEM_write_bio_PKCS8_PRIV_KEY_INFO = DIRECT; - PEM_read_PKCS8 = DIRECT; - d2i_PKCS8_PRIV_KEY_INFO_bio = DIRECT; - d2i_PKCS8_fp = DIRECT; - PEM_write_PKCS8 = DIRECT; - PEM_read_PKCS8_PRIV_KEY_INFO = DIRECT; - PEM_read_bio_PKCS8 = DIRECT; - PEM_write_PKCS8_PRIV_KEY_INFO = DIRECT; - PKCS5_PBE_keyivgen = DIRECT; - i2d_PKCS8_bio = DIRECT; - i2d_PKCS8_PRIV_KEY_INFO_fp = DIRECT; - i2d_PKCS8_PRIV_KEY_INFO_bio = DIRECT; - BIO_s_bio = DIRECT; - PKCS5_pbe2_set = DIRECT; - PKCS5_v2_PBE_keyivgen = DIRECT; - PEM_write_bio_PKCS8PrivateKey = DIRECT; - PEM_write_PKCS8PrivateKey = DIRECT; - BIO_ctrl_get_read_request = DIRECT; - BIO_ctrl_pending = DIRECT; - BIO_ctrl_wpending = DIRECT; - BIO_new_bio_pair = DIRECT; - BIO_ctrl_get_write_guarantee = DIRECT; - CRYPTO_num_locks = DIRECT; - CONF_load_bio = DIRECT; - CONF_load_fp = DIRECT; - PKCS7_signatureVerify = DIRECT; - RSA_set_method = DIRECT; - RSA_get_method = DIRECT; - RSA_get_default_method = DIRECT; - RSA_check_key = DIRECT; - OBJ_obj2txt = DIRECT; - DSA_dup_DH = DIRECT; - X509_REQ_get_extensions = DIRECT; - X509_REQ_set_extension_nids = DIRECT; - BIO_nwrite = DIRECT; - X509_REQ_extension_nid = DIRECT; - BIO_nread = DIRECT; - X509_REQ_get_extension_nids = DIRECT; - BIO_nwrite0 = DIRECT; - X509_REQ_add_extensions_nid = DIRECT; - BIO_nread0 = DIRECT; - X509_REQ_add_extensions = DIRECT; - BIO_new_mem_buf = DIRECT; - DH_set_ex_data = DIRECT; - DH_set_method = DIRECT; - DSA_OpenSSL = DIRECT; - DH_get_ex_data = DIRECT; - DH_get_ex_new_index = DIRECT; - DSA_new_method = DIRECT; - DH_new_method = DIRECT; - DH_OpenSSL = DIRECT; - DSA_get_ex_new_index = DIRECT; - DH_get_default_method = DIRECT; - DSA_set_ex_data = DIRECT; - DH_set_default_method = DIRECT; - DSA_get_ex_data = DIRECT; - X509V3_EXT_REQ_add_conf = DIRECT; - NETSCAPE_SPKI_print = DIRECT; - NETSCAPE_SPKI_set_pubkey = DIRECT; - NETSCAPE_SPKI_b64_encode = DIRECT; - NETSCAPE_SPKI_get_pubkey = DIRECT; - NETSCAPE_SPKI_b64_decode = DIRECT; - UTF8_putc = DIRECT; - UTF8_getc = DIRECT; - RSA_null_method = DIRECT; - ASN1_tag2str = DIRECT; - BIO_ctrl_reset_read_request = DIRECT; - DISPLAYTEXT_new = DIRECT; - ASN1_GENERALIZEDTIME_free = DIRECT; - X509_REVOKED_get_ext_d2i = DIRECT; - X509_set_ex_data = DIRECT; - X509_NAME_add_entry_by_txt = DIRECT; - X509_NAME_add_entry_by_NID = DIRECT; - X509_PURPOSE_get0 = DIRECT; - PEM_read_X509_AUX = DIRECT; - d2i_AUTHORITY_INFO_ACCESS = DIRECT; - PEM_write_PUBKEY = DIRECT; - ACCESS_DESCRIPTION_new = DIRECT; - X509_CERT_AUX_free = DIRECT; - d2i_ACCESS_DESCRIPTION = DIRECT; - X509_trust_clear = DIRECT; - X509_TRUST_add = DIRECT; - ASN1_VISIBLESTRING_new = DIRECT; - X509_alias_set1 = DIRECT; - ASN1_PRINTABLESTRING_free = DIRECT; - EVP_PKEY_get1_DSA = DIRECT; - ASN1_BMPSTRING_new = DIRECT; - ASN1_mbstring_copy = DIRECT; - ASN1_UTF8STRING_new = DIRECT; - DSA_get_default_method = DIRECT; - ASN1_T61STRING_free = DIRECT; - DSA_set_method = DIRECT; - X509_get_ex_data = DIRECT; - ASN1_STRING_type = DIRECT; - X509_PURPOSE_get_by_sname = DIRECT; - ASN1_TIME_free = DIRECT; - ASN1_OCTET_STRING_cmp = DIRECT; - ASN1_BIT_STRING_new = DIRECT; - X509_get_ext_d2i = DIRECT; - PEM_read_bio_X509_AUX = DIRECT; - ASN1_STRING_set_default_mask_asc = DIRECT; - PEM_write_bio_RSA_PUBKEY = DIRECT; - ASN1_INTEGER_cmp = DIRECT; - d2i_RSA_PUBKEY_fp = DIRECT; - PEM_write_bio_DSA_PUBKEY = DIRECT; - X509_STORE_CTX_free = DIRECT; - EVP_PKEY_set1_DSA = DIRECT; - i2d_DSA_PUBKEY_fp = DIRECT; - X509_load_cert_crl_file = DIRECT; - ASN1_TIME_new = DIRECT; - i2d_RSA_PUBKEY = DIRECT; - X509_STORE_CTX_purpose_inherit = DIRECT; - PEM_read_RSA_PUBKEY = DIRECT; - d2i_X509_AUX = DIRECT; - i2d_DSA_PUBKEY = DIRECT; - X509_CERT_AUX_print = DIRECT; - PEM_read_DSA_PUBKEY = DIRECT; - i2d_RSA_PUBKEY_bio = DIRECT; - ASN1_BIT_STRING_num_asc = DIRECT; - i2d_PUBKEY = DIRECT; - ASN1_UTCTIME_free = DIRECT; - DSA_set_default_method = DIRECT; - X509_PURPOSE_get_by_id = DIRECT; - ACCESS_DESCRIPTION_free = DIRECT; - PEM_read_bio_PUBKEY = DIRECT; - ASN1_STRING_set_by_NID = DIRECT; - X509_PURPOSE_get_id = DIRECT; - DISPLAYTEXT_free = DIRECT; - OTHERNAME_new = DIRECT; - X509_CERT_AUX_new = DIRECT; - X509_TRUST_cleanup = DIRECT; - X509_NAME_add_entry_by_OBJ = DIRECT; - X509_CRL_get_ext_d2i = DIRECT; - X509_PURPOSE_get0_name = DIRECT; - PEM_read_PUBKEY = DIRECT; - i2d_DSA_PUBKEY_bio = DIRECT; - i2d_OTHERNAME = DIRECT; - ASN1_OCTET_STRING_free = DIRECT; - ASN1_BIT_STRING_set_asc = DIRECT; - X509_get_ex_new_index = DIRECT; - ASN1_STRING_TABLE_cleanup = DIRECT; - X509_TRUST_get_by_id = DIRECT; - X509_PURPOSE_get_trust = DIRECT; - ASN1_STRING_length = DIRECT; - ASN1_PRINTABLESTRING_new = DIRECT; - X509V3_get_d2i = DIRECT; - ASN1_ENUMERATED_free = DIRECT; - i2d_X509_CERT_AUX = DIRECT; - X509_STORE_CTX_set_trust = DIRECT; - ASN1_STRING_set_default_mask = DIRECT; - X509_STORE_CTX_new = DIRECT; - EVP_PKEY_get1_RSA = DIRECT; - DIRECTORYSTRING_free = DIRECT; - PEM_write_X509_AUX = DIRECT; - ASN1_OCTET_STRING_set = DIRECT; - d2i_DSA_PUBKEY_fp = DIRECT; - d2i_RSA_PUBKEY = DIRECT; - X509_TRUST_get0_name = DIRECT; - X509_TRUST_get0 = DIRECT; - AUTHORITY_INFO_ACCESS_free = DIRECT; - ASN1_IA5STRING_new = DIRECT; - d2i_DSA_PUBKEY = DIRECT; - X509_check_purpose = DIRECT; - ASN1_ENUMERATED_new = DIRECT; - d2i_RSA_PUBKEY_bio = DIRECT; - d2i_PUBKEY = DIRECT; - X509_TRUST_get_trust = DIRECT; - X509_TRUST_get_flags = DIRECT; - ASN1_BMPSTRING_free = DIRECT; - ASN1_T61STRING_new = DIRECT; - ASN1_UTCTIME_new = DIRECT; - i2d_AUTHORITY_INFO_ACCESS = DIRECT; - EVP_PKEY_set1_RSA = DIRECT; - X509_STORE_CTX_set_purpose = DIRECT; - ASN1_IA5STRING_free = DIRECT; - PEM_write_bio_X509_AUX = DIRECT; - X509_PURPOSE_get_count = DIRECT; - X509_NAME_ENTRY_create_by_txt = DIRECT; - ASN1_STRING_get_default_mask = DIRECT; - X509_alias_get0 = DIRECT; - ASN1_STRING_data = DIRECT; - i2d_ACCESS_DESCRIPTION = DIRECT; - ASN1_BIT_STRING_free = DIRECT; - PEM_read_bio_RSA_PUBKEY = DIRECT; - X509_add1_reject_object = DIRECT; - X509_check_trust = DIRECT; - PEM_read_bio_DSA_PUBKEY = DIRECT; - X509_PURPOSE_add = DIRECT; - ASN1_STRING_TABLE_get = DIRECT; - ASN1_UTF8STRING_free = DIRECT; - d2i_DSA_PUBKEY_bio = DIRECT; - PEM_write_RSA_PUBKEY = DIRECT; - d2i_OTHERNAME = DIRECT; - PEM_write_DSA_PUBKEY = DIRECT; - X509_PURPOSE_get0_sname = DIRECT; - EVP_PKEY_set1_DH = DIRECT; - ASN1_OCTET_STRING_dup = DIRECT; - ASN1_BIT_STRING_set = DIRECT; - X509_TRUST_get_count = DIRECT; - ASN1_INTEGER_free = DIRECT; - OTHERNAME_free = DIRECT; - i2d_RSA_PUBKEY_fp = DIRECT; - ASN1_INTEGER_dup = DIRECT; - d2i_X509_CERT_AUX = DIRECT; - PEM_write_bio_PUBKEY = DIRECT; - ASN1_VISIBLESTRING_free = DIRECT; - X509_PURPOSE_cleanup = DIRECT; - ASN1_mbstring_ncopy = DIRECT; - ASN1_GENERALIZEDTIME_new = DIRECT; - EVP_PKEY_get1_DH = DIRECT; - ASN1_OCTET_STRING_new = DIRECT; - ASN1_INTEGER_new = DIRECT; - i2d_X509_AUX = DIRECT; - ASN1_BIT_STRING_name_print = DIRECT; - X509_cmp = DIRECT; - ASN1_STRING_length_set = DIRECT; - DIRECTORYSTRING_new = DIRECT; - X509_add1_trust_object = DIRECT; - PKCS12_newpass = DIRECT; - SMIME_write_PKCS7 = DIRECT; - SMIME_read_PKCS7 = DIRECT; - DES_set_key_checked = DIRECT; - PKCS7_verify = DIRECT; - PKCS7_encrypt = DIRECT; - DES_set_key_unchecked = DIRECT; - SMIME_crlf_copy = DIRECT; - i2d_ASN1_PRINTABLESTRING = DIRECT; - PKCS7_get0_signers = DIRECT; - PKCS7_decrypt = DIRECT; - SMIME_text = DIRECT; - PKCS7_simple_smimecap = DIRECT; - PKCS7_get_smimecap = DIRECT; - PKCS7_sign = DIRECT; - PKCS7_add_attrib_smimecap = DIRECT; - CRYPTO_dbg_set_options = DIRECT; - CRYPTO_remove_all_info = DIRECT; - CRYPTO_get_mem_debug_functions = DIRECT; - CRYPTO_is_mem_check_on = DIRECT; - CRYPTO_set_mem_debug_functions = DIRECT; - CRYPTO_pop_info = DIRECT; - CRYPTO_push_info_ = DIRECT; - CRYPTO_set_mem_debug_options = DIRECT; - PEM_write_PKCS8PrivateKey_nid = DIRECT; - PEM_write_bio_PKCS8PrivateKey_nid = DIRECT; - d2i_PKCS8PrivateKey_bio = DIRECT; - ASN1_NULL_free = DIRECT; - d2i_ASN1_NULL = DIRECT; - ASN1_NULL_new = DIRECT; - i2d_PKCS8PrivateKey_bio = DIRECT; - i2d_PKCS8PrivateKey_fp = DIRECT; - i2d_ASN1_NULL = DIRECT; - i2d_PKCS8PrivateKey_nid_fp = DIRECT; - d2i_PKCS8PrivateKey_fp = DIRECT; - i2d_PKCS8PrivateKey_nid_bio = DIRECT; - i2d_PKCS8PrivateKeyInfo_fp = DIRECT; - i2d_PKCS8PrivateKeyInfo_bio = DIRECT; - i2d_PrivateKey_fp = DIRECT; - d2i_PrivateKey_bio = DIRECT; - d2i_PrivateKey_fp = DIRECT; - i2d_PrivateKey_bio = DIRECT; - X509_reject_clear = DIRECT; - X509_TRUST_set_default = DIRECT; - d2i_AutoPrivateKey = DIRECT; - X509_ATTRIBUTE_get0_type = DIRECT; - X509_ATTRIBUTE_set1_data = DIRECT; - X509at_get_attr = DIRECT; - X509at_get_attr_count = DIRECT; - X509_ATTRIBUTE_create_by_NID = DIRECT; - X509_ATTRIBUTE_set1_object = DIRECT; - X509_ATTRIBUTE_count = DIRECT; - X509_ATTRIBUTE_create_by_OBJ = DIRECT; - X509_ATTRIBUTE_get0_object = DIRECT; - X509at_get_attr_by_NID = DIRECT; - X509at_add1_attr = DIRECT; - X509_ATTRIBUTE_get0_data = DIRECT; - X509at_delete_attr = DIRECT; - X509at_get_attr_by_OBJ = DIRECT; - RAND_add = DIRECT; - BIO_number_written = DIRECT; - BIO_number_read = DIRECT; - X509_STORE_CTX_get1_chain = DIRECT; - ERR_load_RAND_strings = DIRECT; - RAND_pseudo_bytes = DIRECT; - X509_REQ_get_attr_by_NID = DIRECT; - X509_REQ_get_attr = DIRECT; - X509_REQ_add1_attr_by_NID = DIRECT; - X509_REQ_get_attr_by_OBJ = DIRECT; - X509at_add1_attr_by_NID = DIRECT; - X509_REQ_add1_attr_by_OBJ = DIRECT; - X509_REQ_get_attr_count = DIRECT; - X509_REQ_add1_attr = DIRECT; - X509_REQ_delete_attr = DIRECT; - X509at_add1_attr_by_OBJ = DIRECT; - X509_REQ_add1_attr_by_txt = DIRECT; - X509_ATTRIBUTE_create_by_txt = DIRECT; - X509at_add1_attr_by_txt = DIRECT; - BN_pseudo_rand = DIRECT; - BN_is_prime_fasttest = DIRECT; - BN_CTX_end = DIRECT; - BN_CTX_start = DIRECT; - BN_CTX_get = DIRECT; - EVP_PKEY2PKCS8_broken = DIRECT; - ASN1_STRING_TABLE_add = DIRECT; - CRYPTO_dbg_get_options = DIRECT; - AUTHORITY_INFO_ACCESS_new = DIRECT; - CRYPTO_get_mem_debug_options = DIRECT; - DES_crypt = DIRECT; - PEM_write_bio_X509_REQ_NEW = DIRECT; - PEM_write_X509_REQ_NEW = DIRECT; - BIO_callback_ctrl = DIRECT; - RAND_egd = DIRECT; - RAND_status = DIRECT; - DES_check_key_parity = DIRECT; - lh_num_items = DIRECT; - DSO_new = DIRECT; - DSO_new_method = DIRECT; - DSO_free = DIRECT; - DSO_flags = DIRECT; - DSO_set_default_method = DIRECT; - DSO_get_default_method = DIRECT; - DSO_get_method = DIRECT; - DSO_set_method = DIRECT; - DSO_load = DIRECT; - DSO_bind_var = DIRECT; - DSO_METHOD_null = DIRECT; - DSO_METHOD_openssl = DIRECT; - DSO_METHOD_dlfcn = DIRECT; - DSO_METHOD_win32 = DIRECT; - ERR_load_DSO_strings = DIRECT; - DSO_METHOD_dl = DIRECT; - NCONF_load = DIRECT; - NCONF_load_fp = DIRECT; - NCONF_new = DIRECT; - NCONF_get_string = DIRECT; - NCONF_free = DIRECT; - CONF_dump_fp = DIRECT; - NCONF_load_bio = DIRECT; - NCONF_dump_fp = DIRECT; - NCONF_get_section = DIRECT; - NCONF_dump_bio = DIRECT; - CONF_dump_bio = DIRECT; - NCONF_free_data = DIRECT; - CONF_set_default_method = DIRECT; - ERR_error_string_n = DIRECT; - BIO_snprintf = DIRECT; - DSO_ctrl = DIRECT; - BIO_vfree = DIRECT; - X509_REQ_digest = DIRECT; - X509_CRL_digest = DIRECT; - EVP_CIPHER_CTX_set_key_length = DIRECT; - EVP_CIPHER_CTX_ctrl = DIRECT; - BN_mod_exp_mont_word = DIRECT; - RAND_egd_bytes = DIRECT; - X509_REQ_get1_email = DIRECT; - X509_get1_email = DIRECT; - X509_email_free = DIRECT; - i2d_RSA_NET = DIRECT; - d2i_RSA_NET = DIRECT; - DSO_bind_func = DIRECT; - CRYPTO_get_new_dynlockid = DIRECT; - sk_new_null = DIRECT; - CRYPTO_set_dynlock_destroy_callback = DIRECT; - CRYPTO_destroy_dynlockid = DIRECT; - CRYPTO_set_dynlock_create_callback = DIRECT; - CRYPTO_set_dynlock_lock_callback = DIRECT; - CRYPTO_get_dynlock_lock_callback = DIRECT; - CRYPTO_get_dynlock_destroy_callback = DIRECT; - CRYPTO_get_dynlock_value = DIRECT; - CRYPTO_get_dynlock_create_callback = DIRECT; - c2i_ASN1_BIT_STRING = DIRECT; - i2c_ASN1_BIT_STRING = DIRECT; - RAND_poll = DIRECT; - c2i_ASN1_INTEGER = DIRECT; - i2c_ASN1_INTEGER = DIRECT; - BIO_dump_indent = DIRECT; - ASN1_parse_dump = DIRECT; - c2i_ASN1_OBJECT = DIRECT; - X509_NAME_print_ex_fp = DIRECT; - ASN1_STRING_print_ex_fp = DIRECT; - X509_NAME_print_ex = DIRECT; - ASN1_STRING_print_ex = DIRECT; - MD4 = DIRECT; - MD4_Transform = DIRECT; - MD4_Final = DIRECT; - MD4_Update = DIRECT; - MD4_Init = DIRECT; - EVP_md4 = DIRECT; - i2d_PUBKEY_bio = DIRECT; - i2d_PUBKEY_fp = DIRECT; - d2i_PUBKEY_bio = DIRECT; - ASN1_STRING_to_UTF8 = DIRECT; - BIO_vprintf = DIRECT; - BIO_vsnprintf = DIRECT; - d2i_PUBKEY_fp = DIRECT; - X509_cmp_time = DIRECT; - X509_STORE_CTX_set_time = DIRECT; - X509_STORE_CTX_get1_issuer = DIRECT; - X509_OBJECT_retrieve_match = DIRECT; - X509_OBJECT_idx_by_subject = DIRECT; - X509_STORE_CTX_set_flags = DIRECT; - X509_STORE_CTX_trusted_stack = DIRECT; - X509_time_adj = DIRECT; - X509_check_issued = DIRECT; - ASN1_UTCTIME_cmp_time_t = DIRECT; - X509_keyid_set1 = DIRECT; - BIO_next = DIRECT; - DSO_METHOD_vms = DIRECT; - BN_bntest_rand = DIRECT; - OPENSSL_issetugid = DIRECT; - BN_rand_range = DIRECT; - ERR_load_ENGINE_strings = DIRECT; - ENGINE_set_DSA = DIRECT; - ENGINE_get_finish_function = DIRECT; - ENGINE_get_default_RSA = DIRECT; - ENGINE_set_DH = DIRECT; - ENGINE_init = DIRECT; - ENGINE_finish = DIRECT; - ENGINE_load_public_key = DIRECT; - ENGINE_get_DH = DIRECT; - ENGINE_ctrl = DIRECT; - ENGINE_get_init_function = DIRECT; - ENGINE_set_init_function = DIRECT; - ENGINE_set_default_DSA = DIRECT; - ENGINE_get_name = DIRECT; - ENGINE_get_last = DIRECT; - ENGINE_get_prev = DIRECT; - ENGINE_get_default_DH = DIRECT; - ENGINE_get_RSA = DIRECT; - ENGINE_set_default = DIRECT; - ENGINE_get_RAND = DIRECT; - ENGINE_get_first = DIRECT; - ENGINE_by_id = DIRECT; - ENGINE_set_finish_function = DIRECT; - ENGINE_set_RSA = DIRECT; - ENGINE_load_private_key = DIRECT; - ENGINE_set_default_RAND = DIRECT; - ENGINE_remove = DIRECT; - ENGINE_free = DIRECT; - ENGINE_get_next = DIRECT; - ENGINE_set_name = DIRECT; - ENGINE_get_default_DSA = DIRECT; - ENGINE_set_default_RSA = DIRECT; - ENGINE_get_default_RAND = DIRECT; - ENGINE_set_RAND = DIRECT; - ENGINE_set_id = DIRECT; - ENGINE_set_default_DH = DIRECT; - ENGINE_new = DIRECT; - ENGINE_get_id = DIRECT; - ENGINE_add = DIRECT; - ENGINE_get_DSA = DIRECT; - ENGINE_get_ctrl_function = DIRECT; - ENGINE_set_ctrl_function = DIRECT; - BN_pseudo_rand_range = DIRECT; - X509_STORE_CTX_set_verify_cb = DIRECT; - ERR_load_COMP_strings = DIRECT; - PKCS12_item_decrypt_d2i = DIRECT; - ASN1_UTF8STRING_it = DIRECT; - ASN1_UTF8STRING_it = DIRECT; - ENGINE_unregister_ciphers = DIRECT; - ENGINE_get_ciphers = DIRECT; - d2i_OCSP_BASICRESP = DIRECT; - KRB5_CHECKSUM_it = DIRECT; - KRB5_CHECKSUM_it = DIRECT; - EC_POINT_add = DIRECT; - ASN1_item_ex_i2d = DIRECT; - OCSP_CERTID_it = DIRECT; - OCSP_CERTID_it = DIRECT; - d2i_OCSP_RESPBYTES = DIRECT; - X509V3_add1_i2d = DIRECT; - PKCS7_ENVELOPE_it = DIRECT; - PKCS7_ENVELOPE_it = DIRECT; - UI_add_input_boolean = DIRECT; - ENGINE_unregister_RSA = DIRECT; - X509V3_EXT_nconf = DIRECT; - ASN1_GENERALSTRING_free = DIRECT; - d2i_OCSP_CERTSTATUS = DIRECT; - X509_REVOKED_set_serialNumber = DIRECT; - X509_print_ex = DIRECT; - OCSP_ONEREQ_get1_ext_d2i = DIRECT; - ENGINE_register_all_RAND = DIRECT; - ENGINE_load_dynamic = DIRECT; - PBKDF2PARAM_it = DIRECT; - PBKDF2PARAM_it = DIRECT; - EXTENDED_KEY_USAGE_new = DIRECT; - EC_GROUP_clear_free = DIRECT; - OCSP_sendreq_bio = DIRECT; - ASN1_item_digest = DIRECT; - OCSP_BASICRESP_delete_ext = DIRECT; - OCSP_SIGNATURE_it = DIRECT; - OCSP_SIGNATURE_it = DIRECT; - X509_CRL_it = DIRECT; - X509_CRL_it = DIRECT; - OCSP_BASICRESP_add_ext = DIRECT; - KRB5_ENCKEY_it = DIRECT; - KRB5_ENCKEY_it = DIRECT; - UI_method_set_closer = DIRECT; - X509_STORE_set_purpose = DIRECT; - i2d_ASN1_GENERALSTRING = DIRECT; - OCSP_response_status = DIRECT; - i2d_OCSP_SERVICELOC = DIRECT; - ENGINE_get_digest_engine = DIRECT; - EC_GROUP_set_curve_GFp = DIRECT; - OCSP_REQUEST_get_ext_by_OBJ = DIRECT; - _ossl_old_des_random_key = DIRECT; - ASN1_T61STRING_it = DIRECT; - ASN1_T61STRING_it = DIRECT; - EC_GROUP_method_of = DIRECT; - i2d_KRB5_APREQ = DIRECT; - _ossl_old_des_encrypt = DIRECT; - ASN1_PRINTABLE_new = DIRECT; - HMAC_Init_ex = DIRECT; - d2i_KRB5_AUTHENT = DIRECT; - OCSP_archive_cutoff_new = DIRECT; - EC_POINT_set_Jprojective_coordinates_GFp = DIRECT; - _ossl_old_des_is_weak_key = DIRECT; - OCSP_BASICRESP_get_ext_by_OBJ = DIRECT; - EC_POINT_oct2point = DIRECT; - OCSP_SINGLERESP_get_ext_count = DIRECT; - UI_ctrl = DIRECT; - asn1_do_adb = DIRECT; - ASN1_template_i2d = DIRECT; - ENGINE_register_DH = DIRECT; - UI_construct_prompt = DIRECT; - X509_STORE_set_trust = DIRECT; - UI_dup_input_string = DIRECT; - d2i_KRB5_APREQ = DIRECT; - EVP_MD_CTX_copy_ex = DIRECT; - OCSP_request_is_signed = DIRECT; - i2d_OCSP_REQINFO = DIRECT; - KRB5_ENCKEY_free = DIRECT; - OCSP_resp_get0 = DIRECT; - GENERAL_NAME_it = DIRECT; - GENERAL_NAME_it = DIRECT; - ASN1_GENERALIZEDTIME_it = DIRECT; - ASN1_GENERALIZEDTIME_it = DIRECT; - X509_STORE_set_flags = DIRECT; - EC_POINT_set_compressed_coordinates_GFp = DIRECT; - OCSP_response_status_str = DIRECT; - d2i_OCSP_REVOKEDINFO = DIRECT; - OCSP_basic_add1_cert = DIRECT; - ERR_get_implementation = DIRECT; - EVP_CipherFinal_ex = DIRECT; - OCSP_CERTSTATUS_new = DIRECT; - CRYPTO_cleanup_all_ex_data = DIRECT; - OCSP_resp_find = DIRECT; - BN_nnmod = DIRECT; - X509_CRL_sort = DIRECT; - X509_REVOKED_set_revocationDate = DIRECT; - ENGINE_register_RAND = DIRECT; - OCSP_SERVICELOC_new = DIRECT; - EC_POINT_set_affine_coordinates_GFp = DIRECT; - _ossl_old_des_options = DIRECT; - SXNET_it = DIRECT; - SXNET_it = DIRECT; - UI_dup_input_boolean = DIRECT; - PKCS12_add_CSPName_asc = DIRECT; - EC_POINT_is_at_infinity = DIRECT; - ENGINE_load_cryptodev = DIRECT; - DSO_convert_filename = DIRECT; - POLICYQUALINFO_it = DIRECT; - POLICYQUALINFO_it = DIRECT; - ENGINE_register_ciphers = DIRECT; - BN_mod_lshift_quick = DIRECT; - DSO_set_filename = DIRECT; - ASN1_item_free = DIRECT; - KRB5_TKTBODY_free = DIRECT; - AUTHORITY_KEYID_it = DIRECT; - AUTHORITY_KEYID_it = DIRECT; - KRB5_APREQBODY_new = DIRECT; - X509V3_EXT_REQ_add_nconf = DIRECT; - ENGINE_ctrl_cmd_string = DIRECT; - i2d_OCSP_RESPDATA = DIRECT; - EVP_MD_CTX_init = DIRECT; - EXTENDED_KEY_USAGE_free = DIRECT; - PKCS7_ATTR_SIGN_it = DIRECT; - PKCS7_ATTR_SIGN_it = DIRECT; - UI_add_error_string = DIRECT; - KRB5_CHECKSUM_free = DIRECT; - OCSP_REQUEST_get_ext = DIRECT; - ENGINE_register_all_digests = DIRECT; - PKEY_USAGE_PERIOD_it = DIRECT; - PKEY_USAGE_PERIOD_it = DIRECT; - PKCS12_unpack_authsafes = DIRECT; - ASN1_item_unpack = DIRECT; - NETSCAPE_SPKAC_it = DIRECT; - NETSCAPE_SPKAC_it = DIRECT; - X509_REVOKED_it = DIRECT; - X509_REVOKED_it = DIRECT; - EVP_aes_128_ecb = DIRECT; - KRB5_AUTHENT_free = DIRECT; - OCSP_BASICRESP_get_ext_by_critical = DIRECT; - OCSP_cert_status_str = DIRECT; - d2i_OCSP_REQUEST = DIRECT; - UI_dup_info_string = DIRECT; - PKCS12_it = DIRECT; - PKCS12_it = DIRECT; - OCSP_SINGLERESP_get_ext_by_critical = DIRECT; - OCSP_CERTSTATUS_free = DIRECT; - _ossl_old_des_crypt = DIRECT; - ASN1_item_i2d = DIRECT; - EVP_DecryptFinal_ex = DIRECT; - ENGINE_load_openssl = DIRECT; - ENGINE_get_cmd_defns = DIRECT; - ENGINE_set_load_privkey_function = DIRECT; - EVP_EncryptFinal_ex = DIRECT; - ENGINE_set_default_digests = DIRECT; - X509_get0_pubkey_bitstr = DIRECT; - asn1_ex_i2c = DIRECT; - ENGINE_register_RSA = DIRECT; - ENGINE_unregister_DSA = DIRECT; - _ossl_old_des_key_sched = DIRECT; - X509_EXTENSION_it = DIRECT; - X509_EXTENSION_it = DIRECT; - i2d_KRB5_AUTHENT = DIRECT; - SXNETID_it = DIRECT; - SXNETID_it = DIRECT; - d2i_OCSP_SINGLERESP = DIRECT; - EDIPARTYNAME_new = DIRECT; - PKCS12_certbag2x509 = DIRECT; - _ossl_old_des_ofb64_encrypt = DIRECT; - d2i_EXTENDED_KEY_USAGE = DIRECT; - ERR_print_errors_cb = DIRECT; - ENGINE_set_ciphers = DIRECT; - d2i_KRB5_APREQBODY = DIRECT; - UI_method_get_flusher = DIRECT; - X509_PUBKEY_it = DIRECT; - X509_PUBKEY_it = DIRECT; - _ossl_old_des_enc_read = DIRECT; - PKCS7_ENCRYPT_it = DIRECT; - PKCS7_ENCRYPT_it = DIRECT; - i2d_OCSP_RESPONSE = DIRECT; - EC_GROUP_get_cofactor = DIRECT; - PKCS12_unpack_p7data = DIRECT; - d2i_KRB5_AUTHDATA = DIRECT; - OCSP_copy_nonce = DIRECT; - KRB5_AUTHDATA_new = DIRECT; - OCSP_RESPDATA_new = DIRECT; - EC_GFp_mont_method = DIRECT; - OCSP_REVOKEDINFO_free = DIRECT; - UI_get_ex_data = DIRECT; - KRB5_APREQBODY_free = DIRECT; - EC_GROUP_get0_generator = DIRECT; - UI_get_default_method = DIRECT; - X509V3_set_nconf = DIRECT; - PKCS12_item_i2d_encrypt = DIRECT; - X509_add1_ext_i2d = DIRECT; - PKCS7_SIGNER_INFO_it = DIRECT; - PKCS7_SIGNER_INFO_it = DIRECT; - KRB5_PRINCNAME_new = DIRECT; - PKCS12_SAFEBAG_it = DIRECT; - PKCS12_SAFEBAG_it = DIRECT; - EC_GROUP_get_order = DIRECT; - d2i_OCSP_RESPID = DIRECT; - OCSP_request_verify = DIRECT; - NCONF_get_number_e = DIRECT; - _ossl_old_des_decrypt3 = DIRECT; - X509_signature_print = DIRECT; - OCSP_SINGLERESP_free = DIRECT; - ENGINE_load_builtin_engines = DIRECT; - i2d_OCSP_ONEREQ = DIRECT; - OCSP_REQUEST_add_ext = DIRECT; - OCSP_RESPBYTES_new = DIRECT; - EVP_MD_CTX_create = DIRECT; - OCSP_resp_find_status = DIRECT; - X509_ALGOR_it = DIRECT; - X509_ALGOR_it = DIRECT; - ASN1_TIME_it = DIRECT; - ASN1_TIME_it = DIRECT; - OCSP_request_set1_name = DIRECT; - OCSP_ONEREQ_get_ext_count = DIRECT; - UI_get0_result = DIRECT; - PKCS12_AUTHSAFES_it = DIRECT; - PKCS12_AUTHSAFES_it = DIRECT; - EVP_aes_256_ecb = DIRECT; - PKCS12_pack_authsafes = DIRECT; - ASN1_IA5STRING_it = DIRECT; - ASN1_IA5STRING_it = DIRECT; - UI_get_input_flags = DIRECT; - EC_GROUP_set_generator = DIRECT; - _ossl_old_des_string_to_2keys = DIRECT; - OCSP_CERTID_free = DIRECT; - X509_CERT_AUX_it = DIRECT; - X509_CERT_AUX_it = DIRECT; - CERTIFICATEPOLICIES_it = DIRECT; - CERTIFICATEPOLICIES_it = DIRECT; - _ossl_old_des_ede3_cbc_encrypt = DIRECT; - RAND_set_rand_engine = DIRECT; - DSO_get_loaded_filename = DIRECT; - X509_ATTRIBUTE_it = DIRECT; - X509_ATTRIBUTE_it = DIRECT; - OCSP_ONEREQ_get_ext_by_NID = DIRECT; - PKCS12_decrypt_skey = DIRECT; - KRB5_AUTHENT_it = DIRECT; - KRB5_AUTHENT_it = DIRECT; - UI_dup_error_string = DIRECT; - RSAPublicKey_it = DIRECT; - RSAPublicKey_it = DIRECT; - i2d_OCSP_REQUEST = DIRECT; - PKCS12_x509crl2certbag = DIRECT; - OCSP_SERVICELOC_it = DIRECT; - OCSP_SERVICELOC_it = DIRECT; - ASN1_item_sign = DIRECT; - X509_CRL_set_issuer_name = DIRECT; - OBJ_NAME_do_all_sorted = DIRECT; - i2d_OCSP_BASICRESP = DIRECT; - i2d_OCSP_RESPBYTES = DIRECT; - PKCS12_unpack_p7encdata = DIRECT; - HMAC_CTX_init = DIRECT; - ENGINE_get_digest = DIRECT; - OCSP_RESPONSE_print = DIRECT; - KRB5_TKTBODY_it = DIRECT; - KRB5_TKTBODY_it = DIRECT; - ACCESS_DESCRIPTION_it = DIRECT; - ACCESS_DESCRIPTION_it = DIRECT; - PKCS7_ISSUER_AND_SERIAL_it = DIRECT; - PKCS7_ISSUER_AND_SERIAL_it = DIRECT; - PBE2PARAM_it = DIRECT; - PBE2PARAM_it = DIRECT; - PKCS12_certbag2x509crl = DIRECT; - PKCS7_SIGNED_it = DIRECT; - PKCS7_SIGNED_it = DIRECT; - ENGINE_get_cipher = DIRECT; - i2d_OCSP_CRLID = DIRECT; - OCSP_SINGLERESP_new = DIRECT; - ENGINE_cmd_is_executable = DIRECT; - RSA_up_ref = DIRECT; - ASN1_GENERALSTRING_it = DIRECT; - ASN1_GENERALSTRING_it = DIRECT; - ENGINE_register_DSA = DIRECT; - X509V3_EXT_add_nconf_sk = DIRECT; - ENGINE_set_load_pubkey_function = DIRECT; - PKCS8_decrypt = DIRECT; - PEM_bytes_read_bio = DIRECT; - DIRECTORYSTRING_it = DIRECT; - DIRECTORYSTRING_it = DIRECT; - d2i_OCSP_CRLID = DIRECT; - EC_POINT_is_on_curve = DIRECT; - CRYPTO_set_locked_mem_ex_functions = DIRECT; - d2i_KRB5_CHECKSUM = DIRECT; - ASN1_item_dup = DIRECT; - X509_it = DIRECT; - X509_it = DIRECT; - BN_mod_add = DIRECT; - KRB5_AUTHDATA_free = DIRECT; - _ossl_old_des_cbc_cksum = DIRECT; - ASN1_item_verify = DIRECT; - CRYPTO_set_mem_ex_functions = DIRECT; - EC_POINT_get_Jprojective_coordinates_GFp = DIRECT; - ZLONG_it = DIRECT; - ZLONG_it = DIRECT; - CRYPTO_get_locked_mem_ex_functions = DIRECT; - ASN1_TIME_check = DIRECT; - UI_get0_user_data = DIRECT; - HMAC_CTX_cleanup = DIRECT; - DSA_up_ref = DIRECT; - _ossl_old_des_ede3_cfb64_encrypt = DIRECT; - ASN1_BMPSTRING_it = DIRECT; - ASN1_BMPSTRING_it = DIRECT; - ASN1_tag2bit = DIRECT; - UI_method_set_flusher = DIRECT; - X509_ocspid_print = DIRECT; - KRB5_ENCDATA_it = DIRECT; - KRB5_ENCDATA_it = DIRECT; - ENGINE_get_load_pubkey_function = DIRECT; - UI_add_user_data = DIRECT; - OCSP_REQUEST_delete_ext = DIRECT; - UI_get_method = DIRECT; - OCSP_ONEREQ_free = DIRECT; - ASN1_PRINTABLESTRING_it = DIRECT; - ASN1_PRINTABLESTRING_it = DIRECT; - X509_CRL_set_nextUpdate = DIRECT; - OCSP_REQUEST_it = DIRECT; - OCSP_REQUEST_it = DIRECT; - OCSP_BASICRESP_it = DIRECT; - OCSP_BASICRESP_it = DIRECT; - AES_ecb_encrypt = DIRECT; - BN_mod_sqr = DIRECT; - NETSCAPE_CERT_SEQUENCE_it = DIRECT; - NETSCAPE_CERT_SEQUENCE_it = DIRECT; - GENERAL_NAMES_it = DIRECT; - GENERAL_NAMES_it = DIRECT; - AUTHORITY_INFO_ACCESS_it = DIRECT; - AUTHORITY_INFO_ACCESS_it = DIRECT; - ASN1_FBOOLEAN_it = DIRECT; - ASN1_FBOOLEAN_it = DIRECT; - UI_set_ex_data = DIRECT; - _ossl_old_des_string_to_key = DIRECT; - ENGINE_register_all_RSA = DIRECT; - d2i_KRB5_PRINCNAME = DIRECT; - OCSP_RESPBYTES_it = DIRECT; - OCSP_RESPBYTES_it = DIRECT; - X509_CINF_it = DIRECT; - X509_CINF_it = DIRECT; - ENGINE_unregister_digests = DIRECT; - d2i_EDIPARTYNAME = DIRECT; - d2i_OCSP_SERVICELOC = DIRECT; - ENGINE_get_digests = DIRECT; - _ossl_old_des_set_odd_parity = DIRECT; - OCSP_RESPDATA_free = DIRECT; - d2i_KRB5_TICKET = DIRECT; - OTHERNAME_it = DIRECT; - OTHERNAME_it = DIRECT; - EVP_MD_CTX_cleanup = DIRECT; - d2i_ASN1_GENERALSTRING = DIRECT; - X509_CRL_set_version = DIRECT; - BN_mod_sub = DIRECT; - OCSP_SINGLERESP_get_ext_by_NID = DIRECT; - ENGINE_get_ex_new_index = DIRECT; - OCSP_REQUEST_free = DIRECT; - OCSP_REQUEST_add1_ext_i2d = DIRECT; - X509_VAL_it = DIRECT; - X509_VAL_it = DIRECT; - EC_POINTs_make_affine = DIRECT; - EC_POINT_mul = DIRECT; - X509V3_EXT_add_nconf = DIRECT; - X509_TRUST_set = DIRECT; - X509_CRL_add1_ext_i2d = DIRECT; - _ossl_old_des_fcrypt = DIRECT; - DISPLAYTEXT_it = DIRECT; - DISPLAYTEXT_it = DIRECT; - X509_CRL_set_lastUpdate = DIRECT; - OCSP_BASICRESP_free = DIRECT; - OCSP_BASICRESP_add1_ext_i2d = DIRECT; - d2i_KRB5_AUTHENTBODY = DIRECT; - CRYPTO_set_ex_data_implementation = DIRECT; - KRB5_ENCDATA_new = DIRECT; - DSO_up_ref = DIRECT; - OCSP_crl_reason_str = DIRECT; - UI_get0_result_string = DIRECT; - ASN1_GENERALSTRING_new = DIRECT; - X509_SIG_it = DIRECT; - X509_SIG_it = DIRECT; - ERR_set_implementation = DIRECT; - ERR_load_EC_strings = DIRECT; - UI_get0_action_string = DIRECT; - OCSP_ONEREQ_get_ext = DIRECT; - EC_POINT_method_of = DIRECT; - i2d_KRB5_APREQBODY = DIRECT; - _ossl_old_des_ecb3_encrypt = DIRECT; - CRYPTO_get_mem_ex_functions = DIRECT; - ENGINE_get_ex_data = DIRECT; - UI_destroy_method = DIRECT; - ASN1_item_i2d_bio = DIRECT; - OCSP_ONEREQ_get_ext_by_OBJ = DIRECT; - ASN1_primitive_new = DIRECT; - ASN1_PRINTABLE_it = DIRECT; - ASN1_PRINTABLE_it = DIRECT; - EVP_aes_192_ecb = DIRECT; - OCSP_SIGNATURE_new = DIRECT; - LONG_it = DIRECT; - LONG_it = DIRECT; - ASN1_VISIBLESTRING_it = DIRECT; - ASN1_VISIBLESTRING_it = DIRECT; - OCSP_SINGLERESP_add1_ext_i2d = DIRECT; - d2i_OCSP_CERTID = DIRECT; - ASN1_item_d2i_fp = DIRECT; - CRL_DIST_POINTS_it = DIRECT; - CRL_DIST_POINTS_it = DIRECT; - GENERAL_NAME_print = DIRECT; - OCSP_SINGLERESP_delete_ext = DIRECT; - PKCS12_SAFEBAGS_it = DIRECT; - PKCS12_SAFEBAGS_it = DIRECT; - d2i_OCSP_SIGNATURE = DIRECT; - OCSP_request_add1_nonce = DIRECT; - ENGINE_set_cmd_defns = DIRECT; - OCSP_SERVICELOC_free = DIRECT; - EC_GROUP_free = DIRECT; - ASN1_BIT_STRING_it = DIRECT; - ASN1_BIT_STRING_it = DIRECT; - X509_REQ_it = DIRECT; - X509_REQ_it = DIRECT; - _ossl_old_des_cbc_encrypt = DIRECT; - ERR_unload_strings = DIRECT; - PKCS7_SIGN_ENVELOPE_it = DIRECT; - PKCS7_SIGN_ENVELOPE_it = DIRECT; - EDIPARTYNAME_free = DIRECT; - OCSP_REQINFO_free = DIRECT; - EC_GROUP_new_curve_GFp = DIRECT; - OCSP_REQUEST_get1_ext_d2i = DIRECT; - PKCS12_item_pack_safebag = DIRECT; - asn1_ex_c2i = DIRECT; - ENGINE_register_digests = DIRECT; - i2d_OCSP_REVOKEDINFO = DIRECT; - asn1_enc_restore = DIRECT; - UI_free = DIRECT; - UI_new_method = DIRECT; - EVP_EncryptInit_ex = DIRECT; - X509_pubkey_digest = DIRECT; - EC_POINT_invert = DIRECT; - OCSP_basic_sign = DIRECT; - i2d_OCSP_RESPID = DIRECT; - OCSP_check_nonce = DIRECT; - ENGINE_ctrl_cmd = DIRECT; - d2i_KRB5_ENCKEY = DIRECT; - OCSP_parse_url = DIRECT; - OCSP_SINGLERESP_get_ext = DIRECT; - OCSP_CRLID_free = DIRECT; - OCSP_BASICRESP_get1_ext_d2i = DIRECT; - RSAPrivateKey_it = DIRECT; - RSAPrivateKey_it = DIRECT; - ENGINE_register_all_DH = DIRECT; - i2d_EDIPARTYNAME = DIRECT; - EC_POINT_get_affine_coordinates_GFp = DIRECT; - OCSP_CRLID_new = DIRECT; - ENGINE_get_flags = DIRECT; - OCSP_ONEREQ_it = DIRECT; - OCSP_ONEREQ_it = DIRECT; - UI_process = DIRECT; - ASN1_INTEGER_it = DIRECT; - ASN1_INTEGER_it = DIRECT; - EVP_CipherInit_ex = DIRECT; - UI_get_string_type = DIRECT; - ENGINE_unregister_DH = DIRECT; - ENGINE_register_all_DSA = DIRECT; - OCSP_ONEREQ_get_ext_by_critical = DIRECT; - bn_dup_expand = DIRECT; - OCSP_cert_id_new = DIRECT; - BASIC_CONSTRAINTS_it = DIRECT; - BASIC_CONSTRAINTS_it = DIRECT; - BN_mod_add_quick = DIRECT; - EC_POINT_new = DIRECT; - EVP_MD_CTX_destroy = DIRECT; - OCSP_RESPBYTES_free = DIRECT; - EVP_aes_128_cbc = DIRECT; - OCSP_SINGLERESP_get1_ext_d2i = DIRECT; - EC_POINT_free = DIRECT; - DH_up_ref = DIRECT; - X509_NAME_ENTRY_it = DIRECT; - X509_NAME_ENTRY_it = DIRECT; - UI_get_ex_new_index = DIRECT; - BN_mod_sub_quick = DIRECT; - OCSP_ONEREQ_add_ext = DIRECT; - OCSP_request_sign = DIRECT; - EVP_DigestFinal_ex = DIRECT; - ENGINE_set_digests = DIRECT; - OCSP_id_issuer_cmp = DIRECT; - OBJ_NAME_do_all = DIRECT; - EC_POINTs_mul = DIRECT; - ENGINE_register_complete = DIRECT; - X509V3_EXT_nconf_nid = DIRECT; - ASN1_SEQUENCE_it = DIRECT; - ASN1_SEQUENCE_it = DIRECT; - UI_set_default_method = DIRECT; - RAND_query_egd_bytes = DIRECT; - UI_method_get_writer = DIRECT; - UI_OpenSSL = DIRECT; - PEM_def_callback = DIRECT; - ENGINE_cleanup = DIRECT; - DIST_POINT_it = DIRECT; - DIST_POINT_it = DIRECT; - OCSP_SINGLERESP_it = DIRECT; - OCSP_SINGLERESP_it = DIRECT; - d2i_KRB5_TKTBODY = DIRECT; - EC_POINT_cmp = DIRECT; - OCSP_REVOKEDINFO_new = DIRECT; - i2d_OCSP_CERTSTATUS = DIRECT; - OCSP_basic_add1_nonce = DIRECT; - ASN1_item_ex_d2i = DIRECT; - BN_mod_lshift1_quick = DIRECT; - UI_set_method = DIRECT; - OCSP_id_get0_info = DIRECT; - BN_mod_sqrt = DIRECT; - EC_GROUP_copy = DIRECT; - KRB5_ENCDATA_free = DIRECT; - _ossl_old_des_cfb_encrypt = DIRECT; - OCSP_SINGLERESP_get_ext_by_OBJ = DIRECT; - OCSP_cert_to_id = DIRECT; - OCSP_RESPID_new = DIRECT; - OCSP_RESPDATA_it = DIRECT; - OCSP_RESPDATA_it = DIRECT; - d2i_OCSP_RESPDATA = DIRECT; - ENGINE_register_all_complete = DIRECT; - OCSP_check_validity = DIRECT; - PKCS12_BAGS_it = DIRECT; - PKCS12_BAGS_it = DIRECT; - OCSP_url_svcloc_new = DIRECT; - ASN1_template_free = DIRECT; - OCSP_SINGLERESP_add_ext = DIRECT; - KRB5_AUTHENTBODY_it = DIRECT; - KRB5_AUTHENTBODY_it = DIRECT; - X509_supported_extension = DIRECT; - i2d_KRB5_AUTHDATA = DIRECT; - UI_method_get_opener = DIRECT; - ENGINE_set_ex_data = DIRECT; - OCSP_REQUEST_print = DIRECT; - CBIGNUM_it = DIRECT; - CBIGNUM_it = DIRECT; - KRB5_TICKET_new = DIRECT; - KRB5_APREQ_new = DIRECT; - EC_GROUP_get_curve_GFp = DIRECT; - KRB5_ENCKEY_new = DIRECT; - ASN1_template_d2i = DIRECT; - _ossl_old_des_quad_cksum = DIRECT; - OCSP_single_get0_status = DIRECT; - BN_swap = DIRECT; - POLICYINFO_it = DIRECT; - POLICYINFO_it = DIRECT; - ENGINE_set_destroy_function = DIRECT; - asn1_enc_free = DIRECT; - OCSP_RESPID_it = DIRECT; - OCSP_RESPID_it = DIRECT; - EC_GROUP_new = DIRECT; - EVP_aes_256_cbc = DIRECT; - i2d_KRB5_PRINCNAME = DIRECT; - _ossl_old_des_encrypt2 = DIRECT; - _ossl_old_des_encrypt3 = DIRECT; - PKCS8_PRIV_KEY_INFO_it = DIRECT; - PKCS8_PRIV_KEY_INFO_it = DIRECT; - OCSP_REQINFO_it = DIRECT; - OCSP_REQINFO_it = DIRECT; - PBEPARAM_it = DIRECT; - PBEPARAM_it = DIRECT; - KRB5_AUTHENTBODY_new = DIRECT; - X509_CRL_add0_revoked = DIRECT; - EDIPARTYNAME_it = DIRECT; - EDIPARTYNAME_it = DIRECT; - NETSCAPE_SPKI_it = DIRECT; - NETSCAPE_SPKI_it = DIRECT; - UI_get0_test_string = DIRECT; - ENGINE_get_cipher_engine = DIRECT; - ENGINE_register_all_ciphers = DIRECT; - EC_POINT_copy = DIRECT; - BN_kronecker = DIRECT; - _ossl_old_des_ede3_ofb64_encrypt = DIRECT; - UI_method_get_reader = DIRECT; - OCSP_BASICRESP_get_ext_count = DIRECT; - ASN1_ENUMERATED_it = DIRECT; - ASN1_ENUMERATED_it = DIRECT; - UI_set_result = DIRECT; - i2d_KRB5_TICKET = DIRECT; - X509_print_ex_fp = DIRECT; - EVP_CIPHER_CTX_set_padding = DIRECT; - d2i_OCSP_RESPONSE = DIRECT; - ASN1_UTCTIME_it = DIRECT; - ASN1_UTCTIME_it = DIRECT; - _ossl_old_des_enc_write = DIRECT; - OCSP_RESPONSE_new = DIRECT; - AES_set_encrypt_key = DIRECT; - OCSP_resp_count = DIRECT; - KRB5_CHECKSUM_new = DIRECT; - OCSP_onereq_get0_id = DIRECT; - ENGINE_set_default_ciphers = DIRECT; - NOTICEREF_it = DIRECT; - NOTICEREF_it = DIRECT; - X509V3_EXT_CRL_add_nconf = DIRECT; - OCSP_REVOKEDINFO_it = DIRECT; - OCSP_REVOKEDINFO_it = DIRECT; - AES_encrypt = DIRECT; - OCSP_REQUEST_new = DIRECT; - ASN1_ANY_it = DIRECT; - ASN1_ANY_it = DIRECT; - CRYPTO_ex_data_new_class = DIRECT; - _ossl_old_des_ncbc_encrypt = DIRECT; - i2d_KRB5_TKTBODY = DIRECT; - EC_POINT_clear_free = DIRECT; - AES_decrypt = DIRECT; - asn1_enc_init = DIRECT; - UI_get_result_maxsize = DIRECT; - OCSP_CERTID_new = DIRECT; - ENGINE_unregister_RAND = DIRECT; - UI_method_get_closer = DIRECT; - d2i_KRB5_ENCDATA = DIRECT; - OCSP_request_onereq_count = DIRECT; - OCSP_basic_verify = DIRECT; - KRB5_AUTHENTBODY_free = DIRECT; - ASN1_item_d2i = DIRECT; - ASN1_primitive_free = DIRECT; - i2d_EXTENDED_KEY_USAGE = DIRECT; - i2d_OCSP_SIGNATURE = DIRECT; - asn1_enc_save = DIRECT; - _ossl_old_des_pcbc_encrypt = DIRECT; - PKCS12_MAC_DATA_it = DIRECT; - PKCS12_MAC_DATA_it = DIRECT; - OCSP_accept_responses_new = DIRECT; - asn1_do_lock = DIRECT; - PKCS7_ATTR_VERIFY_it = DIRECT; - PKCS7_ATTR_VERIFY_it = DIRECT; - KRB5_APREQBODY_it = DIRECT; - KRB5_APREQBODY_it = DIRECT; - i2d_OCSP_SINGLERESP = DIRECT; - ASN1_item_ex_new = DIRECT; - UI_add_verify_string = DIRECT; - _ossl_old_des_set_key = DIRECT; - KRB5_PRINCNAME_it = DIRECT; - KRB5_PRINCNAME_it = DIRECT; - EVP_DecryptInit_ex = DIRECT; - i2d_OCSP_CERTID = DIRECT; - ASN1_item_d2i_bio = DIRECT; - EC_POINT_dbl = DIRECT; - asn1_get_choice_selector = DIRECT; - i2d_KRB5_CHECKSUM = DIRECT; - ENGINE_set_table_flags = DIRECT; - AES_options = DIRECT; - OCSP_id_cmp = DIRECT; - OCSP_BASICRESP_new = DIRECT; - OCSP_REQUEST_get_ext_by_NID = DIRECT; - KRB5_APREQ_it = DIRECT; - KRB5_APREQ_it = DIRECT; - ENGINE_get_destroy_function = DIRECT; - CONF_set_nconf = DIRECT; - ASN1_PRINTABLE_free = DIRECT; - OCSP_BASICRESP_get_ext_by_NID = DIRECT; - DIST_POINT_NAME_it = DIRECT; - DIST_POINT_NAME_it = DIRECT; - X509V3_extensions_print = DIRECT; - _ossl_old_des_cfb64_encrypt = DIRECT; - X509_REVOKED_add1_ext_i2d = DIRECT; - _ossl_old_des_ofb_encrypt = DIRECT; - KRB5_TKTBODY_new = DIRECT; - ASN1_OCTET_STRING_it = DIRECT; - ASN1_OCTET_STRING_it = DIRECT; - ERR_load_UI_strings = DIRECT; - i2d_KRB5_ENCKEY = DIRECT; - ASN1_template_new = DIRECT; - OCSP_SIGNATURE_free = DIRECT; - ASN1_item_i2d_fp = DIRECT; - KRB5_PRINCNAME_free = DIRECT; - PKCS7_RECIP_INFO_it = DIRECT; - PKCS7_RECIP_INFO_it = DIRECT; - EXTENDED_KEY_USAGE_it = DIRECT; - EXTENDED_KEY_USAGE_it = DIRECT; - EC_GFp_simple_method = DIRECT; - EC_GROUP_precompute_mult = DIRECT; - OCSP_request_onereq_get0 = DIRECT; - UI_method_set_writer = DIRECT; - KRB5_AUTHENT_new = DIRECT; - X509_CRL_INFO_it = DIRECT; - X509_CRL_INFO_it = DIRECT; - DSO_set_name_converter = DIRECT; - AES_set_decrypt_key = DIRECT; - PKCS7_DIGEST_it = DIRECT; - PKCS7_DIGEST_it = DIRECT; - PKCS12_x5092certbag = DIRECT; - EVP_DigestInit_ex = DIRECT; - i2a_ACCESS_DESCRIPTION = DIRECT; - OCSP_RESPONSE_it = DIRECT; - OCSP_RESPONSE_it = DIRECT; - PKCS7_ENC_CONTENT_it = DIRECT; - PKCS7_ENC_CONTENT_it = DIRECT; - OCSP_request_add0_id = DIRECT; - EC_POINT_make_affine = DIRECT; - DSO_get_filename = DIRECT; - OCSP_CERTSTATUS_it = DIRECT; - OCSP_CERTSTATUS_it = DIRECT; - OCSP_request_add1_cert = DIRECT; - UI_get0_output_string = DIRECT; - UI_dup_verify_string = DIRECT; - BN_mod_lshift = DIRECT; - KRB5_AUTHDATA_it = DIRECT; - KRB5_AUTHDATA_it = DIRECT; - asn1_set_choice_selector = DIRECT; - OCSP_basic_add1_status = DIRECT; - OCSP_RESPID_free = DIRECT; - asn1_get_field_ptr = DIRECT; - UI_add_input_string = DIRECT; - OCSP_CRLID_it = DIRECT; - OCSP_CRLID_it = DIRECT; - i2d_KRB5_AUTHENTBODY = DIRECT; - OCSP_REQUEST_get_ext_count = DIRECT; - X509_NAME_it = DIRECT; - X509_NAME_it = DIRECT; - USERNOTICE_it = DIRECT; - USERNOTICE_it = DIRECT; - OCSP_REQINFO_new = DIRECT; - OCSP_BASICRESP_get_ext = DIRECT; - CRYPTO_get_ex_data_implementation = DIRECT; - ASN1_item_pack = DIRECT; - i2d_KRB5_ENCDATA = DIRECT; - X509_PURPOSE_set = DIRECT; - X509_REQ_INFO_it = DIRECT; - X509_REQ_INFO_it = DIRECT; - UI_method_set_opener = DIRECT; - ASN1_item_ex_free = DIRECT; - ASN1_BOOLEAN_it = DIRECT; - ASN1_BOOLEAN_it = DIRECT; - ENGINE_get_table_flags = DIRECT; - UI_create_method = DIRECT; - OCSP_ONEREQ_add1_ext_i2d = DIRECT; - d2i_OCSP_REQINFO = DIRECT; - UI_add_info_string = DIRECT; - UI_get_result_minsize = DIRECT; - ASN1_NULL_it = DIRECT; - ASN1_NULL_it = DIRECT; - BN_mod_lshift1 = DIRECT; - d2i_OCSP_ONEREQ = DIRECT; - OCSP_ONEREQ_new = DIRECT; - KRB5_TICKET_it = DIRECT; - KRB5_TICKET_it = DIRECT; - EVP_aes_192_cbc = DIRECT; - KRB5_TICKET_free = DIRECT; - UI_new = DIRECT; - OCSP_response_create = DIRECT; - _ossl_old_des_xcbc_encrypt = DIRECT; - PKCS7_it = DIRECT; - PKCS7_it = DIRECT; - OCSP_REQUEST_get_ext_by_critical = DIRECT; - ENGINE_set_flags = DIRECT; - _ossl_old_des_ecb_encrypt = DIRECT; - OCSP_response_get1_basic = DIRECT; - EVP_Digest = DIRECT; - OCSP_ONEREQ_delete_ext = DIRECT; - ASN1_TBOOLEAN_it = DIRECT; - ASN1_TBOOLEAN_it = DIRECT; - ASN1_item_new = DIRECT; - ASN1_TIME_to_generalizedtime = DIRECT; - BIGNUM_it = DIRECT; - BIGNUM_it = DIRECT; - AES_cbc_encrypt = DIRECT; - ENGINE_get_load_privkey_function = DIRECT; - OCSP_RESPONSE_free = DIRECT; - UI_method_set_reader = DIRECT; - i2d_ASN1_T61STRING = DIRECT; - EC_POINT_set_to_infinity = DIRECT; - ERR_load_OCSP_strings = DIRECT; - EC_POINT_point2oct = DIRECT; - KRB5_APREQ_free = DIRECT; - ASN1_OBJECT_it = DIRECT; - ASN1_OBJECT_it = DIRECT; - OCSP_crlID_new = DIRECT; - CONF_modules_load_file = DIRECT; - CONF_imodule_set_usr_data = DIRECT; - ENGINE_set_default_string = DIRECT; - CONF_module_get_usr_data = DIRECT; - ASN1_add_oid_module = DIRECT; - CONF_modules_finish = DIRECT; - OPENSSL_config = DIRECT; - CONF_modules_unload = DIRECT; - CONF_imodule_get_value = DIRECT; - CONF_module_set_usr_data = DIRECT; - CONF_parse_list = DIRECT; - CONF_module_add = DIRECT; - CONF_get1_default_config_file = DIRECT; - CONF_imodule_get_flags = DIRECT; - CONF_imodule_get_module = DIRECT; - CONF_modules_load = DIRECT; - CONF_imodule_get_name = DIRECT; - CONF_imodule_get_usr_data = DIRECT; - CONF_imodule_set_flags = DIRECT; - ENGINE_add_conf_module = DIRECT; - ERR_peek_last_error_line = DIRECT; - ERR_peek_last_error_line_data = DIRECT; - ERR_peek_last_error = DIRECT; - DES_read_2passwords = DIRECT; - DES_read_password = DIRECT; - UI_UTIL_read_pw = DIRECT; - UI_UTIL_read_pw_string = DIRECT; - OPENSSL_add_all_algorithms_noconf = DIRECT; - OPENSSL_add_all_algorithms_conf = DIRECT; - OPENSSL_load_builtin_modules = DIRECT; - AES_ofb128_encrypt = DIRECT; - AES_ctr128_encrypt = DIRECT; - AES_cfb128_encrypt = DIRECT; - _ossl_096_des_random_seed = DIRECT; - EVP_aes_256_ofb = DIRECT; - EVP_aes_192_ofb = DIRECT; - EVP_aes_128_cfb128 = DIRECT; - EVP_aes_256_cfb128 = DIRECT; - EVP_aes_128_ofb = DIRECT; - EVP_aes_192_cfb128 = DIRECT; - CONF_modules_free = DIRECT; - NCONF_default = DIRECT; - OPENSSL_no_config = DIRECT; - NCONF_WIN32 = DIRECT; - ASN1_UNIVERSALSTRING_new = DIRECT; - EVP_des_ede_ecb = DIRECT; - i2d_ASN1_UNIVERSALSTRING = DIRECT; - ASN1_UNIVERSALSTRING_free = DIRECT; - ASN1_UNIVERSALSTRING_it = DIRECT; - ASN1_UNIVERSALSTRING_it = DIRECT; - d2i_ASN1_UNIVERSALSTRING = DIRECT; - EVP_des_ede3_ecb = DIRECT; - X509_REQ_print_ex = DIRECT; - ENGINE_up_ref = DIRECT; - BUF_MEM_grow_clean = DIRECT; - CRYPTO_realloc_clean = DIRECT; - BUF_strlcat = DIRECT; - BIO_indent = DIRECT; - BUF_strlcpy = DIRECT; - OpenSSLDie = DIRECT; - OPENSSL_cleanse = DIRECT; - ERR_release_err_state_table = DIRECT; - EVP_aes_128_cfb8 = DIRECT; - EVP_aes_128_cfb1 = DIRECT; - EVP_aes_192_cfb8 = DIRECT; - EVP_aes_256_cfb8 = DIRECT; - DES_ede3_cfb_encrypt = DIRECT; - EVP_des_ede3_cfb8 = DIRECT; - AES_cfb8_encrypt = DIRECT; - EVP_aes_192_cfb1 = DIRECT; - EVP_des_cfb8 = DIRECT; - EVP_aes_256_cfb1 = DIRECT; - EVP_des_cfb1 = DIRECT; - AES_cfb1_encrypt = DIRECT; - EVP_des_ede3_cfb1 = DIRECT; - sk_is_sorted = DIRECT; - X509_check_ca = DIRECT; - HMAC_CTX_set_flags = DIRECT; - d2i_PROXY_CERT_INFO_EXTENSION = DIRECT; - PROXY_POLICY_it = DIRECT; - PROXY_POLICY_it = DIRECT; - i2d_PROXY_POLICY = DIRECT; - i2d_PROXY_CERT_INFO_EXTENSION = DIRECT; - d2i_PROXY_POLICY = DIRECT; - PROXY_CERT_INFO_EXTENSION_new = DIRECT; - PROXY_CERT_INFO_EXTENSION_free = DIRECT; - PROXY_CERT_INFO_EXTENSION_it = DIRECT; - PROXY_CERT_INFO_EXTENSION_it = DIRECT; - PROXY_POLICY_free = DIRECT; - PROXY_POLICY_new = DIRECT; - BN_MONT_CTX_set_locked = DIRECT; - EVP_sha384 = DIRECT; - EVP_sha512 = DIRECT; - EVP_sha224 = DIRECT; - EVP_sha256 = DIRECT; - BN_mod_exp_mont_consttime = DIRECT; - RSA_X931_hash_id = DIRECT; - RSA_padding_check_X931 = DIRECT; - RSA_verify_PKCS1_PSS = DIRECT; - RSA_padding_add_X931 = DIRECT; - RSA_padding_add_PKCS1_PSS = DIRECT; - PKCS1_MGF1 = DIRECT; - BN_X931_generate_Xpq = DIRECT; - BIO_new_dgram = DIRECT; - BN_get0_nist_prime_384 = DIRECT; - ERR_set_mark = DIRECT; - X509_STORE_CTX_set0_crls = DIRECT; - ENGINE_set_STORE = DIRECT; - ENGINE_register_ECDSA = DIRECT; - BN_BLINDING_invert_ex = DIRECT; - NAME_CONSTRAINTS_free = DIRECT; - BN_BLINDING_get_thread_id = DIRECT; - X509_STORE_CTX_set0_param = DIRECT; - POLICY_MAPPING_it = DIRECT; - POLICY_MAPPING_it = DIRECT; - POLICY_CONSTRAINTS_free = DIRECT; - EVP_PKEY_add1_attr_by_NID = DIRECT; - BN_nist_mod_192 = DIRECT; - EC_GROUP_get_trinomial_basis = DIRECT; - GENERAL_SUBTREE_free = DIRECT; - NAME_CONSTRAINTS_it = DIRECT; - NAME_CONSTRAINTS_it = DIRECT; - ECDH_get_default_method = DIRECT; - PKCS12_add_safe = DIRECT; - EC_KEY_new_by_curve_name = DIRECT; - ENGINE_register_ECDH = DIRECT; - SHA512_Update = DIRECT; - i2d_ECPrivateKey = DIRECT; - BN_get0_nist_prime_192 = DIRECT; - EC_POINT_set_affine_coordinates_GF2m = DIRECT; - BN_GF2m_mod_exp_arr = DIRECT; - X509_keyid_get0 = DIRECT; - pitem_new = DIRECT; - BN_GF2m_mod_mul_arr = DIRECT; - o2i_ECPublicKey = DIRECT; - EC_KEY_copy = DIRECT; - BIO_dump_fp = DIRECT; - X509_policy_node_get0_parent = DIRECT; - EC_GROUP_check_discriminant = DIRECT; - i2o_ECPublicKey = DIRECT; - EC_KEY_precompute_mult = DIRECT; - a2i_IPADDRESS = DIRECT; - X509_STORE_CTX_set_depth = DIRECT; - X509_VERIFY_PARAM_inherit = DIRECT; - EC_POINT_point2bn = DIRECT; - X509_policy_tree_get0_policies = DIRECT; - EC_GROUP_new_curve_GF2m = DIRECT; - ENGINE_unregister_STORE = DIRECT; - EVP_PKEY_get1_EC_KEY = DIRECT; - ENGINE_get_default_ECDH = DIRECT; - EC_KEY_get_conv_form = DIRECT; - ASN1_OCTET_STRING_NDEF_it = DIRECT; - ASN1_OCTET_STRING_NDEF_it = DIRECT; - ENGINE_get_static_state = DIRECT; - pqueue_iterator = DIRECT; - ECDSA_SIG_new = DIRECT; - OPENSSL_DIR_end = DIRECT; - BN_GF2m_mod_sqr = DIRECT; - EC_POINT_bn2point = DIRECT; - X509_VERIFY_PARAM_set_depth = DIRECT; - EC_KEY_set_asn1_flag = DIRECT; - EC_KEY_get_key_method_data = DIRECT; - ECDSA_sign_ex = DIRECT; - EC_GROUP_get_point_conversion_form = DIRECT; - PEM_read_bio_ECPKParameters = DIRECT; - EC_GROUP_get_pentanomial_basis = DIRECT; - EVP_PKEY_add1_attr_by_txt = DIRECT; - BN_BLINDING_set_flags = DIRECT; - X509_VERIFY_PARAM_set1_policies = DIRECT; - X509_VERIFY_PARAM_set1_name = DIRECT; - X509_VERIFY_PARAM_set_purpose = DIRECT; - ECDSA_sign_setup = DIRECT; - BN_GF2m_mod_solve_quad_arr = DIRECT; - EC_KEY_up_ref = DIRECT; - POLICY_MAPPING_free = DIRECT; - BN_GF2m_mod_div = DIRECT; - X509_VERIFY_PARAM_set_flags = DIRECT; - EC_KEY_free = DIRECT; - PEM_write_bio_ECPrivateKey = DIRECT; - d2i_EC_PUBKEY = DIRECT; - pqueue_print = DIRECT; - EC_GROUP_have_precompute_mult = DIRECT; - EC_KEY_print_fp = DIRECT; - BN_GF2m_mod_arr = DIRECT; - PEM_write_bio_X509_CERT_PAIR = DIRECT; - EVP_PKEY_cmp = DIRECT; - X509_policy_level_node_count = DIRECT; - X509_VERIFY_PARAM_new = DIRECT; - ECDH_get_ex_data = DIRECT; - EVP_PKEY_get_attr = DIRECT; - ECDSA_do_sign = DIRECT; - ENGINE_unregister_ECDH = DIRECT; - ECDH_OpenSSL = DIRECT; - EC_KEY_set_conv_form = DIRECT; - EC_POINT_dup = DIRECT; - GENERAL_SUBTREE_new = DIRECT; - EC_get_builtin_curves = DIRECT; - X509_policy_node_get0_qualifiers = DIRECT; - EVP_PKEY_set1_EC_KEY = DIRECT; - BN_GF2m_mod_sqrt_arr = DIRECT; - i2d_ECPrivateKey_bio = DIRECT; - ECPKParameters_print_fp = DIRECT; - pqueue_find = DIRECT; - ECDSA_SIG_free = DIRECT; - PEM_write_bio_ECPKParameters = DIRECT; - EC_KEY_set_private_key = DIRECT; - pqueue_peek = DIRECT; - X509_policy_node_get0_policy = DIRECT; - PKCS12_add_safes = DIRECT; - BN_BLINDING_convert_ex = DIRECT; - X509_policy_tree_free = DIRECT; - OPENSSL_ia32cap_loc = DIRECT; - BN_GF2m_poly2arr = DIRECT; - BN_get0_nist_prime_224 = DIRECT; - i2d_ECParameters = DIRECT; - i2d_ECPKParameters = DIRECT; - BN_GENCB_call = DIRECT; - d2i_ECPKParameters = DIRECT; - ENGINE_set_ECDH = DIRECT; - NAME_CONSTRAINTS_new = DIRECT; - SHA256_Init = DIRECT; - EC_KEY_get0_public_key = DIRECT; - PEM_write_bio_EC_PUBKEY = DIRECT; - ECParameters_print = DIRECT; - ASN1_generate_nconf = DIRECT; - BUF_memdup = DIRECT; - BN_GF2m_mod_mul = DIRECT; - EC_GROUP_set_seed = DIRECT; - X509_VERIFY_PARAM_set_trust = DIRECT; - EVP_PKEY_get_attr_count = DIRECT; - EC_GROUP_get_curve_GF2m = DIRECT; - BN_is_prime_ex = DIRECT; - X509_STORE_CTX_get0_param = DIRECT; - PEM_read_X509_CERT_PAIR = DIRECT; - X509_STORE_set_depth = DIRECT; - ECDSA_get_ex_data = DIRECT; - SHA224 = DIRECT; - BIO_dump_indent_fp = DIRECT; - EC_KEY_set_group = DIRECT; - BUF_strndup = DIRECT; - BN_GF2m_mod = DIRECT; - X509_REQ_check_private_key = DIRECT; - EC_GROUP_get_seed_len = DIRECT; - PEM_read_bio_EC_PUBKEY = DIRECT; - i2d_EC_PUBKEY = DIRECT; - ECDSA_get_default_method = DIRECT; - ASN1_put_eoc = DIRECT; - X509_STORE_CTX_get_explicit_policy = DIRECT; - X509_VERIFY_PARAM_table_cleanup = DIRECT; - X509_VERIFY_PARAM_free = DIRECT; - EC_METHOD_get_field_type = DIRECT; - EC_GFp_nist_method = DIRECT; - EC_GROUP_set_curve_name = DIRECT; - X509_CERT_PAIR_it = DIRECT; - X509_CERT_PAIR_it = DIRECT; - BN_GF2m_mod_sqr_arr = DIRECT; - RSA_setup_blinding = DIRECT; - BIO_s_datagram = DIRECT; - sk_find_ex = DIRECT; - EC_GROUP_set_curve_GF2m = DIRECT; - ENGINE_set_default_ECDSA = DIRECT; - POLICY_CONSTRAINTS_new = DIRECT; - BN_GF2m_mod_sqrt = DIRECT; - ECDH_set_default_method = DIRECT; - EC_KEY_generate_key = DIRECT; - SHA384_Update = DIRECT; - BN_GF2m_arr2poly = DIRECT; - EC_GROUP_check = DIRECT; - d2i_ECPrivateKey_bio = DIRECT; - EC_KEY_insert_key_method_data = DIRECT; - X509_VERIFY_PARAM_get_depth = DIRECT; - SHA224_Final = DIRECT; - SHA224_Update = DIRECT; - d2i_ECPrivateKey = DIRECT; - ASN1_item_ndef_i2d = DIRECT; - ERR_pop_to_mark = DIRECT; - ENGINE_register_all_STORE = DIRECT; - X509_policy_level_get0_node = DIRECT; - i2d_PKCS7_NDEF = DIRECT; - EC_GROUP_get_degree = DIRECT; - ASN1_generate_v3 = DIRECT; - X509_policy_tree_level_count = DIRECT; - BN_GF2m_add = DIRECT; - EC_KEY_get0_group = DIRECT; - X509_CERT_PAIR_free = DIRECT; - BN_nist_mod_224 = DIRECT; - SHA512_Final = DIRECT; - i2d_EC_PUBKEY_bio = DIRECT; - BIO_dgram_non_fatal_error = DIRECT; - EC_GROUP_get_asn1_flag = DIRECT; - ECDH_get_ex_new_index = DIRECT; - v2i_ASN1_BIT_STRING = DIRECT; - X509_STORE_CTX_set_default = DIRECT; - BN_GF2m_mod_inv = DIRECT; - BN_GF2m_mod_exp = DIRECT; - EC_GROUP_get0_seed = DIRECT; - BN_GF2m_mod_div_arr = DIRECT; - ENGINE_set_ECDSA = DIRECT; - ECPKParameters_print = DIRECT; - EC_KEY_get0_private_key = DIRECT; - PEM_write_EC_PUBKEY = DIRECT; - X509_VERIFY_PARAM_set1 = DIRECT; - ECDH_set_method = DIRECT; - v2i_GENERAL_NAME_ex = DIRECT; - ECDH_set_ex_data = DIRECT; - BN_nist_mod_521 = DIRECT; - X509_policy_tree_get0_level = DIRECT; - EC_GROUP_set_point_conversion_form = DIRECT; - PEM_read_EC_PUBKEY = DIRECT; - i2d_ECDSA_SIG = DIRECT; - ECDSA_OpenSSL = DIRECT; - EC_KEY_get_enc_flags = DIRECT; - ASN1_const_check_infinite_end = DIRECT; - EVP_PKEY_delete_attr = DIRECT; - ECDSA_set_default_method = DIRECT; - EC_POINT_set_compressed_coordinates_GF2m = DIRECT; - EC_GROUP_cmp = DIRECT; - BN_get0_nist_prime_256 = DIRECT; - SHA224_Init = DIRECT; - PEM_read_ECPrivateKey = DIRECT; - SHA512_Init = DIRECT; - BN_set_negative = DIRECT; - ERR_load_ECDSA_strings = DIRECT; - EC_GROUP_get_basis_type = DIRECT; - i2v_ASN1_BIT_STRING = DIRECT; - BN_nist_mod_384 = DIRECT; - i2d_X509_CERT_PAIR = DIRECT; - PEM_write_ECPKParameters = DIRECT; - ECDH_compute_key = DIRECT; - ENGINE_register_all_ECDH = DIRECT; - pqueue_pop = DIRECT; - POLICY_CONSTRAINTS_it = DIRECT; - POLICY_CONSTRAINTS_it = DIRECT; - EVP_PKEY_get_attr_by_OBJ = DIRECT; - X509_VERIFY_PARAM_add0_policy = DIRECT; - BN_GF2m_mod_solve_quad = DIRECT; - SHA256 = DIRECT; - i2d_ECPrivateKey_fp = DIRECT; - X509_policy_tree_get0_user_policies = DIRECT; - OPENSSL_DIR_read = DIRECT; - ENGINE_register_all_ECDSA = DIRECT; - X509_VERIFY_PARAM_lookup = DIRECT; - EC_POINT_get_affine_coordinates_GF2m = DIRECT; - EC_GROUP_dup = DIRECT; - ENGINE_get_default_ECDSA = DIRECT; - EC_KEY_new = DIRECT; - SHA256_Transform = DIRECT; - EC_KEY_set_enc_flags = DIRECT; - ECDSA_verify = DIRECT; - EC_POINT_point2hex = DIRECT; - ENGINE_get_STORE = DIRECT; - SHA512 = DIRECT; - ECDSA_do_sign_ex = DIRECT; - ECDSA_do_verify = DIRECT; - d2i_ECPrivateKey_fp = DIRECT; - SHA512_Transform = DIRECT; - X509_STORE_set1_param = DIRECT; - PEM_write_ECPrivateKey = DIRECT; - EC_KEY_set_public_key = DIRECT; - PEM_read_ECPKParameters = DIRECT; - X509_CERT_PAIR_new = DIRECT; - ENGINE_register_STORE = DIRECT; - RSA_generate_key_ex = DIRECT; - DSA_generate_parameters_ex = DIRECT; - ECParameters_print_fp = DIRECT; - X509V3_NAME_from_section = DIRECT; - EVP_PKEY_add1_attr = DIRECT; - POLICY_MAPPINGS_it = DIRECT; - POLICY_MAPPINGS_it = DIRECT; - GENERAL_SUBTREE_it = DIRECT; - GENERAL_SUBTREE_it = DIRECT; - EC_GROUP_get_curve_name = DIRECT; - PEM_write_X509_CERT_PAIR = DIRECT; - BIO_dump_indent_cb = DIRECT; - d2i_X509_CERT_PAIR = DIRECT; - asn1_const_Finish = DIRECT; - i2d_EC_PUBKEY_fp = DIRECT; - BN_nist_mod_256 = DIRECT; - X509_VERIFY_PARAM_add0_table = DIRECT; - pqueue_free = DIRECT; - BN_BLINDING_create_param = DIRECT; - ECDSA_size = DIRECT; - d2i_EC_PUBKEY_bio = DIRECT; - BN_get0_nist_prime_521 = DIRECT; - BN_generate_prime_ex = DIRECT; - EC_GROUP_new_by_curve_name = DIRECT; - SHA256_Final = DIRECT; - DH_generate_parameters_ex = DIRECT; - PEM_read_bio_ECPrivateKey = DIRECT; - ENGINE_get_ECDH = DIRECT; - d2i_ECDSA_SIG = DIRECT; - BN_is_prime_fasttest_ex = DIRECT; - ECDSA_sign = DIRECT; - X509_policy_check = DIRECT; - EVP_PKEY_get_attr_by_NID = DIRECT; - ENGINE_get_ECDSA = DIRECT; - EVP_ecdsa = DIRECT; - BN_BLINDING_get_flags = DIRECT; - PKCS12_add_cert = DIRECT; - ERR_load_ECDH_strings = DIRECT; - EC_KEY_dup = DIRECT; - EVP_CIPHER_CTX_rand_key = DIRECT; - ECDSA_set_method = DIRECT; - a2i_IPADDRESS_NC = DIRECT; - d2i_ECParameters = DIRECT; - X509_POLICY_NODE_print = DIRECT; - SHA384_Init = DIRECT; - EC_GF2m_simple_method = DIRECT; - ECDSA_set_ex_data = DIRECT; - SHA384_Final = DIRECT; - PKCS7_set_digest = DIRECT; - EC_KEY_print = DIRECT; - ECDSA_get_ex_new_index = DIRECT; - SHA384 = DIRECT; - POLICY_MAPPING_new = DIRECT; - X509_STORE_CTX_get0_policy_tree = DIRECT; - EC_GROUP_set_asn1_flag = DIRECT; - EC_KEY_check_key = DIRECT; - d2i_EC_PUBKEY_fp = DIRECT; - PKCS7_set0_type_other = DIRECT; - PEM_read_bio_X509_CERT_PAIR = DIRECT; - pqueue_next = DIRECT; - EVP_PKEY_add1_attr_by_OBJ = DIRECT; - X509_VERIFY_PARAM_set_time = DIRECT; - pqueue_new = DIRECT; - ENGINE_set_default_ECDH = DIRECT; - PKCS12_add_key = DIRECT; - DSO_merge = DIRECT; - EC_POINT_hex2point = DIRECT; - BIO_dump_cb = DIRECT; - SHA256_Update = DIRECT; - pqueue_insert = DIRECT; - pitem_free = DIRECT; - BN_GF2m_mod_inv_arr = DIRECT; - ENGINE_unregister_ECDSA = DIRECT; - BN_BLINDING_set_thread_id = DIRECT; - get_rfc3526_prime_8192 = DIRECT; - X509_VERIFY_PARAM_clear_flags = DIRECT; - get_rfc2409_prime_1024 = DIRECT; - DH_check_pub_key = DIRECT; - get_rfc3526_prime_2048 = DIRECT; - get_rfc3526_prime_6144 = DIRECT; - get_rfc3526_prime_1536 = DIRECT; - get_rfc3526_prime_3072 = DIRECT; - get_rfc3526_prime_4096 = DIRECT; - get_rfc2409_prime_768 = DIRECT; - X509_VERIFY_PARAM_get_flags = DIRECT; - EVP_CIPHER_CTX_new = DIRECT; - EVP_CIPHER_CTX_free = DIRECT; - a2i_ipadd = DIRECT; - EVP_CIPHER_block_size = DIRECT; - EVP_CIPHER_CTX_set_app_data = DIRECT; - BIO_set_callback_arg = DIRECT; - BIO_set_flags = DIRECT; - BIO_method_type = DIRECT; - AES_ige_encrypt = DIRECT; - EVP_CIPHER_CTX_nid = DIRECT; - EVP_CIPHER_iv_length = DIRECT; - EVP_MD_type = DIRECT; - EVP_CIPHER_CTX_key_length = DIRECT; - EVP_MD_size = DIRECT; - EVP_MD_CTX_test_flags = DIRECT; - BIO_clear_flags = DIRECT; - EVP_MD_pkey_type = DIRECT; - EVP_MD_CTX_clear_flags = DIRECT; - EVP_CIPHER_flags = DIRECT; - AES_bi_ige_encrypt = DIRECT; - BIO_get_callback = DIRECT; - BIO_test_flags = DIRECT; - EVP_CIPHER_key_length = DIRECT; - EVP_Cipher = DIRECT; - EVP_CIPHER_nid = DIRECT; - EVP_CIPHER_CTX_block_size = DIRECT; - EVP_MD_CTX_set_flags = DIRECT; - EVP_CIPHER_CTX_cipher = DIRECT; - EVP_CIPHER_CTX_get_app_data = DIRECT; - EVP_MD_block_size = DIRECT; - EVP_CIPHER_CTX_flags = DIRECT; - EVP_MD_CTX_md = DIRECT; - BIO_method_name = DIRECT; - EVP_CIPHER_CTX_iv_length = DIRECT; - BIO_get_callback_arg = DIRECT; - BIO_set_callback = DIRECT; - X509_EXTENSIONS_it = DIRECT; - X509_EXTENSIONS_it = DIRECT; - X509_get1_ocsp = DIRECT; - OCSP_REQ_CTX_free = DIRECT; - i2d_X509_EXTENSIONS = DIRECT; - OCSP_sendreq_nbio = DIRECT; - OCSP_sendreq_new = DIRECT; - d2i_X509_EXTENSIONS = DIRECT; - X509_ALGORS_it = DIRECT; - X509_ALGORS_it = DIRECT; - X509_ALGOR_get0 = DIRECT; - X509_ALGOR_set0 = DIRECT; - AES_unwrap_key = DIRECT; - AES_wrap_key = DIRECT; - X509at_get0_data_by_OBJ = DIRECT; - ASN1_TYPE_set1 = DIRECT; - ASN1_STRING_set0 = DIRECT; - i2d_X509_ALGORS = DIRECT; - COMP_zlib_cleanup = DIRECT; - d2i_X509_ALGORS = DIRECT; - SMIME_read_ASN1 = DIRECT; - ENGINE_set_load_ssl_client_cert_function = DIRECT; - ENGINE_get_ssl_client_cert_function = DIRECT; - ENGINE_load_ssl_client_cert = DIRECT; - OPENSSL_isservice = DIRECT; - EVP_CIPHER_CTX_clear_flags = DIRECT; - EVP_CIPHER_CTX_set_flags = DIRECT; - BN_X931_generate_prime_ex = DIRECT; - EVP_CIPHER_CTX_test_flags = DIRECT; - BN_X931_derive_prime_ex = DIRECT; - OPENSSL_init = DIRECT; - CRYPTO_strdup = DIRECT; - pqueue_size = DIRECT; - X509_asn1_meth = DIRECT; - RSA_X931_generate_key_ex = DIRECT; - OBJ_bsearch = DIRECT; - i2d_ASN1_HEADER = DIRECT; - EVP_md2 = DIRECT; - uni2asc = DIRECT; - d2i_ASN1_HEADER = DIRECT; - ASN1_HEADER_free = DIRECT; - CRYPTO_malloc_debug_init = DIRECT; - local: - *; -}; - -OPENSSL_0.9.8y { - global: - CRYPTO_memcmp = DIRECT; -} OPENSSL_0.9.8; - Deleted: csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl =================================================================== --- csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl 2013-03-06 19:00:17 UTC (rev 20378) +++ csw/mgar/pkg/openssl/trunk/files/map.openssl.libssl 2013-03-06 23:00:26 UTC (rev 20379) @@ -1,226 +0,0 @@ -OPENSSL_0.9.8 { - global: - BIO_f_ssl = DIRECT; - BIO_new_buffer_ssl_connect = DIRECT; - BIO_new_ssl = DIRECT; - BIO_new_ssl_connect = DIRECT; - BIO_ssl_copy_session_id = DIRECT; - BIO_ssl_shutdown = DIRECT; - d2i_SSL_SESSION = DIRECT; - DTLSv1_client_method = DIRECT; - DTLSv1_method = DIRECT; - DTLSv1_server_method = DIRECT; - ERR_load_SSL_strings = DIRECT; - i2d_SSL_SESSION = DIRECT; - SSL_accept = DIRECT; - SSL_add_client_CA = DIRECT; - SSL_add_dir_cert_subjects_to_stack = DIRECT; - SSL_add_file_cert_subjects_to_stack = DIRECT; - SSL_alert_desc_string = DIRECT; - SSL_alert_desc_string_long = DIRECT; - SSL_alert_type_string = DIRECT; - SSL_alert_type_string_long = DIRECT; - SSL_callback_ctrl = DIRECT; - SSL_check_private_key = DIRECT; - SSL_CIPHER_description = DIRECT; - SSL_CIPHER_get_bits = DIRECT; - SSL_CIPHER_get_name = DIRECT; - SSL_CIPHER_get_version = DIRECT; - SSL_clear = DIRECT; - SSL_COMP_add_compression_method = DIRECT; - SSL_COMP_get_compression_methods = DIRECT; - SSL_COMP_get_name = DIRECT; - SSL_connect = DIRECT; - SSL_copy_session_id = DIRECT; - SSL_ctrl = DIRECT; - SSL_CTX_add_client_CA = DIRECT; - SSL_CTX_add_session = DIRECT; - SSL_CTX_callback_ctrl = DIRECT; - SSL_CTX_check_private_key = DIRECT; - SSL_CTX_ctrl = DIRECT; - SSL_CTX_flush_sessions = DIRECT; - SSL_CTX_free = DIRECT; - SSL_CTX_get_cert_store = DIRECT; - SSL_CTX_get_client_CA_list = DIRECT; - SSL_CTX_get_client_cert_cb = DIRECT; - SSL_CTX_get_ex_data = DIRECT; - SSL_CTX_get_ex_new_index = DIRECT; - SSL_CTX_get_info_callback = DIRECT; - SSL_CTX_get_quiet_shutdown = DIRECT; - SSL_CTX_get_timeout = DIRECT; - SSL_CTX_get_verify_callback = DIRECT; - SSL_CTX_get_verify_depth = DIRECT; - SSL_CTX_get_verify_mode = DIRECT; - SSL_CTX_load_verify_locations = DIRECT; - SSL_CTX_new = DIRECT; - SSL_CTX_remove_session = DIRECT; - SSL_CTX_sess_get_get_cb = DIRECT; - SSL_CTX_sess_get_new_cb = DIRECT; - SSL_CTX_sess_get_remove_cb = DIRECT; - SSL_CTX_sessions = DIRECT; - SSL_CTX_sess_set_get_cb = DIRECT; - SSL_CTX_sess_set_new_cb = DIRECT; - SSL_CTX_sess_set_remove_cb = DIRECT; - SSL_CTX_set_cert_store = DIRECT; - SSL_CTX_set_cert_verify_callback = DIRECT; - SSL_CTX_set_cipher_list = DIRECT; - SSL_CTX_set_client_CA_list = DIRECT; - SSL_CTX_set_client_cert_cb = DIRECT; - SSL_CTX_set_client_cert_engine = DIRECT; - SSL_CTX_set_cookie_generate_cb = DIRECT; - SSL_CTX_set_cookie_verify_cb = DIRECT; - SSL_CTX_set_default_passwd_cb = DIRECT; - SSL_CTX_set_default_passwd_cb_userdata = DIRECT; - SSL_CTX_set_default_verify_paths = DIRECT; - SSL_CTX_set_ex_data = DIRECT; - SSL_CTX_set_generate_session_id = DIRECT; - SSL_CTX_set_info_callback = DIRECT; - SSL_CTX_set_msg_callback = DIRECT; - SSL_CTX_set_purpose = DIRECT; - SSL_CTX_set_quiet_shutdown = DIRECT; - SSL_CTX_set_session_id_context = DIRECT; - SSL_CTX_set_ssl_version = DIRECT; - SSL_CTX_set_timeout = DIRECT; - SSL_CTX_set_tmp_dh_callback = DIRECT; - SSL_CTX_set_tmp_ecdh_callback = DIRECT; - SSL_CTX_set_tmp_rsa_callback = DIRECT; - SSL_CTX_set_trust = DIRECT; - SSL_CTX_set_verify = DIRECT; - SSL_CTX_set_verify_depth = DIRECT; - SSL_CTX_use_certificate = DIRECT; - SSL_CTX_use_certificate_ASN1 = DIRECT; - SSL_CTX_use_certificate_chain_file = DIRECT; - SSL_CTX_use_certificate_file = DIRECT; - SSL_CTX_use_PrivateKey = DIRECT; - SSL_CTX_use_PrivateKey_ASN1 = DIRECT; - SSL_CTX_use_PrivateKey_file = DIRECT; - SSL_CTX_use_RSAPrivateKey = DIRECT; - SSL_CTX_use_RSAPrivateKey_ASN1 = DIRECT; - SSL_CTX_use_RSAPrivateKey_file = DIRECT; - SSL_do_handshake = DIRECT; - SSL_dup = DIRECT; - SSL_dup_CA_list = DIRECT; - SSL_free = DIRECT; - SSL_get1_session = DIRECT; - SSL_get_certificate = DIRECT; - SSL_get_cipher_list = DIRECT; - SSL_get_ciphers = DIRECT; - SSL_get_client_CA_list = DIRECT; - SSL_get_current_cipher = DIRECT; - SSL_get_current_compression = DIRECT; - SSL_get_current_expansion = DIRECT; - SSL_get_default_timeout = DIRECT; - SSL_get_error = DIRECT; - SSL_get_ex_data = DIRECT; - SSL_get_ex_data_X509_STORE_CTX_idx = DIRECT; - SSL_get_ex_new_index = DIRECT; - SSL_get_fd = DIRECT; - SSL_get_finished = DIRECT; - SSL_get_info_callback = DIRECT; - SSL_get_peer_cert_chain = DIRECT; - SSL_get_peer_certificate = DIRECT; - SSL_get_peer_finished = DIRECT; - SSL_get_privatekey = DIRECT; - SSL_get_quiet_shutdown = DIRECT; - SSL_get_rbio = DIRECT; - SSL_get_read_ahead = DIRECT; - SSL_get_rfd = DIRECT; - SSL_get_servername = DIRECT; - SSL_get_servername_type = DIRECT; - SSL_get_session = DIRECT; - SSL_get_shared_ciphers = DIRECT; - SSL_get_shutdown = DIRECT; - SSL_get_SSL_CTX = DIRECT; - SSL_get_ssl_method = DIRECT; - SSL_get_verify_callback = DIRECT; - SSL_get_verify_depth = DIRECT; - SSL_get_verify_mode = DIRECT; - SSL_get_verify_result = DIRECT; - SSL_get_version = DIRECT; - SSL_get_wbio = DIRECT; - SSL_get_wfd = DIRECT; - SSL_has_matching_session_id = DIRECT; - SSL_library_init = DIRECT; - SSL_load_client_CA_file = DIRECT; - SSL_load_error_strings = DIRECT; - SSL_new = DIRECT; - SSL_peek = DIRECT; - SSL_pending = DIRECT; - SSL_read = DIRECT; - SSL_renegotiate = DIRECT; - SSL_renegotiate_pending = DIRECT; - SSL_rstate_string = DIRECT; - SSL_rstate_string_long = DIRECT; - SSL_SESSION_free = DIRECT; - SSL_SESSION_get_ex_data = DIRECT; - SSL_SESSION_get_ex_new_index = DIRECT; - SSL_SESSION_get_id = DIRECT; - SSL_SESSION_get_time = DIRECT; - SSL_SESSION_get_timeout = DIRECT; - SSL_SESSION_new = DIRECT; - SSL_SESSION_print = DIRECT; - SSL_SESSION_print_fp = DIRECT; - SSL_SESSION_set_ex_data = DIRECT; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 7 00:01:46 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 06 Mar 2013 23:01:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20380] csw/mgar/pkg/openssl/trunk/files/changelog.CSW Message-ID: Revision: 20380 http://gar.svn.sourceforge.net/gar/?rev=20380&view=rev Author: chninkel Date: 2013-03-06 23:01:43 +0000 (Wed, 06 Mar 2013) Log Message: ----------- openssl/trunk: changelog update Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2013-03-06 23:00:26 UTC (rev 20379) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2013-03-06 23:01:43 UTC (rev 20380) @@ -1,7 +1,6 @@ openssl (0.9.8y,REV=2013.03.06) unstable * New upstream release. - * Enabled symbol versioning and direct binding. -- Yann Rouillard Wed, 06 Mar 2013 07:14:14 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 7 09:06:21 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 07 Mar 2013 08:06:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20381] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 20381 http://gar.svn.sourceforge.net/gar/?rev=20381&view=rev Author: chninkel Date: 2013-03-07 08:06:20 +0000 (Thu, 07 Mar 2013) Log Message: ----------- openssl/trunk: removed last traces of symbol versioning Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-03-06 23:01:43 UTC (rev 20380) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 08:06:20 UTC (rev 20381) @@ -138,7 +138,6 @@ DISTFILES += CSWlibssl-dev.prototype-i386 CSWlibssl-dev.prototype-sparc DISTFILES += CSWopenssl-utils.prototype DISTFILES += changelog.CSW README.CSW -DISTFILES += map.openssl.libcrypto map.openssl.libssl map.openssl.engines DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 7 09:51:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 07 Mar 2013 08:51:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20382] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 20382 http://gar.svn.sourceforge.net/gar/?rev=20382&view=rev Author: chninkel Date: 2013-03-07 08:51:51 +0000 (Thu, 07 Mar 2013) Log Message: ----------- openssl/trunk: really removed last traces of symbol versioning Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 08:06:20 UTC (rev 20381) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 08:51:51 UTC (rev 20382) @@ -231,11 +231,6 @@ pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure - ln -nf $(WORKDIR)/map.openssl.libcrypto $(WORKSRC)/map.openssl.libcrypto - ln -nf $(WORKDIR)/map.openssl.libssl $(WORKSRC)/map.openssl.libssl - for ENGINE in 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi; do \ - ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/map.openssl.lib$$ENGINE; \ - done @$(MAKECOOKIE) # we remove every debug information except symbol table This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 14:12:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 13:12:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20383] csw/mgar/pkg/iperf/trunk Message-ID: Revision: 20383 http://gar.svn.sourceforge.net/gar/?rev=20383&view=rev Author: dmichelsen Date: 2013-03-07 13:12:54 +0000 (Thu, 07 Mar 2013) Log Message: ----------- iperf/trunk: Update to 2.0.5 Modified Paths: -------------- csw/mgar/pkg/iperf/trunk/Makefile csw/mgar/pkg/iperf/trunk/checksums Modified: csw/mgar/pkg/iperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/iperf/trunk/Makefile 2013-03-07 08:51:51 UTC (rev 20382) +++ csw/mgar/pkg/iperf/trunk/Makefile 2013-03-07 13:12:54 UTC (rev 20383) @@ -7,7 +7,7 @@ # * #ifndef INT*_{MIN,MAX} in include/iperf-int.h to avoid redefined warnings # NAME = iperf -VERSION = 2.0.4 +VERSION = 2.0.5 GARTYPE = v2 DESCRIPTION = Internet Protocol bandwidth measuring tool @@ -44,7 +44,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_PAX_ARGS = '-s,ChangeLog,changelog,p' +# EXTRA_PAX_ARGS = '-s,ChangeLog,changelog,p' include gar/category.mk Modified: csw/mgar/pkg/iperf/trunk/checksums =================================================================== --- csw/mgar/pkg/iperf/trunk/checksums 2013-03-07 08:51:51 UTC (rev 20382) +++ csw/mgar/pkg/iperf/trunk/checksums 2013-03-07 13:12:54 UTC (rev 20383) @@ -1,2 +1 @@ -3bb101038d372642f1fa7e83c7c93e46 download/gar-base.diff -8c5bc14cc2ea55f18f22afe3c23e3dcb download/iperf-2.0.4.tar.gz +44b5536b67719f4250faed632a3cd016 iperf-2.0.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 14:22:09 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 13:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20384] csw/mgar/pkg/iperf/trunk/Makefile Message-ID: Revision: 20384 http://gar.svn.sourceforge.net/gar/?rev=20384&view=rev Author: dmichelsen Date: 2013-03-07 13:22:08 +0000 (Thu, 07 Mar 2013) Log Message: ----------- iperf/trunk: Do not use compiler runpathes Modified Paths: -------------- csw/mgar/pkg/iperf/trunk/Makefile Modified: csw/mgar/pkg/iperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/iperf/trunk/Makefile 2013-03-07 13:12:54 UTC (rev 20383) +++ csw/mgar/pkg/iperf/trunk/Makefile 2013-03-07 13:22:08 UTC (rev 20384) @@ -42,6 +42,8 @@ TEST_SCRIPTS = +EXTRA_LINKER_FLAGS += -norunpath + CONFIGURE_ARGS = $(DIRPATHS) # EXTRA_PAX_ARGS = '-s,ChangeLog,changelog,p' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 17:36:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 16:36:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[20385] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 20385 http://gar.svn.sourceforge.net/gar/?rev=20385&view=rev Author: dmichelsen Date: 2013-03-07 16:36:34 +0000 (Thu, 07 Mar 2013) Log Message: ----------- mGAR v2: Add target post-merge-all to be run after all merge-modulations are done Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2013-03-07 13:22:08 UTC (rev 20384) +++ csw/mgar/gar/v2/gar.mk 2013-03-07 16:36:34 UTC (rev 20385) @@ -876,7 +876,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) +merge: checksum merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge-all @banner merge @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 17:42:55 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 16:42:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[20386] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 20386 http://gar.svn.sourceforge.net/gar/?rev=20386&view=rev Author: dmichelsen Date: 2013-03-07 16:42:54 +0000 (Thu, 07 Mar 2013) Log Message: ----------- mGAR v2: Make sure remerge cleans post-merge-all Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2013-03-07 16:36:34 UTC (rev 20385) +++ csw/mgar/gar/v2/gar.mk 2013-03-07 16:42:54 UTC (rev 20386) @@ -966,7 +966,7 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src - rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge + rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge-all rm -rf $(PKGROOT) reset-merge-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 17:47:51 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 16:47:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20387] csw/mgar/pkg/unixodbc/trunk/Makefile Message-ID: Revision: 20387 http://gar.svn.sourceforge.net/gar/?rev=20387&view=rev Author: dmichelsen Date: 2013-03-07 16:47:51 +0000 (Thu, 07 Mar 2013) Log Message: ----------- unixodbc/trunk: Use 32/64 bit specific include for types Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2013-03-07 16:42:54 UTC (rev 20386) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2013-03-07 16:47:51 UTC (rev 20387) @@ -22,7 +22,6 @@ PACKAGES += CSWunixodbc SPKG_DESC_CSWunixodbc = $(DESCRIPTION) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst2 @@ -71,3 +70,11 @@ MIGRATE_FILES_CSWunixodbc += ODBCDataSources include gar/category.mk + +post-merge-all: + gdiff -D 64bit \ + $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)$(includedir)/unixodbc_conf.h \ + $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT)$(includedir)/unixodbc_conf.h \ + | sed -e 's/ifndef 64bit/if defined __amd64 || defined __x86_64 || defined __sparcv9/' \ + > $(PKGROOT)$(includedir)/unixodbc_conf.h + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 17:48:23 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 16:48:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20388] csw/mgar/pkg Message-ID: Revision: 20388 http://gar.svn.sourceforge.net/gar/?rev=20388&view=rev Author: dmichelsen Date: 2013-03-07 16:48:22 +0000 (Thu, 07 Mar 2013) Log Message: ----------- sphinx/trunk: First commit, does not include 64 bit yet Added Paths: ----------- csw/mgar/pkg/sphinx/ csw/mgar/pkg/sphinx/Makefile csw/mgar/pkg/sphinx/branches/ csw/mgar/pkg/sphinx/tags/ csw/mgar/pkg/sphinx/trunk/ csw/mgar/pkg/sphinx/trunk/Makefile csw/mgar/pkg/sphinx/trunk/checksums csw/mgar/pkg/sphinx/trunk/files/ Added: csw/mgar/pkg/sphinx/Makefile =================================================================== --- csw/mgar/pkg/sphinx/Makefile (rev 0) +++ csw/mgar/pkg/sphinx/Makefile 2013-03-07 16:48:22 UTC (rev 20388) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/sphinx/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/sphinx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sphinx/trunk/Makefile 2013-03-07 16:48:22 UTC (rev 20388) @@ -0,0 +1,74 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = sphinx +VERSION = 2.0.6 +GARTYPE = v2 + +DESCRIPTION = An open source full text search server + +MASTER_SITES += http://sphinxsearch.com/files/ +MASTER_SITES += http://snowball.tartarus.org/dist/ +DISTNAME = $(NAME)-$(VERSION)-release +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += libstemmer_c.tgz + +PACKAGES += CSWsphinx-search +SPKG_DESC_CSWsphinx-search = An open source full text search server +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibodbc2 +RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibgcc-s1 + +# These are just examples +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/bin/searchd +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/indexer.1 +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/etc/opt/csw/sphinx.conf.CSW +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/indextool.1 +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/indexer.1 +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/search.1 +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/searchd.1 +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spelldump.1 + +GARCOMPILER = GCC4 + +EXTRA_LINKER_FLAGS += -liconv + +#BUILD64 = 1 +#ISAEXEC = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-id64 +CONFIGURE_ARGS += --with-libstemmer + +CONFIGURE_ARHS += --with-pgsql +# --with-pgsql-includes path to PostgreSQL header files +# --with-pgsql-libs path to PostgreSQL libraries +CONFIGURE_ARGS += --with-libexpat +CONFIGURE_ARGS += --with-iconv +CONFIGURE_ARGS += --with-syslog + +# UnixODBC can't be enabled right now as 64 bit has different type in include, this needs to be fixed first +CONFIGURE_ARGS += --with-unixodbc + +# Make sure we find GNU grep before Solaris grep as "grep -q" is uesd to detect postgres presence +CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) + +# Test needs a running SQL server +SKIPTEST ?= 1 + +EXTRA_PAX_ARGS += -s ",$(sysconfdir)/(example.sql),$(docdir)/$(CATALOGNAME)/\$$1," +EXTRA_PAX_ARGS += -s ",$(sysconfdir)/(sphinx-min\.conf\.dist),$(docdir)/$(CATALOGNAME)/\$$1," +EXTRA_PAX_ARGS += -s ",($(sysconfdir)/sphinx\.conf)\.dist,\$$1.CSW," + +PRESERVECONF += sphinx.conf + +include gar/category.mk + +post-extract: + cp -rp $(WORKDIR)/libstemmer_c/* $(WORKSRC)/libstemmer_c/ + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/sphinx/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/sphinx/trunk/checksums =================================================================== --- csw/mgar/pkg/sphinx/trunk/checksums (rev 0) +++ csw/mgar/pkg/sphinx/trunk/checksums 2013-03-07 16:48:22 UTC (rev 20388) @@ -0,0 +1,2 @@ +5e4c9d75c0759c4584b525cd16876ccb libstemmer_c.tgz +de6be5ee20b1bfafa2a0cea7155a8331 sphinx-2.0.6-release.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 18:32:56 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 17:32:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20389] csw/mgar/pkg/sphinx/trunk/Makefile Message-ID: Revision: 20389 http://gar.svn.sourceforge.net/gar/?rev=20389&view=rev Author: dmichelsen Date: 2013-03-07 17:32:56 +0000 (Thu, 07 Mar 2013) Log Message: ----------- sphinx/trunk: Enable 64 bit, disable postgres Modified Paths: -------------- csw/mgar/pkg/sphinx/trunk/Makefile Modified: csw/mgar/pkg/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/sphinx/trunk/Makefile 2013-03-07 16:48:22 UTC (rev 20388) +++ csw/mgar/pkg/sphinx/trunk/Makefile 2013-03-07 17:32:56 UTC (rev 20389) @@ -25,7 +25,10 @@ RUNTIME_DEP_PKGS_CSWsphinx-search += CSWlibgcc-s1 # These are just examples -CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/bin/searchd +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/searchd +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/searchd +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/searchd +CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/searchd CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/indexer.1 CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/local|root/etc/opt/csw/sphinx.conf.CSW CHECKPKG_OVERRIDES_CSWsphinx-search += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/indextool.1 @@ -38,16 +41,18 @@ EXTRA_LINKER_FLAGS += -liconv -#BUILD64 = 1 -#ISAEXEC = 1 +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-id64 CONFIGURE_ARGS += --with-libstemmer -CONFIGURE_ARHS += --with-pgsql +# Lets do MySQL first +#CONFIGURE_ARHS += --with-pgsql # --with-pgsql-includes path to PostgreSQL header files # --with-pgsql-libs path to PostgreSQL libraries + CONFIGURE_ARGS += --with-libexpat CONFIGURE_ARGS += --with-iconv CONFIGURE_ARGS += --with-syslog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 7 18:57:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 07 Mar 2013 17:57:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20390] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 20390 http://gar.svn.sourceforge.net/gar/?rev=20390&view=rev Author: chninkel Date: 2013-03-07 17:57:47 +0000 (Thu, 07 Mar 2013) Log Message: ----------- openssl/trunk: no direct binding for openssl 0.9.7 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 17:32:56 UTC (rev 20389) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 17:57:47 UTC (rev 20390) @@ -79,17 +79,19 @@ endif # we will not recompile old 0.9.7 version for now -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/pentium_pro/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 ifeq ($(shell /usr/bin/uname -p),sparc) #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/sparcv9/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 else CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libcrypto.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libssl.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/libcrypto.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/libssl.so.0.9.7 +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/pentium_pro/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 7 20:14:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Mar 2013 19:14:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[20391] csw/mgar/pkg Message-ID: Revision: 20391 http://gar.svn.sourceforge.net/gar/?rev=20391&view=rev Author: dmichelsen Date: 2013-03-07 19:14:16 +0000 (Thu, 07 Mar 2013) Log Message: ----------- sphinx-russian-morphology/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/sphinx-russian-morphology/ csw/mgar/pkg/sphinx-russian-morphology/Makefile csw/mgar/pkg/sphinx-russian-morphology/branches/ csw/mgar/pkg/sphinx-russian-morphology/tags/ csw/mgar/pkg/sphinx-russian-morphology/trunk/ csw/mgar/pkg/sphinx-russian-morphology/trunk/Makefile csw/mgar/pkg/sphinx-russian-morphology/trunk/checksums csw/mgar/pkg/sphinx-russian-morphology/trunk/files/ Added: csw/mgar/pkg/sphinx-russian-morphology/Makefile =================================================================== --- csw/mgar/pkg/sphinx-russian-morphology/Makefile (rev 0) +++ csw/mgar/pkg/sphinx-russian-morphology/Makefile 2013-03-07 19:14:16 UTC (rev 20391) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/sphinx-russian-morphology/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/sphinx-russian-morphology/trunk/Makefile =================================================================== --- csw/mgar/pkg/sphinx-russian-morphology/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sphinx-russian-morphology/trunk/Makefile 2013-03-07 19:14:16 UTC (rev 20391) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = sphinx-russian-morphology +VERSION = 20130120 + +DESCRIPTION = Russian morphology dictionary for Sphinx lemmatizer + +MASTER_SITES = http://sphinxsearch.com/files/dicts/ +DISTFILES += ru.pak + +PACKAGES += CSWsphinx-russian-morphology +SPKG_DESC_CSWmypkg = Russian morphology dictionary for Sphinx lemmatizer +# PKGFILES is catchall +ARCHALL_CSWsphinx-russian-morphology = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + mkdir -p $(DESTDIR)$(sharedstatedir)/sphinx + ginstall -m 0644 $(WORKDIR)/ru.pak $(DESTDIR)$(sharedstatedir)/sphinx/ + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/sphinx-russian-morphology/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/sphinx-russian-morphology/trunk/checksums =================================================================== --- csw/mgar/pkg/sphinx-russian-morphology/trunk/checksums (rev 0) +++ csw/mgar/pkg/sphinx-russian-morphology/trunk/checksums 2013-03-07 19:14:16 UTC (rev 20391) @@ -0,0 +1 @@ +2a5425b088d5d23c2e427ce961037098 ru.pak This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 7 21:02:29 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 07 Mar 2013 20:02:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20392] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 20392 http://gar.svn.sourceforge.net/gar/?rev=20392&view=rev Author: chninkel Date: 2013-03-07 20:02:28 +0000 (Thu, 07 Mar 2013) Log Message: ----------- openssl/trunk: fixed direct binding checkpkg override Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 19:14:16 UTC (rev 20391) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-03-07 20:02:28 UTC (rev 20392) @@ -79,6 +79,7 @@ endif # we will not recompile old 0.9.7 version for now +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 ifeq ($(shell /usr/bin/uname -p),sparc) #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis @@ -90,7 +91,6 @@ CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libssl.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/libcrypto.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/libssl.so.0.9.7 -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += no-direct-binding|/opt/csw/lib/pentium_pro/libssl.so.0.9.7|is|not|directly|bound|to|soname|libcrypto.so.0.9.7 endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Mar 8 09:18:06 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Mar 2013 08:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[20393] csw/mgar/pkg/tex_rcsinfo/trunk/Makefile Message-ID: Revision: 20393 http://gar.svn.sourceforge.net/gar/?rev=20393&view=rev Author: pfelecan Date: 2013-03-08 08:18:06 +0000 (Fri, 08 Mar 2013) Log Message: ----------- tex_rcsinfo/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/tex_rcsinfo/trunk/Makefile Modified: csw/mgar/pkg/tex_rcsinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_rcsinfo/trunk/Makefile 2013-03-07 20:02:28 UTC (rev 20392) +++ csw/mgar/pkg/tex_rcsinfo/trunk/Makefile 2013-03-08 08:18:06 UTC (rev 20393) @@ -19,18 +19,17 @@ DISTFILES += COPYING PATCHFILES += 0001-Adapt-build.patch -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive BUILD_DEP_PKGS += CSWlatex2html -RUNTIME_DEP_PKGS += CSWtetex - PACKAGES = CSWtex-rcsinfo SPKG_DESC_CSWtex-rcsinfo = $(DESCRIPTION) CATALOGNAME_CSWtex-rcsinfo = tex_rcsinfo OBSOLETED_BY_CSWtex-rcsinfo = CSWtexrcsinfo CATALOGNAME_CSWtexrcsinfo = tex_rcsinfo_stub +RUNTIME_DEP_PKGS += CSWtexlive +CHECKPKG_OVERRIDES_CSWtex-rcsinfo += surplus-dependency|CSWtexlive ARCHALL_CSWtex-rcsinfo = 1 -CHECKPKG_OVERRIDES_CSWtex-rcsinfo += surplus-dependency|CSWtetex CONFIGURE_SCRIPTS = TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Mar 8 10:10:49 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Mar 2013 09:10:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[20394] csw/mgar/pkg/tex_svninfo/trunk/Makefile Message-ID: Revision: 20394 http://gar.svn.sourceforge.net/gar/?rev=20394&view=rev Author: pfelecan Date: 2013-03-08 09:10:48 +0000 (Fri, 08 Mar 2013) Log Message: ----------- tex_svninfo/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/tex_svninfo/trunk/Makefile Modified: csw/mgar/pkg/tex_svninfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_svninfo/trunk/Makefile 2013-03-08 08:18:06 UTC (rev 20393) +++ csw/mgar/pkg/tex_svninfo/trunk/Makefile 2013-03-08 09:10:48 UTC (rev 20394) @@ -18,9 +18,9 @@ DISTFILES += COPYING PATCHFILES += 0001-Adapt-build.patch -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive -RUNTIME_DEP_PKGS += CSWtetex +RUNTIME_DEP_PKGS += CSWtexlive PACKAGES = CSWtex-svninfo SPKG_DESC_CSWtex-svninfo = $(DESCRIPTION) @@ -28,7 +28,7 @@ OBSOLETED_BY_CSWtex-svninfo = CSWtexsvninfo CATALOGNAME_CSWtexsvninfo = tex_svninfo_stub ARCHALL_CSWtex-svninfo = 1 -CHECKPKG_OVERRIDES_CSWtex-svninfo += surplus-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWtex-svninfo += surplus-dependency|CSWtexlive CONFIGURE_SCRIPTS = TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Mar 8 10:43:32 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Mar 2013 09:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[20395] csw/mgar/pkg/tex_devnag/trunk/Makefile Message-ID: Revision: 20395 http://gar.svn.sourceforge.net/gar/?rev=20395&view=rev Author: pfelecan Date: 2013-03-08 09:43:31 +0000 (Fri, 08 Mar 2013) Log Message: ----------- tex_devnag/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/tex_devnag/trunk/Makefile Modified: csw/mgar/pkg/tex_devnag/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_devnag/trunk/Makefile 2013-03-08 09:10:48 UTC (rev 20394) +++ csw/mgar/pkg/tex_devnag/trunk/Makefile 2013-03-08 09:43:31 UTC (rev 20395) @@ -30,9 +30,9 @@ OBSOLETED_BY_CSWtex-devnag-common = CSWtexvdevnagcommon CATALOGNAME_CSWtexvdevnagcommon = tex_vdevnag_common_stub ARCHALL_CSWtex-devnag-common = 1 -RUNTIME_DEP_PKGS_CSWtex-devnag-common += CSWtetex +RUNTIME_DEP_PKGS_CSWtex-devnag-common += CSWtexlive -CHECKPKG_OVERRIDES_CSWtex-devnag_common += surplus-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWtex-devnag_common += surplus-dependency|CSWtexlive PACKAGES += CSWtex-devnag SPKG_DESC_CSWtex-devnag = $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Mar 8 11:14:19 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Mar 2013 10:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[20396] csw/mgar/pkg/latex2html/trunk/Makefile Message-ID: Revision: 20396 http://gar.svn.sourceforge.net/gar/?rev=20396&view=rev Author: pfelecan Date: 2013-03-08 10:14:19 +0000 (Fri, 08 Mar 2013) Log Message: ----------- latex2html/trunk: change dependencies from teTeX to TeXLive Modified Paths: -------------- csw/mgar/pkg/latex2html/trunk/Makefile Modified: csw/mgar/pkg/latex2html/trunk/Makefile =================================================================== --- csw/mgar/pkg/latex2html/trunk/Makefile 2013-03-08 09:43:31 UTC (rev 20395) +++ csw/mgar/pkg/latex2html/trunk/Makefile 2013-03-08 10:14:19 UTC (rev 20396) @@ -56,7 +56,7 @@ BUILD_DEP_PKGS += CSWgs BUILD_DEP_PKGS += CSWnetpbm BUILD_DEP_PKGS += CSWperl -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive BUILD_SCRIPTS = nominal # as strange as it seems the check and test are build actions... @@ -73,8 +73,8 @@ RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWnetpbm CHECKPKG_OVERRIDES_CSWlatex2html += surplus-dependency|CSWnetpbm -RUNTIME_DEP_PKGS += CSWtetex -CHECKPKG_OVERRIDES_CSWlatex2html += surplus-dependency|CSWtetex +RUNTIME_DEP_PKGS += CSWtexlive +CHECKPKG_OVERRIDES_CSWlatex2html += surplus-dependency|CSWtexlive # only in comments: CHECKPKG_OVERRIDES_CSWlatex2html += file-with-bad-content|/usr/local|root/opt/csw/lib/l2hconf.pm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Mar 8 14:41:38 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Mar 2013 13:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[20397] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20397 http://gar.svn.sourceforge.net/gar/?rev=20397&view=rev Author: pfelecan Date: 2013-03-08 13:41:36 +0000 (Fri, 08 Mar 2013) Log Message: ----------- texlive/trunk: - obsoleting CSWtetex for those packages which didn't explicitly do it - removal of pdftricks stub stubbing Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-03-08 10:14:19 UTC (rev 20396) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-03-08 13:41:36 UTC (rev 20397) @@ -211,6 +211,7 @@ PACKAGES += CSWlibptexenc1 CATALOGNAME_CSWlibptexenc1 = libptexenc1 SPKG_DESC_CSWlibptexenc1 += $(DESCRIPTION), libptexenc1.so.0 +OBSOLETED_BY_CSWlibptexenc1 = CSWtetex PKGFILES_CSWlibptexenc1 += $(call baseisadirs,$(libdir),libptexenc\.so\.1\.3\.0) PKGFILES_CSWlibptexenc1 += $(call baseisadirs,$(libdir),libptexenc\.so\.1(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibptexenc1 += CSWlibgcc-s1 @@ -4517,9 +4518,6 @@ OBSOLETED_BY_CSWtexlive-pstricks += CSWtex-pdftricks CATALOGNAME_CSWtex-pdftricks = tex_pdftricks_stub ARCHALL_CSWtex-pdftricks = 1 -OBSOLETED_BY_CSWtexlive-pstricks += CSWtexpdftricks -CATALOGNAME_CSWtexpdftricks = tex_pdftricks_old_stub -ARCHALL_CSWtexpdftricks = 1 PKGFILES_CSWtexlive-pstricks += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks)/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pedigree PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pst2pdf @@ -5075,6 +5073,7 @@ PACKAGES += CSWtexlive-xindy CATALOGNAME_CSWtexlive-xindy = texlive_xindy SPKG_DESC_CSWtexlive-xindy += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML +OBSOLETED_BY_CSWtexlive-xindy = CSWtetex PKGFILES_CSWtexlive-xindy += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy)/.* PKGFILES_CSWtexlive-xindy += /opt/csw//bin/texindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/xindy @@ -5097,6 +5096,7 @@ PACKAGES += CSWtexlive-xindy-binaries CATALOGNAME_CSWtexlive-xindy-binaries = texlive_xindy_binaries SPKG_DESC_CSWtexlive-xindy-binaries += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML, binaries +OBSOLETED_BY_CSWtexlive-xindy-binaries = CSWtetex PKGFILES_CSWtexlive-xindy-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy-binaries)/.* PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/bin/tex2xindy PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/share/man/man1/tex2xindy.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 9 18:21:12 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Mar 2013 17:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[20398] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 20398 http://gar.svn.sourceforge.net/gar/?rev=20398&view=rev Author: bdwalton Date: 2013-03-09 17:21:11 +0000 (Sat, 09 Mar 2013) Log Message: ----------- cswutils/trunk: version bump; embed svn revision info in the package Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2013-03-08 13:41:36 UTC (rev 20397) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2013-03-09 17:21:11 UTC (rev 20398) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.26 +VERSION = 1.27 GARTYPE = v2 DESCRIPTION = Utilities for CSW maintainers @@ -88,6 +88,7 @@ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw @ginstall -d $(DESTDIR)$(datadir)/opencsw/gar + @(cd $(GARDIR); svn info > $(DESTDIR)$(datadir)/opencsw/gar/cswutils.svn_version.txt) @ginstall -m 0644 $(GARDIR)/etc/commondirs* $(DESTDIR)/$(datadir)/opencsw/gar/ @rsync -av --exclude=.svn/ --exclude='*.pyc' $(GARDIR)/lib/python/ \ $(DESTDIR)/$(libdir)/python/csw/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 9 18:34:52 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Mar 2013 17:34:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20399] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 20399 http://gar.svn.sourceforge.net/gar/?rev=20399&view=rev Author: bdwalton Date: 2013-03-09 17:34:52 +0000 (Sat, 09 Mar 2013) Log Message: ----------- cswutils/trunk: base the package version on the svn revision of GAR that we use to build the package Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2013-03-09 17:21:11 UTC (rev 20398) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2013-03-09 17:34:52 UTC (rev 20399) @@ -1,8 +1,9 @@ # $Id$ NAME = cswutils -VERSION = 1.27 +VERSION = 1.$(GARHEAD) GARTYPE = v2 +GARHEAD = $(shell cd $(GARDIR); svn info | grep 'Last Changed Rev' | sed 's/[^0-9]*//') DESCRIPTION = Utilities for CSW maintainers define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 07:27:39 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 06:27:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20400] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20400 http://gar.svn.sourceforge.net/gar/?rev=20400&view=rev Author: chninkel Date: 2013-03-10 06:27:38 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: removed the aesni patch, aesni support has been integrated upstream Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-aesni-engine.i386-patch.2012-05-25 Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-09 17:34:52 UTC (rev 20399) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 06:27:38 UTC (rev 20400) @@ -12,7 +12,6 @@ PKCS11 = 1 T4 = 1 -#AESNI = 1 ###### Package information ####### @@ -137,12 +136,6 @@ endif endif -ifdef AESNI -ifeq ($(shell /usr/bin/uname -p),i386) - PATCHFILES += openssl-1.0.1c-aesni-engine.i386-patch.2012-05-25 -endif -endif - LICENSE = LICENSE ##### Build and installation information ##### Deleted: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-aesni-engine.i386-patch.2012-05-25 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-aesni-engine.i386-patch.2012-05-25 2013-03-09 17:34:52 UTC (rev 20399) +++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-aesni-engine.i386-patch.2012-05-25 2013-03-10 06:27:38 UTC (rev 20400) @@ -1,484 +0,0 @@ -diff -Nur openssl-1.0.1c.orig/crypto/aes/Makefile openssl-1.0.1c/crypto/aes/Makefile ---- openssl-1.0.1c.orig/crypto/aes/Makefile 2011-11-14 21:42:21.000000000 +0100 -+++ openssl-1.0.1c/crypto/aes/Makefile 2012-05-25 22:08:42.142601000 +0200 -@@ -54,6 +54,9 @@ - $(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - aesni-x86.s: asm/aesni-x86.pl ../perlasm/x86asm.pl - $(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -+aesni-x86.o: aesni-x86.s -+ $(CC) $(CFLAGS) -o $@ -c $< -+ elfedit -e 'cap:hw1 -and -cmp aes' $@ - - aes-x86_64.s: asm/aes-x86_64.pl - $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@ -diff -Nur openssl-1.0.1c.orig/crypto/engine/eng_aesni.c openssl-1.0.1c/crypto/engine/eng_aesni.c ---- openssl-1.0.1c.orig/crypto/engine/eng_aesni.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1c/crypto/engine/eng_aesni.c 2012-05-25 22:09:05.201452000 +0200 -@@ -0,0 +1,412 @@ -+/* -+ * Support for Intel AES-NI intruction set -+ * Author: Huang Ying -+ * -+ * Intel AES-NI is a new set of Single Instruction Multiple Data -+ * (SIMD) instructions that are going to be introduced in the next -+ * generation of Intel processor, as of 2009. These instructions -+ * enable fast and secure data encryption and decryption, using the -+ * Advanced Encryption Standard (AES), defined by FIPS Publication -+ * number 197. The architecture introduces six instructions that -+ * offer full hardware support for AES. Four of them support high -+ * performance data encryption and decryption, and the other two -+ * instructions support the AES key expansion procedure. -+ * -+ * The white paper can be downloaded from: -+ * http://softwarecommunity.intel.com/isn/downloads/intelavx/AES-Instructions-Set_WP.pdf -+ * -+ * This file is based on engines/e_padlock.c -+ */ -+ -+/* ==================================================================== -+ * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * licensing at OpenSSL.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This product includes cryptographic software written by Eric Young -+ * (eay at cryptsoft.com). This product includes software written by Tim -+ * Hudson (tjh at cryptsoft.com). -+ * -+ */ -+ -+ -+#include -+ -+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AES_NI) && !defined(OPENSSL_NO_AES) -+ -+#include -+#include "cryptlib.h" -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* AES-NI is available *ONLY* on some x86 CPUs. Not only that it -+ doesn't exist elsewhere, but it even can't be compiled on other -+ platforms! */ -+#undef COMPILE_HW_AESNI -+#if (defined(__x86_64) || defined(__x86_64__) || \ -+ defined(_M_AMD64) || defined(_M_X64) || \ -+ defined(OPENSSL_IA32_SSE2)) && !defined(OPENSSL_NO_ASM) -+#define COMPILE_HW_AESNI -+static ENGINE *ENGINE_aesni (void); -+#endif -+ -+void ENGINE_load_aesni (void) -+{ -+/* On non-x86 CPUs it just returns. */ -+#ifdef COMPILE_HW_AESNI -+ ENGINE *toadd = ENGINE_aesni(); -+ if (!toadd) -+ return; -+ ENGINE_add (toadd); -+ ENGINE_free (toadd); -+ ERR_clear_error (); -+#endif -+} -+ -+#ifdef COMPILE_HW_AESNI -+int aesni_set_encrypt_key(const unsigned char *userKey, int bits, -+ AES_KEY *key); -+int aesni_set_decrypt_key(const unsigned char *userKey, int bits, -+ AES_KEY *key); -+ -+void aesni_encrypt(const unsigned char *in, unsigned char *out, -+ const AES_KEY *key); -+void aesni_decrypt(const unsigned char *in, unsigned char *out, -+ const AES_KEY *key); -+ -+void aesni_ecb_encrypt(const unsigned char *in, -+ unsigned char *out, -+ size_t length, -+ const AES_KEY *key, -+ int enc); -+void aesni_cbc_encrypt(const unsigned char *in, -+ unsigned char *out, -+ size_t length, -+ const AES_KEY *key, -+ unsigned char *ivec, int enc); -+ -+/* Function for ENGINE detection and control */ -+static int aesni_init(ENGINE *e); -+ -+/* Cipher Stuff */ -+static int aesni_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid); -+ -+#define AESNI_MIN_ALIGN 16 -+#define AESNI_ALIGN(x) \ -+ ((void *)(((unsigned long)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1))) -+ -+/* Engine names */ -+static const char aesni_id[] = "aesni", -+ aesni_name[] = "Intel AES-NI engine", -+ no_aesni_name[] = "Intel AES-NI engine (no-aesni)"; -+ -+/* ===== Engine "management" functions ===== */ -+ -+#if defined(_WIN32) -+typedef unsigned __int64 IA32CAP; -+#else -+typedef unsigned long long IA32CAP; -+#endif -+ -+/* Prepare the ENGINE structure for registration */ -+static int -+aesni_bind_helper(ENGINE *e) -+{ -+ int engage; -+ if (sizeof(OPENSSL_ia32cap_P) > 4) { -+ engage = (int)((OPENSSL_ia32cap_P >> 30) >> 27) & 1; -+ } else { -+ IA32CAP OPENSSL_ia32_cpuid(void); -+ engage = (int)(OPENSSL_ia32_cpuid() >> 57) & 1; -+ } -+ -+ /* Register everything or return with an error */ -+ if (!ENGINE_set_id(e, aesni_id) || -+ !ENGINE_set_name(e, engage ? aesni_name : no_aesni_name) || -+ -+ !ENGINE_set_init_function(e, aesni_init) || -+ (engage && !ENGINE_set_ciphers (e, aesni_ciphers)) -+ ) -+ return 0; -+ -+ /* Everything looks good */ -+ return 1; -+} -+ -+/* Constructor */ -+static ENGINE * -+ENGINE_aesni(void) -+{ -+ ENGINE *eng = ENGINE_new(); -+ -+ if (!eng) { -+ return NULL; -+ } -+ -+ if (!aesni_bind_helper(eng)) { -+ ENGINE_free(eng); -+ return NULL; -+ } -+ -+ return eng; -+} -+ -+/* Check availability of the engine */ -+static int -+aesni_init(ENGINE *e) -+{ -+ return 1; -+} -+ -+#if defined(NID_aes_128_cfb128) && ! defined (NID_aes_128_cfb) -+#define NID_aes_128_cfb NID_aes_128_cfb128 -+#endif -+ -+#if defined(NID_aes_128_ofb128) && ! defined (NID_aes_128_ofb) -+#define NID_aes_128_ofb NID_aes_128_ofb128 -+#endif -+ -+#if defined(NID_aes_192_cfb128) && ! defined (NID_aes_192_cfb) -+#define NID_aes_192_cfb NID_aes_192_cfb128 -+#endif -+ -+#if defined(NID_aes_192_ofb128) && ! defined (NID_aes_192_ofb) -+#define NID_aes_192_ofb NID_aes_192_ofb128 -+#endif -+ -+#if defined(NID_aes_256_cfb128) && ! defined (NID_aes_256_cfb) -+#define NID_aes_256_cfb NID_aes_256_cfb128 -+#endif -+ -+#if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb) -+#define NID_aes_256_ofb NID_aes_256_ofb128 -+#endif -+ -+/* List of supported ciphers. */ -+static int aesni_cipher_nids[] = { -+ NID_aes_128_ecb, -+ NID_aes_128_cbc, -+ NID_aes_128_cfb, -+ NID_aes_128_ofb, -+ -+ NID_aes_192_ecb, -+ NID_aes_192_cbc, -+ NID_aes_192_cfb, -+ NID_aes_192_ofb, -+ -+ NID_aes_256_ecb, -+ NID_aes_256_cbc, -+ NID_aes_256_cfb, -+ NID_aes_256_ofb, -+}; -+static int aesni_cipher_nids_num = -+ (sizeof(aesni_cipher_nids)/sizeof(aesni_cipher_nids[0])); -+ -+typedef struct -+{ -+ AES_KEY ks; -+ unsigned int _pad1[3]; -+} AESNI_KEY; -+ -+static int -+aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *user_key, -+ const unsigned char *iv, int enc) -+{ -+ int ret; -+ AES_KEY *key = AESNI_ALIGN(ctx->cipher_data); -+ -+ if ((ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_CFB_MODE -+ || (ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_OFB_MODE -+ || enc) -+ ret=aesni_set_encrypt_key(user_key, ctx->key_len * 8, key); -+ else -+ ret=aesni_set_decrypt_key(user_key, ctx->key_len * 8, key); -+ -+ if(ret < 0) { -+ EVPerr(EVP_F_AESNI_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED); -+ return 0; -+ } -+ -+ return 1; -+} -+ -+static int aesni_cipher_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t inl) -+{ AES_KEY *key = AESNI_ALIGN(ctx->cipher_data); -+ aesni_ecb_encrypt(in, out, inl, key, ctx->encrypt); -+ return 1; -+} -+static int aesni_cipher_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t inl) -+{ AES_KEY *key = AESNI_ALIGN(ctx->cipher_data); -+ aesni_cbc_encrypt(in, out, inl, key, -+ ctx->iv, ctx->encrypt); -+ return 1; -+} -+static int aesni_cipher_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t inl) -+{ AES_KEY *key = AESNI_ALIGN(ctx->cipher_data); -+ CRYPTO_cfb128_encrypt(in, out, inl, key, ctx->iv, -+ &ctx->num, ctx->encrypt, -+ (block128_f)aesni_encrypt); -+ return 1; -+} -+static int aesni_cipher_ofb(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t inl) -+{ AES_KEY *key = AESNI_ALIGN(ctx->cipher_data); -+ CRYPTO_ofb128_encrypt(in, out, inl, key, ctx->iv, -+ &ctx->num, (block128_f)aesni_encrypt); -+ return 1; -+} -+ -+#define AES_BLOCK_SIZE 16 -+ -+#define EVP_CIPHER_block_size_ECB AES_BLOCK_SIZE -+#define EVP_CIPHER_block_size_CBC AES_BLOCK_SIZE -+#define EVP_CIPHER_block_size_OFB 1 -+#define EVP_CIPHER_block_size_CFB 1 -+ -+/* Declaring so many ciphers by hand would be a pain. -+ Instead introduce a bit of preprocessor magic :-) */ -+#define DECLARE_AES_EVP(ksize,lmode,umode) \ -+static const EVP_CIPHER aesni_##ksize##_##lmode = { \ -+ NID_aes_##ksize##_##lmode, \ -+ EVP_CIPHER_block_size_##umode, \ -+ ksize / 8, \ -+ AES_BLOCK_SIZE, \ -+ 0 | EVP_CIPH_##umode##_MODE, \ -+ aesni_init_key, \ -+ aesni_cipher_##lmode, \ -+ NULL, \ -+ sizeof(AESNI_KEY), \ -+ EVP_CIPHER_set_asn1_iv, \ -+ EVP_CIPHER_get_asn1_iv, \ -+ NULL, \ -+ NULL \ -+} -+ -+DECLARE_AES_EVP(128,ecb,ECB); -+DECLARE_AES_EVP(128,cbc,CBC); -+DECLARE_AES_EVP(128,cfb,CFB); -+DECLARE_AES_EVP(128,ofb,OFB); -+ -+DECLARE_AES_EVP(192,ecb,ECB); -+DECLARE_AES_EVP(192,cbc,CBC); -+DECLARE_AES_EVP(192,cfb,CFB); -+DECLARE_AES_EVP(192,ofb,OFB); -+ -+DECLARE_AES_EVP(256,ecb,ECB); -+DECLARE_AES_EVP(256,cbc,CBC); -+DECLARE_AES_EVP(256,cfb,CFB); -+DECLARE_AES_EVP(256,ofb,OFB); -+ -+static int -+aesni_ciphers (ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid) -+{ -+ /* No specific cipher => return a list of supported nids ... */ -+ if (!cipher) { -+ *nids = aesni_cipher_nids; -+ return aesni_cipher_nids_num; -+ } -+ -+ /* ... or the requested "cipher" otherwise */ -+ switch (nid) { -+ case NID_aes_128_ecb: -+ *cipher = &aesni_128_ecb; -+ break; -+ case NID_aes_128_cbc: -+ *cipher = &aesni_128_cbc; -+ break; -+ case NID_aes_128_cfb: -+ *cipher = &aesni_128_cfb; -+ break; -+ case NID_aes_128_ofb: -+ *cipher = &aesni_128_ofb; -+ break; -+ -+ case NID_aes_192_ecb: -+ *cipher = &aesni_192_ecb; -+ break; -+ case NID_aes_192_cbc: -+ *cipher = &aesni_192_cbc; -+ break; -+ case NID_aes_192_cfb: -+ *cipher = &aesni_192_cfb; -+ break; -+ case NID_aes_192_ofb: -+ *cipher = &aesni_192_ofb; -+ break; -+ -+ case NID_aes_256_ecb: -+ *cipher = &aesni_256_ecb; -+ break; -+ case NID_aes_256_cbc: -+ *cipher = &aesni_256_cbc; -+ break; -+ case NID_aes_256_cfb: -+ *cipher = &aesni_256_cfb; -+ break; -+ case NID_aes_256_ofb: -+ *cipher = &aesni_256_ofb; -+ break; -+ -+ default: -+ /* Sorry, we don't support this NID */ -+ *cipher = NULL; -+ return 0; -+ } -+ -+ return 1; -+} -+ -+#endif /* COMPILE_HW_AESNI */ -+#endif /* !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AESNI) && !defined(OPENSSL_NO_AES) */ -diff -Nur openssl-1.0.1c.orig/crypto/engine/eng_all.c openssl-1.0.1c/crypto/engine/eng_all.c ---- openssl-1.0.1c.orig/crypto/engine/eng_all.c 2012-05-25 22:16:38.541423000 +0200 -+++ openssl-1.0.1c/crypto/engine/eng_all.c 2012-05-25 22:08:42.171127000 +0200 -@@ -79,6 +79,10 @@ - #ifndef OPENSSL_NO_RDRAND - ENGINE_load_rdrand(); - #endif -+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AESNI) -+ ENGINE_load_aesni(); -+ ENGINE_register_all_complete(); -+#endif - ENGINE_load_dynamic(); - #ifndef OPENSSL_NO_HW_PKCS11 - ENGINE_load_pk11(); -diff -Nur openssl-1.0.1c.orig/crypto/engine/engine.h openssl-1.0.1c/crypto/engine/engine.h ---- openssl-1.0.1c.orig/crypto/engine/engine.h 2012-05-25 22:16:38.558758000 +0200 -+++ openssl-1.0.1c/crypto/engine/engine.h 2012-05-25 22:08:42.187719000 +0200 -@@ -351,6 +351,7 @@ - #endif - #endif - void ENGINE_load_cryptodev(void); -+void ENGINE_load_aesni(void); - void ENGINE_load_pk11(void); - void ENGINE_load_rsax(void); - void ENGINE_load_rdrand(void); -diff -Nur openssl-1.0.1c.orig/crypto/engine/Makefile openssl-1.0.1c/crypto/engine/Makefile ---- openssl-1.0.1c.orig/crypto/engine/Makefile 2012-05-25 22:16:38.503727000 +0200 -+++ openssl-1.0.1c/crypto/engine/Makefile 2012-05-25 22:08:42.157670000 +0200 -@@ -22,6 +22,7 @@ - tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ - tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ - eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ -+ eng_aesni.c \ - eng_rsax.c eng_rdrand.c \ - hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c - LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ -@@ -29,6 +30,7 @@ - tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ - tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \ - eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \ -+ eng_aesni.o \ - eng_rsax.o eng_rdrand.o \ - hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o - -diff -Nur openssl-1.0.1c.orig/util/libeay.num openssl-1.0.1c/util/libeay.num ---- openssl-1.0.1c.orig/util/libeay.num 2011-12-25 15:48:44.000000000 +0100 -+++ openssl-1.0.1c/util/libeay.num 2012-05-25 22:08:42.228996000 +0200 -@@ -4178,6 +4178,7 @@ - UI_method_set_prompt_constructor 4551 EXIST:!VMS:FUNCTION: - UI_method_set_prompt_constructr 4551 EXIST:VMS:FUNCTION: - EVP_read_pw_string_min 4552 EXIST::FUNCTION: -+ENGINE_load_aesni 4553 EXIST::FUNCTION:ENGINE - CRYPTO_cts128_encrypt 4553 EXIST::FUNCTION: - CRYPTO_cts128_decrypt_block 4554 EXIST::FUNCTION: - CRYPTO_cfb128_1_encrypt 4555 EXIST::FUNCTION: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 11:53:01 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 10:53:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[20401] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20401 http://gar.svn.sourceforge.net/gar/?rev=20401&view=rev Author: chninkel Date: 2013-03-10 10:53:01 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: adapted patches to be able to update more easily t4 patch Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 06:27:38 UTC (rev 20400) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 10:53:01 UTC (rev 20401) @@ -88,9 +88,15 @@ DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE +# This patch is taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ +# original file: components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch +# I think they are smarter than me to figure what are the best compiler options +PATCHFILES = optimized_configure_targets.patch + # This patch add optimised build targets for some solaris isa, ie: -# solaris-pentium_pro-cc and solaris-sparcv9+vis-cc -PATCHFILES = more_configure_targets.patch +# solaris-sparcv8-cc-sunw, solaris-pentium_pro-cc-sunw and solaris-sparcv9+vis-cc-sunw +# (wonder if they are really worth it) +PATCHFILES += more_configure_targets.patch #PATCHFILES += fix-test-failure.patch @@ -130,7 +136,7 @@ ifeq ($(shell /usr/bin/uname -p),sparc) ifneq ($(shell /usr/bin/uname -r),5.9) ifneq ($(shell /usr/bin/uname -r),5.10) - PATCHFILES += openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 + #PATCHFILES += openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 endif endif endif @@ -156,15 +162,14 @@ # The corresponding os/compiler to pass to the # openssl Configure script -i386_OS_COMPILER = solaris-x86-cc -pentium_OS_COMPILER = solaris-pentium-cc -pentium_pro_OS_COMPILER = solaris-pentium_pro-cc -amd64_OS_COMPILER = solaris64-x86_64-cc +i386_OS_COMPILER = solaris-x86-cc-sunw +pentium_pro_OS_COMPILER = solaris-x86-pentium_pro-cc-sunw +amd64_OS_COMPILER = solaris64-x86_64-cc-sunw -sparcv8_OS_COMPILER = solaris-sparcv8-cc -sparcv8plus_OS_COMPILER = solaris-sparcv9-cc -sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc -sparcv9_OS_COMPILER = solaris64-sparcv9-cc +sparcv8_OS_COMPILER = solaris-sparcv8-cc-sunw +sparcv8plus_OS_COMPILER = solaris-sparcv9-cc-sunw +sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc-sunw +sparcv9_OS_COMPILER = solaris64-sparcv9-cc-sunw CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) @@ -200,6 +205,11 @@ EXT_CFLAGS += -mt -xstrconst EXT_CXXFLAGS += -noex -mt +# The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ +# added "-z defs" to the linker options. That causes object compilation to fail because +# they are not linked against libc. This is workaround until I find a better fix. +EXTRA_LD_OPTIONS = "-lc" + # By default, the install target put man pages under # /opt/csw/ssl/man, but we want them under /opt/csw/share/man INSTALL_ARGS += MANDIR=$(mandir) Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-10 06:27:38 UTC (rev 20400) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-10 10:53:01 UTC (rev 20401) @@ -1,38 +1,20 @@ -From 71b64c5da0b3279ffbe23a76641c40d4ee8972ee Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Thu, 7 Feb 2013 21:56:04 +0100 -Subject: [PATCH] Tune and add configure targets - ---- - Configure | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Configure b/Configure -index 5c92282..2e0344f 100755 ---- a/Configure -+++ b/Configure -@@ -224,8 +224,9 @@ my %table=( - "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", - - #### Solaris x86 with Sun C setups --"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", -+"solaris-x86-cc","cc:-m32 -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium_pro-cc","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-x86_64-cc","cc:-m64 -xarch=sse2 -xO3 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", - - #### SPARC Solaris with GNU C setups - "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -243,7 +244,8 @@ my %table=( - # SC5.0 note: Compiler common patch 107357-01 or later is required! - "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9-cc","cc:-m32 -xtarget=ultra -xarch=sparc -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-m32 -xtarget=ultra -xarch=sparcvis -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", - #### - "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --- -1.8.1 - +diff -ur openssl-1.0.1e.orig/Configure openssl-1.0.1e/Configure +--- openssl-1.0.1e.orig/Configure 2013-03-10 07:52:44.423621000 +0100 ++++ openssl-1.0.1e/Configure 2013-03-10 08:15:34.966266918 +0100 +@@ -257,10 +257,16 @@ + #### Solaris configs, used for OpenSSL as delivered by S11. + "solaris-x86-cc-sunw","cc:-m32 -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # ++"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# + "solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # ++"solaris-sparcv8-cc-sunw","cc:-xtarget=v8 -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# + "solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # ++"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# + "solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + # Option -xF=%all instructs the compiler to place functions and data + # variables into separate section fragments. This enables the link editor Added: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch 2013-03-10 10:53:01 UTC (rev 20401) @@ -0,0 +1,22 @@ +--- openssl-1.0.0d/Configure Thu Feb 10 20:02:41 2011 ++++ /tmp/Configure Thu Feb 10 20:01:51 2011 +@@ -257,6 +257,19 @@ + #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::", + "sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::", + ++#### Solaris configs, used for OpenSSL as delivered by S11. ++"solaris-x86-cc-sunw","cc:-m32 -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++# Option -xF=%all instructs the compiler to place functions and data ++# variables into separate section fragments. This enables the link editor ++# to discard unused sections and files when linking wanboot-openssl.o ++"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++ + #### IRIX 5.x configs + # -mips2 flag is added by ./config when appropriate. + "irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 11:54:36 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 10:54:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20402] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20402 http://gar.svn.sourceforge.net/gar/?rev=20402&view=rev Author: chninkel Date: 2013-03-10 10:54:36 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: removed build optimisation in Makefile, they are already present in patches Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 10:53:01 UTC (rev 20401) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 10:54:36 UTC (rev 20402) @@ -201,10 +201,6 @@ # with the shell command added by the t4 patch CONFIGURE_ENV += MAKE="/opt/csw/bin/gmake" -# Some optimization -EXT_CFLAGS += -mt -xstrconst -EXT_CXXFLAGS += -noex -mt - # The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # added "-z defs" to the linker options. That causes object compilation to fail because # they are not linked against libc. This is workaround until I find a better fix. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 10 17:41:29 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 10 Mar 2013 16:41:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20403] csw/mgar/pkg/cpan/Net-DNS/trunk Message-ID: Revision: 20403 http://gar.svn.sourceforge.net/gar/?rev=20403&view=rev Author: bonivart Date: 2013-03-10 16:41:29 +0000 (Sun, 10 Mar 2013) Log Message: ----------- cpan/Net-DNS/trunk: update to 0.72 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2013-03-10 10:54:36 UTC (rev 20402) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2013-03-10 16:41:29 UTC (rev 20403) @@ -1,14 +1,11 @@ NAME = Net-DNS -VERSION = 0.71 +VERSION = 0.72 CATEGORIES = cpan GARTYPE = v2 AUTHOR = NLNETLABS DESCRIPTION = Interface to the DNS resolver define BLURB - Net::DNS is a collection of Perl modules that act as a Domain Name System - (DNS) resolver. It allows the programmer to perform DNS queries that are - beyond the capabilities of gethostbyname and gethostbyaddr. endef PACKAGES = CSWpm-net-dns Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2013-03-10 10:54:36 UTC (rev 20402) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2013-03-10 16:41:29 UTC (rev 20403) @@ -1 +1 @@ -dde4db75467a155beba741de822387f9 Net-DNS-0.71.tar.gz +393e48ec6f28abe5ed30204276e02775 Net-DNS-0.72.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 21:51:03 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 20:51:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20405] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20405 http://gar.svn.sourceforge.net/gar/?rev=20405&view=rev Author: chninkel Date: 2013-03-10 20:51:02 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: added a target to easily update the t4 engine patch Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 20:49:54 UTC (rev 20404) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 20:51:02 UTC (rev 20405) @@ -240,3 +240,19 @@ post-merge: merge-doc install-conf-misc +T4_ENGINE_FILES = eng_t4_aes_asm.h eng_t4_bignum.h eng_t4_des_asm.h eng_t4_err.h eng_t4_sha2_asm.h +T4_ENGINE_FILES = eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c +T4_ENGINE_FILES += t4_aes.S t4_des.S t4_md5.S t4_sha1.S t4_sha2.S +MERCURIAL_URL = https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/tip/components/openssl/openssl-1.0.1/ +PATCH_DATE = $(shell date +"%Y-%m-%d %H:%M:%S.%N %z") +update-t4-patch: + @echo "Updating t4 engine patch from $(MERCURIAL_URL)..." + @( wget --quiet --output-document=- $(MERCURIAL_URL)/patches/openssl-$(VERSION)-t4-engine.sparc-patch; \ + for FILE in $(T4_ENGINE_FILES); do \ + DIR="engine"; \ + if echo $$FILE | grep "\.S$$" >/dev/null; then DIR="`basename $$FILE .S | cut -d_ -f2 | cut -b1-3`/asm"; fi; \ + echo "diff -uNr openssl-$(VERSION)/$$DIR/$$FILE openssl-$(VERSION)/$$DIR/$$FILE"; \ + echo "--- openssl-$(VERSION)/crypto/$$DIR/$$FILE 1970-01-01 01:00:00.000000000 +0100"; \ + echo "+++ openssl-$(VERSION)/crypto/$$DIR/$$FILE $(PATCH_DATE)"; \ + wget --quiet --output-document=- $(MERCURIAL_URL)/engines/t4/$$FILE | sed -e 's/^/+/'; \ + done; ) > "$(FILEDIR)/openssl-$(VERSION)-t4-engine.sparc-patch" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 21:49:54 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 20:49:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20404] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20404 http://gar.svn.sourceforge.net/gar/?rev=20404&view=rev Author: chninkel Date: 2013-03-10 20:49:54 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: updated t4 engine patch Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0.1b.patch.2012-04-30 Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 16:41:29 UTC (rev 20403) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 20:49:54 UTC (rev 20404) @@ -124,7 +124,7 @@ # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 ifneq ($(shell /usr/bin/uname -r),5.9) - PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30 + PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30 endif endif @@ -136,7 +136,7 @@ ifeq ($(shell /usr/bin/uname -p),sparc) ifneq ($(shell /usr/bin/uname -r),5.9) ifneq ($(shell /usr/bin/uname -r),5.10) - #PATCHFILES += openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 + PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch endif endif endif @@ -186,14 +186,6 @@ endif -ifeq ($(shell /usr/bin/uname -r),5.11) -GARCOMPILER = SOS12U3 -else -GARCOMPILER = SOS12 -endif - - - # For now we want the sun perl to be used CONFIGURE_ENV += PERL="/usr/bin/perl" @@ -246,3 +238,5 @@ @$(MAKECOOKIE) post-merge: merge-doc install-conf-misc + + Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-10 16:41:29 UTC (rev 20403) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-10 20:49:54 UTC (rev 20404) @@ -1,20 +1,31 @@ -diff -ur openssl-1.0.1e.orig/Configure openssl-1.0.1e/Configure ---- openssl-1.0.1e.orig/Configure 2013-03-10 07:52:44.423621000 +0100 -+++ openssl-1.0.1e/Configure 2013-03-10 08:15:34.966266918 +0100 -@@ -257,10 +257,16 @@ - #### Solaris configs, used for OpenSSL as delivered by S11. - "solaris-x86-cc-sunw","cc:-m32 -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - # +From a693531b40e1f8d707cea5f984d935358c12f14d Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Sun, 10 Mar 2013 12:14:09 +0100 +Subject: [PATCH] More configure targets + +--- + Configure | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Configure b/Configure +index a84e9d7..6f93ad3 100755 +--- a/Configure ++++ b/Configure +@@ -267,6 +267,14 @@ my %table=( + # to discard unused sections and files when linking wanboot-openssl.o + "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + ++#### More configure targets for Opencsw build +"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# - "solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - # +"solaris-sparcv8-cc-sunw","cc:-xtarget=v8 -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# - "solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - # +"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+# - "solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", - # Option -xF=%all instructs the compiler to place functions and data - # variables into separate section fragments. This enables the link editor ++ ++ + #### IRIX 5.x configs + # -mips2 flag is added by ./config when appropriate. + "irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-- +1.8.1.4 + Deleted: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 2013-03-10 16:41:29 UTC (rev 20403) +++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1c-t4-engine.sparc-patch.2012-05-11 2013-03-10 20:49:54 UTC (rev 20404) @@ -1,8744 +0,0 @@ -diff -uNr openssl-1.0.1c.orig/Configure openssl-1.0.1c/Configure ---- openssl-1.0.1c.orig/Configure 2012-05-11 22:28:08.972569770 +0200 -+++ openssl-1.0.1c/Configure 2012-05-11 22:19:17.459525000 +0200 -@@ -133,8 +133,8 @@ - - my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:"; - my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void"; --my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void"; --my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void"; -+my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o t4_des.o:aes_core.o aes_cbc.o aes-sparcv9.o t4_aes.o::t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void"; -+my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o t4_des.o:t4_aes.o::t4_md5.o:t4_sha1.o t4_sha2.o:::::::::void"; - my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void"; - my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::"; - my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::"; -@@ -246,9 +246,9 @@ - # SC5.0 note: Compiler common patch 107357-01 or later is required! - "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris-sparcv9-cc","cc:-m32 -xtarget=ultra -xarch=sparc -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris-sparcv9+vis-cc","cc:-m32 -xtarget=ultra -xarch=sparcvis -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-sparcv9-cc","cc:-m64 -xtarget=ultra -xarch=sparc -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", -+"solaris-sparcv9-cc","cc:-m32 -xtarget=ultra -xarch=sparc -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl -lsoftcrypto:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-m32 -xtarget=ultra -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl -lsoftcrypto:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-sparcv9-cc","cc:-m64 -xtarget=ultra -xarch=sparc -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl -lsoftcrypto:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", - #### - "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -diff -uNr openssl-1.0.1c.orig/crypto/aes/Makefile openssl-1.0.1c/crypto/aes/Makefile ---- openssl-1.0.1c.orig/crypto/aes/Makefile 2011-11-14 21:42:21.000000000 +0100 -+++ openssl-1.0.1c/crypto/aes/Makefile 2012-05-11 22:19:17.481179000 +0200 -@@ -17,6 +17,10 @@ - ASFLAGS= $(INCLUDES) $(ASFLAG) - AFLAGS= $(ASFLAGS) - -+BITS:= $(shell if grep '^CFLAG.*=.*-m64' ../../Makefile >/dev/null; \ -+ then echo 64; else echo 32; fi) -+ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS) -+ - GENERAL=Makefile - #TEST=aestest.c - TEST= -@@ -69,6 +73,10 @@ - aes-sparcv9.s: asm/aes-sparcv9.pl - $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ - -+t4_aes.o: asm/t4_aes.S -+ as $(ASFLAGSYF) -o $@ asm/t4_aes.S -+ elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ -+ - aes-ppc.s: asm/aes-ppc.pl - $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ - -diff -uNr openssl-1.0.1c.orig/crypto/aes/asm/t4_aes.S openssl-1.0.1c/crypto/aes/asm/t4_aes.S ---- openssl-1.0.1c.orig/crypto/aes/asm/t4_aes.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1c/crypto/aes/asm/t4_aes.S 2012-05-11 21:34:40.438327000 +0200 -@@ -0,0 +1,3052 @@ -+/* -+ * ==================================================================== -+ * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * openssl-core at openssl.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ */ -+ -+/* -+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -+ */ -+ -+/*LINTLIBRARY*/ -+ -+#if defined(lint) || defined(__lint) -+ -+ -+#include -+ -+/*ARGSUSED*/ -+void t4_aes_expand128(uint64_t *rk, const uint32_t *key) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes_expand192(uint64_t *rk, const uint32_t *key) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes_expand256(uint64_t *rk, const uint32_t *key) -+{ return; } -+ -+void t4_aes128_load_keys_for_encrypt(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_load_keys_for_encrypt(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_load_keys_for_encrypt(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_ecb_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_ecb_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_ecb_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_ctr_crypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_ctr_crypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_ctr_crypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+void t4_aes128_load_keys_for_decrypt(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_load_keys_for_decrypt(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_load_keys_for_decrypt(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_ecb_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_ecb_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_ecb_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes128_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes192_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_aes256_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t * asm_out, size_t amount_to_encrypt, uint64_t *iv) -+{ return; } -+ -+#else /* lint || __lint */ -+ -+#include -+ -+ -+ ENTRY(t4_aes_expand128) -+ -+!load key -+ ld [%o1], %f0 -+ ld [%o1 + 0x4], %f1 -+ ld [%o1 + 0x8], %f2 -+ ld [%o1 + 0xc], %f3 -+ -+!expand the key -+ !aes_kexpand1 %f0, %f2, 0x0, %f4 -+ !aes_kexpand2 %f2, %f4, %f6 -+ !aes_kexpand1 %f4, %f6, 0x1, %f8 -+ !aes_kexpand2 %f6, %f8, %f10 -+ !aes_kexpand1 %f8, %f10, 0x2, %f12 -+ !aes_kexpand2 %f10, %f12, %f14 -+ !aes_kexpand1 %f12, %f14, 0x3, %f16 -+ !aes_kexpand2 %f14, %f16, %f18 -+ !aes_kexpand1 %f16, %f18, 0x4, %f20 -+ !aes_kexpand2 %f18, %f20, %f22 -+ !aes_kexpand1 %f20, %f22, 0x5, %f24 -+ !aes_kexpand2 %f22, %f24, %f26 -+ !aes_kexpand1 %f24, %f26, 0x6, %f28 -+ !aes_kexpand2 %f26, %f28, %f30 -+ !aes_kexpand1 %f28, %f30, 0x7, %f32 -+ !aes_kexpand2 %f30, %f32, %f34 -+ !aes_kexpand1 %f32, %f34, 0x8, %f36 -+ !aes_kexpand2 %f34, %f36, %f38 -+ !aes_kexpand1 %f36, %f38, 0x9, %f40 -+ !aes_kexpand2 %f38, %f40, %f42 -+ .byte 0x88, 0xc8, 0x01, 0x02 -+ .byte 0x8d, 0xb0, 0xa6, 0x24 -+ .byte 0x90, 0xc9, 0x03, 0x06 -+ .byte 0x95, 0xb1, 0xa6, 0x28 -+ .byte 0x98, 0xca, 0x05, 0x0a -+ .byte 0x9d, 0xb2, 0xa6, 0x2c -+ .byte 0xa0, 0xcb, 0x07, 0x0e -+ .byte 0xa5, 0xb3, 0xa6, 0x30 -+ .byte 0xa8, 0xcc, 0x09, 0x12 -+ .byte 0xad, 0xb4, 0xa6, 0x34 -+ .byte 0xb0, 0xcd, 0x0b, 0x16 -+ .byte 0xb5, 0xb5, 0xa6, 0x38 -+ .byte 0xb8, 0xce, 0x0d, 0x1a -+ .byte 0xbd, 0xb6, 0xa6, 0x3c -+ .byte 0x82, 0xcf, 0x0f, 0x1e -+ .byte 0x87, 0xb7, 0xa6, 0x21 -+ .byte 0x8a, 0xc8, 0x51, 0x03 -+ .byte 0x8f, 0xb0, 0xe6, 0x25 -+ .byte 0x92, 0xc9, 0x53, 0x07 -+ .byte 0x97, 0xb1, 0xe6, 0x29 -+ -+!copy expanded key back into array -+ std %f4, [%o0] -+ std %f6, [%o0 + 0x8] -+ std %f8, [%o0 + 0x10] -+ std %f10, [%o0 + 0x18] -+ std %f12, [%o0 + 0x20] -+ std %f14, [%o0 + 0x28] -+ std %f16, [%o0 + 0x30] -+ std %f18, [%o0 + 0x38] -+ std %f20, [%o0 + 0x40] -+ std %f22, [%o0 + 0x48] -+ std %f24, [%o0 + 0x50] -+ std %f26, [%o0 + 0x58] -+ std %f28, [%o0 + 0x60] -+ std %f30, [%o0 + 0x68] -+ std %f32, [%o0 + 0x70] -+ std %f34, [%o0 + 0x78] -+ std %f36, [%o0 + 0x80] -+ std %f38, [%o0 + 0x88] -+ std %f40, [%o0 + 0x90] -+ retl -+ std %f42, [%o0 + 0x98] -+ -+ SET_SIZE(t4_aes_expand128) -+ -+ -+ ENTRY(t4_aes_expand192) -+ -+!load key -+ ld [%o1], %f0 -+ ld [%o1 + 0x4], %f1 -+ ld [%o1 + 0x8], %f2 -+ ld [%o1 + 0xc], %f3 -+ ld [%o1 + 0x10], %f4 -+ ld [%o1 + 0x14], %f5 -+ -+!expand the key -+ !aes_kexpand1 %f0, %f4, 0x0, %f6 -+ !aes_kexpand2 %f2, %f6, %f8 -+ !aes_kexpand2 %f4, %f8, %f10 -+ -+ !aes_kexpand1 %f6, %f10, 0x1, %f12 -+ !aes_kexpand2 %f8, %f12, %f14 -+ !aes_kexpand2 %f10, %f14, %f16 -+ -+ !aes_kexpand1 %f12, %f16, 0x2, %f18 -+ !aes_kexpand2 %f14, %f18, %f20 -+ !aes_kexpand2 %f16, %f20, %f22 -+ -+ !aes_kexpand1 %f18, %f22, 0x3, %f24 -+ !aes_kexpand2 %f20, %f24, %f26 -+ !aes_kexpand2 %f22, %f26, %f28 -+ -+ !aes_kexpand1 %f24, %f28, 0x4, %f30 -+ !aes_kexpand2 %f26, %f30, %f32 -+ !aes_kexpand2 %f28, %f32, %f34 -+ -+ !aes_kexpand1 %f30, %f34, 0x5, %f36 -+ !aes_kexpand2 %f32, %f36, %f38 -+ !aes_kexpand2 %f34, %f38, %f40 -+ -+ !aes_kexpand1 %f36, %f40, 0x6, %f42 -+ !aes_kexpand2 %f38, %f42, %f44 -+ !aes_kexpand2 %f40, %f44, %f46 -+ -+ !aes_kexpand1 %f42, %f46, 0x7, %f48 -+ !aes_kexpand2 %f44, %f48, %f50 -+ .byte 0x8c, 0xc8, 0x01, 0x04 -+ .byte 0x91, 0xb0, 0xa6, 0x26 -+ .byte 0x95, 0xb1, 0x26, 0x28 -+ .byte 0x98, 0xc9, 0x83, 0x0a -+ .byte 0x9d, 0xb2, 0x26, 0x2c -+ .byte 0xa1, 0xb2, 0xa6, 0x2e -+ .byte 0xa4, 0xcb, 0x05, 0x10 -+ .byte 0xa9, 0xb3, 0xa6, 0x32 -+ .byte 0xad, 0xb4, 0x26, 0x34 -+ .byte 0xb0, 0xcc, 0x87, 0x16 -+ .byte 0xb5, 0xb5, 0x26, 0x38 -+ .byte 0xb9, 0xb5, 0xa6, 0x3a -+ .byte 0xbc, 0xce, 0x09, 0x1c -+ .byte 0x83, 0xb6, 0xa6, 0x3e -+ .byte 0x87, 0xb7, 0x26, 0x21 -+ .byte 0x8a, 0xcf, 0x8b, 0x03 -+ .byte 0x8f, 0xb0, 0x66, 0x25 -+ .byte 0x93, 0xb0, 0xe6, 0x27 -+ .byte 0x96, 0xc9, 0x4d, 0x09 -+ .byte 0x9b, 0xb1, 0xe6, 0x2b -+ .byte 0x9f, 0xb2, 0x66, 0x2d -+ .byte 0xa2, 0xca, 0xcf, 0x0f -+ .byte 0xa7, 0xb3, 0x66, 0x31 -+ -+!copy expanded key back into array -+ std %f6, [%o0] -+ std %f8, [%o0 + 0x8] -+ std %f10, [%o0 + 0x10] -+ std %f12, [%o0 + 0x18] -+ std %f14, [%o0 + 0x20] -+ std %f16, [%o0 + 0x28] -+ std %f18, [%o0 + 0x30] -+ std %f20, [%o0 + 0x38] -+ std %f22, [%o0 + 0x40] -+ std %f24, [%o0 + 0x48] -+ std %f26, [%o0 + 0x50] -+ std %f28, [%o0 + 0x58] -+ std %f30, [%o0 + 0x60] -+ std %f32, [%o0 + 0x68] -+ std %f34, [%o0 + 0x70] -+ std %f36, [%o0 + 0x78] -+ std %f38, [%o0 + 0x80] -+ std %f40, [%o0 + 0x88] -+ std %f42, [%o0 + 0x90] -+ std %f44, [%o0 + 0x98] -+ std %f46, [%o0 + 0xa0] -+ std %f48, [%o0 + 0xa8] -+ retl -+ std %f50, [%o0 + 0xb0] -+ -+ SET_SIZE(t4_aes_expand192) -+ -+ -+ ENTRY(t4_aes_expand256) -+ -+!load key -+ ld [%o1], %f0 -+ ld [%o1 + 0x4], %f1 -+ ld [%o1 + 0x8], %f2 -+ ld [%o1 + 0xc], %f3 -+ ld [%o1 + 0x10], %f4 -+ ld [%o1 + 0x14], %f5 -+ ld [%o1 + 0x18], %f6 -+ ld [%o1 + 0x1c], %f7 -+ -+!expand the key -+ !aes_kexpand1 %f0, %f6, 0x0, %f8 -+ !aes_kexpand2 %f2, %f8, %f10 -+ !aes_kexpand0 %f4, %f10, %f12 -+ !aes_kexpand2 %f6, %f12, %f14 -+ -+ !aes_kexpand1 %f8, %f14, 0x1, %f16 -+ !aes_kexpand2 %f10, %f16, %f18 -+ !aes_kexpand0 %f12, %f18, %f20 -+ !aes_kexpand2 %f14, %f20, %f22 -+ -+ !aes_kexpand1 %f16, %f22, 0x2, %f24 -+ !aes_kexpand2 %f18, %f24, %f26 -+ !aes_kexpand0 %f20, %f26, %f28 -+ !aes_kexpand2 %f22, %f28, %f30 -+ -+ !aes_kexpand1 %f24, %f30, 0x3, %f32 -+ !aes_kexpand2 %f26, %f32, %f34 -+ !aes_kexpand0 %f28, %f34, %f36 -+ !aes_kexpand2 %f30, %f36, %f38 -+ -+ !aes_kexpand1 %f32, %f38, 0x4, %f40 -+ !aes_kexpand2 %f34, %f40, %f42 -+ !aes_kexpand0 %f36, %f42, %f44 -+ !aes_kexpand2 %f38, %f44, %f46 -+ -+ !aes_kexpand1 %f40, %f46, 0x5, %f48 -+ !aes_kexpand2 %f42, %f48, %f50 -+ !aes_kexpand0 %f44, %f50, %f52 -+ !aes_kexpand2 %f46, %f52, %f54 -+ -+ !aes_kexpand1 %f48, %f54, 0x6, %f56 -+ !aes_kexpand2 %f50, %f56, %f58 -+ .byte 0x90, 0xc8, 0x01, 0x06 -+ .byte 0x95, 0xb0, 0xa6, 0x28 -+ .byte 0x99, 0xb1, 0x26, 0x0a -+ .byte 0x9d, 0xb1, 0xa6, 0x2c -+ .byte 0xa0, 0xca, 0x03, 0x0e -+ .byte 0xa5, 0xb2, 0xa6, 0x30 -+ .byte 0xa9, 0xb3, 0x26, 0x12 -+ .byte 0xad, 0xb3, 0xa6, 0x34 -+ .byte 0xb0, 0xcc, 0x05, 0x16 -+ .byte 0xb5, 0xb4, 0xa6, 0x38 -+ .byte 0xb9, 0xb5, 0x26, 0x1a -+ .byte 0xbd, 0xb5, 0xa6, 0x3c -+ .byte 0x82, 0xce, 0x07, 0x1e -+ .byte 0x87, 0xb6, 0xa6, 0x21 -+ .byte 0x8b, 0xb7, 0x26, 0x03 -+ .byte 0x8f, 0xb7, 0xa6, 0x25 -+ .byte 0x92, 0xc8, 0x49, 0x07 -+ .byte 0x97, 0xb0, 0xe6, 0x29 -+ .byte 0x9b, 0xb1, 0x66, 0x0b -+ .byte 0x9f, 0xb1, 0xe6, 0x2d -+ .byte 0xa2, 0xca, 0x4b, 0x0f -+ .byte 0xa7, 0xb2, 0xe6, 0x31 -+ .byte 0xab, 0xb3, 0x66, 0x13 -+ .byte 0xaf, 0xb3, 0xe6, 0x35 -+ .byte 0xb2, 0xcc, 0x4d, 0x17 -+ .byte 0xb7, 0xb4, 0xe6, 0x39 -+ -+!copy expanded key back into array -+ std %f8, [%o0] -+ std %f10, [%o0 + 0x8] -+ std %f12, [%o0 + 0x10] -+ std %f14, [%o0 + 0x18] -+ std %f16, [%o0 + 0x20] -+ std %f18, [%o0 + 0x28] -+ std %f20, [%o0 + 0x30] -+ std %f22, [%o0 + 0x38] -+ std %f24, [%o0 + 0x40] -+ std %f26, [%o0 + 0x48] -+ std %f28, [%o0 + 0x50] -+ std %f30, [%o0 + 0x58] -+ std %f32, [%o0 + 0x60] -+ std %f34, [%o0 + 0x68] -+ std %f36, [%o0 + 0x70] -+ std %f38, [%o0 + 0x78] -+ std %f40, [%o0 + 0x80] -+ std %f42, [%o0 + 0x88] -+ std %f44, [%o0 + 0x90] -+ std %f46, [%o0 + 0x98] -+ std %f48, [%o0 + 0xa0] -+ std %f50, [%o0 + 0xa8] -+ std %f52, [%o0 + 0xb0] -+ std %f54, [%o0 + 0xb8] -+ std %f56, [%o0 + 0xc0] -+ retl -+ std %f58, [%o0 + 0xc8] -+ -+ SET_SIZE(t4_aes_expand256) -+ -+ -+#define FIRST_TWO_EROUNDS \ -+ .byte 0xb2, 0xc8, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xc8, 0xbe, 0x3d ; \ -+ .byte 0xba, 0xc9, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xc9, 0xb6, 0x39 -+ !aes_eround01 %f0, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f2, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f4, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f6, %f56, %f58, %f62 -+ -+#define MID_TWO_EROUNDS \ -+ .byte 0xb2, 0xca, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xca, 0xbe, 0x3d ; \ -+ .byte 0xba, 0xcb, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcb, 0xb6, 0x39 -+ !aes_eround01 %f8, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f10, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f12, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f14, %f56, %f58, %f62 -+ -+#define MID_TWO_EROUNDS_2 \ -+ .byte 0x8c, 0xca, 0x04, 0x00 ; \ -+ .byte 0x88, 0xca, 0x84, 0x20 ; \ -+ .byte 0xb2, 0xca, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xca, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xcb, 0x08, 0x06 ; \ -+ .byte 0x84, 0xcb, 0x88, 0x26 ; \ -+ .byte 0xba, 0xcb, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcb, 0xb6, 0x39 -+ !aes_eround01 %f8, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f10, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f8, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f10, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f12, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f14, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f12, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f14, %f56, %f58, %f62 -+ -+#define TEN_EROUNDS \ -+ .byte 0xb2, 0xcc, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xcc, 0xbe, 0x3d ; \ -+ .byte 0xba, 0xcd, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcd, 0xb6, 0x39 ; \ -+ .byte 0xb2, 0xce, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xce, 0xbe, 0x3d ; \ -+ .byte 0xba, 0xcf, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcf, 0xb6, 0x39 ; \ -+ .byte 0xb2, 0xc8, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xc8, 0xfe, 0x3d ; \ -+ .byte 0xba, 0xc9, 0x76, 0x19 ; \ -+ .byte 0xbe, 0xc9, 0xf6, 0x39 ; \ -+ .byte 0xb2, 0xca, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xca, 0xfe, 0x3d ; \ -+ .byte 0xba, 0xcb, 0x76, 0x19 ; \ -+ .byte 0xbe, 0xcb, 0xf6, 0x39 ; \ -+ .byte 0xb2, 0xcc, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xcc, 0xfe, 0x3d ; \ -+ .byte 0xba, 0xcd, 0x76, 0x99 ; \ -+ .byte 0xbe, 0xcd, 0xf6, 0xb9 -+ !aes_eround01 %f16, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f18, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f20, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f22, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f24, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f26, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f28, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f30, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f32, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f34, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f36, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f38, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f40, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f42, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f44, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f46, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f48, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f50, %f60, %f62, %f58 ; \ -+ !aes_eround01_l %f52, %f56, %f58, %f60 ; \ -+ !aes_eround23_l %f54, %f56, %f58, %f62 -+ -+#define TEN_EROUNDS_2 \ -+ .byte 0x8c, 0xcc, 0x04, 0x00 ; \ -+ .byte 0x88, 0xcc, 0x84, 0x20 ; \ -+ .byte 0xb2, 0xcc, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xcc, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xcd, 0x08, 0x06 ; \ -+ .byte 0x84, 0xcd, 0x88, 0x26 ; \ -+ .byte 0xba, 0xcd, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcd, 0xb6, 0x39 ; \ -+ .byte 0x8c, 0xce, 0x04, 0x00 ; \ -+ .byte 0x88, 0xce, 0x84, 0x20 ; \ -+ .byte 0xb2, 0xce, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xce, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xcf, 0x08, 0x06 ; \ -+ .byte 0x84, 0xcf, 0x88, 0x26 ; \ -+ .byte 0xba, 0xcf, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcf, 0xb6, 0x39 ; \ -+ .byte 0x8c, 0xc8, 0x44, 0x00 ; \ -+ .byte 0x88, 0xc8, 0xc4, 0x20 ; \ -+ .byte 0xb2, 0xc8, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xc8, 0xfe, 0x3d ; \ -+ .byte 0x80, 0xc9, 0x48, 0x06 ; \ -+ .byte 0x84, 0xc9, 0xc8, 0x26 ; \ -+ .byte 0xba, 0xc9, 0x76, 0x19 ; \ -+ .byte 0xbe, 0xc9, 0xf6, 0x39 ; \ -+ .byte 0x8c, 0xca, 0x44, 0x00 ; \ -+ .byte 0x88, 0xca, 0xc4, 0x20 ; \ -+ .byte 0xb2, 0xca, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xca, 0xfe, 0x3d ; \ -+ .byte 0x80, 0xcb, 0x48, 0x06 ; \ -+ .byte 0x84, 0xcb, 0xc8, 0x26 ; \ -+ .byte 0xba, 0xcb, 0x76, 0x19 ; \ -+ .byte 0xbe, 0xcb, 0xf6, 0x39 ; \ -+ .byte 0x8c, 0xcc, 0x44, 0x00 ; \ -+ .byte 0x88, 0xcc, 0xc4, 0x20 ; \ -+ .byte 0xb2, 0xcc, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xcc, 0xfe, 0x3d ; \ -+ .byte 0x80, 0xcd, 0x48, 0x86 ; \ -+ .byte 0x84, 0xcd, 0xc8, 0xa6 ; \ -+ .byte 0xba, 0xcd, 0x76, 0x99 ; \ -+ .byte 0xbe, 0xcd, 0xf6, 0xb9 -+ !aes_eround01 %f16, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f18, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f16, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f18, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f20, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f22, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f20, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f22, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f24, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f26, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f24, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f26, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f28, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f30, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f28, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f30, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f32, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f34, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f32, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f34, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f36, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f38, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f36, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f38, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f40, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f42, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f40, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f42, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f44, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f46, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f44, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f46, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f48, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f50, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f48, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f50, %f60, %f62, %f58 ; \ -+ !aes_eround01_l %f52, %f6, %f4, %f0 ; \ -+ !aes_eround23_l %f54, %f6, %f4, %f2 ; \ -+ !aes_eround01_l %f52, %f56, %f58, %f60 ; \ -+ !aes_eround23_l %f54, %f56, %f58, %f62 -+ -+#define TWELVE_EROUNDS \ -+ MID_TWO_EROUNDS ; \ -+ TEN_EROUNDS -+ -+#define TWELVE_EROUNDS_2 \ -+ MID_TWO_EROUNDS_2 ; \ -+ TEN_EROUNDS_2 -+ -+#define FOURTEEN_EROUNDS \ -+ FIRST_TWO_EROUNDS ; \ -+ TWELVE_EROUNDS -+ -+#define FOURTEEN_EROUNDS_2 \ -+ .byte 0xb0, 0xc8, 0x2c, 0x14 ; \ -+ .byte 0xac, 0xc8, 0xac, 0x34 ; \ -+ ldd [%o0 + 0x60], %f20 ; \ -+ .byte 0xb2, 0xc8, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xc8, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xc9, 0x2c, 0x18 ; \ -+ .byte 0x84, 0xc9, 0xac, 0x38 ;\ -+ ldd [%o0 + 0x68], %f22 ; \ -+ .byte 0xba, 0xc9, 0x36, 0x19 ; \ -+ ldd [%o0 + 0x70], %f24 ; \ -+ .byte 0xbe, 0xc9, 0xb6, 0x39 ; \ -+ .byte 0x8c, 0xca, 0x04, 0x00 ; \ -+ .byte 0x88, 0xca, 0x84, 0x20 ; \ -+ .byte 0xb2, 0xca, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xca, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xcb, 0x08, 0x06 ; \ -+ .byte 0x84, 0xcb, 0x88, 0x26 ; \ -+ .byte 0xba, 0xcb, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcb, 0xb6, 0x39 ; \ -+ .byte 0x8c, 0xcc, 0x04, 0x00 ; \ -+ .byte 0x88, 0xcc, 0x84, 0x20 ; \ -+ .byte 0xb2, 0xcc, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xcc, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xcd, 0x08, 0x06 ; \ -+ .byte 0x84, 0xcd, 0x88, 0x26 ; \ -+ .byte 0xba, 0xcd, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcd, 0xb6, 0x39 ; \ -+ .byte 0x8c, 0xce, 0x04, 0x00 ; \ -+ .byte 0x88, 0xce, 0x84, 0x20 ; \ -+ .byte 0xb2, 0xce, 0x3e, 0x1d ; \ -+ .byte 0xb6, 0xce, 0xbe, 0x3d ; \ -+ .byte 0x80, 0xcf, 0x08, 0x06 ; \ -+ .byte 0x84, 0xcf, 0x88, 0x26 ; \ -+ .byte 0xba, 0xcf, 0x36, 0x19 ; \ -+ .byte 0xbe, 0xcf, 0xb6, 0x39 ; \ -+ .byte 0x8c, 0xc8, 0x44, 0x00 ; \ -+ .byte 0x88, 0xc8, 0xc4, 0x20 ; \ -+ .byte 0xb2, 0xc8, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xc8, 0xfe, 0x3d ; \ -+ .byte 0x80, 0xc9, 0x48, 0x06 ; \ -+ .byte 0x84, 0xc9, 0xc8, 0x26 ; \ -+ .byte 0xba, 0xc9, 0x76, 0x19 ; \ -+ .byte 0xbe, 0xc9, 0xf6, 0x39 ; \ -+ .byte 0x8c, 0xca, 0x44, 0x00 ; \ -+ .byte 0x88, 0xca, 0xc4, 0x20 ; \ -+ .byte 0xb2, 0xca, 0x7e, 0x1d ; \ -+ .byte 0xb6, 0xca, 0xfe, 0x3d ; \ -+ .byte 0x80, 0xcb, 0x48, 0x06 ; \ -+ .byte 0x84, 0xcb, 0xc8, 0x26 ; \ -+ .byte 0xba, 0xcb, 0x76, 0x19 ; \ -+ .byte 0xbe, 0xcb, 0xf6, 0x39 ; \ -+ .byte 0x8c, 0xcc, 0x44, 0x00 ; \ -+ .byte 0x88, 0xcc, 0xc4, 0x20 ; \ -+ ldd [%o0 + 0x10], %f0 ; \ -+ .byte 0xb2, 0xcc, 0x7e, 0x1d ; \ -+ ldd [%o0 + 0x18], %f2 ; \ -+ .byte 0xb6, 0xcc, 0xfe, 0x3d ; \ -+ .byte 0xa8, 0xcd, 0x48, 0x86 ; \ -+ .byte 0xac, 0xcd, 0xc8, 0xa6 ; \ -+ ldd [%o0 + 0x20], %f4 ; \ -+ .byte 0xba, 0xcd, 0x76, 0x99 ; \ -+ ldd [%o0 + 0x28], %f6 ; \ -+ .byte 0xbe, 0xcd, 0xf6, 0xb9 -+ !aes_eround01 %f0, %f20, %f22, %f24 ; \ -+ !aes_eround23 %f2, %f20, %f22, %f22 ; \ -+ !ldd [%o0 + 0x60], %f20 ; \ -+ !aes_eround01 %f0, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f2, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f4, %f24, %f22, %f0 ; \ -+ !aes_eround23 %f6, %f24, %f22, %f2 ; \ -+ !ldd [%o0 + 0x68], %f22 ; \ -+ !aes_eround01 %f4, %f56, %f58, %f60 ; \ -+ !ldd [%o0 + 0x70], %f24 ; \ -+ !aes_eround23 %f6, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f8, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f10, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f8, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f10, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f12, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f14, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f12, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f14, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f16, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f18, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f16, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f18, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f20, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f22, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f20, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f22, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f24, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f26, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f24, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f26, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f28, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f30, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f28, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f30, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f32, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f34, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f32, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f34, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f36, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f38, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f36, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f38, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f40, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f42, %f0, %f2, %f4 ; \ -+ !aes_eround01 %f40, %f60, %f62, %f56 ; \ -+ !aes_eround23 %f42, %f60, %f62, %f58 ; \ -+ !aes_eround01 %f44, %f6, %f4, %f0 ; \ -+ !aes_eround23 %f46, %f6, %f4, %f2 ; \ -+ !aes_eround01 %f44, %f56, %f58, %f60 ; \ -+ !aes_eround23 %f46, %f56, %f58, %f62 ; \ -+ !aes_eround01 %f48, %f0, %f2, %f6 ; \ -+ !aes_eround23 %f50, %f0, %f2, %f4 ; \ -+ !ldd [%o0 + 0x10], %f0 ; \ -+ !aes_eround01 %f48, %f60, %f62, %f56 ; \ -+ !ldd [%o0 + 0x18], %f2 ; \ -+ !aes_eround23 %f50, %f60, %f62, %f58 ; \ -+ !aes_eround01_l %f52, %f6, %f4, %f20 ; \ -+ !aes_eround23_l %f54, %f6, %f4, %f22 ; \ -+ !ldd [%o0 + 0x20], %f4 ; \ -+ !aes_eround01_l %f52, %f56, %f58, %f60 ; \ -+ !ldd [%o0 + 0x28], %f6 ; \ -+ !aes_eround23_l %f54, %f56, %f58, %f62 -+ -+#define FIRST_TWO_DROUNDS \ -+ .byte 0xb2, 0xc8, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xc8, 0xbe, 0x7d ; \ -+ .byte 0xba, 0xc9, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xc9, 0xb6, 0x79 -+ !aes_dround01 %f0, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f2, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f4, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f6, %f56, %f58, %f62 -+ -+#define MID_TWO_DROUNDS \ -+ .byte 0xb2, 0xca, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xca, 0xbe, 0x7d ; \ -+ .byte 0xba, 0xcb, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcb, 0xb6, 0x79 -+ !aes_dround01 %f8, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f10, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f12, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f14, %f56, %f58, %f62 -+ -+#define MID_TWO_DROUNDS_2 \ -+ .byte 0x8c, 0xca, 0x04, 0x40 ; \ -+ .byte 0x88, 0xca, 0x84, 0x60 ; \ -+ .byte 0xb2, 0xca, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xca, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xcb, 0x08, 0x46 ; \ -+ .byte 0x84, 0xcb, 0x88, 0x66 ; \ -+ .byte 0xba, 0xcb, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcb, 0xb6, 0x79 -+ !aes_dround01 %f8, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f10, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f8, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f10, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f12, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f14, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f12, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f14, %f56, %f58, %f62 -+ -+#define TEN_DROUNDS \ -+ .byte 0xb2, 0xcc, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xcc, 0xbe, 0x7d ; \ -+ .byte 0xba, 0xcd, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcd, 0xb6, 0x79 ; \ -+ .byte 0xb2, 0xce, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xce, 0xbe, 0x7d ; \ -+ .byte 0xba, 0xcf, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcf, 0xb6, 0x79 ; \ -+ .byte 0xb2, 0xc8, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xc8, 0xfe, 0x7d ; \ -+ .byte 0xba, 0xc9, 0x76, 0x59 ; \ -+ .byte 0xbe, 0xc9, 0xf6, 0x79 ; \ -+ .byte 0xb2, 0xca, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xca, 0xfe, 0x7d ; \ -+ .byte 0xba, 0xcb, 0x76, 0x59 ; \ -+ .byte 0xbe, 0xcb, 0xf6, 0x79 ; \ -+ .byte 0xb2, 0xcc, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xcc, 0xfe, 0x7d ; \ -+ .byte 0xba, 0xcd, 0x76, 0xd9 ; \ -+ .byte 0xbe, 0xcd, 0xf6, 0xf9 -+ !aes_dround01 %f16, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f18, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f20, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f22, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f24, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f26, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f28, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f30, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f32, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f34, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f36, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f38, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f40, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f42, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f44, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f46, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f48, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f50, %f60, %f62, %f58 ; \ -+ !aes_dround01_l %f52, %f56, %f58, %f60 ; \ -+ !aes_dround23_l %f54, %f56, %f58, %f62 -+ -+#define TEN_DROUNDS_2 \ -+ .byte 0x8c, 0xcc, 0x04, 0x40 ; \ -+ .byte 0x88, 0xcc, 0x84, 0x60 ; \ -+ .byte 0xb2, 0xcc, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xcc, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xcd, 0x08, 0x46 ; \ -+ .byte 0x84, 0xcd, 0x88, 0x66 ; \ -+ .byte 0xba, 0xcd, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcd, 0xb6, 0x79 ; \ -+ .byte 0x8c, 0xce, 0x04, 0x40 ; \ -+ .byte 0x88, 0xce, 0x84, 0x60 ; \ -+ .byte 0xb2, 0xce, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xce, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xcf, 0x08, 0x46 ; \ -+ .byte 0x84, 0xcf, 0x88, 0x66 ; \ -+ .byte 0xba, 0xcf, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcf, 0xb6, 0x79 ; \ -+ .byte 0x8c, 0xc8, 0x44, 0x40 ; \ -+ .byte 0x88, 0xc8, 0xc4, 0x60 ; \ -+ .byte 0xb2, 0xc8, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xc8, 0xfe, 0x7d ; \ -+ .byte 0x80, 0xc9, 0x48, 0x46 ; \ -+ .byte 0x84, 0xc9, 0xc8, 0x66 ; \ -+ .byte 0xba, 0xc9, 0x76, 0x59 ; \ -+ .byte 0xbe, 0xc9, 0xf6, 0x79 ; \ -+ .byte 0x8c, 0xca, 0x44, 0x40 ; \ -+ .byte 0x88, 0xca, 0xc4, 0x60 ; \ -+ .byte 0xb2, 0xca, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xca, 0xfe, 0x7d ; \ -+ .byte 0x80, 0xcb, 0x48, 0x46 ; \ -+ .byte 0x84, 0xcb, 0xc8, 0x66 ; \ -+ .byte 0xba, 0xcb, 0x76, 0x59 ; \ -+ .byte 0xbe, 0xcb, 0xf6, 0x79 ; \ -+ .byte 0x8c, 0xcc, 0x44, 0x40 ; \ -+ .byte 0x88, 0xcc, 0xc4, 0x60 ; \ -+ .byte 0xb2, 0xcc, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xcc, 0xfe, 0x7d ; \ -+ .byte 0x80, 0xcd, 0x48, 0xc6 ; \ -+ .byte 0x84, 0xcd, 0xc8, 0xe6 ; \ -+ .byte 0xba, 0xcd, 0x76, 0xd9 ; \ -+ .byte 0xbe, 0xcd, 0xf6, 0xf9 -+ !aes_dround01 %f16, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f18, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f16, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f18, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f20, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f22, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f20, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f22, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f24, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f26, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f24, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f26, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f28, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f30, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f28, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f30, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f32, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f34, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f32, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f34, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f36, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f38, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f36, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f38, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f40, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f42, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f40, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f42, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f44, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f46, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f44, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f46, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f48, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f50, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f48, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f50, %f60, %f62, %f58 ; \ -+ !aes_dround01_l %f52, %f6, %f4, %f0 ; \ -+ !aes_dround23_l %f54, %f6, %f4, %f2 ; \ -+ !aes_dround01_l %f52, %f56, %f58, %f60 ; \ -+ !aes_dround23_l %f54, %f56, %f58, %f62 -+ -+#define TWELVE_DROUNDS \ -+ MID_TWO_DROUNDS ; \ -+ TEN_DROUNDS -+ -+#define TWELVE_DROUNDS_2 \ -+ MID_TWO_DROUNDS_2 ; \ -+ TEN_DROUNDS_2 -+ -+#define FOURTEEN_DROUNDS \ -+ FIRST_TWO_DROUNDS ; \ -+ TWELVE_DROUNDS -+ -+#define FOURTEEN_DROUNDS_2 \ -+ .byte 0xb0, 0xc8, 0x2c, 0x54 ; \ -+ .byte 0xac, 0xc8, 0xac, 0x74 ; \ -+ ldd [%o0 + 0x80], %f20 ; \ -+ .byte 0xb2, 0xc8, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xc8, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xc9, 0x2c, 0x58 ; \ -+ .byte 0x84, 0xc9, 0xac, 0x78 ; \ -+ ldd [%o0 + 0x88], %f22 ; \ -+ .byte 0xba, 0xc9, 0x36, 0x59 ; \ -+ ldd [%o0 + 0x70], %f24 ; \ -+ .byte 0xbe, 0xc9, 0xb6, 0x79 ; \ -+ .byte 0x8c, 0xca, 0x04, 0x40 ; \ -+ .byte 0x88, 0xca, 0x84, 0x60 ; \ -+ .byte 0xb2, 0xca, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xca, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xcb, 0x08, 0x46 ; \ -+ .byte 0x84, 0xcb, 0x88, 0x66 ; \ -+ .byte 0xba, 0xcb, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcb, 0xb6, 0x79 ; \ -+ .byte 0x8c, 0xcc, 0x04, 0x40 ; \ -+ .byte 0x88, 0xcc, 0x84, 0x60 ; \ -+ .byte 0xb2, 0xcc, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xcc, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xcd, 0x08, 0x46 ; \ -+ .byte 0x84, 0xcd, 0x88, 0x66 ; \ -+ .byte 0xba, 0xcd, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcd, 0xb6, 0x79 ; \ -+ .byte 0x8c, 0xce, 0x04, 0x40 ; \ -+ .byte 0x88, 0xce, 0x84, 0x60 ; \ -+ .byte 0xb2, 0xce, 0x3e, 0x5d ; \ -+ .byte 0xb6, 0xce, 0xbe, 0x7d ; \ -+ .byte 0x80, 0xcf, 0x08, 0x46 ; \ -+ .byte 0x84, 0xcf, 0x88, 0x66 ; \ -+ .byte 0xba, 0xcf, 0x36, 0x59 ; \ -+ .byte 0xbe, 0xcf, 0xb6, 0x79 ; \ -+ .byte 0x8c, 0xc8, 0x44, 0x40 ; \ -+ .byte 0x88, 0xc8, 0xc4, 0x60 ; \ -+ .byte 0xb2, 0xc8, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xc8, 0xfe, 0x7d ; \ -+ .byte 0x80, 0xc9, 0x48, 0x46 ; \ -+ .byte 0x84, 0xc9, 0xc8, 0x66 ; \ -+ .byte 0xba, 0xc9, 0x76, 0x59 ; \ -+ .byte 0xbe, 0xc9, 0xf6, 0x79 ; \ -+ .byte 0x8c, 0xca, 0x44, 0x40 ; \ -+ .byte 0x88, 0xca, 0xc4, 0x60 ; \ -+ .byte 0xb2, 0xca, 0x7e, 0x5d ; \ -+ .byte 0xb6, 0xca, 0xfe, 0x7d ; \ -+ .byte 0x80, 0xcb, 0x48, 0x46 ; \ -+ .byte 0x84, 0xcb, 0xc8, 0x66 ; \ -+ .byte 0xba, 0xcb, 0x76, 0x59 ; \ -+ .byte 0xbe, 0xcb, 0xf6, 0x79 ; \ -+ .byte 0x8c, 0xcc, 0x44, 0x40 ; \ -+ .byte 0x88, 0xcc, 0xc4, 0x60 ; \ -+ ldd [%o0 + 0xd0], %f0 ; \ -+ .byte 0xb2, 0xcc, 0x7e, 0x5d ; \ -+ ldd [%o0 + 0xd8], %f2 ; \ -+ .byte 0xb6, 0xcc, 0xfe, 0x7d ; \ -+ .byte 0xa8, 0xcd, 0x48, 0xc6 ; \ -+ .byte 0xac, 0xcd, 0xc8, 0xe6 ; \ -+ ldd [%o0 + 0xc0], %f4 ; \ -+ .byte 0xba, 0xcd, 0x76, 0xd9 ; \ -+ ldd [%o0 + 0xc8], %f6 ; \ -+ .byte 0xbe, 0xcd, 0xf6, 0xf9 -+ !aes_dround01 %f0, %f20, %f22, %f24 ; \ -+ !aes_dround23 %f2, %f20, %f22, %f22 ; \ -+ !ldd [%o0 + 0x80], %f20 ; \ -+ !aes_dround01 %f0, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f2, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f4, %f24, %f22, %f0 ; \ -+ !aes_dround23 %f6, %f24, %f22, %f2 ; \ -+ !ldd [%o0 + 0x88], %f22 ; \ -+ !aes_dround01 %f4, %f56, %f58, %f60 ; \ -+ !ldd [%o0 + 0x70], %f24 ; \ -+ !aes_dround23 %f6, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f8, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f10, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f8, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f10, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f12, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f14, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f12, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f14, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f16, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f18, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f16, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f18, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f20, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f22, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f20, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f22, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f24, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f26, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f24, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f26, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f28, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f30, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f28, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f30, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f32, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f34, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f32, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f34, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f36, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f38, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f36, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f38, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f40, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f42, %f0, %f2, %f4 ; \ -+ !aes_dround01 %f40, %f60, %f62, %f56 ; \ -+ !aes_dround23 %f42, %f60, %f62, %f58 ; \ -+ !aes_dround01 %f44, %f6, %f4, %f0 ; \ -+ !aes_dround23 %f46, %f6, %f4, %f2 ; \ -+ !aes_dround01 %f44, %f56, %f58, %f60 ; \ -+ !aes_dround23 %f46, %f56, %f58, %f62 ; \ -+ !aes_dround01 %f48, %f0, %f2, %f6 ; \ -+ !aes_dround23 %f50, %f0, %f2, %f4 ; \ -+ !ldd [%o0 + 0xd0], %f0 ; \ -+ !aes_dround01 %f48, %f60, %f62, %f56 ; \ -+ !ldd [%o0 + 0xd8], %f2 ; \ -+ !aes_dround23 %f50, %f60, %f62, %f58 ; \ -+ !aes_dround01_l %f52, %f6, %f4, %f20 ; \ -+ !aes_dround23_l %f54, %f6, %f4, %f22 ; \ -+ !ldd [%o0 + 0xc0], %f4 ; \ -+ !aes_dround01_l %f52, %f56, %f58, %f60 ; \ -+ !ldd [%o0 + 0xc8], %f6 ; \ -+ !aes_dround23_l %f54, %f56, %f58, %f62 -+ -+ -+ ENTRY(t4_aes128_load_keys_for_encrypt) -+ -+ ldd [%o0 + 0x10], %f16 -+ ldd [%o0 + 0x18], %f18 -+ ldd [%o0 + 0x20], %f20 -+ ldd [%o0 + 0x28], %f22 -+ ldd [%o0 + 0x30], %f24 -+ ldd [%o0 + 0x38], %f26 -+ ldd [%o0 + 0x40], %f28 -+ ldd [%o0 + 0x48], %f30 -+ ldd [%o0 + 0x50], %f32 -+ ldd [%o0 + 0x58], %f34 -+ ldd [%o0 + 0x60], %f36 -+ ldd [%o0 + 0x68], %f38 -+ ldd [%o0 + 0x70], %f40 -+ ldd [%o0 + 0x78], %f42 -+ ldd [%o0 + 0x80], %f44 -+ ldd [%o0 + 0x88], %f46 -+ ldd [%o0 + 0x90], %f48 -+ ldd [%o0 + 0x98], %f50 -+ ldd [%o0 + 0xa0], %f52 -+ retl -+ ldd [%o0 + 0xa8], %f54 -+ -+ SET_SIZE(t4_aes128_load_keys_for_encrypt) -+ -+ -+ ENTRY(t4_aes192_load_keys_for_encrypt) -+ -+ ldd [%o0 + 0x10], %f8 -+ ldd [%o0 + 0x18], %f10 -+ ldd [%o0 + 0x20], %f12 -+ ldd [%o0 + 0x28], %f14 -+ ldd [%o0 + 0x30], %f16 -+ ldd [%o0 + 0x38], %f18 -+ ldd [%o0 + 0x40], %f20 -+ ldd [%o0 + 0x48], %f22 -+ ldd [%o0 + 0x50], %f24 -+ ldd [%o0 + 0x58], %f26 -+ ldd [%o0 + 0x60], %f28 -+ ldd [%o0 + 0x68], %f30 -+ ldd [%o0 + 0x70], %f32 -+ ldd [%o0 + 0x78], %f34 -+ ldd [%o0 + 0x80], %f36 -+ ldd [%o0 + 0x88], %f38 -+ ldd [%o0 + 0x90], %f40 -+ ldd [%o0 + 0x98], %f42 -+ ldd [%o0 + 0xa0], %f44 -+ ldd [%o0 + 0xa8], %f46 -+ ldd [%o0 + 0xb0], %f48 -+ ldd [%o0 + 0xb8], %f50 -+ ldd [%o0 + 0xc0], %f52 -+ retl -+ ldd [%o0 + 0xc8], %f54 -+ -+ SET_SIZE(t4_aes192_load_keys_for_encrypt) -+ -+ -+ ENTRY(t4_aes256_load_keys_for_encrypt) -+ -+ ldd [%o0 + 0x10], %f0 -+ ldd [%o0 + 0x18], %f2 -+ ldd [%o0 + 0x20], %f4 -+ ldd [%o0 + 0x28], %f6 -+ ldd [%o0 + 0x30], %f8 -+ ldd [%o0 + 0x38], %f10 -+ ldd [%o0 + 0x40], %f12 -+ ldd [%o0 + 0x48], %f14 -+ ldd [%o0 + 0x50], %f16 -+ ldd [%o0 + 0x58], %f18 -+ ldd [%o0 + 0x60], %f20 -+ ldd [%o0 + 0x68], %f22 -+ ldd [%o0 + 0x70], %f24 -+ ldd [%o0 + 0x78], %f26 -+ ldd [%o0 + 0x80], %f28 -+ ldd [%o0 + 0x88], %f30 -+ ldd [%o0 + 0x90], %f32 -+ ldd [%o0 + 0x98], %f34 -+ ldd [%o0 + 0xa0], %f36 -+ ldd [%o0 + 0xa8], %f38 -+ ldd [%o0 + 0xb0], %f40 -+ ldd [%o0 + 0xb8], %f42 -+ ldd [%o0 + 0xc0], %f44 -+ ldd [%o0 + 0xc8], %f46 -+ ldd [%o0 + 0xd0], %f48 -+ ldd [%o0 + 0xd8], %f50 -+ ldd [%o0 + 0xe0], %f52 -+ retl -+ ldd [%o0 + 0xe8], %f54 -+ -+ SET_SIZE(t4_aes256_load_keys_for_encrypt) -+ -+ -+#define TEST_PARALLEL_ECB_ENCRYPT -+#ifdef TEST_PARALLEL_ECB_ENCRYPT -+ ENTRY(t4_aes128_ecb_encrypt) -+ -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %o4 -+ brz %o4, ecbenc128_loop -+ nop -+ -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ TEN_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ecbenc128_loop_end -+ add %o2, 16, %o2 -+ -+ecbenc128_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f0 -+ movxtod %g4, %f2 -+ ldx [%o1 + 16], %g3 !input -+ ldx [%o1 + 24], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ TEN_EROUNDS_2 -+ -+ std %f0, [%o2] -+ std %f2, [%o2 + 8] -+ -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ecbenc128_loop -+ add %o2, 32, %o2 -+ecbenc128_loop_end: -+ retl -+ nop -+ -+ SET_SIZE(t4_aes128_ecb_encrypt) -+ -+ -+ ENTRY(t4_aes192_ecb_encrypt) -+ -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %o4 -+ brz %o4, ecbenc192_loop -+ nop -+ -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ TWELVE_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ecbenc192_loop_end -+ add %o2, 16, %o2 -+ -+ecbenc192_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f0 -+ movxtod %g4, %f2 -+ ldx [%o1 + 16], %g3 !input -+ ldx [%o1 + 24], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ TWELVE_EROUNDS_2 -+ -+ std %f0, [%o2] -+ std %f2, [%o2 + 8] -+ -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ecbenc192_loop -+ add %o2, 32, %o2 -+ecbenc192_loop_end: -+ retl -+ nop -+ -+ SET_SIZE(t4_aes192_ecb_encrypt) -+ -+ -+ ENTRY(t4_aes256_ecb_encrypt) -+ -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %o4 -+ brz %o4, ecbenc256_loop -+ nop -+ -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ FOURTEEN_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ecbenc256_loop_end -+ add %o2, 16, %o2 -+ -+ecbenc256_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f20 -+ movxtod %g4, %f22 -+ ldx [%o1 + 16], %g3 !input -+ ldx [%o1 + 24], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ FOURTEEN_EROUNDS_2 -+ -+ std %f20, [%o2] -+ std %f22, [%o2 + 8] -+ -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ecbenc256_loop -+ add %o2, 32, %o2 -+ -+ ldd [%o0 + 0x60], %f20 -+ ldd [%o0 + 0x68], %f22 -+ -+ecbenc256_loop_end: -+ retl -+ nop -+ -+ SET_SIZE(t4_aes256_ecb_encrypt) -+ -+#else -+ -+ ENTRY(t4_aes128_ecb_encrypt) -+ -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+ecbenc128_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ TEN_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ecbenc128_loop -+ add %o2, 16, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes128_ecb_encrypt) -+ -+ -+ ENTRY(t4_aes192_ecb_encrypt) -+ -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+ecbenc192_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ TWELVE_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ecbenc192_loop -+ add %o2, 16, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes192_ecb_encrypt) -+ -+ -+ ENTRY(t4_aes256_ecb_encrypt) -+ -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+ecbenc256_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f60 -+ movxtod %g4, %f62 -+ -+ FOURTEEN_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ecbenc256_loop -+ add %o2, 16, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes256_ecb_encrypt) -+#endif -+ -+ -+ ENTRY(t4_aes128_cbc_encrypt) -+ -+ ldd [%o4], %f60 ! IV -+ ldd [%o4 +8], %f62 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cbcenc128_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f56 -+ movxtod %g4, %f58 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ TEN_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cbcenc128_loop -+ add %o2, 16, %o2 -+ -+ std %f60, [%o4] -+ retl -+ std %f62, [%o4 + 8] -+ -+ SET_SIZE(t4_aes128_cbc_encrypt) -+ -+ -+ ENTRY(t4_aes192_cbc_encrypt) -+ -+ ldd [%o4], %f60 ! IV -+ ldd [%o4 + 8], %f62 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cbcenc192_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f56 -+ movxtod %g4, %f58 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ TWELVE_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cbcenc192_loop -+ add %o2, 16, %o2 -+ -+ std %f60, [%o4] -+ retl -+ std %f62, [%o4 + 8] -+ -+ SET_SIZE(t4_aes192_cbc_encrypt) -+ -+ -+ ENTRY(t4_aes256_cbc_encrypt) -+ -+ ldd [%o4], %f60 ! IV -+ ldd [%o4 + 8], %f62 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cbcenc256_loop: -+ ldx [%o1], %g3 !input -+ ldx [%o1 + 8], %g4 !input -+ xor %g1, %g3, %g3 !input ^ ks[0-1] -+ xor %g2, %g4, %g4 !input ^ ks[0-1] -+ movxtod %g3, %f56 -+ movxtod %g4, %f58 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ FOURTEEN_EROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cbcenc256_loop -+ add %o2, 16, %o2 -+ -+ std %f60, [%o4] -+ retl -+ std %f62, [%o4 + 8] -+ -+ SET_SIZE(t4_aes256_cbc_encrypt) -+ -+ -+#define TEST_PARALLEL_CTR_CRYPT -+#ifdef TEST_PARALLEL_CTR_CRYPT -+ ENTRY(t4_aes128_ctr_crypt) -+ -+ ldx [%o4], %g3 ! IV -+ ldx [%o4 +8], %g4 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %g5 -+ brz, %g5, ctr128_loop -+ -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ TEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ctr128_loop_end -+ add %o2, 16, %o2 -+ -+ctr128_loop: -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f0 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f2 -+ inc %g4 -+ -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ TEN_EROUNDS_2 -+ -+ ldd [%o1], %f6 !input -+ ldd [%o1 + 8], %f4 !input -+ ldd [%o1 + 16], %f56 !input -+ ldd [%o1 + 24], %f58 !input -+ fxor %f0, %f6, %f0 -+ fxor %f2, %f4, %f2 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f0, [%o2] -+ std %f2, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ctr128_loop -+ add %o2, 32, %o2 -+ -+ctr128_loop_end: -+ stx %g3, [%o4] -+ retl -+ stx %g4, [%o4 + 8] -+ -+ SET_SIZE(t4_aes128_ctr_crypt) -+ -+ -+ ENTRY(t4_aes192_ctr_crypt) -+ -+ ldx [%o4], %g3 ! IV -+ ldx [%o4 +8], %g4 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %g5 -+ brz, %g5, ctr192_loop -+ -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ TWELVE_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ctr192_loop_end -+ add %o2, 16, %o2 -+ -+ctr192_loop: -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f0 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f2 -+ inc %g4 -+ -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ TWELVE_EROUNDS_2 -+ -+ ldd [%o1], %f6 !input -+ ldd [%o1 + 8], %f4 !input -+ ldd [%o1 + 16], %f56 !input -+ ldd [%o1 + 24], %f58 !input -+ fxor %f0, %f6, %f0 -+ fxor %f2, %f4, %f2 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f0, [%o2] -+ std %f2, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ctr192_loop -+ add %o2, 32, %o2 -+ -+ctr192_loop_end: -+ stx %g3, [%o4] -+ retl -+ stx %g4, [%o4 + 8] -+ -+ SET_SIZE(t4_aes192_ctr_crypt) -+ -+ -+ ENTRY(t4_aes256_ctr_crypt) -+ -+ ldx [%o4], %g3 ! IV -+ ldx [%o4 +8], %g4 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %g5 -+ brz, %g5, ctr256_loop -+ -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ FOURTEEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ctr256_loop_end -+ add %o2, 16, %o2 -+ -+ctr256_loop: -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f20 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f22 -+ inc %g4 -+ -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ FOURTEEN_EROUNDS_2 -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f20, %f56, %f20 -+ fxor %f22, %f58, %f22 -+ ldd [%o1 + 16], %f56 !input -+ ldd [%o1 + 24], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f20, [%o2] -+ std %f22, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ctr256_loop -+ add %o2, 32, %o2 -+ -+ ldd [%o0 + 0x60], %f20 -+ ldd [%o0 + 0x68], %f22 -+ -+ctr256_loop_end: -+ stx %g3, [%o4] -+ retl -+ stx %g4, [%o4 + 8] -+ -+ SET_SIZE(t4_aes256_ctr_crypt) -+ -+#else -+ -+ ENTRY(t4_aes128_ctr_crypt) -+ -+ ldx [%o4], %g3 ! IV -+ ldx [%o4 +8], %g4 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+ctr128_loop: -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ TEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ctr128_loop -+ add %o2, 16, %o2 -+ -+ stx %g3, [%o4] -+ retl -+ stx %g4, [%o4 + 8] -+ -+ SET_SIZE(t4_aes128_ctr_crypt) -+ -+ ENTRY(t4_aes192_ctr_crypt) -+ -+ ldx [%o4], %g3 ! IV -+ ldx [%o4 +8], %g4 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+ctr192_loop: -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ TWELVE_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ctr192_loop -+ add %o2, 16, %o2 -+ -+ stx %g3, [%o4] -+ retl -+ stx %g4, [%o4 + 8] -+ -+ SET_SIZE(t4_aes192_ctr_crypt) -+ -+ -+ ENTRY(t4_aes256_ctr_crypt) -+ -+ ldx [%o4], %g3 ! IV -+ ldx [%o4 +8], %g4 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+ctr256_loop: -+ xor %g1, %g3, %g5 -+ movxtod %g5, %f60 -+ xor %g2, %g4, %g5 -+ movxtod %g5, %f62 -+ inc %g4 -+ -+ FOURTEEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ctr256_loop -+ add %o2, 16, %o2 -+ -+ stx %g3, [%o4] -+ retl -+ stx %g4, [%o4 + 8] -+ -+ SET_SIZE(t4_aes256_ctr_crypt) -+ -+#endif -+ -+ ENTRY(t4_aes128_cfb128_encrypt) -+ -+ ldd [%o4], %f60 ! IV -+ ldd [%o4 +8], %f62 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cfb128_128_loop: -+ movxtod %g1, %f56 -+ movxtod %g2, %f58 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ TEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cfb128_128_loop -+ add %o2, 16, %o2 -+ -+ std %f60, [%o4] -+ retl -+ std %f62, [%o4 + 8] -+ -+ SET_SIZE(t4_aes128_cfb128_encrypt) -+ -+ -+ ENTRY(t4_aes192_cfb128_encrypt) -+ -+ ldd [%o4], %f60 ! IV -+ ldd [%o4 +8], %f62 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cfb128_192_loop: -+ movxtod %g1, %f56 -+ movxtod %g2, %f58 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ TWELVE_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cfb128_192_loop -+ add %o2, 16, %o2 -+ -+ std %f60, [%o4] -+ retl -+ std %f62, [%o4 + 8] -+ -+ SET_SIZE(t4_aes192_cfb128_encrypt) -+ -+ -+ ENTRY(t4_aes256_cfb128_encrypt) -+ -+ ldd [%o4], %f60 ! IV -+ ldd [%o4 +8], %f62 ! IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cfb128_256_loop: -+ movxtod %g1, %f56 -+ movxtod %g2, %f58 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ FOURTEEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cfb128_256_loop -+ add %o2, 16, %o2 -+ -+ std %f60, [%o4] -+ retl -+ std %f62, [%o4 + 8] -+ -+ SET_SIZE(t4_aes256_cfb128_encrypt) -+ -+ -+ ENTRY(t4_aes128_load_keys_for_decrypt) -+ -+ ldd [%o0], %f52 -+ ldd [%o0 + 0x8], %f54 -+ ldd [%o0 + 0x10], %f48 -+ ldd [%o0 + 0x18], %f50 -+ ldd [%o0 + 0x20], %f44 -+ ldd [%o0 + 0x28], %f46 -+ ldd [%o0 + 0x30], %f40 -+ ldd [%o0 + 0x38], %f42 -+ ldd [%o0 + 0x40], %f36 -+ ldd [%o0 + 0x48], %f38 -+ ldd [%o0 + 0x50], %f32 -+ ldd [%o0 + 0x58], %f34 -+ ldd [%o0 + 0x60], %f28 -+ ldd [%o0 + 0x68], %f30 -+ ldd [%o0 + 0x70], %f24 -+ ldd [%o0 + 0x78], %f26 -+ ldd [%o0 + 0x80], %f20 -+ ldd [%o0 + 0x88], %f22 -+ ldd [%o0 + 0x90], %f16 -+ retl -+ ldd [%o0 + 0x98], %f18 -+ -+ SET_SIZE(t4_aes128_load_keys_for_decrypt) -+ -+ -+ ENTRY(t4_aes192_load_keys_for_decrypt) -+ -+ ldd [%o0], %f52 -+ ldd [%o0 + 0x8], %f54 -+ ldd [%o0 + 0x10], %f48 -+ ldd [%o0 + 0x18], %f50 -+ ldd [%o0 + 0x20], %f44 -+ ldd [%o0 + 0x28], %f46 -+ ldd [%o0 + 0x30], %f40 -+ ldd [%o0 + 0x38], %f42 -+ ldd [%o0 + 0x40], %f36 -+ ldd [%o0 + 0x48], %f38 -+ ldd [%o0 + 0x50], %f32 -+ ldd [%o0 + 0x58], %f34 -+ ldd [%o0 + 0x60], %f28 -+ ldd [%o0 + 0x68], %f30 -+ ldd [%o0 + 0x70], %f24 -+ ldd [%o0 + 0x78], %f26 -+ ldd [%o0 + 0x80], %f20 -+ ldd [%o0 + 0x88], %f22 -+ ldd [%o0 + 0x90], %f16 -+ ldd [%o0 + 0x98], %f18 -+ ldd [%o0 + 0xa0], %f12 -+ ldd [%o0 + 0xa8], %f14 -+ ldd [%o0 + 0xb0], %f8 -+ retl -+ ldd [%o0 + 0xb8], %f10 -+ -+ SET_SIZE(t4_aes192_load_keys_for_decrypt) -+ -+ -+ ENTRY(t4_aes256_load_keys_for_decrypt) -+ -+ -+ ldd [%o0], %f52 -+ ldd [%o0 + 0x8], %f54 -+ ldd [%o0 + 0x10], %f48 -+ ldd [%o0 + 0x18], %f50 -+ ldd [%o0 + 0x20], %f44 -+ ldd [%o0 + 0x28], %f46 -+ ldd [%o0 + 0x30], %f40 -+ ldd [%o0 + 0x38], %f42 -+ ldd [%o0 + 0x40], %f36 -+ ldd [%o0 + 0x48], %f38 -+ ldd [%o0 + 0x50], %f32 -+ ldd [%o0 + 0x58], %f34 -+ ldd [%o0 + 0x60], %f28 -+ ldd [%o0 + 0x68], %f30 -+ ldd [%o0 + 0x70], %f24 -+ ldd [%o0 + 0x78], %f26 -+ ldd [%o0 + 0x80], %f20 -+ ldd [%o0 + 0x88], %f22 -+ ldd [%o0 + 0x90], %f16 -+ ldd [%o0 + 0x98], %f18 -+ ldd [%o0 + 0xa0], %f12 -+ ldd [%o0 + 0xa8], %f14 -+ ldd [%o0 + 0xb0], %f8 -+ ldd [%o0 + 0xb8], %f10 -+ ldd [%o0 + 0xc0], %f4 -+ ldd [%o0 + 0xc8], %f6 -+ ldd [%o0 + 0xd0], %f0 -+ retl -+ ldd [%o0 + 0xd8], %f2 -+ -+ SET_SIZE(t4_aes256_load_keys_for_decrypt) -+ -+ -+#define TEST_PARALLEL_ECB_DECRYPT -+#ifdef TEST_PARALLEL_ECB_DECRYPT -+ ENTRY(t4_aes128_ecb_decrypt) -+ -+ ldx [%o0 + 0xa0], %g1 !ks[last-1] -+ ldx [%o0 + 0xa8], %g2 !ks[last] -+ and %o3, 16, %o4 -+ brz %o4, ecbdec128_loop -+ nop -+ -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ TEN_DROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 0x8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ecbdec128_loop_end -+ add %o2, 16, %o2 -+ -+ecbdec128_loop: -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f0 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f2 -+ ldx [%o1 + 16], %o4 -+ ldx [%o1 + 24], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ TEN_DROUNDS_2 -+ -+ std %f0, [%o2] -+ std %f2, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ecbdec128_loop -+ add %o2, 32, %o2 -+ecbdec128_loop_end: -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes128_ecb_decrypt) -+ -+ ENTRY(t4_aes192_ecb_decrypt) -+ -+ ldx [%o0 + 0xc0], %g1 !ks[last-1] -+ ldx [%o0 + 0xc8], %g2 !ks[last] -+ and %o3, 16, %o4 -+ brz %o4, ecbdec192_loop -+ nop -+ -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ TWELVE_DROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 0x8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ecbdec192_loop_end -+ add %o2, 16, %o2 -+ -+ecbdec192_loop: -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f0 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f2 -+ ldx [%o1 + 16], %o4 -+ ldx [%o1 + 24], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ TWELVE_DROUNDS_2 -+ -+ std %f0, [%o2] -+ std %f2, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ecbdec192_loop -+ add %o2, 32, %o2 -+ecbdec192_loop_end: -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes192_ecb_decrypt) -+ -+ -+ ENTRY(t4_aes256_ecb_decrypt) -+ -+ ldx [%o0 + 0xe0], %g1 !ks[last-1] -+ ldx [%o0 + 0xe8], %g2 !ks[last] -+ and %o3, 16, %o4 -+ brz %o4, ecbdec256_loop -+ nop -+ -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ FOURTEEN_DROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 0x8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be ecbdec256_loop_end -+ add %o2, 16, %o2 -+ -+ecbdec256_loop: -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f20 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f22 -+ ldx [%o1 + 16], %o4 -+ ldx [%o1 + 24], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ FOURTEEN_DROUNDS_2 -+ -+ std %f20, [%o2] -+ std %f22, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne ecbdec256_loop -+ add %o2, 32, %o2 -+ -+ ldd [%o0 + 0x80], %f20 -+ ldd [%o0 + 0x88], %f22 -+ -+ecbdec256_loop_end: -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes256_ecb_decrypt) -+ -+#else -+ -+ ENTRY(t4_aes128_ecb_decrypt) -+ -+ ldx [%o0 + 0xa0], %g1 !ks[last-1] -+ ldx [%o0 + 0xa8], %g2 !ks[last] -+ -+ecbdec128_loop: -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ TEN_DROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 0x8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ecbdec128_loop -+ add %o2, 16, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes128_ecb_decrypt) -+ -+ -+ ENTRY(t4_aes192_ecb_decrypt) -+ -+ ldx [%o0 + 0xc0], %g1 !ks[last-1] -+ ldx [%o0 + 0xc8], %g2 !ks[last] -+ -+ecbdec192_loop: -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ TWELVE_DROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 0x8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ecbdec192_loop -+ add %o2, 16, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes192_ecb_decrypt) -+ -+ -+ ENTRY(t4_aes256_ecb_decrypt) -+ -+ ldx [%o0 + 0xe0], %g1 !ks[last-1] -+ ldx [%o0 + 0xe8], %g2 !ks[last] -+ -+ecbdec256_loop: -+ ldx [%o1], %o4 -+ ldx [%o1 + 8], %o5 -+ xor %g1, %o4, %g3 !initial ARK -+ movxtod %g3, %f60 -+ xor %g2, %o5, %g3 !initial ARK -+ movxtod %g3, %f62 -+ -+ FOURTEEN_DROUNDS -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 0x8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne ecbdec256_loop -+ add %o2, 16, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_aes256_ecb_decrypt) -+ -+#endif -+ -+#define TEST_PARALLEL_CBC_DECRYPT -+#ifdef EST_PARALLEL_CBC_DECRYPT -+ ENTRY(t4_aes128_cbc_decrypt) -+ -+ save %sp, -SA(MINFRAME), %sp -+ ldx [%i4], %o0 !IV -+ ldx [%i4 + 8], %o1 !IV -+ ldx [%i0 + 0xa0], %o2 !ks[last-1] -+ ldx [%i0 + 0xa8], %o3 !ks[last] -+ and %i3, 16, %o4 -+ brz %o4, cbcdec128_loop -+ nop -+ -+ ldx [%i1], %o4 -+ ldx [%i1 + 8], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ TEN_DROUNDS -+ -+ movxtod %o0, %f56 -+ movxtod %o1, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2] -+ std %f62, [%i2 + 0x8] -+ -+ add %i1, 16, %i1 -+ subcc %i3, 16, %i3 -+ be cbcdec128_loop_end -+ add %i2, 16, %i2 -+ -+ -+cbcdec128_loop: -+ ldx [%i1], %g4 -+ ldx [%i1 + 8], %g5 -+ xor %o2, %g4, %g1 !initial ARK -+ movxtod %g1, %f0 -+ xor %o3, %g5, %g1 !initial ARK -+ movxtod %g1, %f2 -+ -+ ldx [%i1 + 16], %o4 -+ ldx [%i1 + 24], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ TEN_DROUNDS_2 -+ -+ movxtod %o0, %f6 -+ movxtod %o1, %f4 -+ fxor %f6, %f0, %f0 !add in previous IV -+ fxor %f4, %f2, %f2 -+ -+ std %f0, [%i2] -+ std %f2, [%i2 + 8] -+ -+ movxtod %g4, %f56 -+ movxtod %g5, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2 + 16] -+ std %f62, [%i2 + 24] -+ -+ add %i1, 32, %i1 -+ subcc %i3, 32, %i3 -+ bne cbcdec128_loop -+ add %i2, 32, %i2 -+ -+cbcdec128_loop_end: -+ stx %o0, [%i4] -+ stx %o1, [%i4 + 8] -+ ret -+ restore -+ -+ SET_SIZE(t4_aes128_cbc_decrypt) -+ -+ -+ ENTRY(t4_aes192_cbc_decrypt) -+ -+ save %sp, -SA(MINFRAME), %sp -+ ldx [%i4], %o0 !IV -+ ldx [%i4 + 8], %o1 !IV -+ ldx [%i0 + 0xc0], %o2 !ks[last-1] -+ ldx [%i0 + 0xc8], %o3 !ks[last] -+ and %i3, 16, %o4 -+ brz %o4, cbcdec192_loop -+ nop -+ -+ ldx [%i1], %o4 -+ ldx [%i1 + 8], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ TWELVE_DROUNDS -+ -+ movxtod %o0, %f56 -+ movxtod %o1, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2] -+ std %f62, [%i2 + 0x8] -+ -+ add %i1, 16, %i1 -+ subcc %i3, 16, %i3 -+ be cbcdec192_loop_end -+ add %i2, 16, %i2 -+ -+ -+cbcdec192_loop: -+ ldx [%i1], %g4 -+ ldx [%i1 + 8], %g5 -+ xor %o2, %g4, %g1 !initial ARK -+ movxtod %g1, %f0 -+ xor %o3, %g5, %g1 !initial ARK -+ movxtod %g1, %f2 -+ -+ ldx [%i1 + 16], %o4 -+ ldx [%i1 + 24], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ TWELVE_DROUNDS_2 -+ -+ movxtod %o0, %f6 -+ movxtod %o1, %f4 -+ fxor %f6, %f0, %f0 !add in previous IV -+ fxor %f4, %f2, %f2 -+ -+ std %f0, [%i2] -+ std %f2, [%i2 + 8] -+ -+ movxtod %g4, %f56 -+ movxtod %g5, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2 + 16] -+ std %f62, [%i2 + 24] -+ -+ add %i1, 32, %i1 -+ subcc %i3, 32, %i3 -+ bne cbcdec192_loop -+ add %i2, 32, %i2 -+ -+cbcdec192_loop_end: -+ stx %o0, [%i4] -+ stx %o1, [%i4 + 8] -+ ret -+ restore -+ -+ SET_SIZE(t4_aes192_cbc_decrypt) -+ -+ -+ ENTRY(t4_aes256_cbc_decrypt) -+ -+ save %sp, -SA(MINFRAME), %sp -+ mov %i0, %o0 !FOURTEEN_DROUNDS uses %o0 -+ ldx [%i4], %g2 !IV -+ ldx [%i4 + 8], %o1 !IV -+ ldx [%o0 + 0xe0], %o2 !ks[last-1] -+ ldx [%o0 + 0xe8], %o3 !ks[last] -+ and %i3, 16, %o4 -+ brz %o4, cbcdec256_loop -+ nop -+ -+ ldx [%i1], %o4 -+ ldx [%i1 + 8], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ FOURTEEN_DROUNDS -+ -+ movxtod %g2, %f56 -+ movxtod %o1, %f58 -+ mov %o4, %g2 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2] -+ std %f62, [%i2 + 0x8] -+ -+ add %i1, 16, %i1 -+ subcc %i3, 16, %i3 -+ be cbcdec256_loop_end -+ add %i2, 16, %i2 -+ -+ -+cbcdec256_loop: -+ ldx [%i1], %g4 -+ ldx [%i1 + 8], %g5 -+ xor %o2, %g4, %g1 !initial ARK -+ movxtod %g1, %f20 -+ xor %o3, %g5, %g1 !initial ARK -+ movxtod %g1, %f22 -+ -+ ldx [%i1 + 16], %o4 -+ ldx [%i1 + 24], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ FOURTEEN_DROUNDS_2 -+ -+ movxtod %g2, %f56 -+ movxtod %o1, %f58 -+ fxor %f56, %f20, %f20 !add in previous IV -+ fxor %f58, %f22, %f22 -+ -+ std %f20, [%i2] -+ std %f22, [%i2 + 8] -+ -+ movxtod %g4, %f56 -+ movxtod %g5, %f58 -+ mov %o4, %g2 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2 + 16] -+ std %f62, [%i2 + 24] -+ -+ add %i1, 32, %i1 -+ subcc %i3, 32, %i3 -+ bne cbcdec256_loop -+ add %i2, 32, %i2 -+ -+ ldd [%o0 + 0x80], %f20 -+ ldd [%o0 + 0x88], %f22 -+ -+cbcdec256_loop_end: -+ stx %g2, [%i4] -+ stx %o1, [%i4 + 8] -+ ret -+ restore -+ -+ SET_SIZE(t4_aes256_cbc_decrypt) -+ -+#else -+ -+ ENTRY(t4_aes128_cbc_decrypt) -+ -+ save %sp, -SA(MINFRAME), %sp -+ ldx [%i4], %o0 !IV -+ ldx [%i4 + 8], %o1 !IV -+ ldx [%i0 + 0xa0], %o2 !ks[last-1] -+ ldx [%i0 + 0xa8], %o3 !ks[last] -+ -+cbcdec128_loop: -+ ldx [%i1], %o4 -+ ldx [%i1 + 8], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ TEN_DROUNDS -+ -+ movxtod %o0, %f56 -+ movxtod %o1, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2] -+ std %f62, [%i2 + 0x8] -+ -+ add %i1, 16, %i1 -+ subcc %i3, 16, %i3 -+ bne cbcdec128_loop -+ add %i2, 16, %i2 -+ -+ stx %o0, [%i4] -+ stx %o1, [%i4 + 8] -+ ret -+ restore -+ -+ SET_SIZE(t4_aes128_cbc_decrypt) -+ -+ -+ ENTRY(t4_aes192_cbc_decrypt) -+ -+ save %sp, -SA(MINFRAME), %sp -+ ldx [%i4], %o0 !IV -+ ldx [%i4 + 8], %o1 !IV -+ ldx [%i0 + 0xc0], %o2 !ks[last-1] -+ ldx [%i0 + 0xc8], %o3 !ks[last] -+ -+cbcdec192_loop: -+ ldx [%i1], %o4 -+ ldx [%i1 + 8], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ TWELVE_DROUNDS -+ -+ movxtod %o0, %f56 -+ movxtod %o1, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2] -+ std %f62, [%i2 + 0x8] -+ -+ add %i1, 16, %i1 -+ subcc %i3, 16, %i3 -+ bne cbcdec192_loop -+ add %i2, 16, %i2 -+ -+ stx %o0, [%i4] -+ stx %o1, [%i4 + 8] -+ ret -+ restore -+ -+ SET_SIZE(t4_aes192_cbc_decrypt) -+ -+ -+ ENTRY(t4_aes256_cbc_decrypt) -+ -+ save %sp, -SA(MINFRAME), %sp -+ ldx [%i4], %o0 !IV -+ ldx [%i4 + 8], %o1 !IV -+ ldx [%i0 + 0xe0], %o2 !ks[last-1] -+ ldx [%i0 + 0xe8], %o3 !ks[last] -+ -+cbcdec256_loop: -+ ldx [%i1], %o4 -+ ldx [%i1 + 8], %o5 -+ xor %o2, %o4, %g1 !initial ARK -+ movxtod %g1, %f60 -+ xor %o3, %o5, %g1 !initial ARK -+ movxtod %g1, %f62 -+ -+ FOURTEEN_DROUNDS -+ -+ movxtod %o0, %f56 -+ movxtod %o1, %f58 -+ mov %o4, %o0 !save last block as next IV -+ mov %o5, %o1 -+ fxor %f56, %f60, %f60 !add in previous IV -+ fxor %f58, %f62, %f62 -+ -+ std %f60, [%i2] -+ std %f62, [%i2 + 0x8] -+ -+ add %i1, 16, %i1 -+ subcc %i3, 16, %i3 -+ bne cbcdec256_loop -+ add %i2, 16, %i2 -+ -+ stx %o0, [%i4] -+ stx %o1, [%i4 + 8] -+ ret -+ restore -+ -+ SET_SIZE(t4_aes256_cbc_decrypt) -+ -+#endif -+ -+#define TEST_PARALLEL_CFB128_DECRYPT -+#ifdef TEST_PARALLEL_CFB128_DECRYPT -+ -+ ENTRY(t4_aes128_cfb128_decrypt) -+ -+ ldd [%o4], %f56 !IV -+ ldd [%o4 + 8], %f58 !IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %o5 -+ brz %o5, cfb128dec_128_loop -+ -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ TEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be cfb128dec_128_loop_end -+ add %o2, 16, %o2 -+ -+cfb128dec_128_loop: -+ ldd [%o1], %f6 !input -+ ldd [%o1 + 8], %f4 !input -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f6, %f0 -+ fxor %f62, %f4, %f2 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ TEN_EROUNDS_2 -+ -+ ldd [%o1], %f6 !input -+ ldd [%o1 + 8], %f4 !input -+ ldd [%o1 + 16], %f56 !input -+ ldd [%o1 + 24], %f58 !input -+ -+ fxor %f60, %f6, %f6 -+ fxor %f62, %f4, %f4 -+ fxor %f0, %f56, %f60 -+ fxor %f2, %f58, %f62 -+ -+ std %f6, [%o2] -+ std %f4, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne cfb128dec_128_loop -+ add %o2, 32, %o2 -+ -+cfb128dec_128_loop_end: -+ std %f56, [%o4] -+ retl -+ std %f58, [%o4 + 8] -+ -+ SET_SIZE(t4_aes128_cfb128_decrypt) -+ -+ -+ ENTRY(t4_aes192_cfb128_decrypt) -+ -+ ldd [%o4], %f56 !IV -+ ldd [%o4 + 8], %f58 !IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %o5 -+ brz %o5, cfb128dec_192_loop -+ -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ TWELVE_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be cfb128dec_192_loop_end -+ add %o2, 16, %o2 -+ -+cfb128dec_192_loop: -+ ldd [%o1], %f6 !input -+ ldd [%o1 + 8], %f4 !input -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f6, %f0 -+ fxor %f62, %f4, %f2 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ TWELVE_EROUNDS_2 -+ -+ ldd [%o1], %f6 !input -+ ldd [%o1 + 8], %f4 !input -+ ldd [%o1 + 16], %f56 !input -+ ldd [%o1 + 24], %f58 !input -+ -+ fxor %f60, %f6, %f6 -+ fxor %f62, %f4, %f4 -+ fxor %f0, %f56, %f60 -+ fxor %f2, %f58, %f62 -+ -+ std %f6, [%o2] -+ std %f4, [%o2 + 8] -+ std %f60, [%o2 + 16] -+ std %f62, [%o2 + 24] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne cfb128dec_192_loop -+ add %o2, 32, %o2 -+ -+cfb128dec_192_loop_end: -+ std %f56, [%o4] -+ retl -+ std %f58, [%o4 + 8] -+ -+ SET_SIZE(t4_aes192_cfb128_decrypt) -+ -+ -+ ENTRY(t4_aes256_cfb128_decrypt) -+ -+ ldd [%o4], %f56 !IV -+ ldd [%o4 + 8], %f58 !IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ and %o3, 16, %o5 -+ brz %o5, cfb128dec_256_loop -+ -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ FOURTEEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ be cfb128dec_256_loop_end -+ add %o2, 16, %o2 -+ -+cfb128dec_256_loop: -+ ldd [%o1], %f20 !input -+ ldd [%o1 + 8], %f22 !input -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f20, %f20 -+ fxor %f62, %f22, %f22 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ FOURTEEN_EROUNDS_2 -+ -+ ldd [%o1 + 16], %f56 !input -+ ldd [%o1 + 24], %f58 !input -+ fxor %f20, %f56, %f20 -+ fxor %f22, %f58, %f22 -+ std %f20, [%o2 + 16] -+ std %f22, [%o2 + 24] -+ -+ ldd [%o1], %f20 !input -+ ldd [%o1 + 8], %f22 !input -+ -+ fxor %f60, %f20, %f20 -+ fxor %f62, %f22, %f22 -+ -+ std %f20, [%o2] -+ std %f22, [%o2 + 8] -+ -+ add %o1, 32, %o1 -+ subcc %o3, 32, %o3 -+ bne cfb128dec_256_loop -+ add %o2, 32, %o2 -+ -+ ldd [%o0 + 0x60], %f20 -+ ldd [%o0 + 0x68], %f22 -+ -+cfb128dec_256_loop_end: -+ std %f56, [%o4] -+ retl -+ std %f58, [%o4 + 8] -+ -+ SET_SIZE(t4_aes256_cfb128_decrypt) -+ -+#else -+ ENTRY(t4_aes128_cfb128_decrypt) -+ -+ ldd [%o4], %f56 !IV -+ ldd [%o4 + 8], %f58 !IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cfb128dec_128_loop: -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ TEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cfb128dec_128_loop -+ add %o2, 16, %o2 -+ -+ std %f56, [%o4] -+ retl -+ std %f58, [%o4 + 8] -+ -+ SET_SIZE(t4_aes128_cfb128_decrypt) -+ -+ -+ ENTRY(t4_aes192_cfb128_decrypt) -+ -+ ldd [%o4], %f56 !IV -+ ldd [%o4 + 8], %f58 !IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cfb128dec_192_loop: -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ TWELVE_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cfb128dec_192_loop -+ add %o2, 16, %o2 -+ -+ std %f56, [%o4] -+ retl -+ std %f58, [%o4 + 8] -+ -+ SET_SIZE(t4_aes192_cfb128_decrypt) -+ -+ -+ ENTRY(t4_aes256_cfb128_decrypt) -+ -+ ldd [%o4], %f56 !IV -+ ldd [%o4 + 8], %f58 !IV -+ ldx [%o0], %g1 ! ks[0] -+ ldx [%o0 + 8], %g2 ! ks[1] -+ -+cfb128dec_256_loop: -+ movxtod %g1, %f60 -+ movxtod %g2, %f62 -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ /* CFB mode uses encryption for the decrypt operation */ -+ FOURTEEN_EROUNDS -+ -+ ldd [%o1], %f56 !input -+ ldd [%o1 + 8], %f58 !input -+ fxor %f60, %f56, %f60 -+ fxor %f62, %f58, %f62 -+ -+ std %f60, [%o2] -+ std %f62, [%o2 + 8] -+ -+ add %o1, 16, %o1 -+ subcc %o3, 16, %o3 -+ bne cfb128dec_256_loop -+ add %o2, 16, %o2 -+ -+ std %f56, [%o4] -+ retl -+ std %f58, [%o4 + 8] -+ -+ SET_SIZE(t4_aes256_cfb128_decrypt) -+ -+#endif -+ -+#endif /* lint || __lint */ -diff -uNr openssl-1.0.1c.orig/crypto/des/Makefile openssl-1.0.1c/crypto/des/Makefile ---- openssl-1.0.1c.orig/crypto/des/Makefile 2011-08-14 15:46:47.000000000 +0200 -+++ openssl-1.0.1c/crypto/des/Makefile 2012-05-11 22:19:17.483690000 +0200 -@@ -17,6 +17,10 @@ - ASFLAGS= $(INCLUDES) $(ASFLAG) - AFLAGS= $(ASFLAGS) - -+BITS:= $(shell if grep '^CFLAG.*=.*-m64' ../../Makefile >/dev/null; \ -+ then echo 64; else echo 32; fi) -+ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS) -+ - GENERAL=Makefile - TEST=destest.c - APPS= -@@ -62,6 +66,10 @@ - des_enc-sparc.S: asm/des_enc.m4 - m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S - -+t4_des.o: asm/t4_des.S -+ as $(ASFLAGSYF) -o $@ asm/t4_des.S -+ elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ -+ - des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ - crypt586.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl -diff -uNr openssl-1.0.1c.orig/crypto/des/asm/t4_des.S openssl-1.0.1c/crypto/des/asm/t4_des.S ---- openssl-1.0.1c.orig/crypto/des/asm/t4_des.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1c/crypto/des/asm/t4_des.S 2012-05-11 21:34:39.694955000 +0200 -@@ -0,0 +1,786 @@ -+/* -+ * ==================================================================== -+ * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * openssl-core at openssl.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ */ -+ -+/* -+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -+ */ -+ -+/*LINTLIBRARY*/ -+ -+#if defined(lint) || defined(__lint) -+ -+#include -+#include "../engine/eng_t4_des_asm.h" -+ -+/*ARGSUSED*/ -+void t4_des_expand(uint64_t *rk, const uint32_t *key) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des_encrypt(const uint64_t *rk, const uint64_t *pt, uint64_t *ct) -+{ return; } -+ -+ -+/*ARGSUSED*/ -+void t4_des_load_keys(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des_ecb_crypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des3_load_keys(uint64_t *ks) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des3_ecb_crypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des3_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv) -+{ return; } -+ -+/*ARGSUSED*/ -+void t4_des3_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, -+ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv) -+{ return; } -+ -+#else /* lint || __lint */ -+ -+#include -+ -+ -+ ENTRY(t4_des_expand) -+ -+!load key -+ ld [%o1], %f0 -+ ld [%o1 + 0x4], %f1 -+ -+!expand the key -+ !des_kexpand %f0, 0, %f0 -+ !des_kexpand %f0, 1, %f2 -+ !des_kexpand %f2, 3, %f6 -+ !des_kexpand %f2, 2, %f4 -+ !des_kexpand %f6, 3, %f10 -+ !des_kexpand %f6, 2, %f8 -+ !des_kexpand %f10, 3, %f14 -+ !des_kexpand %f10, 2, %f12 -+ !des_kexpand %f14, 1, %f16 -+ !des_kexpand %f16, 3, %f20 -+ !des_kexpand %f16, 2, %f18 -+ !des_kexpand %f20, 3, %f24 -+ !des_kexpand %f20, 2, %f22 -+ !des_kexpand %f24, 3, %f28 -+ !des_kexpand %f24, 2, %f26 -+ !des_kexpand %f28, 1, %f30 -+ .byte 0x81, 0xb0, 0x26, 0xc0 -+ .byte 0x85, 0xb0, 0x26, 0xc1 -+ .byte 0x8d, 0xb0, 0xa6, 0xc3 -+ .byte 0x89, 0xb0, 0xa6, 0xc2 -+ .byte 0x95, 0xb1, 0xa6, 0xc3 -+ .byte 0x91, 0xb1, 0xa6, 0xc2 -+ .byte 0x9d, 0xb2, 0xa6, 0xc3 -+ .byte 0x99, 0xb2, 0xa6, 0xc2 -+ .byte 0xa1, 0xb3, 0xa6, 0xc1 -+ .byte 0xa9, 0xb4, 0x26, 0xc3 -+ .byte 0xa5, 0xb4, 0x26, 0xc2 -+ .byte 0xb1, 0xb5, 0x26, 0xc3 -+ .byte 0xad, 0xb5, 0x26, 0xc2 -+ .byte 0xb9, 0xb6, 0x26, 0xc3 -+ .byte 0xb5, 0xb6, 0x26, 0xc2 -+ .byte 0xbd, 0xb7, 0x26, 0xc1 -+ -+!copy expanded key back into array -+ std %f0, [%o0] -+ std %f2, [%o0 + 0x8] -+ std %f4, [%o0 + 0x10] -+ std %f6, [%o0 + 0x18] -+ std %f8, [%o0 + 0x20] -+ std %f10, [%o0 + 0x28] -+ std %f12, [%o0 + 0x30] -+ std %f14, [%o0 + 0x38] -+ std %f16, [%o0 + 0x40] -+ std %f18, [%o0 + 0x48] -+ std %f20, [%o0 + 0x50] -+ std %f22, [%o0 + 0x58] -+ std %f24, [%o0 + 0x60] -+ std %f26, [%o0 + 0x68] -+ std %f28, [%o0 + 0x70] -+ retl -+ std %f30, [%o0 + 0x78] -+ -+ SET_SIZE(t4_des_expand) -+ -+ -+ ENTRY(t4_des_encrypt) -+ -+!load expanded key -+ ldd [%o0], %f0 -+ ldd [%o0 + 0x8], %f2 -+ ldd [%o0 + 0x10], %f4 -+ ldd [%o0 + 0x18], %f6 -+ ldd [%o0 + 0x20], %f8 -+ ldd [%o0 + 0x28], %f10 -+ ldd [%o0 + 0x30], %f12 -+ ldd [%o0 + 0x38], %f14 -+ ldd [%o0 + 0x40], %f16 -+ ldd [%o0 + 0x48], %f18 -+ ldd [%o0 + 0x50], %f20 -+ ldd [%o0 + 0x58], %f22 -+ ldd [%o0 + 0x60], %f24 -+ ldd [%o0 + 0x68], %f26 -+ ldd [%o0 + 0x70], %f28 -+ ldd [%o0 + 0x78], %f30 -+ -+!load input -+ ldd [%o1], %f32 -+ -+!perform the cipher transformation -+ !des_ip %f32, %f32 -+ !des_round %f0, %f2, %f32, %f32 -+ !des_round %f4, %f6, %f32, %f32 -+ !des_round %f8, %f10, %f32, %f32 -+ !des_round %f12, %f14, %f32, %f32 -+ !des_round %f16, %f18, %f32, %f32 -+ !des_round %f20, %f22, %f32, %f32 -+ !des_round %f24, %f26, %f32, %f32 -+ !des_round %f28, %f30, %f32, %f32 -+ !des_iip %f32, %f32 -+ .byte 0x83, 0xb0, 0x66, 0x80 -+ .byte 0x82, 0xc8, 0x03, 0x22 -+ .byte 0x82, 0xc9, 0x03, 0x26 -+ .byte 0x82, 0xca, 0x03, 0x2a -+ .byte 0x82, 0xcb, 0x03, 0x2e -+ .byte 0x82, 0xcc, 0x03, 0x32 -+ .byte 0x82, 0xcd, 0x03, 0x36 -+ .byte 0x82, 0xce, 0x03, 0x3a -+ .byte 0x82, 0xcf, 0x03, 0x3e -+ .byte 0x83, 0xb0, 0x66, 0xa0 -+ -+!copy output back to array -+ retl -+ std %f32, [%o2] -+ -+ SET_SIZE(t4_des_encrypt) -+ -+ ENTRY(t4_des_load_keys) -+ -+!load expanded key -+ ldd [%o0], %f0 -+ ldd [%o0 + 0x8], %f2 -+ ldd [%o0 + 0x10], %f4 -+ ldd [%o0 + 0x18], %f6 -+ ldd [%o0 + 0x20], %f8 -+ ldd [%o0 + 0x28], %f10 -+ ldd [%o0 + 0x30], %f12 -+ ldd [%o0 + 0x38], %f14 -+ ldd [%o0 + 0x40], %f16 -+ ldd [%o0 + 0x48], %f18 -+ ldd [%o0 + 0x50], %f20 -+ ldd [%o0 + 0x58], %f22 -+ ldd [%o0 + 0x60], %f24 -+ ldd [%o0 + 0x68], %f26 -+ ldd [%o0 + 0x70], %f28 -+ retl -+ ldd [%o0 + 0x78], %f30 -+ -+ SET_SIZE(t4_des_load_keys) -+ -+ ENTRY(t4_des3_load_keys) -+ -+!load first 30 pieces of the expanded key -+ ldd [%o0], %f0 -+ ldd [%o0 + 0x8], %f2 -+ ldd [%o0 + 0x10], %f4 -+ ldd [%o0 + 0x18], %f6 -+ ldd [%o0 + 0x20], %f8 -+ ldd [%o0 + 0x28], %f10 -+ ldd [%o0 + 0x30], %f12 -+ ldd [%o0 + 0x38], %f14 -+ ldd [%o0 + 0x40], %f16 -+ ldd [%o0 + 0x48], %f18 -+ ldd [%o0 + 0x50], %f20 -+ ldd [%o0 + 0x58], %f22 -+ ldd [%o0 + 0x60], %f24 -+ ldd [%o0 + 0x68], %f26 -+ ldd [%o0 + 0x70], %f28 -+ ldd [%o0 + 0x78], %f30 -+ ldd [%o0 + 0x80], %f32 -+ ldd [%o0 + 0x88], %f34 -+ ldd [%o0 + 0x90], %f36 -+ ldd [%o0 + 0x98], %f38 -+ ldd [%o0 + 0xa0], %f40 -+ ldd [%o0 + 0xa8], %f42 -+ ldd [%o0 + 0xb0], %f44 -+ ldd [%o0 + 0xb8], %f46 -+ ldd [%o0 + 0xc0], %f48 -+ ldd [%o0 + 0xc8], %f50 -+ ldd [%o0 + 0xd0], %f52 -+ ldd [%o0 + 0xd8], %f54 -+ ldd [%o0 + 0xe0], %f56 -+ retl -+ ldd [%o0 + 0xe8], %f58 -+ -+ SET_SIZE(t4_des3_load_keys) -+ -+ ENTRY(t4_des_ecb_crypt) -+ -+des_ecb_loop: -+!load input -+ ldd [%o1], %f62 -+ -+!perform the cipher transformation -+ !des_ip %f62, %f62 -+ !des_round %f0, %f2, %f62, %f62 -+ !des_round %f4, %f6, %f62, %f62 -+ !des_round %f8, %f10, %f62, %f62 -+ !des_round %f12, %f14, %f62, %f62 -+ !des_round %f16, %f18, %f62, %f62 -+ !des_round %f20, %f22, %f62, %f62 -+ !des_round %f24, %f26, %f62, %f62 -+ !des_round %f28, %f30, %f62, %f62 -+ !des_iip %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ .byte 0xbe, 0xc8, 0x3f, 0x22 -+ .byte 0xbe, 0xc9, 0x3f, 0x26 -+ .byte 0xbe, 0xca, 0x3f, 0x2a -+ .byte 0xbe, 0xcb, 0x3f, 0x2e -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ .byte 0xbe, 0xcd, 0x3f, 0x36 -+ .byte 0xbe, 0xce, 0x3f, 0x3a -+ .byte 0xbe, 0xcf, 0x3f, 0x3e -+ .byte 0xbf, 0xb7, 0xe6, 0xa0 -+ -+!copy output back to array -+ std %f62, [%o2] -+ sub %o3, 8, %o3 -+ add %o1, 8, %o1 -+ brnz %o3, des_ecb_loop -+ add %o2, 8, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_des_ecb_crypt) -+ -+ -+ ENTRY(t4_des_cbc_encrypt) -+ -+ ldd [%o4], %f60 -+des_cbc_encrypt_loop: -+!load input -+ ldd [%o1], %f58 -+ fxor %f58, %f60, %f62 -+ -+!perform the cipher transformation -+ !des_ip %f62, %f62 -+ !des_round %f0, %f2, %f62, %f62 -+ !des_round %f4, %f6, %f62, %f62 -+ !des_round %f8, %f10, %f62, %f62 -+ !des_round %f12, %f14, %f62, %f62 -+ !des_round %f16, %f18, %f62, %f62 -+ !des_round %f20, %f22, %f62, %f62 -+ !des_round %f24, %f26, %f62, %f62 -+ !des_round %f28, %f30, %f62, %f62 -+ !des_iip %f62, %f60 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ .byte 0xbe, 0xc8, 0x3f, 0x22 -+ .byte 0xbe, 0xc9, 0x3f, 0x26 -+ .byte 0xbe, 0xca, 0x3f, 0x2a -+ .byte 0xbe, 0xcb, 0x3f, 0x2e -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ .byte 0xbe, 0xcd, 0x3f, 0x36 -+ .byte 0xbe, 0xce, 0x3f, 0x3a -+ .byte 0xbe, 0xcf, 0x3f, 0x3e -+ .byte 0xbb, 0xb7, 0xe6, 0xa0 -+ -+!copy output back to array -+ std %f60, [%o2] -+ sub %o3, 8, %o3 -+ add %o1, 8, %o1 -+ brnz %o3, des_cbc_encrypt_loop -+ add %o2, 8, %o2 -+ -+ retl -+ std %f60, [%o4] -+ -+ SET_SIZE(t4_des_cbc_encrypt) -+ -+ -+ -+ ENTRY(t4_des_cbc_decrypt) -+ -+ ldd [%o4], %f60 -+des_cbc_decrypt_loop: -+!load input -+ ldd [%o1], %f62 -+ ldx [%o1], %o5 -+ -+!perform the cipher transformation -+ !des_ip %f62, %f62 -+ !des_round %f0, %f2, %f62, %f62 -+ !des_round %f4, %f6, %f62, %f62 -+ !des_round %f8, %f10, %f62, %f62 -+ !des_round %f12, %f14, %f62, %f62 -+ !des_round %f16, %f18, %f62, %f62 -+ !des_round %f20, %f22, %f62, %f62 -+ !des_round %f24, %f26, %f62, %f62 -+ !des_round %f28, %f30, %f62, %f62 -+ !des_iip %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ .byte 0xbe, 0xc8, 0x3f, 0x22 -+ .byte 0xbe, 0xc9, 0x3f, 0x26 -+ .byte 0xbe, 0xca, 0x3f, 0x2a -+ .byte 0xbe, 0xcb, 0x3f, 0x2e -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ .byte 0xbe, 0xcd, 0x3f, 0x36 -+ .byte 0xbe, 0xce, 0x3f, 0x3a -+ .byte 0xbe, 0xcf, 0x3f, 0x3e -+ .byte 0xbf, 0xb7, 0xe6, 0xa0 -+ fxor %f60, %f62, %f62 -+ movxtod %o5, %f60 -+ -+!copy output back to array -+ std %f62, [%o2] -+ sub %o3, 8, %o3 -+ add %o1, 8, %o1 -+ brnz %o3, des_cbc_decrypt_loop -+ add %o2, 8, %o2 -+ -+ retl -+ std %f60, [%o4] -+ -+ SET_SIZE(t4_des_cbc_decrypt) -+ -+ -+ -+ ENTRY(t4_des3_ecb_crypt) -+ -+des3_ecb_loop: -+!load input -+ ldd [%o1], %f62 -+ -+!perform the cipher transformation -+ !des_ip %f62, %f62 -+ !des_round %f0, %f2, %f62, %f62 -+ !des_round %f4, %f6, %f62, %f62 -+ !des_round %f8, %f10, %f62, %f62 -+ !des_round %f12, %f14, %f62, %f62 -+ !des_round %f16, %f18, %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ .byte 0xbe, 0xc8, 0x3f, 0x22 -+ .byte 0xbe, 0xc9, 0x3f, 0x26 -+ .byte 0xbe, 0xca, 0x3f, 0x2a -+ .byte 0xbe, 0xcb, 0x3f, 0x2e -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ -+ ldd [%o0 + 0xf0], %f16 -+ ldd [%o0 + 0xf8], %f18 -+ !des_round %f20, %f22, %f62, %f62 -+ .byte 0xbe, 0xcd, 0x3f, 0x36 -+ ldd [%o0 + 0x100], %f20 -+ ldd [%o0 + 0x108], %f22 -+ !des_round %f24, %f26, %f62, %f62 -+ .byte 0xbe, 0xce, 0x3f, 0x3a -+ ldd [%o0 + 0x110], %f24 -+ ldd [%o0 + 0x118], %f26 -+ !des_round %f28, %f30, %f62, %f62 -+ .byte 0xbe, 0xcf, 0x3f, 0x3e -+ ldd [%o0 + 0x120], %f28 -+ ldd [%o0 + 0x128], %f30 -+ -+ !des_iip %f62, %f62 -+ !des_ip %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0xa0 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ -+ !des_round %f32, %f34, %f62, %f62 -+ .byte 0xbe, 0xc8, 0x7f, 0x23 -+ ldd [%o0 + 0x130], %f0 -+ ldd [%o0 + 0x138], %f2 -+ !des_round %f36, %f38, %f62, %f62 -+ .byte 0xbe, 0xc9, 0x7f, 0x27 -+ ldd [%o0 + 0x140], %f4 -+ ldd [%o0 + 0x148], %f6 -+ !des_round %f40, %f42, %f62, %f62 -+ .byte 0xbe, 0xca, 0x7f, 0x2b -+ ldd [%o0 + 0x150], %f8 -+ ldd [%o0 + 0x158], %f10 -+ !des_round %f44, %f46, %f62, %f62 -+ .byte 0xbe, 0xcb, 0x7f, 0x2f -+ ldd [%o0 + 0x160], %f12 -+ ldd [%o0 + 0x168], %f14 -+ !des_round %f48, %f50, %f62, %f62 -+ !des_round %f52, %f54, %f62, %f62 -+ !des_round %f56, %f58, %f62, %f62 -+ !des_round %f16, %f18, %f62, %f62 -+ .byte 0xbe, 0xcc, 0x7f, 0x33 -+ .byte 0xbe, 0xcd, 0x7f, 0x37 -+ .byte 0xbe, 0xce, 0x7f, 0x3b -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ ldd [%o0 + 0x170], %f16 -+ ldd [%o0 + 0x178], %f18 -+ -+ !des_iip %f62, %f62 -+ !des_ip %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0xa0 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ -+ !des_round %f20, %f22, %f62, %f62 -+ .byte 0xbe, 0xcd, 0x3f, 0x36 -+ ldd [%o0 + 0x50], %f20 -+ ldd [%o0 + 0x58], %f22 -+ !des_round %f24, %f26, %f62, %f62 -+ .byte 0xbe, 0xce, 0x3f, 0x3a -+ ldd [%o0 + 0x60], %f24 -+ ldd [%o0 + 0x68], %f26 -+ !des_round %f28, %f30, %f62, %f62 -+ .byte 0xbe, 0xcf, 0x3f, 0x3e -+ ldd [%o0 + 0x70], %f28 -+ ldd [%o0 + 0x78], %f30 -+ !des_round %f0, %f2, %f62, %f62 -+ .byte 0xbe, 0xc8, 0x3f, 0x22 -+ ldd [%o0], %f0 -+ ldd [%o0 + 0x8], %f2 -+ !des_round %f4, %f6, %f62, %f62 -+ .byte 0xbe, 0xc9, 0x3f, 0x26 -+ -+ ldd [%o0 + 0x10], %f4 -+ ldd [%o0 + 0x18], %f6 -+ !des_round %f8, %f10, %f62, %f62 -+ .byte 0xbe, 0xca, 0x3f, 0x2a -+ ldd [%o0 + 0x20], %f8 -+ ldd [%o0 + 0x28], %f10 -+ !des_round %f12, %f14, %f62, %f62 -+ .byte 0xbe, 0xcb, 0x3f, 0x2e -+ ldd [%o0 + 0x30], %f12 -+ ldd [%o0 + 0x38], %f14 -+ !des_round %f16, %f18, %f62, %f62 -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ ldd [%o0 + 0x40], %f16 -+ ldd [%o0 + 0x48], %f18 -+ -+ !des_iip %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0xa0 -+ -+!copy output back to array -+ std %f62, [%o2] -+ sub %o3, 8, %o3 -+ add %o1, 8, %o1 -+ brnz %o3, des3_ecb_loop -+ add %o2, 8, %o2 -+ -+ retl -+ nop -+ -+ SET_SIZE(t4_des3_ecb_crypt) -+ -+ -+ ENTRY(t4_des3_cbc_encrypt) -+ -+ ldd [%o4], %f62 -+des3_cbc_encrypt_loop: -+!load input -+ ldd [%o1], %f60 -+ fxor %f60, %f62, %f62 -+ -+!perform the cipher transformation -+ !des_ip %f62, %f62 -+ .byte 0xbf, 0xb7, 0xe6, 0x80 -+ !des_round %f0, %f2, %f62, %f62 -+ !des_round %f4, %f6, %f62, %f62 -+ !des_round %f8, %f10, %f62, %f62 -+ !des_round %f12, %f14, %f62, %f62 -+ !des_round %f16, %f18, %f62, %f62 -+ .byte 0xbe, 0xc8, 0x3f, 0x22 -+ .byte 0xbe, 0xc9, 0x3f, 0x26 -+ .byte 0xbe, 0xca, 0x3f, 0x2a -+ .byte 0xbe, 0xcb, 0x3f, 0x2e -+ .byte 0xbe, 0xcc, 0x3f, 0x32 -+ ldd [%o0 + 0xf0], %f16 -+ ldd [%o0 + 0xf8], %f18 -+ !des_round %f20, %f22, %f62, %f62 -+ .byte 0xbe, 0xcd, 0x3f, 0x36 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 23:34:41 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 22:34:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20406] csw/mgar/pkg/openssl1/trunk/files/openssl-1.0. 1e-t4-engine.sparc-patch Message-ID: Revision: 20406 http://gar.svn.sourceforge.net/gar/?rev=20406&view=rev Author: chninkel Date: 2013-03-10 22:34:40 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: fixed t4 engine patch Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch 2013-03-10 20:51:02 UTC (rev 20405) +++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch 2013-03-10 22:34:40 UTC (rev 20406) @@ -209,9 +209,806 @@ CRYPTO_cts128_encrypt 4553 EXIST::FUNCTION: CRYPTO_cts128_decrypt_block 4554 EXIST::FUNCTION: CRYPTO_cfb128_1_encrypt 4555 EXIST::FUNCTION: +Index: crypto/engine/eng_t4_aes_asm.h +=================================================================== +diff -uNr openssl-1.0.1e/engine/eng_t4_aes_asm.h openssl-1.0.1e/engine/eng_t4_aes_asm.h +--- openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,147 @@ ++/* ++ * This product includes cryptographic software developed by the OpenSSL ++ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). ++ */ ++ ++/* ++ * ==================================================================== ++ * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. All advertising materials mentioning features or use of this ++ * software must display the following acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" ++ * ++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For written permission, please contact ++ * licensing at OpenSSL.org. ++ * ++ * 5. Products derived from this software may not be called "OpenSSL" ++ * nor may "OpenSSL" appear in their names without prior written ++ * permission of the OpenSSL Project. ++ * ++ * 6. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ==================================================================== ++ */ ++ ++/* ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. ++ */ ++ ++#ifndef ENG_T4_AES_ASM_H ++#define ENG_T4_AES_ASM_H ++ ++/* ++ * SPARC AES assembly language functions. ++ * ++ * Based on Solaris file aes_impl.h. ++ */ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#include ++ ++#if (defined(sun4v) || defined(__sparcv9) || defined(__sparcv8plus) || \ ++ defined(__sparcv8)) && ! defined(OPENSSL_NO_ASM) ++ ++extern void t4_aes_expand128(uint64_t *rk, const uint32_t *key); ++extern void t4_aes_expand192(uint64_t *rk, const uint32_t *key); ++extern void t4_aes_expand256(uint64_t *rk, const uint32_t *key); ++extern void t4_aes_encrypt128(const uint64_t *rk, const uint32_t *pt, ++ uint32_t *ct); ++extern void t4_aes_encrypt192(const uint64_t *rk, const uint32_t *pt, ++ uint32_t *ct); ++extern void t4_aes_encrypt256(const uint64_t *rk, const uint32_t *pt, ++ uint32_t *ct); ++extern void t4_aes_decrypt128(const uint64_t *rk, const uint32_t *ct, ++ uint32_t *pt); ++extern void t4_aes_decrypt192(const uint64_t *rk, const uint32_t *ct, ++ uint32_t *pt); ++extern void t4_aes_decrypt256(const uint64_t *rk, const uint32_t *ct, ++ uint32_t *pt); ++extern void t4_aes128_load_keys_for_encrypt(uint64_t *ks); ++extern void t4_aes192_load_keys_for_encrypt(uint64_t *ks); ++extern void t4_aes256_load_keys_for_encrypt(uint64_t *ks); ++extern void t4_aes128_ecb_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *dummy); ++extern void t4_aes192_ecb_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *dummy); ++extern void t4_aes256_ecb_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *dummy); ++extern void t4_aes128_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes192_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes256_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes128_ctr_crypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes192_ctr_crypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes256_ctr_crypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes128_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes192_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes256_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv); ++extern void t4_aes128_load_keys_for_decrypt(uint64_t *ks); ++extern void t4_aes192_load_keys_for_decrypt(uint64_t *ks); ++extern void t4_aes256_load_keys_for_decrypt(uint64_t *ks); ++extern void t4_aes128_ecb_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *dummy); ++extern void t4_aes192_ecb_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *dummy); ++extern void t4_aes256_ecb_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *dummy); ++extern void t4_aes128_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv); ++extern void t4_aes192_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv); ++extern void t4_aes256_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv); ++extern void t4_aes128_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv); ++extern void t4_aes192_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv); ++extern void t4_aes256_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv); ++ ++#endif /* (sun4v||__sparv9||__sparcv8plus||__sparvc8) && !OPENSSL_NO_ASM */ ++ ++#ifdef __cplusplus ++} ++#endif ++#endif /* ENG_T4_AES_ASM_H */ +Index: crypto/engine/eng_t4_bignum.h +=================================================================== +diff -uNr openssl-1.0.1e/engine/eng_t4_bignum.h openssl-1.0.1e/engine/eng_t4_bignum.h +--- openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,287 @@ ++/* ++ * This product includes cryptographic software developed by the OpenSSL ++ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). ++ */ ++ ++/* ++ * ==================================================================== ++ * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. All advertising materials mentioning features or use of this ++ * software must display the following acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" ++ * ++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For written permission, please contact ++ * licensing at OpenSSL.org. ++ * ++ * 5. Products derived from this software may not be called "OpenSSL" ++ * nor may "OpenSSL" appear in their names without prior written ++ * permission of the OpenSSL Project. ++ * ++ * 6. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ==================================================================== ++ */ ++ ++/* ++ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. ++ */ ++ ++/* ++ * This file is a copy of the ON gate's usr/src/common/bignum/bignum.h file ++ */ ++ ++#ifndef _BIGNUM_H ++#define _BIGNUM_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#include ++ ++#if defined(__sparcv9) || defined(__amd64) || defined(__sparc) ++ /* 64-bit chunk size */ ++#ifndef UMUL64 ++#define UMUL64 /* 64-bit multiplication results are supported */ ++#endif ++#else ++#define BIGNUM_CHUNK_32 ++#endif ++ ++ ++#define BITSINBYTE 8 ++ ++/* Bignum "digits" (aka "chunks" or "words") are either 32- or 64-bits */ ++#ifdef BIGNUM_CHUNK_32 ++#define BIG_CHUNK_SIZE 32 ++#define BIG_CHUNK_TYPE uint32_t ++#define BIG_CHUNK_TYPE_SIGNED int32_t ++#define BIG_CHUNK_HIGHBIT 0x80000000 ++#define BIG_CHUNK_ALLBITS 0xffffffff ++#define BIG_CHUNK_LOWHALFBITS 0xffff ++#define BIG_CHUNK_HALF_HIGHBIT 0x8000 ++ ++#else ++#define BIG_CHUNK_SIZE 64 ++#define BIG_CHUNK_TYPE uint64_t ++#define BIG_CHUNK_TYPE_SIGNED int64_t ++#define BIG_CHUNK_HIGHBIT 0x8000000000000000ULL ++#define BIG_CHUNK_ALLBITS 0xffffffffffffffffULL ++#define BIG_CHUNK_LOWHALFBITS 0xffffffffULL ++#define BIG_CHUNK_HALF_HIGHBIT 0x80000000ULL ++#endif ++ ++#define BITLEN2BIGNUMLEN(x) ((x) > 0 ? \ ++ ((((x) - 1) / BIG_CHUNK_SIZE) + 1) : 0) ++#define CHARLEN2BIGNUMLEN(x) ((x) > 0 ? \ ++ ((((x) - 1) / sizeof (BIG_CHUNK_TYPE)) + 1) : 0) ++ ++#define BIGNUM_WORDSIZE (BIG_CHUNK_SIZE / BITSINBYTE) /* word size in bytes */ ++#define BIG_CHUNKS_FOR_160BITS BITLEN2BIGNUMLEN(160) ++ ++ ++/* ++ * leading 0's are permitted ++ * 0 should be represented by size>=1, size>=len>=1, sign=1, ++ * value[i]=0 for 0 ++ ++#if (defined(sun4v) || defined(__sparcv9) || defined(__sparcv8plus) || \ ++ defined(__sparcv8)) && ! defined(OPENSSL_NO_ASM) ++ ++extern void t4_des_expand(uint64_t *rk, const uint32_t *key); ++extern void t4_des_encrypt(const uint64_t *rk, const uint64_t *pt, ++ uint64_t *ct); ++extern void t4_des_load_keys(uint64_t *ks); ++void t4_des_ecb_crypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv); ++extern void t4_des_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv); ++extern void t4_des_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv); ++extern void t4_des3_load_keys(uint64_t *ks); ++extern void t4_des3_ecb_crypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv); ++extern void t4_des3_cbc_encrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv); ++extern void t4_des3_cbc_decrypt(uint64_t *ks, uint64_t *asm_in, ++ uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv); ++ ++ ++#endif /* (sun4v||__sparv9||__sparcv8plus||__sparvc8) && !OPENSSL_NO_ASM */ ++ ++#ifdef __cplusplus ++} ++#endif ++#endif /* ENG_T4_DES_ASM_H */ +Index: crypto/engine/eng_t4_err.h +=================================================================== +diff -uNr openssl-1.0.1e/engine/eng_t4_err.h openssl-1.0.1e/engine/eng_t4_err.h +--- openssl-1.0.1e/crypto/engine/eng_t4_err.h 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_err.h 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,97 @@ ++/* ++ * This product includes cryptographic software developed by the OpenSSL ++ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). ++ */ ++ ++/* ++ * ==================================================================== ++ * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. All advertising materials mentioning features or use of this ++ * software must display the following acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" ++ * ++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For written permission, please contact ++ * openssl-core at openssl.org. ++ * ++ * 5. Products derived from this software may not be called "OpenSSL" ++ * nor may "OpenSSL" appear in their names without prior written ++ * permission of the OpenSSL Project. ++ * ++ * 6. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit (http://www.openssl.org/)" ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ==================================================================== ++ */ ++ ++/* ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. ++ */ ++ ++#ifndef ENG_T4_ERR_H ++#define ENG_T4_ERR_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++static void ERR_unload_t4_strings(void); ++#pragma inline(ERR_unload_t4_strings) ++static void ERR_t4_error(int function, int reason, char *file, int line); ++ ++#define T4err(f, r) ERR_t4_error((f), (r), __FILE__, __LINE__) ++ ++/* Function codes */ ++#define T4_F_INIT 100 ++#define T4_F_DESTROY 101 ++#define T4_F_FINISH 102 ++#define T4_F_CIPHER_INIT_AES 103 ++#define T4_F_ADD_NID 104 ++#define T4_F_GET_ALL_CIPHERS 105 ++#define T4_F_CIPHER_DO_AES 106 ++#define T4_F_CIPHER_CLEANUP 107 ++#define T4_F_CIPHER_INIT_DES 108 ++#define T4_F_CIPHER_DO_DES 109 ++ ++/* Reason codes */ ++#define T4_R_CIPHER_KEY 100 ++#define T4_R_CIPHER_NID 101 ++#define T4_R_IV_LEN_INCORRECT 102 ++#define T4_R_KEY_LEN_INCORRECT 103 ++#define T4_R_ASN1_OBJECT_CREATE 104 ++#define T4_R_NOT_BLOCKSIZE_LENGTH 105 ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* ENG_T4_ERR_H */ +Index: crypto/engine/eng_t4_sha2_asm.h +=================================================================== +diff -uNr openssl-1.0.1e/engine/eng_t4_sha2_asm.h openssl-1.0.1e/engine/eng_t4_sha2_asm.h +--- openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,135 @@ ++/* ++ * This product includes cryptographic software developed by the OpenSSL ++ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This ++ * product includes cryptographic software written by Eric Young ++ * (eay at cryptsoft.com). ++ */ ++ ++/* ++ * ==================================================================== ++ * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. All advertising materials mentioning features or use of this ++ * software must display the following acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" ++ * ++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For written permission, please contact ++ * openssl-core at openssl.org. ++ * ++ * 5. Products derived from this software may not be called "OpenSSL" ++ * nor may "OpenSSL" appear in their names without prior written ++ * permission of the OpenSSL Project. ++ * ++ * 6. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit (http://www.openssl.org/)" ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ==================================================================== ++ */ ++ ++/* ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. ++ */ ++ ++#ifndef ENG_T4_SHA2_ASM_H ++#define ENG_T4_SHA2_ASM_H ++ ++/* ++ * SPARC T4 SHA2 (SHA256/SHA512) assembly language functions and context. ++ * The context must match that used by the Solaris SPARC T4 assembly ++ * (except for OpenSSL-specific fields num and md_len that aren't in Solaris). ++ * ++ * Based on OpenSSL file openssl/sha.h and Solaris file sys/sha2.h. ++ */ ++ ++#include ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#ifndef OPENSSL_NO_SHA256 ++/* ++ * The contents of this structure are a private interface between the ++ * Init/Update/Multiblock/Final functions. ++ * Callers must never attempt to read or write any of the fields ++ * in this structure directly. ++ */ ++typedef struct t4_SHA256state_st { ++ uint32_t algotype; /* Solaris-only field; unused here */ ++ uint32_t algotype_pad; /* Pad to align next field 0 mod 8 */ ++ uint32_t h[8]; /* State (ABCDEFGH) */ ++ uint32_t h_pad[8]; /* Pad fields to match T4_SHA512_CTX */ ++ uint32_t Nl, Nh; /* Number of bits, module 2^64 */ ++ uint32_t Nl_pad, Nh_pad; /* Pad fields to match T4_SHA512_CTX */ ++ uint32_t data[SHA_LBLOCK]; /* Input */ ++ unsigned int num, md_len; /* Fields unused by Solaris assembly */ ++} T4_SHA256_CTX; ++#endif /* !OPENSSL_NO_SHA256 */ ++ ++ ++#ifndef OPENSSL_NO_SHA512 ++/* ++ * The contents of this structure are a private interface between the ++ * Init/Update/Multiblock/Final functions. ++ * Callers must never attempt to read or write any of the fields ++ * in this structure directly. ++ */ ++typedef struct t4_SHA512state_st { ++ uint32_t algotype; /* Solaris-only field; unused here */ ++ uint64_t h[8]; /* State (ABCDEFGH) */ ++ uint64_t Nl, Nh; /* Number of bits, module 2^128 */ ++ union { ++ uint64_t d[SHA_LBLOCK]; ++ unsigned char p[SHA512_CBLOCK]; ++ } u; /* Input */ ++ unsigned int num, md_len; /* Fields unused by Solaris assembly */ ++} T4_SHA512_CTX; ++#endif /* !OPENSSL_NO_SHA512 */ ++ ++/* ++ * SPARC T4 assembly language functions ++ */ ++#ifndef OPENSSL_NO_SHA256 ++extern void t4_sha256_multiblock(T4_SHA256_CTX *c, const void *input, ++ size_t num); ++#endif ++#ifndef OPENSSL_NO_SHA512 ++extern void t4_sha512_multiblock(T4_SHA512_CTX *c, const void *input, ++ size_t num); ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++#endif /* ENG_T4_SHA2_ASM_H */ +Index: crypto/engine/eng_t4.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4.c openssl-1.0.1e/engine/eng_t4.c --- openssl-1.0.1e/crypto/engine/eng_t4.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,1010 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). @@ -1222,9 +2019,12 @@ +#endif /* DYNAMIC_ENGINE */ +#endif /* COMPILE_HW_T4 */ +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_AES_T4 && !OPENSSL_NO_AES */ +Index: crypto/engine/eng_t4_des.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_des.c openssl-1.0.1e/engine/eng_t4_des.c --- openssl-1.0.1e/crypto/engine/eng_t4_des.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_des.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_des.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,486 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). @@ -1711,9 +2511,12 @@ + +#endif /* COMPILE_HW_T4 */ +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_DES_T4 && !OPENSSL_NO_DES */ +Index: crypto/engine/eng_t4_err.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_err.c openssl-1.0.1e/engine/eng_t4_err.c --- openssl-1.0.1e/crypto/engine/eng_t4_err.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_err.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_err.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,157 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). @@ -1871,9 +2674,12 @@ + t4_error_code = ERR_get_next_error_library(); + ERR_PUT_error(t4_error_code, function, reason, file, line); +} +Index: crypto/engine/eng_t4_md5.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_md5.c openssl-1.0.1e/engine/eng_t4_md5.c --- openssl-1.0.1e/crypto/engine/eng_t4_md5.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_md5.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_md5.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,200 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This @@ -2074,9 +2880,12 @@ +#endif /* COMPILE_HW_T4 */ +#endif /* !OPENSSL_NO_MD5 */ +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_MD_T4 */ +Index: crypto/engine/eng_t4_montmul.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_montmul.c openssl-1.0.1e/engine/eng_t4_montmul.c --- openssl-1.0.1e/crypto/engine/eng_t4_montmul.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_montmul.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_montmul.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,459 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). @@ -2536,9 +3345,12 @@ +#endif /* COMPILE_HW_T4 */ + +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_MONTMUL_T4 */ +Index: crypto/engine/eng_t4_sha1.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha1.c openssl-1.0.1e/engine/eng_t4_sha1.c --- openssl-1.0.1e/crypto/engine/eng_t4_sha1.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha1.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha1.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,197 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This @@ -2736,9 +3548,12 @@ +#endif /* COMPILE_HW_T4 */ +#endif /* !OPENSSL_NO_SHA && !OPENSSL_NO_SHA1 */ +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_MD_T4 */ +Index: crypto/engine/eng_t4_sha256.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha256.c openssl-1.0.1e/engine/eng_t4_sha256.c --- openssl-1.0.1e/crypto/engine/eng_t4_sha256.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha256.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha256.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,246 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This @@ -2985,9 +3800,12 @@ +#endif /* COMPILE_HW_T4 */ +#endif /* !OPENSSL_NO_SHA && !OPENSSL_NO_SHA256 */ +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_MD_T4 */ +Index: crypto/engine/eng_t4_sha512.c +=================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha512.c openssl-1.0.1e/engine/eng_t4_sha512.c --- openssl-1.0.1e/crypto/engine/eng_t4_sha512.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha512.c 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha512.c 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,325 @@ +/* + * This product includes cryptographic software developed by the OpenSSL + * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This @@ -3313,9 +4131,12 @@ +#endif /* COMPILE_HW_T4 */ +#endif /* !OPENSSL_NO_SHA && !OPENSSL_NO_SHA512 */ +#endif /* !OPENSSL_NO_HW && !OPENSSL_NO_HW_MD_T4 */ +Index: crypto/aes/asm/t4_aes.S +=================================================================== diff -uNr openssl-1.0.1e/aes/asm/t4_aes.S openssl-1.0.1e/aes/asm/t4_aes.S --- openssl-1.0.1e/crypto/aes/asm/t4_aes.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/aes/asm/t4_aes.S 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/aes/asm/t4_aes.S 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,3052 @@ +/* + * ==================================================================== + * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. @@ -6368,9 +7189,12 @@ +#endif + +#endif /* lint || __lint */ +Index: crypto/des/asm/t4_des.S +=================================================================== diff -uNr openssl-1.0.1e/des/asm/t4_des.S openssl-1.0.1e/des/asm/t4_des.S --- openssl-1.0.1e/crypto/des/asm/t4_des.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/des/asm/t4_des.S 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/des/asm/t4_des.S 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,786 @@ +/* + * ==================================================================== + * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. @@ -7157,9 +7981,12 @@ + + +#endif /* lint || __lint */ +Index: crypto/md5/asm/t4_md5.S +=================================================================== diff -uNr openssl-1.0.1e/md5/asm/t4_md5.S openssl-1.0.1e/md5/asm/t4_md5.S --- openssl-1.0.1e/crypto/md5/asm/t4_md5.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/md5/asm/t4_md5.S 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/md5/asm/t4_md5.S 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,151 @@ +/* + * ==================================================================== + * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. @@ -7311,9 +8138,12 @@ + SET_SIZE(t4_md5_multiblock) + +#endif /* lint || __lint */ +Index: crypto/sha/asm/t4_sha1.S +=================================================================== diff -uNr openssl-1.0.1e/sha/asm/t4_sha1.S openssl-1.0.1e/sha/asm/t4_sha1.S --- openssl-1.0.1e/crypto/sha/asm/t4_sha1.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/sha/asm/t4_sha1.S 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/sha/asm/t4_sha1.S 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,153 @@ +/* + * ==================================================================== + * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. @@ -7467,9 +8297,12 @@ + SET_SIZE(t4_sha1_multiblock) + +#endif /* lint || __lint */ +Index: crypto/sha/asm/t4_sha2.S +=================================================================== diff -uNr openssl-1.0.1e/sha/asm/t4_sha2.S openssl-1.0.1e/sha/asm/t4_sha2.S --- openssl-1.0.1e/crypto/sha/asm/t4_sha2.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/sha/asm/t4_sha2.S 2013-03-10 21:38:30.975905091 +0100 ++++ openssl-1.0.1e/crypto/sha/asm/t4_sha2.S 2013-03-10 22:45:19.089618665 +0100 +@@ -0,0 +1,314 @@ +/* + * ==================================================================== + * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 23:35:23 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 22:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20407] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20407 http://gar.svn.sourceforge.net/gar/?rev=20407&view=rev Author: chninkel Date: 2013-03-10 22:35:23 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: fixed t4 engine patch update script Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 22:34:40 UTC (rev 20406) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 22:35:23 UTC (rev 20407) @@ -241,18 +241,23 @@ T4_ENGINE_FILES = eng_t4_aes_asm.h eng_t4_bignum.h eng_t4_des_asm.h eng_t4_err.h eng_t4_sha2_asm.h -T4_ENGINE_FILES = eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c +T4_ENGINE_FILES += eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c T4_ENGINE_FILES += t4_aes.S t4_des.S t4_md5.S t4_sha1.S t4_sha2.S MERCURIAL_URL = https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/tip/components/openssl/openssl-1.0.1/ PATCH_DATE = $(shell date +"%Y-%m-%d %H:%M:%S.%N %z") +TMP_PATCH_FILE = "/tmp/t4_engine_tmp.patch" update-t4-patch: @echo "Updating t4 engine patch from $(MERCURIAL_URL)..." @( wget --quiet --output-document=- $(MERCURIAL_URL)/patches/openssl-$(VERSION)-t4-engine.sparc-patch; \ for FILE in $(T4_ENGINE_FILES); do \ DIR="engine"; \ if echo $$FILE | grep "\.S$$" >/dev/null; then DIR="`basename $$FILE .S | cut -d_ -f2 | cut -b1-3`/asm"; fi; \ + wget --quiet --output-document=$(TMP_PATCH_FILE) $(MERCURIAL_URL)/engines/t4/$$FILE | sed -e 's/^/+/'; \ + echo "Index: crypto/$$DIR/$$FILE"; \ + echo "==================================================================="; \ echo "diff -uNr openssl-$(VERSION)/$$DIR/$$FILE openssl-$(VERSION)/$$DIR/$$FILE"; \ echo "--- openssl-$(VERSION)/crypto/$$DIR/$$FILE 1970-01-01 01:00:00.000000000 +0100"; \ echo "+++ openssl-$(VERSION)/crypto/$$DIR/$$FILE $(PATCH_DATE)"; \ - wget --quiet --output-document=- $(MERCURIAL_URL)/engines/t4/$$FILE | sed -e 's/^/+/'; \ + echo "@@ -0,0 +1,`wc -l $(TMP_PATCH_FILE) | awk '{ print $$1 }'` @@"; \ + sed -e 's/^/+/' "$(TMP_PATCH_FILE)"; \ done; ) > "$(FILEDIR)/openssl-$(VERSION)-t4-engine.sparc-patch" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 23:42:37 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 22:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[20408] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20408 http://gar.svn.sourceforge.net/gar/?rev=20408&view=rev Author: chninkel Date: 2013-03-10 22:42:37 +0000 (Sun, 10 Mar 2013) Log Message: ----------- openssl1/trunk: removed conditional on PKCS11 and T4 support Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 22:35:23 UTC (rev 20407) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 22:42:37 UTC (rev 20408) @@ -10,9 +10,6 @@ # software causes damage. ##################################################################### -PKCS11 = 1 -T4 = 1 - ###### Package information ####### NAME = openssl @@ -30,6 +27,8 @@ PACKAGES = CSWlibssl1-0-0 CSWlibssl-dev CSWopenssl-utils +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-soarc solaris11-i386 + SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT) PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs @@ -122,25 +121,19 @@ PATCHFILES += 0007-enables-symbols-versioning.patch # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine -ifdef PKCS11 ifneq ($(shell /usr/bin/uname -r),5.9) PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30 endif -endif # support for sparc t4 crypto engine # see http://bubbva.blogspot.fr/2011/11/exciting-crypto-advances-with-t4.html # https://blogs.oracle.com/DanX/entry/sparc_t4_openssl_engine # patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ -ifdef T4 ifeq ($(shell /usr/bin/uname -p),sparc) -ifneq ($(shell /usr/bin/uname -r),5.9) -ifneq ($(shell /usr/bin/uname -r),5.10) +ifeq ($(shell /usr/bin/uname -r),5.11) PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch endif endif -endif -endif LICENSE = LICENSE @@ -174,18 +167,10 @@ CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages -ifdef PKCS11 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 ifneq ($(shell /usr/bin/uname -r),5.9) CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) -endif endif -ifdef T4 -PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 -endif - - # For now we want the sun perl to be used CONFIGURE_ENV += PERL="/usr/bin/perl" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 10 23:54:19 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Mar 2013 22:54:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[20409] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20409 http://gar.svn.sourceforge.net/gar/?rev=20409&view=rev Author: chninkel Date: 2013-03-10 22:54:19 +0000 (Sun, 10 Mar 2013) Log Message: ----------- still handle the Solaris 9 case Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 22:42:37 UTC (rev 20408) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-10 22:54:19 UTC (rev 20409) @@ -87,15 +87,21 @@ DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE +# configure targets patchs needs to be different for Solaris 9 as some map files +# are not available +ifeq ($(shell /usr/bin/uname -r),5.9) + PATCH_SUFFIX = .SunOS5.9 +endif + # This patch is taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # original file: components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch # I think they are smarter than me to figure what are the best compiler options -PATCHFILES = optimized_configure_targets.patch +PATCHFILES = optimized_configure_targets.patch$(PATCH_SUFFIX) # This patch add optimised build targets for some solaris isa, ie: # solaris-sparcv8-cc-sunw, solaris-pentium_pro-cc-sunw and solaris-sparcv9+vis-cc-sunw # (wonder if they are really worth it) -PATCHFILES += more_configure_targets.patch +PATCHFILES += more_configure_targets.patch$(PATCH_SUFFIX) #PATCHFILES += fix-test-failure.patch Added: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-10 22:54:19 UTC (rev 20409) @@ -0,0 +1,31 @@ +From a693531b40e1f8d707cea5f984d935358c12f14d Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Sun, 10 Mar 2013 12:14:09 +0100 +Subject: [PATCH] More configure targets + +--- + Configure | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Configure b/Configure +index a84e9d7..6f93ad3 100755 +--- a/Configure ++++ b/Configure +@@ -267,6 +267,14 @@ my %table=( + # to discard unused sections and files when linking wanboot-openssl.o + "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + ++#### More configure targets for Opencsw build ++"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris-sparcv8-cc-sunw","cc:-xtarget=v8 -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ ++ + #### IRIX 5.x configs + # -mips2 flag is added by ./config when appropriate. + "irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-- +1.8.1.4 + Added: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-10 22:54:19 UTC (rev 20409) @@ -0,0 +1,22 @@ +--- openssl-1.0.0d/Configure Thu Feb 10 20:02:41 2011 ++++ /tmp/Configure Thu Feb 10 20:01:51 2011 +@@ -257,6 +257,19 @@ + #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::", + "sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::", + ++#### Solaris configs, used for OpenSSL as delivered by S11. ++"solaris-x86-cc-sunw","cc:-m32 -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++# ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++# Option -xF=%all instructs the compiler to place functions and data ++# variables into separate section fragments. This enables the link editor ++# to discard unused sections and files when linking wanboot-openssl.o ++"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++ + #### IRIX 5.x configs + # -mips2 flag is added by ./config when appropriate. + "irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 11 09:31:42 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 11 Mar 2013 08:31:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20410] csw/mgar/pkg/puppet3/trunk Message-ID: Revision: 20410 http://gar.svn.sourceforge.net/gar/?rev=20410&view=rev Author: phipsy Date: 2013-03-11 08:31:41 +0000 (Mon, 11 Mar 2013) Log Message: ----------- puppet3 -> 3.1.0; first hack at fixing startup scripts Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile csw/mgar/pkg/puppet3/trunk/checksums csw/mgar/pkg/puppet3/trunk/files/cswpuppetd csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-03-10 22:54:19 UTC (rev 20409) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-03-11 08:31:41 UTC (rev 20410) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.0.1 +VERSION = 3.1.0 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2013-03-10 22:54:19 UTC (rev 20409) +++ csw/mgar/pkg/puppet3/trunk/checksums 2013-03-11 08:31:41 UTC (rev 20410) @@ -1 +1,2 @@ 2117e3a1964ac54fcd36d926eed3db94 puppet-3.0.1.tar.gz +4cbdcc9dfcda677c820175375a500651 puppet-3.1.0.tar.gz Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet3/trunk/files/cswpuppetd 2013-03-10 22:54:19 UTC (rev 20409) +++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetd 2013-03-11 08:31:41 UTC (rev 20410) @@ -28,6 +28,7 @@ prefix="/opt/csw" exec_prefix="/opt/csw" sysconfdir="/etc/opt/csw" +bindir="/opt/csw/bin" sbindir="/opt/csw/sbin" localstatedir="/var/opt/csw" @@ -43,8 +44,7 @@ #ssldir=`getprop puppet/ssldir` # Start daemons. - #${sbindir}/puppetd --confdir=$confdir --vardir=$vardir --ssldir=$ssldir - ${sbindir}/puppetd + ${bindir}/puppet agent } reload_puppetd() { Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-10 22:54:19 UTC (rev 20409) +++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-11 08:31:41 UTC (rev 20410) @@ -17,6 +17,7 @@ prefix=/opt/csw exec_prefix=/opt/csw sysconfdir=/etc/opt/csw +bindir=/opt/csw/bin sbindir=/opt/csw/sbin pidfile=`$prefix/bin/puppet master --genconf | awk '/pidfile/ { print $3 }'` @@ -32,7 +33,7 @@ # Start daemons. printf "Starting Puppet server services:" - ${sbindir}/puppetmasterd + ${sbindir}/puppet master printf " puppetmaster" echo "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 09:48:53 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 08:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20411] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20411 http://gar.svn.sourceforge.net/gar/?rev=20411&view=rev Author: chninkel Date: 2013-03-11 08:48:53 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: fixed typo Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 08:31:41 UTC (rev 20410) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 08:48:53 UTC (rev 20411) @@ -27,7 +27,7 @@ PACKAGES = CSWlibssl1-0-0 CSWlibssl-dev CSWopenssl-utils -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-soarc solaris11-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 10:06:35 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 09:06:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[20412] csw/mgar/pkg/openssl1/trunk/files Message-ID: Revision: 20412 http://gar.svn.sourceforge.net/gar/?rev=20412&view=rev Author: chninkel Date: 2013-03-11 09:06:35 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: fixed compilation options for Solaris 9 Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 08:48:53 UTC (rev 20411) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 09:06:35 UTC (rev 20412) @@ -18,9 +18,9 @@ +#### More configure targets for Opencsw build +"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris-sparcv8-cc-sunw","cc:-xtarget=v8 -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv8-cc-sunw","cc:-xarch=v8 -m32 -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + #### IRIX 5.x configs Modified: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-11 08:48:53 UTC (rev 20411) +++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-11 09:06:35 UTC (rev 20412) @@ -9,13 +9,13 @@ +# +"solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", +# Option -xF=%all instructs the compiler to place functions and data +# variables into separate section fragments. This enables the link editor +# to discard unused sections and files when linking wanboot-openssl.o -+"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 11 10:17:02 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 11 Mar 2013 09:17:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[20413] csw/mgar/pkg/puppet3/trunk/Makefile Message-ID: Revision: 20413 http://gar.svn.sourceforge.net/gar/?rev=20413&view=rev Author: phipsy Date: 2013-03-11 09:17:01 +0000 (Mon, 11 Mar 2013) Log Message: ----------- puppet3: removed some possibly spurious files. Need to test this cut Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-03-11 09:06:35 UTC (rev 20412) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-03-11 09:17:01 UTC (rev 20413) @@ -105,13 +105,13 @@ --full ginstall -m 755 $(FILEDIR)/pkgutil.rb $(DESTDIR)$(rubysitelibdir)/puppet/provider/package cd $(DESTDIR)$(mandir)/man8 && gunzip * - (cd $(WORKSRC)/examples/etc/puppet && \ - for f in *; do \ - if [ -f $$f ] ; then \ - cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - fi; \ - done) + # (cd $(WORKSRC)/examples/etc/puppet && \ + # for f in *; do \ + # if [ -f $$f ] ; then \ + # cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + # chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + # fi; \ + # done) mv $(DESTDIR)$(sysconfdir)/puppet/auth.conf $(DESTDIR)$(sysconfdir)/puppet/auth.conf.example ginstall -m 644 $(FILEDIR)/puppet.conf.example-CSW $(DESTDIR)$(sysconfdir)/puppet/puppet.conf.example ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 10:40:44 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 09:40:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20414] csw/mgar/pkg/openssl1/trunk/files/ more_configure_targets.patch.SunOS5.9 Message-ID: Revision: 20414 http://gar.svn.sourceforge.net/gar/?rev=20414&view=rev Author: chninkel Date: 2013-03-11 09:40:44 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: fixed solaris 9 specific patches Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 09:17:01 UTC (rev 20413) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 09:40:44 UTC (rev 20414) @@ -13,7 +13,7 @@ +++ b/Configure @@ -267,6 +267,14 @@ my %table=( # to discard unused sections and files when linking wanboot-openssl.o - "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", +#### More configure targets for Opencsw build +"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 10:54:15 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 09:54:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20415] csw/mgar/pkg/openssl1/trunk/files/ more_configure_targets.patch.SunOS5.9 Message-ID: Revision: 20415 http://gar.svn.sourceforge.net/gar/?rev=20415&view=rev Author: chninkel Date: 2013-03-11 09:54:14 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: fixed asm for sparcv8 Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 09:40:44 UTC (rev 20414) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 09:54:14 UTC (rev 20415) @@ -18,7 +18,7 @@ +#### More configure targets for Opencsw build +"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris-sparcv8-cc-sunw","cc:-xarch=v8 -m32 -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv8-cc-sunw","cc:-xarch=v8 -m32 -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# +"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 11:20:46 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 10:20:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20416] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20416 http://gar.svn.sourceforge.net/gar/?rev=20416&view=rev Author: chninkel Date: 2013-03-11 10:20:45 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: workaround the missing -ldl option Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 09:54:14 UTC (rev 20415) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 10:20:45 UTC (rev 20416) @@ -186,8 +186,8 @@ # The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # added "-z defs" to the linker options. That causes object compilation to fail because -# they are not linked against libc. This is workaround until I find a better fix. -EXTRA_LD_OPTIONS = "-lc" +# they are not linked against libc and libdl (for Sol9). This is workaround until I find a better fix. +EXTRA_LD_OPTIONS = "-lc -ldl" # By default, the install target put man pages under # /opt/csw/ssl/man, but we want them under /opt/csw/share/man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 11:25:54 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 10:25:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20417] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20417 http://gar.svn.sourceforge.net/gar/?rev=20417&view=rev Author: chninkel Date: 2013-03-11 10:25:54 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: removed unecessary quotes in Makefile Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 10:20:45 UTC (rev 20416) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 10:25:54 UTC (rev 20417) @@ -187,7 +187,7 @@ # The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # added "-z defs" to the linker options. That causes object compilation to fail because # they are not linked against libc and libdl (for Sol9). This is workaround until I find a better fix. -EXTRA_LD_OPTIONS = "-lc -ldl" +EXTRA_LD_OPTIONS = -lc -ldl # By default, the install target put man pages under # /opt/csw/ssl/man, but we want them under /opt/csw/share/man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 13:28:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 12:28:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20418] csw/mgar/pkg/openssl1/trunk/files Message-ID: Revision: 20418 http://gar.svn.sourceforge.net/gar/?rev=20418&view=rev Author: chninkel Date: 2013-03-11 12:28:33 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: ar is not in /usr/bin under Solaris 9 by default (it seems) Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 10:25:54 UTC (rev 20417) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch.SunOS5.9 2013-03-11 12:28:33 UTC (rev 20418) @@ -13,7 +13,7 @@ +++ b/Configure @@ -267,6 +267,14 @@ my %table=( # to discard unused sections and files when linking wanboot-openssl.o - "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", +#### More configure targets for Opencsw build +"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", Modified: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-11 10:25:54 UTC (rev 20417) +++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-11 12:28:33 UTC (rev 20418) @@ -11,11 +11,11 @@ +# +"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/"bin/ar rs::/64", +# Option -xF=%all instructs the compiler to place functions and data +# variables into separate section fragments. This enables the link editor +# to discard unused sections and files when linking wanboot-openssl.o -+"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", + #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 13:32:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 12:32:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20419] csw/mgar/pkg/openssl1/trunk/files/ optimized_configure_targets.patch.SunOS5.9 Message-ID: Revision: 20419 http://gar.svn.sourceforge.net/gar/?rev=20419&view=rev Author: chninkel Date: 2013-03-11 12:32:51 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: fixed typo Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 Modified: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-11 12:28:33 UTC (rev 20418) +++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch.SunOS5.9 2013-03-11 12:32:51 UTC (rev 20419) @@ -11,7 +11,7 @@ +# +"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/"bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", +# Option -xF=%all instructs the compiler to place functions and data +# variables into separate section fragments. This enables the link editor +# to discard unused sections and files when linking wanboot-openssl.o 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 Mar 11 15:06:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Mar 2013 14:06:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20420] csw/mgar/gar/v2/bin/pcopy Message-ID: Revision: 20420 http://gar.svn.sourceforge.net/gar/?rev=20420&view=rev Author: dmichelsen Date: 2013-03-11 14:06:42 +0000 (Mon, 11 Mar 2013) Log Message: ----------- mGAR v2: Merge pipes Modified Paths: -------------- csw/mgar/gar/v2/bin/pcopy Modified: csw/mgar/gar/v2/bin/pcopy =================================================================== --- csw/mgar/gar/v2/bin/pcopy 2013-03-11 12:32:51 UTC (rev 20419) +++ csw/mgar/gar/v2/bin/pcopy 2013-03-11 14:06:42 UTC (rev 20420) @@ -7,6 +7,7 @@ use File::Copy; use File::Find; use File::Path qw(make_path); +use POSIX qw(mkfifo); use Pod::Usage; use Getopt::Long; @@ -135,6 +136,12 @@ return; } + # Create FIFOs on destination + if( -p $whole ) { + mkfifo( $todir . '/' . $target, (stat( $whole ))[2] ); + return; + } + # Copy with preserving hardlinks if( -l $whole ) { my $link = readlink( $whole ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Mar 11 16:32:05 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Mar 2013 15:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20421] csw/mgar/pkg Message-ID: Revision: 20421 http://gar.svn.sourceforge.net/gar/?rev=20421&view=rev Author: pfelecan Date: 2013-03-11 15:32:04 +0000 (Mon, 11 Mar 2013) Log Message: ----------- mdk/trunk: instantiate Added Paths: ----------- csw/mgar/pkg/mdk/ csw/mgar/pkg/mdk/Makefile csw/mgar/pkg/mdk/branches/ csw/mgar/pkg/mdk/tags/ csw/mgar/pkg/mdk/trunk/ csw/mgar/pkg/mdk/trunk/Makefile csw/mgar/pkg/mdk/trunk/checksums csw/mgar/pkg/mdk/trunk/files/ csw/mgar/pkg/mdk/trunk/files/0001-no-glib-deprecation.patch csw/mgar/pkg/mdk/trunk/files/0002-remove-gld-flag.patch Added: csw/mgar/pkg/mdk/Makefile =================================================================== --- csw/mgar/pkg/mdk/Makefile (rev 0) +++ csw/mgar/pkg/mdk/Makefile 2013-03-11 15:32:04 UTC (rev 20421) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/mdk/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/mdk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mdk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mdk/trunk/Makefile 2013-03-11 15:32:04 UTC (rev 20421) @@ -0,0 +1,69 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mdk +VERSION = 1.2.7 +GARTYPE = v2 + +DESCRIPTION = MIX Development Kit +define BLURB + MDK stands for MIX Development Kit, and provides tools for developing + and executing, in a MIX virtual machine, MIXAL programs. + + The MIX is Donald Knuth\'s mythical computer, described in the first + volume of The Art of Computer Programming, which is programmed using + MIXAL, the MIX assembly language. + + MDK includes a MIXAL assembler (mixasm) and a MIX virtual machine + (mixvm) with a command line interface. In addition, a GTK+ GUI to + mixvm, called gmixvm, is provided; and, in case you are an Emacs guy, + you can try misc/mixvm.el, which allows running mixvm inside an Emacs + GUD buffer. + + Using these interfaces, you can debug your MIXAL programs at source + code level, and read/modify the contents of all the components of the + MIX computer (including block devices, which are simulated using the + file system). +endef + +MASTER_SITES = $(GNU_MIRROR)/v$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-no-glib-deprecation.patch +PATCHFILES += 0002-remove-gld-flag.patch + +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +BUILD_DEP_PKGS = CSWlibglib2-dev +BUILD_DEP_PKGS = CSWlibgtk2-dev +BUILD_DEP_PKGS = CSWlibgdk-pixbuf-dev +BUILD_DEP_PKGS = CSWlibcairo-dev +BUILD_DEP_PKGS = CSWpangodevel +BUILD_DEP_PKGS = CSWlibatk-dev +BUILD_DEP_PKGS = CSWguile-dev +BUILD_DEP_PKGS = CSWlibglade2 + +CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +EXTRA_INC += $(includedir)/glib-2.0 +EXTRA_INC += $(libdir)/glib-2.0/include +EXTRA_INC += $(includedir)/gtk-2.0 +EXTRA_INC += $(libdir)/gtk-2.0/include +EXTRA_INC += $(includedir)/cairo +EXTRA_INC += $(includedir)/pango-1.0 +EXTRA_INC += $(includedir)/gdk-pixbuf-2.0 +EXTRA_INC += $(includedir)/atk-1.0 +EXTRA_INC += $(includedir)/libglade-2.0 + +include gar/category.mk + +PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) + +pre-configure-modulated: + @echo "executing $@" + cd $(WORKSRC) && libtoolize + cd $(WORKSRC) && aclocal -I m4 + cd $(WORKSRC) && automake -a + cd $(WORKSRC) && autoconf + $(MAKECOOKIE) + Property changes on: csw/mgar/pkg/mdk/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mdk/trunk/checksums =================================================================== --- csw/mgar/pkg/mdk/trunk/checksums (rev 0) +++ csw/mgar/pkg/mdk/trunk/checksums 2013-03-11 15:32:04 UTC (rev 20421) @@ -0,0 +1 @@ +ab5ceb4363958261fd5e0614c9c11701 mdk-1.2.7.tar.gz Added: csw/mgar/pkg/mdk/trunk/files/0001-no-glib-deprecation.patch =================================================================== --- csw/mgar/pkg/mdk/trunk/files/0001-no-glib-deprecation.patch (rev 0) +++ csw/mgar/pkg/mdk/trunk/files/0001-no-glib-deprecation.patch 2013-03-11 15:32:04 UTC (rev 20421) @@ -0,0 +1,26 @@ +From 8e72611e21d7f93a2636a436f7b3ba4565f22076 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 1 Mar 2013 14:53:38 +0100 +Subject: [PATCH] no glib deprecation slightly adapted from Debian + 01-gtk-deprecated.patch + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5b8d40c..99ac6cb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -105,7 +105,7 @@ dnl Check for glib + PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.0) + + LIBS="$LIBS $GLIB_LIBS" +-AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS -DG_DISABLE_DEPRECATED" ++AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS" + + dnl Check if the gtk gui is required + AC_ARG_ENABLE(gui, +-- +1.8.1.4 + Added: csw/mgar/pkg/mdk/trunk/files/0002-remove-gld-flag.patch =================================================================== --- csw/mgar/pkg/mdk/trunk/files/0002-remove-gld-flag.patch (rev 0) +++ csw/mgar/pkg/mdk/trunk/files/0002-remove-gld-flag.patch 2013-03-11 15:32:04 UTC (rev 20421) @@ -0,0 +1,26 @@ +From cb6ec31ffe5629195c33b32f2f5185f6258a7d44 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 11 Mar 2013 16:18:07 +0100 +Subject: [PATCH] remove gld flag + +In my opinion this is not needed even with gld as we link an +executable and not a library. +--- + mixgtk/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am +index 37e16ad..5a32192 100644 +--- a/mixgtk/Makefile.am ++++ b/mixgtk/Makefile.am +@@ -39,7 +39,6 @@ INCLUDES = -I$(includedir) -I$(top_srcdir) \ + LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a\ + $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS) + +-AM_LDFLAGS = -Wl,--export-dynamic + bin_PROGRAMS = gmixvm + gmixvm_SOURCES = gmixvm.c mixgtk.h mixgtk.c \ + mixgtk_config.h mixgtk_config.c \ +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 16:46:25 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 15:46:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20422] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 20422 http://gar.svn.sourceforge.net/gar/?rev=20422&view=rev Author: chninkel Date: 2013-03-11 15:46:25 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssh/trunk: removed Solaris 8 legacy checkinstall script Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-03-11 15:32:04 UTC (rev 20421) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-03-11 15:46:25 UTC (rev 20422) @@ -103,8 +103,6 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*p\d+).tar.gz DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWopenssh.checkinstall -DISTFILES += CSWopensshlpk.checkinstall DISTFILES += changelog.CSW DISTFILES += cswusergroup Deleted: csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall 2013-03-11 15:32:04 UTC (rev 20421) +++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall 2013-03-11 15:46:25 UTC (rev 20422) @@ -1,24 +0,0 @@ -#!/bin/sh - -err=0 - -if [ `uname -r` = "5.8" ] ; then - -if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then - echo ERROR: /dev/random must exist - err=1 -fi - -if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then - echo ERROR: /dev/urandom must exist - err=1 -fi - -fi - -if [ "$err" = "1" ] ; then - echo "For solaris 8 sparc, install patch 112438" - echo "For solaris 8 x86, install patch 112439" - exit 1 -fi - Deleted: csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall 2013-03-11 15:32:04 UTC (rev 20421) +++ csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall 2013-03-11 15:46:25 UTC (rev 20422) @@ -1,24 +0,0 @@ -#!/bin/sh - -err=0 - -if [ `uname -r` = "5.8" ] ; then - -if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then - echo ERROR: /dev/random must exist - err=1 -fi - -if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then - echo ERROR: /dev/urandom must exist - err=1 -fi - -fi - -if [ "$err" = "1" ] ; then - echo "For solaris 8 sparc, install patch 112438" - echo "For solaris 8 x86, install patch 112439" - exit 1 -fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 17:06:02 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 16:06:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[20423] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20423 http://gar.svn.sourceforge.net/gar/?rev=20423&view=rev Author: chninkel Date: 2013-03-11 16:06:01 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssh/trunk: WARNING.RNG is not present anymore Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-03-11 15:46:25 UTC (rev 20422) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-03-11 16:06:01 UTC (rev 20423) @@ -135,7 +135,7 @@ # documentation files to install (not a gar variable) DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns -DOCFILES += README.platform README.privsep README.tun TODO WARNING.RNG +DOCFILES += README.platform README.privsep README.tun TODO # we're using conf handling class from the cswclassutils package RUNTIME_DEP_PKGS += CSWcswclassutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 17:54:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 16:54:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20424] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20424 http://gar.svn.sourceforge.net/gar/?rev=20424&view=rev Author: chninkel Date: 2013-03-11 16:54:52 +0000 (Mon, 11 Mar 2013) Log Message: ----------- gar/v2: first try the elf file parser with hachoir parser since it's what we are interested in Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-03-11 16:06:01 UTC (rev 20423) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-03-11 16:54:52 UTC (rev 20424) @@ -61,7 +61,8 @@ else: raise package.PackageError(msg) if sharedlib_utils.IsBinary(file_info, check_consistency=False): - parser = hachoir_parser.createParser(full_path) + parser_tag = ('class', hachoir_parser.program.elf.ElfFile) + parser = hachoir_parser.createParser(full_path, tags=[parser_tag]) if not parser: logging.warning("Can't parse file %s", file_path) else: Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-03-11 16:06:01 UTC (rev 20423) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-03-11 16:54:52 UTC (rev 20424) @@ -140,8 +140,10 @@ self.mox.StubOutWithMock(hachoir_parser, 'createParser', use_mock_anything=True) hachoir_parser_mock = self.mox.CreateMockAnything() + parser_tag = ('class', hachoir_parser.program.elf.ElfFile) hachoir_parser.createParser( - u'/fake/path/CSWfoo/root/foo-file').AndReturn(hachoir_parser_mock) + u'/fake/path/CSWfoo/root/foo-file', + tags = [parser_tag]).AndReturn(hachoir_parser_mock) self.mox.StubOutWithMock(os, 'access') os.access(u'/fake/path/CSWfoo/root/foo-file', os.R_OK).AndReturn(True) machine_mock = self.mox.CreateMockAnything() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 11 17:57:23 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 11 Mar 2013 16:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20425] csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd Message-ID: Revision: 20425 http://gar.svn.sourceforge.net/gar/?rev=20425&view=rev Author: phipsy Date: 2013-03-11 16:57:22 +0000 (Mon, 11 Mar 2013) Log Message: ----------- puppet3: cswpuppetmasterd init script updated Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-11 16:54:52 UTC (rev 20424) +++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-11 16:57:22 UTC (rev 20425) @@ -20,7 +20,7 @@ bindir=/opt/csw/bin sbindir=/opt/csw/sbin -pidfile=`$prefix/bin/puppet master --genconf | awk '/pidfile/ { print $3 }'` +pidfile=`$prefix/bin/puppet master --configprint pidfile` getprop() { val=`/usr/bin/svcprop -p $1 $SMF_FMRI` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 18:00:39 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 17:00:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20426] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 20426 http://gar.svn.sourceforge.net/gar/?rev=20426&view=rev Author: chninkel Date: 2013-03-11 17:00:38 +0000 (Mon, 11 Mar 2013) Log Message: ----------- gar/v2: don't complain about unused soname if the library is not even in the dependencies (can happen if the library was preloaded) Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-03-11 16:57:22 UTC (rev 20425) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-03-11 17:00:38 UTC (rev 20426) @@ -175,7 +175,8 @@ ldd_info = pkg_data['ldd_info'][binary_info["path"]] for ldd_response in ldd_info: if (ldd_response['state'] == 'soname-unused' - and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES): + and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES + and ldd_response['soname'] in binary_info['needed sonames']): sonames_unused.add(ldd_response['soname']) messenger.Message( "Binary %s links to library %s but doesn't seem to use any" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 18:11:30 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 17:11:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[20427] csw/mgar/pkg/openssl1/trunk/files Message-ID: Revision: 20427 http://gar.svn.sourceforge.net/gar/?rev=20427&view=rev Author: chninkel Date: 2013-03-11 17:11:30 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1: /usr/bin/ar exists only under Solaris 11, it's /usr/ccs/bin/ar elsewhere Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-11 17:00:38 UTC (rev 20426) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2013-03-11 17:11:30 UTC (rev 20427) @@ -13,7 +13,7 @@ +++ b/Configure @@ -267,6 +267,14 @@ my %table=( # to discard unused sections and files when linking wanboot-openssl.o - "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", + "solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", +#### More configure targets for Opencsw build +"solaris-x86-pentium_pro-cc-sunw","cc:-m32 -xarch=pentium_pro -xO3 -xspace -Xa::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", Modified: csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch 2013-03-11 17:00:38 UTC (rev 20426) +++ csw/mgar/pkg/openssl1/trunk/files/optimized_configure_targets.patch 2013-03-11 17:11:30 UTC (rev 20427) @@ -11,11 +11,11 @@ +# +"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# -+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", +# Option -xF=%all instructs the compiler to place functions and data +# variables into separate section fragments. This enables the link editor +# to discard unused sections and files when linking wanboot-openssl.o -+"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", + #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 11 18:13:57 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 11 Mar 2013 17:13:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20428] csw/mgar/pkg/puppet3/trunk/files Message-ID: Revision: 20428 http://gar.svn.sourceforge.net/gar/?rev=20428&view=rev Author: phipsy Date: 2013-03-11 17:13:56 +0000 (Mon, 11 Mar 2013) Log Message: ----------- puppet3: fixes for mantis 5035 Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/files/cswpuppetd csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet3/trunk/files/cswpuppetd 2013-03-11 17:11:30 UTC (rev 20427) +++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetd 2013-03-11 17:13:56 UTC (rev 20428) @@ -67,7 +67,7 @@ else zoneopts="" fi - pgrep $zoneopts puppetd + pgrep -f $zoneopts 'puppet agent' } # Returns a line with certain string from a config file. Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-11 17:11:30 UTC (rev 20427) +++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-11 17:13:56 UTC (rev 20428) @@ -27,6 +27,16 @@ [ -n "$val" ] && echo $val } +get_current_pid() { + if [ -x /usr/bin/zonename ]; then + zone=`/usr/bin/zonename` + zoneopts="-z $zone" + else + zoneopts="" + fi + pgrep -f $zoneopts 'puppet master' +} + case "$1" in start) cd / @@ -63,7 +73,7 @@ status) if [ -f $pidfile ]; then pid=`cat $pidfile` - curpid=`pgrep puppetmasterd` + curpid=`get_current_pid` if [ "$pid" -eq "$curpid" ]; then exit 0 else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 18:18:40 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 17:18:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20429] csw/mgar/pkg/openssl1/trunk/files/openssl-1.0. 1e-t4-engine.sparc-patch Message-ID: Revision: 20429 http://gar.svn.sourceforge.net/gar/?rev=20429&view=rev Author: chninkel Date: 2013-03-11 17:18:39 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1: updated t4 engine patch Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch 2013-03-11 17:13:56 UTC (rev 20428) +++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch 2013-03-11 17:18:39 UTC (rev 20429) @@ -27,9 +27,9 @@ +"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-cc-sunw-fips","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_fips_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # --"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", -+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", -+"solaris64-sparcv9-cc-sunw-fips","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_fips_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64", +-"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", ++"solaris64-sparcv9-cc-sunw-fips","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_fips_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64", # Option -xF=%all instructs the compiler to place functions and data # variables into separate section fragments. This enables the link editor # to discard unused sections and files when linking wanboot-openssl.o @@ -213,7 +213,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_aes_asm.h openssl-1.0.1e/engine/eng_t4_aes_asm.h --- openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,147 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -366,7 +366,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_bignum.h openssl-1.0.1e/engine/eng_t4_bignum.h --- openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,287 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -659,7 +659,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_des_asm.h openssl-1.0.1e/engine/eng_t4_des_asm.h --- openssl-1.0.1e/crypto/engine/eng_t4_des_asm.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_des_asm.h 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_des_asm.h 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,98 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -763,7 +763,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_err.h openssl-1.0.1e/engine/eng_t4_err.h --- openssl-1.0.1e/crypto/engine/eng_t4_err.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_err.h 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_err.h 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,97 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -866,7 +866,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha2_asm.h openssl-1.0.1e/engine/eng_t4_sha2_asm.h --- openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,135 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -1007,7 +1007,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4.c openssl-1.0.1e/engine/eng_t4.c --- openssl-1.0.1e/crypto/engine/eng_t4.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,1010 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -2023,7 +2023,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_des.c openssl-1.0.1e/engine/eng_t4_des.c --- openssl-1.0.1e/crypto/engine/eng_t4_des.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_des.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_des.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,486 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -2515,7 +2515,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_err.c openssl-1.0.1e/engine/eng_t4_err.c --- openssl-1.0.1e/crypto/engine/eng_t4_err.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_err.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_err.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,157 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -2678,7 +2678,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_md5.c openssl-1.0.1e/engine/eng_t4_md5.c --- openssl-1.0.1e/crypto/engine/eng_t4_md5.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_md5.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_md5.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,200 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -2884,7 +2884,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_montmul.c openssl-1.0.1e/engine/eng_t4_montmul.c --- openssl-1.0.1e/crypto/engine/eng_t4_montmul.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_montmul.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_montmul.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,459 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -3349,7 +3349,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha1.c openssl-1.0.1e/engine/eng_t4_sha1.c --- openssl-1.0.1e/crypto/engine/eng_t4_sha1.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha1.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha1.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,197 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -3552,7 +3552,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha256.c openssl-1.0.1e/engine/eng_t4_sha256.c --- openssl-1.0.1e/crypto/engine/eng_t4_sha256.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha256.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha256.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,246 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -3804,7 +3804,7 @@ =================================================================== diff -uNr openssl-1.0.1e/engine/eng_t4_sha512.c openssl-1.0.1e/engine/eng_t4_sha512.c --- openssl-1.0.1e/crypto/engine/eng_t4_sha512.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/engine/eng_t4_sha512.c 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/engine/eng_t4_sha512.c 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,325 @@ +/* + * This product includes cryptographic software developed by the OpenSSL @@ -4135,7 +4135,7 @@ =================================================================== diff -uNr openssl-1.0.1e/aes/asm/t4_aes.S openssl-1.0.1e/aes/asm/t4_aes.S --- openssl-1.0.1e/crypto/aes/asm/t4_aes.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/aes/asm/t4_aes.S 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/aes/asm/t4_aes.S 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,3052 @@ +/* + * ==================================================================== @@ -7193,7 +7193,7 @@ =================================================================== diff -uNr openssl-1.0.1e/des/asm/t4_des.S openssl-1.0.1e/des/asm/t4_des.S --- openssl-1.0.1e/crypto/des/asm/t4_des.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/des/asm/t4_des.S 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/des/asm/t4_des.S 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,786 @@ +/* + * ==================================================================== @@ -7985,7 +7985,7 @@ =================================================================== diff -uNr openssl-1.0.1e/md5/asm/t4_md5.S openssl-1.0.1e/md5/asm/t4_md5.S --- openssl-1.0.1e/crypto/md5/asm/t4_md5.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/md5/asm/t4_md5.S 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/md5/asm/t4_md5.S 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,151 @@ +/* + * ==================================================================== @@ -8142,7 +8142,7 @@ =================================================================== diff -uNr openssl-1.0.1e/sha/asm/t4_sha1.S openssl-1.0.1e/sha/asm/t4_sha1.S --- openssl-1.0.1e/crypto/sha/asm/t4_sha1.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/sha/asm/t4_sha1.S 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/sha/asm/t4_sha1.S 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,153 @@ +/* + * ==================================================================== @@ -8301,7 +8301,7 @@ =================================================================== diff -uNr openssl-1.0.1e/sha/asm/t4_sha2.S openssl-1.0.1e/sha/asm/t4_sha2.S --- openssl-1.0.1e/crypto/sha/asm/t4_sha2.S 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.1e/crypto/sha/asm/t4_sha2.S 2013-03-10 22:45:19.089618665 +0100 ++++ openssl-1.0.1e/crypto/sha/asm/t4_sha2.S 2013-03-11 18:15:54.571043544 +0100 @@ -0,0 +1,314 @@ +/* + * ==================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 11 18:30:42 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 11 Mar 2013 17:30:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20430] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 20430 http://gar.svn.sourceforge.net/gar/?rev=20430&view=rev Author: phipsy Date: 2013-03-11 17:30:41 +0000 (Mon, 11 Mar 2013) Log Message: ----------- puppet: version ramp to 2.7.20 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2013-03-11 17:18:39 UTC (rev 20429) +++ csw/mgar/pkg/puppet/trunk/Makefile 2013-03-11 17:30:41 UTC (rev 20430) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.19 +VERSION = 2.7.20 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2013-03-11 17:18:39 UTC (rev 20429) +++ csw/mgar/pkg/puppet/trunk/checksums 2013-03-11 17:30:41 UTC (rev 20430) @@ -16,3 +16,4 @@ a505a02e23975464fcf4a2c0cb0b3b59 puppet-2.7.14.tar.gz 210725704692a0ca7b8ffc312471796e puppet-2.7.18.tar.gz ba76fa7831df53db7424a8d523465ef5 puppet-2.7.19.tar.gz +746ebdd7ae734fb54e53bf6167f0928d puppet-2.7.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 19:18:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 18:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20431] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20431 http://gar.svn.sourceforge.net/gar/?rev=20431&view=rev Author: chninkel Date: 2013-03-11 18:18:47 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: moved update-t4-patch script in a separate file Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/update-t4-patch.sh Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 17:30:41 UTC (rev 20430) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 18:18:47 UTC (rev 20431) @@ -135,6 +135,9 @@ # see http://bubbva.blogspot.fr/2011/11/exciting-crypto-advances-with-t4.html # https://blogs.oracle.com/DanX/entry/sparc_t4_openssl_engine # patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ +# To update the patch, do: +# cd files && ./update-t4-patch.sh OPENSSL_VERSION +# ifeq ($(shell /usr/bin/uname -p),sparc) ifeq ($(shell /usr/bin/uname -r),5.11) PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch @@ -230,25 +233,3 @@ post-merge: merge-doc install-conf-misc - -T4_ENGINE_FILES = eng_t4_aes_asm.h eng_t4_bignum.h eng_t4_des_asm.h eng_t4_err.h eng_t4_sha2_asm.h -T4_ENGINE_FILES += eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c -T4_ENGINE_FILES += t4_aes.S t4_des.S t4_md5.S t4_sha1.S t4_sha2.S -MERCURIAL_URL = https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/tip/components/openssl/openssl-1.0.1/ -PATCH_DATE = $(shell date +"%Y-%m-%d %H:%M:%S.%N %z") -TMP_PATCH_FILE = "/tmp/t4_engine_tmp.patch" -update-t4-patch: - @echo "Updating t4 engine patch from $(MERCURIAL_URL)..." - @( wget --quiet --output-document=- $(MERCURIAL_URL)/patches/openssl-$(VERSION)-t4-engine.sparc-patch; \ - for FILE in $(T4_ENGINE_FILES); do \ - DIR="engine"; \ - if echo $$FILE | grep "\.S$$" >/dev/null; then DIR="`basename $$FILE .S | cut -d_ -f2 | cut -b1-3`/asm"; fi; \ - wget --quiet --output-document=$(TMP_PATCH_FILE) $(MERCURIAL_URL)/engines/t4/$$FILE | sed -e 's/^/+/'; \ - echo "Index: crypto/$$DIR/$$FILE"; \ - echo "==================================================================="; \ - echo "diff -uNr openssl-$(VERSION)/$$DIR/$$FILE openssl-$(VERSION)/$$DIR/$$FILE"; \ - echo "--- openssl-$(VERSION)/crypto/$$DIR/$$FILE 1970-01-01 01:00:00.000000000 +0100"; \ - echo "+++ openssl-$(VERSION)/crypto/$$DIR/$$FILE $(PATCH_DATE)"; \ - echo "@@ -0,0 +1,`wc -l $(TMP_PATCH_FILE) | awk '{ print $$1 }'` @@"; \ - sed -e 's/^/+/' "$(TMP_PATCH_FILE)"; \ - done; ) > "$(FILEDIR)/openssl-$(VERSION)-t4-engine.sparc-patch" Added: csw/mgar/pkg/openssl1/trunk/files/update-t4-patch.sh =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/update-t4-patch.sh (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/update-t4-patch.sh 2013-03-11 18:18:47 UTC (rev 20431) @@ -0,0 +1,55 @@ +#!/bin/bash +# +# update-t4-patch - retrieve the last t4 engine patch from +# hg.openindiana.org repository +# + +T4_ENGINE_FILES="eng_t4_aes_asm.h eng_t4_bignum.h eng_t4_des_asm.h eng_t4_err.h eng_t4_sha2_asm.h \ + eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c \ + t4_aes.S t4_des.S t4_md5.S t4_sha1.S t4_sha2.S" +MERCURIAL_URL="https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/tip/components/openssl/openssl-1.0.1/" +WGET_OPTIONS="--quiet" + + +if [[ -z "$1" ]]; then + echo "Usage: update-t4-patch.sh OPENSSL_VERSION" + exit 1 +fi + +VERSION="$1" +PATCH_FILE="openssl-${VERSION}-t4-engine.sparc-patch" +PATCH_DATE=$(date +"%Y-%m-%d %H:%M:%S.%N %z") + +echo "Updating t4 engine patch from ${MERCURIAL_URL}..." +( + # ar in in /usr/ccs/bin under Solaris 9 and 10 so we change the path + wget $WGET_OPTIONS --output-document=- ${MERCURIAL_URL}/patches/openssl-${VERSION}-t4-engine.sparc-patch | \ + sed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g' + + # in the repository, the new files are not part of the patch, but we merge them + # in a single patch + for FILE in $T4_ENGINE_FILES; do \ + if [[ "${FILE##*.}" != "S" ]]; then + DIR="engine" + else + DIR="${FILE:3:3}/asm" + fi + + wget $WGET_OPTIONS --output-document="${PATCH_FILE}.tmp" "${MERCURIAL_URL}/engines/t4/$FILE" + NB_LINES=$(wc -l "${PATCH_FILE}.tmp" | awk '{ print $1 }') + + echo "Index: crypto/$DIR/$FILE" + echo "===================================================================" + echo "diff -uNr openssl-${VERSION}/$DIR/$FILE openssl-${VERSION}/$DIR/$FILE" + echo "--- openssl-${VERSION}/crypto/$DIR/$FILE 1970-01-01 01:00:00.000000000 +0100" + echo "+++ openssl-${VERSION}/crypto/$DIR/$FILE ${PATCH_DATE}" + echo "@@ -0,0 +1,${NB_LINES} @@" + sed -e 's/^/+/' "${PATCH_FILE}.tmp" + done +) > "${PATCH_FILE}" + +rm -f "${PATCH_FILE}.tmp" +echo "Updated patch in ${PATCH_FILE}" + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 19:21:09 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 18:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20432] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20432 http://gar.svn.sourceforge.net/gar/?rev=20432&view=rev Author: chninkel Date: 2013-03-11 18:21:09 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: use sun studio 12.3 to have the -Qoption cg option Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 18:18:47 UTC (rev 20431) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 18:21:09 UTC (rev 20432) @@ -162,6 +162,12 @@ # No .so files in libraries #EXTRA_MERGE_EXCLUDE_FILES = .*/libcrypto.so .*/libssl.so +# We use Studio 12.3 to have the "-Qoption cg" option +# but this version is not available under Solaris 9 +ifneq ($(shell /usr/bin/uname -r),5.9) + GARCOMPILER=SOS12U3 +endif + # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = solaris-x86-cc-sunw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 11 19:23:35 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 11 Mar 2013 18:23:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[20433] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20433 http://gar.svn.sourceforge.net/gar/?rev=20433&view=rev Author: chninkel Date: 2013-03-11 18:23:35 +0000 (Mon, 11 Mar 2013) Log Message: ----------- openssl1/trunk: some cleaning, simplification Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 18:21:09 UTC (rev 20432) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-11 18:23:35 UTC (rev 20433) @@ -73,9 +73,6 @@ CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/FAQ CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/INSTALL -# We have a lot of collision until libssl1.0.0 will replace libssl0.9.8 -#include checkpkg.overrides - ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.openssl.org/source/ @@ -138,11 +135,9 @@ # To update the patch, do: # cd files && ./update-t4-patch.sh OPENSSL_VERSION # -ifeq ($(shell /usr/bin/uname -p),sparc) -ifeq ($(shell /usr/bin/uname -r),5.11) +ifeq ($(shell /usr/bin/uname -rp),5.11 sparc) PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch endif -endif LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Mar 12 10:38:32 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Mar 2013 09:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[20434] csw/mgar/pkg/mdk/trunk/Makefile Message-ID: Revision: 20434 http://gar.svn.sourceforge.net/gar/?rev=20434&view=rev Author: pfelecan Date: 2013-03-12 09:38:31 +0000 (Tue, 12 Mar 2013) Log Message: ----------- mdk/trunk: - addition of dependencies - verified and validated overrides Modified Paths: -------------- csw/mgar/pkg/mdk/trunk/Makefile Modified: csw/mgar/pkg/mdk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mdk/trunk/Makefile 2013-03-11 18:23:35 UTC (rev 20433) +++ csw/mgar/pkg/mdk/trunk/Makefile 2013-03-12 09:38:31 UTC (rev 20434) @@ -55,6 +55,19 @@ EXTRA_INC += $(includedir)/atk-1.0 EXTRA_INC += $(includedir)/libglade-2.0 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibguile2-0-22 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibhistory6 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWmdk += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWmdk += CSWpango +RUNTIME_DEP_PKGS_CSWmdk += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWmdk += CSWemacs +CHECKPKG_OVERRIDES_CSWmdk += surplus-dependency|CSWemacs +CHECKPKG_OVERRIDES_CSWmdk += missing-dependency|CSWemacscommon + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Mar 12 11:22:52 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Mar 2013 10:22:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20435] csw/mgar/pkg/mdk/trunk/Makefile Message-ID: Revision: 20435 http://gar.svn.sourceforge.net/gar/?rev=20435&view=rev Author: pfelecan Date: 2013-03-12 10:22:52 +0000 (Tue, 12 Mar 2013) Log Message: ----------- mdk/trunk: - addition of scheme dependency - addition of new overrides Modified Paths: -------------- csw/mgar/pkg/mdk/trunk/Makefile Modified: csw/mgar/pkg/mdk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mdk/trunk/Makefile 2013-03-12 09:38:31 UTC (rev 20434) +++ csw/mgar/pkg/mdk/trunk/Makefile 2013-03-12 10:22:52 UTC (rev 20435) @@ -67,6 +67,9 @@ RUNTIME_DEP_PKGS_CSWmdk += CSWemacs CHECKPKG_OVERRIDES_CSWmdk += surplus-dependency|CSWemacs CHECKPKG_OVERRIDES_CSWmdk += missing-dependency|CSWemacscommon +RUNTIME_DEP_PKGS_CSWmdk += CSWscm +CHECKPKG_OVERRIDES_CSWmdk += surplus-dependency|CSWscm +CHECKPKG_OVERRIDES_CSWmdk += file-with-bad-content|/usr/local|root/opt/csw/share/info/mdk.info include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Mar 12 12:27:59 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 12 Mar 2013 11:27:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[20436] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20436 http://gar.svn.sourceforge.net/gar/?rev=20436&view=rev Author: chninkel Date: 2013-03-12 11:27:57 +0000 (Tue, 12 Mar 2013) Log Message: ----------- openssl1/trunk: added sparcv9+vis specific target for t4 engine support Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-12 10:22:52 UTC (rev 20435) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-12 11:27:57 UTC (rev 20436) @@ -137,6 +137,7 @@ # ifeq ($(shell /usr/bin/uname -rp),5.11 sparc) PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch + PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis endif LICENSE = LICENSE Added: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis 2013-03-12 11:27:57 UTC (rev 20436) @@ -0,0 +1,25 @@ +From 3b63574c8a3ba589f9a69bece6931a22a73675d2 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Mon, 11 Mar 2013 23:41:45 +0100 +Subject: [PATCH] t4 engine complement patch for sparcv9+vis target + +--- + Configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Configure b/Configure +index 3f32e5a..e3bf481 100755 +--- a/Configure ++++ b/Configure +@@ -278,7 +278,7 @@ my %table=( + # + "solaris-sparcv8-cc-sunw","cc:-xtarget=v8 -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # +-"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + + #### IRIX 5.x configs +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Mar 12 12:31:23 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 12 Mar 2013 11:31:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20437] csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Message-ID: Revision: 20437 http://gar.svn.sourceforge.net/gar/?rev=20437&view=rev Author: chninkel Date: 2013-03-12 11:31:23 +0000 (Tue, 12 Mar 2013) Log Message: ----------- openssl1/trunk: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-03-12 11:27:57 UTC (rev 20436) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-03-12 11:31:23 UTC (rev 20437) @@ -1,3 +1,10 @@ +openssl (1.0.1e,rev=2013.03.12) unstable + + * New upstream release. + * Updated t4 engine patch for Solaris 11 + + -- Yann Rouillard Tue, 12 Mar 2013 12:30:26 +0100 + openssl (1.0.1d,rev=2013.02.07) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Mar 12 13:05:38 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Mar 2013 12:05:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[20438] csw/mgar/pkg/ocaml/trunk Message-ID: Revision: 20438 http://gar.svn.sourceforge.net/gar/?rev=20438&view=rev Author: cgrzemba Date: 2013-03-12 12:05:37 +0000 (Tue, 12 Mar 2013) Log Message: ----------- ocaml/trunk: bump version 3.12.1 Modified Paths: -------------- csw/mgar/pkg/ocaml/trunk/Makefile csw/mgar/pkg/ocaml/trunk/checksums csw/mgar/pkg/ocaml/trunk/files/0-patch csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch csw/mgar/pkg/ocaml/trunk/files/14-patch csw/mgar/pkg/ocaml/trunk/files/17-patch csw/mgar/pkg/ocaml/trunk/files/19-patch csw/mgar/pkg/ocaml/trunk/files/2-patch csw/mgar/pkg/ocaml/trunk/files/3-patch csw/mgar/pkg/ocaml/trunk/files/8-patch csw/mgar/pkg/ocaml/trunk/files/9-patch Modified: csw/mgar/pkg/ocaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/ocaml/trunk/Makefile 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/Makefile 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,5 +1,5 @@ NAME = ocaml -VERSION = 3.11.2 +VERSION = 3.12.1 GARTYPE = v2 DESCRIPTION = Objective Caml programming language @@ -18,7 +18,7 @@ PATCHFILES += 0-patch PATCHFILES += 10-patch PATCHFILES += 12-patch -PATCHFILES += 13-patch +# PATCHFILES += 13-patch PATCHFILES += 14-patch PATCHFILES += 15-patch PATCHFILES += 16-patch Modified: csw/mgar/pkg/ocaml/trunk/checksums =================================================================== --- csw/mgar/pkg/ocaml/trunk/checksums 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/checksums 2013-03-12 12:05:37 UTC (rev 20438) @@ -1 +1 @@ -9d0611245122ffbc8263735cae1da7fb ocaml-3.11.2.tar.gz +814a047085f0f901ab7d8e3a4b7a9e65 ocaml-3.12.1.tar.gz Modified: csw/mgar/pkg/ocaml/trunk/files/0-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/0-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/0-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -11,10 +11,10 @@ + $(MKDIR) $(DESTDIR)$(MANDIR)/man1 ; \ + cp $(TARGET) $(DESTDIR)$(MANDIR)/man1/. ; \ for i in $(ALIASES); do \ -- rm -f $(MANDIR)/man1/$$i; \ -- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ -+ rm -f $(DESTDIR)$(MANDIR)/man1/$$i; \ -+ echo '.so man1/$(TARGET)' > $(DESTDIR)$(MANDIR)/man1/$$i; \ - done; \ +- rm -f $(MANDIR)/man1/$$i; \ +- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ ++ rm -f $(DESTDIR)$(MANDIR)/man1/$$i; \ ++ echo '.so man1/$(TARGET)' > $(DESTDIR)$(MANDIR)/man1/$$i; \ + done; \ fi Modified: csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,12 +1,12 @@ --- a/byterun/io.c +++ b/byterun/io.c -@@ -479,6 +479,9 @@ CAMLprim value caml_ml_close_channel(value vchannel) - struct channel * channel = Channel(vchannel); - if (channel->fd != -1){ - result = close(channel->fd); -+ /* Work around an NFS issue that causes close() to fails with EINVAL */ -+ if ((result < 0) && (errno == EINVAL)) -+ result = 0; - channel->fd = -1; - }else{ - result = 0; +@@ -518,7 +518,8 @@ CAMLprim value caml_ml_close_channel(value vchannel) + caml_leave_blocking_section(); + } + +- if (result == -1) caml_sys_error (NO_ARG); ++ /* Work around an NFS issue that causes close() to fails with EINVAL */ ++ if ((result == -1) && (errno != EINVAL)) caml_sys_error (NO_ARG); + return Val_unit; + } + Modified: csw/mgar/pkg/ocaml/trunk/files/14-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/14-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/14-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,15 +1,25 @@ --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile -@@ -62,9 +62,9 @@ install: +@@ -58,18 +58,18 @@ $(LIBNAME): Makefile $(TOPDIR)/config/Makefile + @echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@ + + install-script: $(LIBNAME) +- cp $(LIBNAME) $(BINDIR) +- chmod 755 $(BINDIR)/$(LIBNAME) ++ cp $(LIBNAME) $(DESTDIR)$(BINDIR) ++ chmod 755 $(DESTDIR)$(BINDIR)/$(LIBNAME) + + install-batch: +- cp labltk.bat $(BINDIR) ++ cp labltk.bat $(DESTDIR)$(BINDIR) + + install: + if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR) chmod 644 $(INSTALLDIR)/$(LIBNAME).cma chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE) - @if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi -- cp $(LIBNAME) $(BINDIR) -- chmod 755 $(BINDIR)/$(LIBNAME) + @if test -d $(DESTDIR)$(BINDIR); then : ; else mkdir $(DESTDIR)$(BINDIR); fi -+ cp $(LIBNAME) $(DESTDIR)$(BINDIR) -+ chmod 755 $(DESTDIR)$(BINDIR)/$(LIBNAME) - - installopt: - @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi + @case x$(TOOLCHAIN) in \ + xmingw|xmsvc) $(MAKE) install-batch ;; \ + *) $(MAKE) install-script ;; \ Modified: csw/mgar/pkg/ocaml/trunk/files/17-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/17-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/17-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,6 +1,6 @@ --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile -@@ -66,12 +66,12 @@ extract_crc: dynlink.cma extract_crc.cmo +@@ -66,13 +66,13 @@ extract_crc: dynlink.cma extract_crc.cmo $(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo install: @@ -10,10 +10,11 @@ + cp extract_crc $(DESTDIR)$(LIBDIR)/extract_crc$(EXE) installopt: -- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) -- cd $(LIBDIR); $(RANLIB) dynlink.$(A) -+ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(DESTDIR)$(LIBDIR) -+ cd $(DESTDIR)$(LIBDIR); $(RANLIB) dynlink.$(A) + if $(NATDYNLINK); then \ +- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \ +- cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \ ++ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(DESTDIR)$(LIBDIR) && \ ++ cd $(DESTDIR)$(LIBDIR) && $(RANLIB) dynlink.$(A); \ + fi partialclean: - rm -f extract_crc *.cm[ioax] *.cmxa Modified: csw/mgar/pkg/ocaml/trunk/files/19-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/19-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/19-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,7 +1,7 @@ --- a/otherlibs/systhreads/Makefile +++ b/otherlibs/systhreads/Makefile -@@ -76,19 +76,19 @@ clean: partialclean - rm -f $(GENFILES) +@@ -70,20 +70,20 @@ clean: partialclean + rm -f *.o *.a *.so install: - if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi @@ -11,6 +11,7 @@ - cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads - rm -f $(LIBDIR)/threads/stdlib.cma - cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) +- cp threads.h $(LIBDIR)/caml/threads.h + if test -f dllthreads.so; then cp dllthreads.so $(DESTDIR)$(STUBLIBDIR)/dllthreads.so; fi + cp libthreads.a $(DESTDIR)$(LIBDIR)/libthreads.a + cd $(DESTDIR)$(LIBDIR); $(RANLIB) libthreads.a @@ -18,6 +19,7 @@ + cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(DESTDIR)$(LIBDIR)/threads + rm -f $(DESTDIR)$(LIBDIR)/threads/stdlib.cma + cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(DESTDIR)$(LIBDIR) ++ cp threads.h $(DESTDIR)$(LIBDIR)/caml/threads.h installopt: - cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a Modified: csw/mgar/pkg/ocaml/trunk/files/2-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/2-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/2-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,10 +1,11 @@ --- a/tools/Makefile.shared +++ b/tools/Makefile.shared -@@ -51,9 +51,9 @@ clean:: +@@ -52,9 +52,10 @@ clean:: rm -f ocamldep.opt install:: - cp ocamldep $(BINDIR)/ocamldep$(EXE) ++ ginstall -m 755 -d $(DESTDIR)$(BINDIR) + cp ocamldep $(DESTDIR)$(BINDIR)/ocamldep$(EXE) if test -f ocamldep.opt; \ - then cp ocamldep.opt $(BINDIR)/ocamldep.opt$(EXE); else :; fi @@ -12,68 +13,46 @@ # The profiler -@@ -69,15 +69,15 @@ ocamlcp: ocamlcp.cmo - $(CAMLC) $(LINKFLAGS) -o ocamlcp main_args.cmo ocamlcp.cmo +@@ -70,9 +71,10 @@ ocamlcp: ocamlcp.cmo + $(CAMLC) $(LINKFLAGS) -o ocamlcp warnings.cmo main_args.cmo ocamlcp.cmo install:: - cp ocamlprof $(BINDIR)/ocamlprof$(EXE) - cp ocamlcp $(BINDIR)/ocamlcp$(EXE) - cp profiling.cmi profiling.cmo $(LIBDIR) -+ cp ocamlprof $(DESTDIR)$(BINDIR)/ocamlprof$(EXE) -+ cp ocamlcp $(DESTDIR)$(BINDIR)/ocamlcp$(EXE) -+ cp profiling.cmi profiling.cmo $(DESTDIR)$(LIBDIR) ++ ginstall -m 755 -d $(DESTDIR)$(LIBDIR) ++ cp ocamlprof $(DESTDIR)$(BINDIR)/ocamlprof$(EXE) ++ cp ocamlcp $(DESTDIR)$(BINDIR)/ocamlcp$(EXE) ++ cp profiling.cmi profiling.cmo $(DESTDIR)$(LIBDIR) clean:: rm -f ocamlprof ocamlcp - - install:: -- cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE) -+ cp ocamlmktop $(DESTDIR)$(BINDIR)/ocamlmktop$(EXE) - - clean:: - rm -f ocamlmktop -@@ -97,7 +97,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh +@@ -93,7 +95,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh cp ../myocamlbuild_config.ml . install:: - cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE) -+ cp ocamlmklib $(DESTDIR)$(BINDIR)/ocamlmklib$(EXE) ++ cp ocamlmklib $(DESTDIR)$(BINDIR)/ocamlmklib$(EXE) clean:: rm -f ocamlmklib -@@ -121,7 +121,7 @@ clean:: +@@ -117,7 +119,7 @@ clean:: # To make custom toplevels (see Makefile/Makefile.nt) install:: -- cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE) -+ cp ocamlmktop $(DESTDIR)$(BINDIR)/ocamlmktop$(EXE) +- cp ocamlmktop $(BINDIR)/ # no $(EXE) here, ocamlmktop is a script ++ cp ocamlmktop $(DESTDIR)$(BINDIR)/ # no $(EXE) here, ocamlmktop is a script clean:: rm -f ocamlmktop -@@ -139,7 +139,7 @@ lexer299.ml: lexer299.mll - $(CAMLLEX) lexer299.mll +@@ -234,8 +236,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO) + $(CAMLC) -o objinfo $(OBJINFO) - #install:: --# cp ocaml299to3 $(BINDIR)/ocaml299to3$(EXE) -+# cp ocaml299to3 $(DESTDIR)$(BINDIR)/ocaml299to3$(EXE) - - clean:: - rm -f ocaml299to3 lexer299.ml -@@ -155,7 +155,7 @@ lexer301.ml: lexer301.mll - $(CAMLLEX) lexer301.mll - install:: -- cp scrapelabels $(LIBDIR) -+ cp scrapelabels $(DESTDIR)$(LIBDIR) +- cp objinfo $(BINDIR)/ocamlobjinfo$(EXE) +- cp objinfo_helper$(EXE) $(LIBDIR)/objinfo_helper$(EXE) ++ cp objinfo $(DESTDIR)$(BINDIR)/ocamlobjinfo$(EXE) ++ cp objinfo_helper$(EXE) $(DESTDIR)$(LIBDIR)/objinfo_helper$(EXE) clean:: - rm -f scrapelabels lexer301.ml -@@ -171,7 +171,7 @@ addlabels: addlabels.ml - $(ADDLABELS_IMPORTS) addlabels.ml - - install:: -- cp addlabels $(LIBDIR) -+ cp addlabels $(DESTDIR)$(LIBDIR) - - clean:: - rm -f addlabels + rm -f objinfo objinfo_helper$(EXE) Modified: csw/mgar/pkg/ocaml/trunk/files/3-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/3-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/3-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -13,12 +13,11 @@ - rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa - rm -f $(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(LIBDIR)/stdlib.p.a - rm -f $(LIBDIR)/std_exit.p.cmx; \ -- ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx -- rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o + rm -f $(DESTDIR)$(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(DESTDIR)$(LIBDIR)/stdlib.p.cmxa + rm -f $(DESTDIR)$(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(DESTDIR)$(LIBDIR)/stdlib.p.a + rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.cmx; \ -+ ln -s std_exit.cmx $(DESTDIR)$(LIBDIR)/std_exit.p.cmx + ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx +- rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o + rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(DESTDIR)$(LIBDIR)/std_exit.p.o installopt-prof: Modified: csw/mgar/pkg/ocaml/trunk/files/8-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/8-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/8-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,6 +1,6 @@ --- a/byterun/Makefile.common +++ b/byterun/Makefile.common -@@ -45,14 +45,14 @@ ld.conf: ../config/Makefile +@@ -45,14 +45,16 @@ ld.conf: ../config/Makefile echo "$(LIBDIR)" >> ld.conf install:: @@ -8,6 +8,8 @@ - cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A) - cd $(LIBDIR); $(RANLIB) libcamlrun.$(A) - if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi ++ ginstall -m 755 -d $(DESTDIR)$(BINDIR) ++ ginstall -m 755 -d $(DESTDIR)$(LIBDIR) + cp ocamlrun$(EXE) $(DESTDIR)$(BINDIR)/ocamlrun$(EXE) + cp libcamlrun.$(A) $(DESTDIR)$(LIBDIR)/libcamlrun.$(A) + cd $(DESTDIR)$(LIBDIR); $(RANLIB) libcamlrun.$(A) Modified: csw/mgar/pkg/ocaml/trunk/files/9-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/9-patch 2013-03-12 11:31:23 UTC (rev 20437) +++ csw/mgar/pkg/ocaml/trunk/files/9-patch 2013-03-12 12:05:37 UTC (rev 20438) @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -268,53 +268,54 @@ opt.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \ +@@ -273,26 +273,26 @@ base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \ # Installation install: @@ -10,18 +10,17 @@ - if test -d $(MANDIR)/man$(MANEXT); then : ; \ - else $(MKDIR) $(MANDIR)/man$(MANEXT); fi - cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \ -+ if test -d $(DESTDIR)$(BINDIR); then : ; else $(MKDIR) $(DESTDIR)$(BINDIR); fi -+ if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(LIBDIR); fi ++ if test -d $(DESTDIR)$(BINDIR); then : ; else $(MKDIR) $(DESDIR)$(BINDIR); fi ++ if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESDIR)$(LIBDIR); fi + if test -d $(DESTDIR)$(STUBLIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(STUBLIBDIR); fi + if test -d $(DESTDIR)$(MANDIR)/man$(MANEXT); then : ; \ + else $(MKDIR) $(DESTDIR)$(MANDIR)/man$(MANEXT); fi + cd $(DESTDIR)$(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \ - dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \ - dlltkanim.so -- cd byterun; $(MAKE) install + dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \ + dlltkanim.so + cd byterun; $(MAKE) install - cp ocamlc $(BINDIR)/ocamlc$(EXE) - cp ocaml $(BINDIR)/ocaml$(EXE) -+ cd byterun; $(MAKE) install DESTDIR=$(DESTDIR) + cp ocamlc $(DESTDIR)$(BINDIR)/ocamlc$(EXE) + cp ocaml $(DESTDIR)$(BINDIR)/ocaml$(EXE) cd stdlib; $(MAKE) install @@ -41,21 +40,16 @@ - $(LIBDIR) + $(DESTDIR)$(LIBDIR) cd tools; $(MAKE) install - -$(MAKE) -C man install + -cd man; $(MAKE) install for i in $(OTHERLIBRARIES); do \ - (cd otherlibs/$$i; $(MAKE) install) || exit $$?; \ - done - cd ocamldoc; $(MAKE) install -- if test -f ocamlopt; then $(MAKE) installopt; else :; fi -- if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \ -+ if test -f ocamlopt; then $(MAKE) installopt ; else :; fi -+ if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install ); \ +@@ -302,24 +302,24 @@ install: + if test -f ocamlopt; then $(MAKE) installopt; else :; fi + if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \ else :; fi - cp config/Makefile $(LIBDIR)/Makefile.config - BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \ + cp config/Makefile $(DESTDIR)$(LIBDIR)/Makefile.config -+ -+ BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) PREFIX=$(DESTDIR)$(PREFIX) MANDIR=$(DESTDIR)$(MANDIR) DESTDIR=$(DESTDIR)\ ++ BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) MANDIR=$(DESTDIR)$(MANDIR) \ ./build/partial-install.sh # Installation of the native-code compiler @@ -66,8 +60,7 @@ cd stdlib; $(MAKE) installopt cd ocamldoc; $(MAKE) installopt for i in $(OTHERLIBRARIES); \ -- do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done -+ do (cd otherlibs/$$i; $(MAKE) installopt ) || exit $$?; done + do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done if test -f ocamlc.opt; \ - then cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi + then cp ocamlc.opt $(DESTDIR)$(BINDIR)/ocamlc.opt$(EXE); else :; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Mar 12 15:12:29 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Mar 2013 14:12:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20439] csw/mgar/pkg/ocaml/trunk Message-ID: Revision: 20439 http://gar.svn.sourceforge.net/gar/?rev=20439&view=rev Author: cgrzemba Date: 2013-03-12 14:12:29 +0000 (Tue, 12 Mar 2013) Log Message: ----------- ocaml/trunk: fix install patch Modified Paths: -------------- csw/mgar/pkg/ocaml/trunk/Makefile csw/mgar/pkg/ocaml/trunk/files/3-patch csw/mgar/pkg/ocaml/trunk/files/8-patch Modified: csw/mgar/pkg/ocaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/ocaml/trunk/Makefile 2013-03-12 12:05:37 UTC (rev 20438) +++ csw/mgar/pkg/ocaml/trunk/Makefile 2013-03-12 14:12:29 UTC (rev 20439) @@ -58,15 +58,17 @@ CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libgraphics.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libmldbm.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libnums.a -CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libstr.a +# CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libstr.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libthreads.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libthreadsnat.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libunix.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/vmthreads/libvmthreads.a CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/labltk/liblabltk.a -CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/labltk/libtkanim.a +# CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/labltk/libtkanim.a +CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libcamlstr.a + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib Modified: csw/mgar/pkg/ocaml/trunk/files/3-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/3-patch 2013-03-12 12:05:37 UTC (rev 20438) +++ csw/mgar/pkg/ocaml/trunk/files/3-patch 2013-03-12 14:12:29 UTC (rev 20439) @@ -28,3 +28,14 @@ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx) $(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx) +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -32,7 +32,7 @@ installopt-noprof: + rm -f $(DESTDIR)$(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(DESTDIR)$(LIBDIR)/stdlib.p.cmxa + rm -f $(DESTDIR)$(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(DESTDIR)$(LIBDIR)/stdlib.p.a + rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.cmx; \ +- ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx ++ ln -s std_exit.cmx $(DESTDIR)$(LIBDIR)/std_exit.p.cmx + rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(DESTDIR)$(LIBDIR)/std_exit.p.o + + installopt-prof: Modified: csw/mgar/pkg/ocaml/trunk/files/8-patch =================================================================== --- csw/mgar/pkg/ocaml/trunk/files/8-patch 2013-03-12 12:05:37 UTC (rev 20438) +++ csw/mgar/pkg/ocaml/trunk/files/8-patch 2013-03-12 14:12:29 UTC (rev 20439) @@ -8,8 +8,8 @@ - cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A) - cd $(LIBDIR); $(RANLIB) libcamlrun.$(A) - if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi -+ ginstall -m 755 -d $(DESTDIR)$(BINDIR) -+ ginstall -m 755 -d $(DESTDIR)$(LIBDIR) ++ ginstall -m 755 -d $(DESTDIR)$(BINDIR) ++ ginstall -m 755 -d $(DESTDIR)$(LIBDIR) + cp ocamlrun$(EXE) $(DESTDIR)$(BINDIR)/ocamlrun$(EXE) + cp libcamlrun.$(A) $(DESTDIR)$(LIBDIR)/libcamlrun.$(A) + cd $(DESTDIR)$(LIBDIR); $(RANLIB) libcamlrun.$(A) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Mar 12 15:33:29 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Mar 2013 14:33:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20440] csw/mgar/pkg/mdk/trunk/Makefile Message-ID: Revision: 20440 http://gar.svn.sourceforge.net/gar/?rev=20440&view=rev Author: pfelecan Date: 2013-03-12 14:33:28 +0000 (Tue, 12 Mar 2013) Log Message: ----------- mdk/trunk: - supply the samples in the documentation directory - add dependency on gamin to avoid a core dump Modified Paths: -------------- csw/mgar/pkg/mdk/trunk/Makefile Modified: csw/mgar/pkg/mdk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mdk/trunk/Makefile 2013-03-12 14:12:29 UTC (rev 20439) +++ csw/mgar/pkg/mdk/trunk/Makefile 2013-03-12 14:33:28 UTC (rev 20440) @@ -30,6 +30,7 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-no-glib-deprecation.patch PATCHFILES += 0002-remove-gld-flag.patch +PATCHFILES += 0003-add-samples-installation.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -43,7 +44,7 @@ BUILD_DEP_PKGS = CSWguile-dev BUILD_DEP_PKGS = CSWlibglade2 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU EXTRA_INC += $(includedir)/glib-2.0 EXTRA_INC += $(libdir)/glib-2.0/include @@ -69,6 +70,8 @@ CHECKPKG_OVERRIDES_CSWmdk += missing-dependency|CSWemacscommon RUNTIME_DEP_PKGS_CSWmdk += CSWscm CHECKPKG_OVERRIDES_CSWmdk += surplus-dependency|CSWscm +RUNTIME_DEP_PKGS_CSWmdk += CSWgamin +CHECKPKG_OVERRIDES_CSWmdk += surplus-dependency|CSWgamin CHECKPKG_OVERRIDES_CSWmdk += file-with-bad-content|/usr/local|root/opt/csw/share/info/mdk.info include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Mar 12 15:33:52 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Mar 2013 14:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20441] csw/mgar/pkg/mdk/trunk/files/ 0003-add-samples-installation.patch Message-ID: Revision: 20441 http://gar.svn.sourceforge.net/gar/?rev=20441&view=rev Author: pfelecan Date: 2013-03-12 14:33:52 +0000 (Tue, 12 Mar 2013) Log Message: ----------- mdk/trunk: - supply the samples in the documentation directory - add dependency on gamin to avoid a core dump Added Paths: ----------- csw/mgar/pkg/mdk/trunk/files/0003-add-samples-installation.patch Added: csw/mgar/pkg/mdk/trunk/files/0003-add-samples-installation.patch =================================================================== --- csw/mgar/pkg/mdk/trunk/files/0003-add-samples-installation.patch (rev 0) +++ csw/mgar/pkg/mdk/trunk/files/0003-add-samples-installation.patch 2013-03-12 14:33:52 UTC (rev 20441) @@ -0,0 +1,24 @@ +From 802e9ea78f865a4c0f9c3c041fa14da2d3839bc1 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 12 Mar 2013 15:30:21 +0100 +Subject: [PATCH] add samples installation + +--- + samples/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/samples/Makefile.am b/samples/Makefile.am +index 357b5f3..d30c933 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -15,3 +15,7 @@ SUBDIRS = tests + EXTRA_DIST = primes.result hello.mixal primes.mixal echo.mixal \ + permutations.mixal permutations.cardrd isains.mixal \ + elevator.mixal mystery.mixal ++ ++samplesdir = $(docdir)/samples ++samples_DATA = \ ++ $(EXTRA_DIST) +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 12 15:47:30 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Mar 2013 14:47:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[20442] csw/mgar/pkg/hylafax/trunk/Makefile Message-ID: Revision: 20442 http://gar.svn.sourceforge.net/gar/?rev=20442&view=rev Author: dmichelsen Date: 2013-03-12 14:47:29 +0000 (Tue, 12 Mar 2013) Log Message: ----------- hylafax/trunk: Update dependencies, use CSW ghostscript Modified Paths: -------------- csw/mgar/pkg/hylafax/trunk/Makefile Modified: csw/mgar/pkg/hylafax/trunk/Makefile =================================================================== --- csw/mgar/pkg/hylafax/trunk/Makefile 2013-03-12 14:33:52 UTC (rev 20441) +++ csw/mgar/pkg/hylafax/trunk/Makefile 2013-03-12 14:47:29 UTC (rev 20442) @@ -28,13 +28,15 @@ BUILD_DEP_PKGS += CSWliblcms2-dev BUILD_DEP_PKGS += CSWopenldap-dev -PACKAGES += CSWhylafax-plus -SPKG_DESC_CSWhylafax-plus = An enterprise-class system for sending and receiving facsimiles and alpha-numeric pages +PACKAGES += CSWhylafax +SPKG_DESC_CSWhylafax = An enterprise-class system for sending and receiving facsimiles and alpha-numeric pages # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWhylafax-plus += CSWlibjbig2 -RUNTIME_DEP_PKGS_CSWhylafax-plus += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWhylafax-plus += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWhylafax-plus += CSWlibz1 +RUNTIME_DEP_PKGS_CSWhylafax += CSWlibjbig2 +RUNTIME_DEP_PKGS_CSWhylafax += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWhylafax += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWhylafax += CSWlibz1 +RUNTIME_DEP_PKGS_CSWhylafax += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWhylafax += CSWlibtiff3 INITSMF += /etc/opt/csw/init.d/hylafax @@ -64,7 +66,7 @@ #CONFIGURE_ENV = PATH_GSRIP=$(bindir)/gs PS=gs DIR_MAN=$(mandir) #BUILD_ENV = PATH_GSRIP=$(bindir)/gs PS=gs DIR_MAN=$(mandir) -#EXTRA_CONFIGURE_EXPORTS += PATH_GSRIP +EXTRA_CONFIGURE_EXPORTS += PATH_GSRIP CONFIGURE_ENV_PATH_GSRIP = $(bindir)/gs #EXTRA_CONFIGURE_EXPORTS += PS CONFIGURE_ENV_PS = gs @@ -75,6 +77,7 @@ BUILD_ENV_PATH_GSRIP = $(bindir)/gs #EXTRA_BUILD_EXPORTS += PS BUILD_ENV_PS = gs + #EXTRA_BUILD_EXPORTS += DIR_MAN BUILD_ENV_DIR_MAN = $(mandir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 12 17:49:09 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Mar 2013 16:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20443] csw/mgar/pkg/gawk/trunk Message-ID: Revision: 20443 http://gar.svn.sourceforge.net/gar/?rev=20443&view=rev Author: dmichelsen Date: 2013-03-12 16:49:09 +0000 (Tue, 12 Mar 2013) Log Message: ----------- gawk/trunk: Update to 4.0.2, enable 64 bit Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile csw/mgar/pkg/gawk/trunk/checksums Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2013-03-12 14:47:29 UTC (rev 20442) +++ csw/mgar/pkg/gawk/trunk/Makefile 2013-03-12 16:49:09 UTC (rev 20443) @@ -1,5 +1,5 @@ NAME = gawk -VERSION = 4.0.0 +VERSION = 4.0.2 GARTYPE = v2 DESCRIPTION = GNU awk @@ -21,6 +21,9 @@ RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 +BUILD64 = 1 +ISAEXEC = 1 + # Otherwise libsigsegv is not detected properly on Solaris 9 i386 as reported in # http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00008.html # Additionally, there is probably a bug in /usr/include/ia32/sys/reg.h which requires @@ -38,7 +41,7 @@ include gar/category.mk -post-install-modulated: +post-install: ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/g*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) @$(MAKECOOKIE) Modified: csw/mgar/pkg/gawk/trunk/checksums =================================================================== --- csw/mgar/pkg/gawk/trunk/checksums 2013-03-12 14:47:29 UTC (rev 20442) +++ csw/mgar/pkg/gawk/trunk/checksums 2013-03-12 16:49:09 UTC (rev 20443) @@ -1 +1 @@ -a42be7536a62d0bcb99ca92467d61660 gawk-4.0.0.tar.xz +8a9b2f1170ac9dcd3eb13716b5ec4021 gawk-4.0.2.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 12 18:07:27 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Mar 2013 17:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20444] csw/mgar/pkg/gawk/trunk/Makefile Message-ID: Revision: 20444 http://gar.svn.sourceforge.net/gar/?rev=20444&view=rev Author: dmichelsen Date: 2013-03-12 17:07:27 +0000 (Tue, 12 Mar 2013) Log Message: ----------- gawk/trunk: Use override Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2013-03-12 16:49:09 UTC (rev 20443) +++ csw/mgar/pkg/gawk/trunk/Makefile 2013-03-12 17:07:27 UTC (rev 20444) @@ -17,10 +17,16 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz +PACKAGES += CSWgawk +SPKG_DESC_CSWgawk = GNU awk +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 +# This is just an example +CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1 + BUILD64 = 1 ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 13 08:10:48 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 13 Mar 2013 07:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[20445] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 20445 http://gar.svn.sourceforge.net/gar/?rev=20445&view=rev Author: chninkel Date: 2013-03-13 07:10:43 +0000 (Wed, 13 Mar 2013) Log Message: ----------- lftp/trunk: updated to 4.4.4 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-03-12 17:07:27 UTC (rev 20444) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-03-13 07:10:43 UTC (rev 20445) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = lftp -VERSION = 4.3.8 +VERSION = 4.4.4 GARTYPE = v2 DESCRIPTION = A sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-03-12 17:07:27 UTC (rev 20444) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-03-13 07:10:43 UTC (rev 20445) @@ -1,3 +1,9 @@ +lftp (4.4.4,REV=2013.03.13) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 13 Mar 2013 08:08:40 +0100 + lftp (4.3.8,REV=2012.08.24) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 13 10:39:31 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Mar 2013 09:39:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[20446] csw/mgar/pkg/apcupsd/trunk Message-ID: Revision: 20446 http://gar.svn.sourceforge.net/gar/?rev=20446&view=rev Author: dmichelsen Date: 2013-03-13 09:39:30 +0000 (Wed, 13 Mar 2013) Log Message: ----------- apcupsd/trunk: Update to 3.14.10, enable usb,gui,cgi, complete rework Modified Paths: -------------- csw/mgar/pkg/apcupsd/trunk/Makefile csw/mgar/pkg/apcupsd/trunk/checksums Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2013-03-13 07:10:43 UTC (rev 20445) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2013-03-13 09:39:30 UTC (rev 20446) @@ -1,9 +1,7 @@ NAME = apcupsd -VERSION = 3.14.8 +VERSION = 3.14.10 GARTYPE = v2 -GARCOMPILER = GCC3 - DESCRIPTION = A daemon for controlling APC UPS define BLURB "apcupsd" can be used for controlling all APC UPS models @@ -21,11 +19,67 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWtcpwrap +BUILD_DEP_PKGS += CSWlibwrap-dev -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +PACKAGES += CSWapcupsd +SPKG_DESC_CSWapcupsd = A daemon for controlling APC UPS +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWapcupsd += CSWlibwrap1 +# We need this for libusb and I definitely want this from Sun +CHECKPKG_OVERRIDES_CSWapcupsd += bad-rpath-entry|/usr/sfw/lib|opt/csw/sbin/apcupsd +CHECKPKG_OVERRIDES_CSWapcupsd += bad-rpath-entry|/usr/sfw/lib|opt/csw/sbin/smtp +CHECKPKG_OVERRIDES_CSWapcupsd += bad-rpath-entry|/usr/sfw/lib|opt/csw/sbin/apctest +CHECKPKG_OVERRIDES_CSWapcupsd += bad-rpath-entry|/usr/sfw/lib|opt/csw/sbin/apcaccess + +PACKAGES += CSWapcups-gui +SPKG_DESC_CSWapcups-gui = GUI for the apcupsd +PKGFILES_CSWapcups-gui += $(bindir)/gapcmon +PKGFILES_CSWapcups-gui += $(sharedstatedir)/applications/.* +PKGFILES_CSWapcups-gui += $(sharedstatedir)/pixmaps/.* +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWpango +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgtk-x11-2-0-0 + +# We need this for libusb and I definitely want this from Sun +CHECKPKG_OVERRIDES_CSWapcups-gui += bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/gapcmon + +PACKAGES += CSWapcups-cgi +SPKG_DESC_CSWapcups-cgi = CGI scripts for apcupsd +PKGFILES_CSWapcups-cgi += $(sharedstatedir)/www/.* +RUNTIME_DEP_PKGS_CSWapcups-cgi += CSWlibgd2 + +# We need this for libusb and I definitely want this from Sun +CHECKPKG_OVERRIDES_CSWapcups-cgi += bad-rpath-entry|/usr/sfw/lib|opt/csw/share/www/apcupsd/cgi/upsstats.cgi +CHECKPKG_OVERRIDES_CSWapcups-cgi += bad-rpath-entry|/usr/sfw/lib|opt/csw/share/www/apcupsd/cgi/upsimage.cgi +CHECKPKG_OVERRIDES_CSWapcups-cgi += bad-rpath-entry|/usr/sfw/lib|opt/csw/share/www/apcupsd/cgi/upsfstats.cgi +CHECKPKG_OVERRIDES_CSWapcups-cgi += bad-rpath-entry|/usr/sfw/lib|opt/csw/share/www/apcupsd/cgi/multimon.cgi + +# Yes, this is correct placement +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/upsimage.cgi|arch_id=3|arch_name=i386 +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/upsstats.cgi|arch_id=3|arch_name=i386 +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/multimon.cgi|arch_id=3|arch_name=i386 +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/upsfstats.cgi|arch_id=3|arch_name=i386 +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/upsimage.cgi|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/upsstats.cgi|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/upsfstats.cgi|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWapcups-cgi += binary-architecture-does-not-match-placement|file=opt/csw/share/www/apcupsd/cgi/multimon.cgi|arch_id=18|arch_name=sparcv8+ + +REINPLACEMENTS += conf +REINPLACE_MATCH_conf = /usr/local/etc/apcupsd +REINPLACE_WITH_conf = $(sysconfdir)/apcupsd +REINPLACE_FILES_conf += doc/apcupsd.conf.5 + +GARCOMPILER = GCC4 + +# This is for libusb.so.1 +EXTRA_RUNPATH_LINKER_FLAGS += -R/usr/sfw/lib + NODIRPATHS = --sysconfdir CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/apcupsd @@ -33,11 +87,17 @@ CONFIGURE_ARGS += --with-libwrap=$(prefix) CONFIGURE_ARGS += --with-nisip=127.0.0.1 CONFIGURE_ARGS += --disable-install-distdir +CONFIGURE_ARGS += --enable-cgi +CONFIGURE_ARGS += --enable-usb +CONFIGURE_ARGS += --with-cgi-bin=$(sharedstatedir)/www/apcupsd/cgi +CONFIGURE_ARGS += --enable-gapcmon -TEST_SCRIPTS= +TEST_SCRIPTS = -INITSMF = $(sysconfdir)/init.d/cswapcupsd -PRESERVECONF = $(sysconfdir)/apcupsd.conf +INITSMF += $(sysconfdir)/init.d/cswapcupsd +PRESERVECONF += $(sysconfdir)/apcupsd.conf +PRESERVECONF += $(sysconfdir)/multimon.conf +PRESERVECONF += $(sysconfdir)/hosts.conf #DISTRETC = init.d rc0.d rc1.d rc2.d APCUPSDDOC = COPYING ChangeLog DISCLAIMER Developers ReleaseNotes VERIFYING @@ -48,7 +108,7 @@ ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(docdir)/apcupsd ginstall -d $(DESTDIR)$(localstatedir)/apcupsd - cd $(DESTDIR)/etc ; rm -rf $(DISTRETC) + #cd $(DESTDIR)/etc ; rm -rf $(DISTRETC) cp $(WORKDIR)/cswapcupsd $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); cp -r $(APCUPSDDOC) $(DESTDIR)$(docdir)/apcupsd $(MAKECOOKIE) Modified: csw/mgar/pkg/apcupsd/trunk/checksums =================================================================== --- csw/mgar/pkg/apcupsd/trunk/checksums 2013-03-13 07:10:43 UTC (rev 20445) +++ csw/mgar/pkg/apcupsd/trunk/checksums 2013-03-13 09:39:30 UTC (rev 20446) @@ -1 +1 @@ -cd17f0a903dc2220e55ed54e242359d2 apcupsd-3.14.8.tar.gz +5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 13 10:55:27 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Mar 2013 09:55:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20447] csw/mgar/pkg/apcupsd/trunk/Makefile Message-ID: Revision: 20447 http://gar.svn.sourceforge.net/gar/?rev=20447&view=rev Author: dmichelsen Date: 2013-03-13 09:55:27 +0000 (Wed, 13 Mar 2013) Log Message: ----------- apcupsd/trunk: Relocate CSS to www area Modified Paths: -------------- csw/mgar/pkg/apcupsd/trunk/Makefile Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2013-03-13 09:39:30 UTC (rev 20446) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2013-03-13 09:55:27 UTC (rev 20447) @@ -90,10 +90,14 @@ CONFIGURE_ARGS += --enable-cgi CONFIGURE_ARGS += --enable-usb CONFIGURE_ARGS += --with-cgi-bin=$(sharedstatedir)/www/apcupsd/cgi +# This is obviously not present yet, relocate during merge until this is integrated +#CONFIGURE_ARGS += --with-css-dir=$(sharedstatedir)/www/apcupsd/html CONFIGURE_ARGS += --enable-gapcmon TEST_SCRIPTS = +EXTRA_PAX_ARGS += -s ',.*/apcupsd\.css$$,.$(sharedstatedir)/www/apcupsd/html/apcupsd.css,' + INITSMF += $(sysconfdir)/init.d/cswapcupsd PRESERVECONF += $(sysconfdir)/apcupsd.conf PRESERVECONF += $(sysconfdir)/multimon.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 13 10:59:51 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 13 Mar 2013 09:59:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20448] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 20448 http://gar.svn.sourceforge.net/gar/?rev=20448&view=rev Author: chninkel Date: 2013-03-13 09:59:50 +0000 (Wed, 13 Mar 2013) Log Message: ----------- lftp/trunk: switched to gcc as compiler Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-03-13 09:55:27 UTC (rev 20447) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-03-13 09:59:50 UTC (rev 20448) @@ -29,6 +29,9 @@ RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWlibreadline6 +# necessary when compiled with gcc +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibstdc++6 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -62,9 +65,13 @@ ##### Build and installation information ##### +GARCOMPILER = GNU + # We don't want Sun Studio RPATH entries # see http://wiki.opencsw.org/checkpkg-error-tags#bad-rpath-entry -EXTRA_LINKER_FLAGS = -norunpath +ifeq ($(GARCOMPILER),SUN) + EXTRA_LINKER_FLAGS = -norunpath +endif CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2013-03-13 09:55:27 UTC (rev 20447) +++ csw/mgar/pkg/lftp/trunk/checksums 2013-03-13 09:59:50 UTC (rev 20448) @@ -1 +0,0 @@ -6f72bd50386b86939c781432c233ebdd lftp-4.3.8.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-03-13 09:55:27 UTC (rev 20447) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-03-13 09:59:50 UTC (rev 20448) @@ -1,6 +1,9 @@ lftp (4.4.4,REV=2013.03.13) unstable * New upstream release. + * Switched to gcc as compiler + * Added CSWlibgcc-s1 and CSWlibstdc++6 dependencies + because of gcc -- Yann Rouillard Wed, 13 Mar 2013 08:08:40 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 13 11:23:39 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Mar 2013 10:23:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20449] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 20449 http://gar.svn.sourceforge.net/gar/?rev=20449&view=rev Author: bonivart Date: 2013-03-13 10:23:39 +0000 (Wed, 13 Mar 2013) Log Message: ----------- cswclassutils/trunk: patches from Yann Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2013-03-13 09:59:50 UTC (rev 20448) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2013-03-13 10:23:39 UTC (rev 20449) @@ -101,6 +101,10 @@ preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG + if [ ! -d "$preservedir" ] && \ + [ -d "$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" ]; then + preservedir="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" + fi confbasename=`basename $confdest` preservedconf=$preservedir/$confbasename Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2013-03-13 09:59:50 UTC (rev 20448) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2013-03-13 10:23:39 UTC (rev 20449) @@ -29,6 +29,10 @@ SVCDIR=/var/opt/csw/svc SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG" +if [ ! -d "$SMF_STATE_DIR" ] && \ + [ -d "$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" ]; then + SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" +fi SMF_STATE_FILE="$SMF_STATE_DIR/smf.state" # retrieve the previous state of a service identified by the given FRMI Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2013-03-13 09:59:50 UTC (rev 20448) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2013-03-13 10:23:39 UTC (rev 20449) @@ -48,6 +48,10 @@ esac preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG + if [ ! -d "$preservedir" ] && \ + [ -d "$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" ]; then + preservedir="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" + fi confbasename=`basename $confdest` preservedconf=$preservedir/$confbasename This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 13 16:51:21 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 13 Mar 2013 15:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20450] csw/mgar/pkg/hevea/branches/2.0.3/ Message-ID: Revision: 20450 http://gar.svn.sourceforge.net/gar/?rev=20450&view=rev Author: pfelecan Date: 2013-03-13 15:51:21 +0000 (Wed, 13 Mar 2013) Log Message: ----------- add branch 2.0.3 for upgrade to the latest upstream version when ocaml 3.12 is released Added Paths: ----------- csw/mgar/pkg/hevea/branches/2.0.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed Mar 13 18:30:21 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 13 Mar 2013 17:30:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20451] csw/mgar/pkg/puppet3/trunk Message-ID: Revision: 20451 http://gar.svn.sourceforge.net/gar/?rev=20451&view=rev Author: phipsy Date: 2013-03-13 17:30:20 +0000 (Wed, 13 Mar 2013) Log Message: ----------- puppet3: 3.1.1 Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile csw/mgar/pkg/puppet3/trunk/checksums Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-03-13 15:51:21 UTC (rev 20450) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-03-13 17:30:20 UTC (rev 20451) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.1.0 +VERSION = 3.1.1 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2013-03-13 15:51:21 UTC (rev 20450) +++ csw/mgar/pkg/puppet3/trunk/checksums 2013-03-13 17:30:20 UTC (rev 20451) @@ -1,2 +1,3 @@ 2117e3a1964ac54fcd36d926eed3db94 puppet-3.0.1.tar.gz 4cbdcc9dfcda677c820175375a500651 puppet-3.1.0.tar.gz +e942079612703a460a9fdb52e6bcae4a puppet-3.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 13 20:07:29 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 13 Mar 2013 19:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20452] csw/mgar/pkg/hevea/trunk Message-ID: Revision: 20452 http://gar.svn.sourceforge.net/gar/?rev=20452&view=rev Author: pfelecan Date: 2013-03-13 19:07:28 +0000 (Wed, 13 Mar 2013) Log Message: ----------- hevea/trunk: downgraded to previous version as the current one doesn't compile with the available ocaml compiler. Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/Makefile csw/mgar/pkg/hevea/trunk/checksums csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch Modified: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile 2013-03-13 17:30:20 UTC (rev 20451) +++ csw/mgar/pkg/hevea/trunk/Makefile 2013-03-13 19:07:28 UTC (rev 20452) @@ -1,8 +1,7 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# + NAME = hevea -VERSION = 2.03 +VERSION = 1.10 GARTYPE = v2 DESCRIPTION = A fast LaTeX to HTML translator Modified: csw/mgar/pkg/hevea/trunk/checksums =================================================================== --- csw/mgar/pkg/hevea/trunk/checksums 2013-03-13 17:30:20 UTC (rev 20451) +++ csw/mgar/pkg/hevea/trunk/checksums 2013-03-13 19:07:28 UTC (rev 20452) @@ -1 +1 @@ -1ff070baebc1e969fc89ef420bbe96f2 hevea-2.03.tar.gz +24a631570bee3cc4b8350e9db39be62b hevea-1.10.tar.gz Modified: csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch =================================================================== --- csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2013-03-13 17:30:20 UTC (rev 20451) +++ csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2013-03-13 19:07:28 UTC (rev 20452) @@ -1,17 +1,17 @@ -From 8795f71f0d7a9b6ab49f7b921c869920cf5277c3 Mon Sep 17 00:00:00 2001 +From f9882d5b5ac794019eba7d1f95098f19e7497c1e Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Thu, 21 Feb 2013 15:13:08 +0100 +Date: Wed, 13 Mar 2013 18:55:56 +0100 Subject: [PATCH] Fix installation paths --- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index e52e0f6..aa93904 100644 +index dd90bcb..5816684 100644 --- a/Makefile +++ b/Makefile -@@ -2,13 +2,14 @@ +@@ -2,7 +2,7 @@ # Compile using ocamlopt, to use ocamlc set TARGET=byte TARGET=opt # Install prefix @@ -20,14 +20,15 @@ # Library directory of hevea LIBDIR=$(PREFIX)/lib/hevea # Where to install programms - BINDIR=$(PREFIX)/bin +@@ -10,7 +10,7 @@ BINDIR=$(PREFIX)/bin + # Install prefix prefix + DESTDIR= #Where to install hevea.sty -LATEXLIBDIR=$(PREFIX)/lib/hevea +LATEXLIBDIR=$(PREFIX)/share/texmf-local/tex/latex/hevea -+ ##### Advanced configuration parameters SUF= DIR= -- -1.8.1 +1.8.1.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 13 22:33:11 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Mar 2013 21:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[20453] csw/mgar/pkg Message-ID: Revision: 20453 http://gar.svn.sourceforge.net/gar/?rev=20453&view=rev Author: bonivart Date: 2013-03-13 21:33:10 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Botan/trunk: first commit Added Paths: ----------- csw/mgar/pkg/Botan/ csw/mgar/pkg/Botan/Makefile csw/mgar/pkg/Botan/branches/ csw/mgar/pkg/Botan/tags/ csw/mgar/pkg/Botan/trunk/ csw/mgar/pkg/Botan/trunk/Makefile csw/mgar/pkg/Botan/trunk/checksums csw/mgar/pkg/Botan/trunk/files/ Added: csw/mgar/pkg/Botan/Makefile =================================================================== --- csw/mgar/pkg/Botan/Makefile (rev 0) +++ csw/mgar/pkg/Botan/Makefile 2013-03-13 21:33:10 UTC (rev 20453) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/Botan/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/Botan/trunk/Makefile =================================================================== --- csw/mgar/pkg/Botan/trunk/Makefile (rev 0) +++ csw/mgar/pkg/Botan/trunk/Makefile 2013-03-13 21:33:10 UTC (rev 20453) @@ -0,0 +1,15 @@ +NAME = Botan +VERSION = 1.10.5 +GARTYPE = v2 + +DESCRIPTION = Crypto library for C++ +define BLURB +endef + +MASTER_SITES = http://botan.randombit.net/files/ +DISTFILES = $(DISTNAME).tgz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/Botan/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/Botan/trunk/checksums =================================================================== --- csw/mgar/pkg/Botan/trunk/checksums (rev 0) +++ csw/mgar/pkg/Botan/trunk/checksums 2013-03-13 21:33:10 UTC (rev 20453) @@ -0,0 +1 @@ +8e9e17f652cfaf74340bc9560a32d2fa Botan-1.10.5.tgz 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 Mar 14 00:10:40 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Mar 2013 23:10:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20454] csw/mgar/pkg Message-ID: Revision: 20454 http://gar.svn.sourceforge.net/gar/?rev=20454&view=rev Author: bonivart Date: 2013-03-13 23:10:40 +0000 (Wed, 13 Mar 2013) Log Message: ----------- log4cplus/trunk: first commit Added Paths: ----------- csw/mgar/pkg/log4cplus/ csw/mgar/pkg/log4cplus/Makefile csw/mgar/pkg/log4cplus/branches/ csw/mgar/pkg/log4cplus/tags/ csw/mgar/pkg/log4cplus/trunk/ csw/mgar/pkg/log4cplus/trunk/Makefile csw/mgar/pkg/log4cplus/trunk/checksums csw/mgar/pkg/log4cplus/trunk/files/ Added: csw/mgar/pkg/log4cplus/Makefile =================================================================== --- csw/mgar/pkg/log4cplus/Makefile (rev 0) +++ csw/mgar/pkg/log4cplus/Makefile 2013-03-13 23:10:40 UTC (rev 20454) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/log4cplus/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/log4cplus/trunk/Makefile =================================================================== --- csw/mgar/pkg/log4cplus/trunk/Makefile (rev 0) +++ csw/mgar/pkg/log4cplus/trunk/Makefile 2013-03-13 23:10:40 UTC (rev 20454) @@ -0,0 +1,32 @@ +NAME = log4cplus +VERSION = 1.0.4.3 +GARTYPE = v2 + +DESCRIPTION = Logging Framework for C++ +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES += CSWliblog4cplus1-0-4 +CATALOGNAME_CSWliblog4cplus1-0-4 = liblog4cplus1_0_4 +SPKG_DESC_CSWliblog4cplus1-0-4 += $(DESCRIPTION), liblog4cplus-1.0.so.4 +PKGFILES_CSWliblog4cplus1-0-4 += $(call baseisadirs,$(libdir),liblog4cplus-1\.0\.so\.4\.0\.0) +PKGFILES_CSWliblog4cplus1-0-4 += $(call baseisadirs,$(libdir),liblog4cplus-1\.0\.so\.4(\.\d+)*) +RUNTIME_DEP_PKGS_CSWliblog4cplus1-0-4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWliblog4cplus1-0-4 += CSWlibstdc++6 + +PACKAGES += CSWlog4cplus-dev +CATALOGNAME_CSWlog4cplus-dev = log4cplus_dev +SPKG_DESC_CSWlog4cplus-dev += $(DESCRIPTION), development files +PKGFILES_CSWlog4cplus-dev += /opt/csw/lib/liblog4cplus.so +PKGFILES_CSWlog4cplus-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlog4cplus-dev += CSWliblog4cplus1-0-4 + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/log4cplus/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/log4cplus/trunk/checksums =================================================================== --- csw/mgar/pkg/log4cplus/trunk/checksums (rev 0) +++ csw/mgar/pkg/log4cplus/trunk/checksums 2013-03-13 23:10:40 UTC (rev 20454) @@ -0,0 +1 @@ +aecaea8c0ed7340356b62e9a33ca0e00 log4cplus-1.0.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Mar 14 16:45:28 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 14 Mar 2013 15:45:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[20455] csw/mgar/pkg/org-mode/trunk Message-ID: Revision: 20455 http://gar.svn.sourceforge.net/gar/?rev=20455&view=rev Author: pfelecan Date: 2013-03-14 15:45:27 +0000 (Thu, 14 Mar 2013) Log Message: ----------- org-mode/trunk: - depends now on TeXLive for building - version bump Modified Paths: -------------- csw/mgar/pkg/org-mode/trunk/Makefile csw/mgar/pkg/org-mode/trunk/checksums Added Paths: ----------- csw/mgar/pkg/org-mode/trunk/files/local.mk Removed Paths: ------------- csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch Modified: csw/mgar/pkg/org-mode/trunk/Makefile =================================================================== --- csw/mgar/pkg/org-mode/trunk/Makefile 2013-03-13 23:10:40 UTC (rev 20454) +++ csw/mgar/pkg/org-mode/trunk/Makefile 2013-03-14 15:45:27 UTC (rev 20455) @@ -2,9 +2,8 @@ NAME_PREFIX = org NAME = $(NAME_PREFIX)-mode -VERSION = 7.8.11 +VERSION = 7.9.4 GARTYPE = v2 -CATEGORIES = apps DESCRIPTION = An Emacs Mode for Notes, Planning, and Authoring define BLURB @@ -18,16 +17,14 @@ DISTFILES = $(NAME_PREFIX)-$(VERSION).tar.gz DISTFILES += README.CSW DISTFILES += COPYING -PATCHFILES += 0001-Use-Open-CSW-prefix.patch -PATCHFILES += 0002-Fix-documentation-build-target.patch +DISTFILES += local.mk BUILD_DEP_PKGS += CSWemacs BUILD_DEP_PKGS += CSWgsed -BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexlive +BUILD_DEP_PKGS += CSWtexinfo CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = nominal -BUILD_SCRIPTS += doc TEST_SCRIPTS = INSTALL_SCRIPTS = nominal INSTALL_SCRIPTS += info @@ -38,20 +35,14 @@ CHECKPKG_OVERRIDES_CSWorg-mode += missing-dependency|CSWemacscommon CHECKPKG_OVERRIDES_CSWorg-mode += file-with-bad-content|/usr/local|root/opt/csw/share/org-mode/lisp/htmlize.el -EXTRA_TEXINFO = $(infodir)/.* +# EXTRA_TEXINFO = $(infodir)/.* include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) -build-nominal: - cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) - $(MAKECOOKIE) - -build-doc: - cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) doc - $(MAKECOOKIE) - +pre-build-modulated: + cp $(WORKDIR)/local.mk $(WORKSRC) install-nominal: cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) -C $(OBJDIR) $(INSTALL_ARGS) DESTDIR=$(DESTDIR) install $(MAKECOOKIE) @@ -72,6 +63,4 @@ ginstall --preserve-timestamps --mode=u=rwx,go=r $(source)/orgguide.pdf $(DESTDIR)/$(pkgdoc) mv $(DESTDIR)/$(infodir)/org $(DESTDIR)/$(infodir)/org-ocsw gsed --in-place --expression='s/^[*] Org Mode: (org)[.] Outline-based notes management and organizer$$/* Org Mode (OCSW): (org-ocsw). Outline-based notes management and organizer as supplied by Open CSW/' $(DESTDIR)/$(infodir)/org-ocsw - ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(contrib) - gtar --directory=$(WORKSRC)/contrib --create --exclude-vcs --file=- . | gtar --directory $(DESTDIR)/$(contrib) --extract --file=- $(MAKECOOKIE) Modified: csw/mgar/pkg/org-mode/trunk/checksums =================================================================== --- csw/mgar/pkg/org-mode/trunk/checksums 2013-03-13 23:10:40 UTC (rev 20454) +++ csw/mgar/pkg/org-mode/trunk/checksums 2013-03-14 15:45:27 UTC (rev 20455) @@ -1 +1 @@ -e95cd63aabe246b3261ff50be84288de org-7.8.11.tar.gz +20b10d8848dd3ddd18b68fe1227796c8 org-7.9.4.tar.gz Deleted: csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch =================================================================== --- csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch 2013-03-13 23:10:40 UTC (rev 20454) +++ csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch 2013-03-14 15:45:27 UTC (rev 20455) @@ -1,25 +0,0 @@ -From 2b51aba657dc6ca5abdb14be60637c4936eedb1a Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 6 Aug 2012 11:22:48 +0200 -Subject: [PATCH] Use Open CSW prefix - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8a7bde1..3783bf0 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,7 +14,7 @@ - EMACS=emacs - - # Where local software is found --prefix=/usr/local -+prefix=/opt/csw - - # Where local lisp files go - lispdir = $(prefix)/share/emacs/site-lisp --- -1.7.11.3 - Deleted: csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch =================================================================== --- csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch 2013-03-13 23:10:40 UTC (rev 20454) +++ csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch 2013-03-14 15:45:27 UTC (rev 20455) @@ -1,40 +0,0 @@ -From 6be29d8424b2bedc775139d7b62d9e01b171d4be Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 6 Aug 2012 11:32:29 +0200 -Subject: [PATCH] Fix documentation build target - ---- - Makefile | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 3783bf0..9cdfbfd 100644 ---- a/Makefile -+++ b/Makefile -@@ -240,7 +240,7 @@ compile: $(ELCFILES0) $(ELCBFILES) - - install: install-lisp install-data - --doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt -+doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf - - p: - ${MAKE} pdf && open doc/org.pdf -@@ -295,14 +295,10 @@ doc/orgguide.pdf: doc/orgguide.texi - - doc/org.html: doc/org.texi - (cd doc && $(TEXI2HTML) --no-split -o org.html org.texi) -- UTILITIES/manfull.pl doc/org.html - - doc/orgcard.pdf: doc/orgcard.tex - (cd doc && pdftex orgcard.tex) - --doc/orgcard.txt: doc/orgcard.tex -- (cd doc && perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt) -- - doc/orgcard_letter.tex: doc/orgcard.tex - perl -pe 's/\\pdflayout=\(0l\)/\\pdflayout=(1l)/' \ - doc/orgcard.tex > doc/orgcard_letter.tex --- -1.7.11.3 - Added: csw/mgar/pkg/org-mode/trunk/files/local.mk =================================================================== --- csw/mgar/pkg/org-mode/trunk/files/local.mk (rev 0) +++ csw/mgar/pkg/org-mode/trunk/files/local.mk 2013-03-14 15:45:27 UTC (rev 20455) @@ -0,0 +1,6 @@ +# Where local software is found +prefix = /opt/csw/share + +ORG_MAKE_DOC = info html pdf card + +ORG_ADD_CONTRIB = org-e-* org-md org-export This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 14 22:36:28 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 14 Mar 2013 21:36:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[20456] csw/mgar/pkg/lftp/trunk/Makefile Message-ID: Revision: 20456 http://gar.svn.sourceforge.net/gar/?rev=20456&view=rev Author: chninkel Date: 2013-03-14 21:36:28 +0000 (Thu, 14 Mar 2013) Log Message: ----------- lftp/trunk: changed master site Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-03-14 15:45:27 UTC (rev 20455) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-03-14 21:36:28 UTC (rev 20456) @@ -37,7 +37,7 @@ ###### Upstream and opencsw files information ####### -MASTER_SITES = http://ftp.yars.free.net/pub/source/lftp/ +MASTER_SITES = http://lftp.cybermirror.org/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += changelog.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 14 22:38:14 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 14 Mar 2013 21:38:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[20457] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 20457 http://gar.svn.sourceforge.net/gar/?rev=20457&view=rev Author: chninkel Date: 2013-03-14 21:38:14 +0000 (Thu, 14 Mar 2013) Log Message: ----------- cyrus_imapd/trunk: updated to 2.4.17 Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/compile_et csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2013-03-14 21:36:28 UTC (rev 20456) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2013-03-14 21:38:14 UTC (rev 20457) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = cyrus_imapd -VERSION = 2.4.16 +VERSION = 2.4.17 GARTYPE = v2 DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -235,7 +235,7 @@ include gar/category.mk # compile_et is missing so we want our to be used -CONFIGURE_ENV += COMPILE_ET="$(CURDIR)/files/compile_et -d $(CURDIR)/files/" +CONFIGURE_ENV += COMPILE_ET="$(abspath $(CURDIR))/files/compile_et" pre-configure-modulated: # master is a too common name, so we rename it cyrus-master Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2013-03-14 21:36:28 UTC (rev 20456) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2013-03-14 21:38:14 UTC (rev 20457) @@ -1,3 +1,2 @@ -de618faf08ec3e0222a71630f3c98944 cyrus-imapd-2.4.16.tar.gz +c1747c6252587535d3d27f71eca8bd44 cyrus-imapd-2.4.17.tar.gz 81126a0e0ca7c8f099e8de8d4ee4b6fb cyrus-imapd-2.4.4-autocreate-0.10-0.patch -84ceba44f5a2b834e95ba1b4eaee6900 cyrus-imapd-2.4.4-autosieve-0.6.0.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/compile_et =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/compile_et 2013-03-14 21:36:28 UTC (rev 20456) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/compile_et 2013-03-14 21:38:14 UTC (rev 20457) @@ -2,7 +2,7 @@ # # AWK=gawk -DIR=/opt/csw/share/et +DIR="`dirname $0`" usage="usage: $0 [ -d scriptDir ] inputfile.et" Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2013-03-14 21:36:28 UTC (rev 20456) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2013-03-14 21:38:14 UTC (rev 20457) @@ -1,3 +1,9 @@ +cyrus_imapd (2.4.17,REV=2013.03.13) + + * New upstream release. + + -- Yann Rouillard Sat, 24 Nov 2012 15:12:49 +0100 + cyrus_imapd (2.4.16,REV=2012.11.24) * New upstream release. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2013-03-14 21:36:28 UTC (rev 20456) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2013-03-14 21:38:14 UTC (rev 20457) @@ -1,3 +1,9 @@ +cyrus_imapd_utils (2.4.17,REV=2013.03.13) + + * New upstream release. + + -- Yann Rouillard Sat, 24 Nov 2012 15:12:49 +0100 + cyrus_imapd_utils (2.4.16,REV=2012.11.24) * New upstream release. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2013-03-14 21:36:28 UTC (rev 20456) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2013-03-14 21:38:14 UTC (rev 20457) @@ -1,3 +1,9 @@ +pm_cyrus (2.4.17,REV=2013.03.13) + + * New upstream release. + + -- Yann Rouillard Sat, 24 Nov 2012 15:12:49 +0100 + pm_cyrus (2.4.16,REV=2012.11.24) * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 14 22:39:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 14 Mar 2013 21:39:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20458] csw/mgar/pkg/lftp/trunk/checksums Message-ID: Revision: 20458 http://gar.svn.sourceforge.net/gar/?rev=20458&view=rev Author: chninkel Date: 2013-03-14 21:39:52 +0000 (Thu, 14 Mar 2013) Log Message: ----------- lftp/trunk: updated checksum Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2013-03-14 21:38:14 UTC (rev 20457) +++ csw/mgar/pkg/lftp/trunk/checksums 2013-03-14 21:39:52 UTC (rev 20458) @@ -0,0 +1 @@ +fb3e4fd15b43c0a30e5b68079d9919dc lftp-4.4.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 14 23:20:18 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 14 Mar 2013 22:20:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[20459] csw/mgar/pkg/cyrus_imapd/trunk/Makefile Message-ID: Revision: 20459 http://gar.svn.sourceforge.net/gar/?rev=20459&view=rev Author: chninkel Date: 2013-03-14 22:20:16 +0000 (Thu, 14 Mar 2013) Log Message: ----------- cyrus_imapd/trunk: fixed LD_OPTIONS usage and removed unecessary dependencies Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2013-03-14 21:39:52 UTC (rev 20458) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2013-03-14 22:20:16 UTC (rev 20459) @@ -50,14 +50,10 @@ RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibz1 -RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWbdb48 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibpcreposix0 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibnetsnmpagent25 @@ -70,13 +66,6 @@ PKGFILES_CSWcyrusimapdutils += $(mandir)/man1/.* PKGFILES_CSWcyrusimapdutils += $(docdir)/cyrus_imapd_utils/.* RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWbdb48 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibpcreposix0 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibz1 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibsasl2-2 @@ -222,7 +211,7 @@ # To link against BerkeleyDB 4.8 explicitly EXTRA_LINKER_FLAGS = -R$(prefix)/bdb48/lib/\$$ISALIST -LD_OPTIONS += -R$(prefix)/bdb48/lib/\$$ISALIST +EXTRA_LD_OPTIONS += -R$(prefix)/bdb48/lib/\$$ISALIST # we add the args so perl libraries are installed # in the correct path This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 15 09:30:00 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Mar 2013 08:30:00 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[660] buildfarm/cleanbuild/dobuild Message-ID: <20130315083016.D1CA965B@mail.opencsw.org> Revision: 660 http://sourceforge.net/p/opencsw/code/660 Author: dmichelsen Date: 2013-03-15 08:29:59 +0000 (Fri, 15 Mar 2013) Log Message: ----------- cleanbuild: One more step Modified Paths: -------------- buildfarm/cleanbuild/dobuild Modified: buildfarm/cleanbuild/dobuild =================================================================== --- buildfarm/cleanbuild/dobuild 2013-02-28 08:41:01 UTC (rev 659) +++ buildfarm/cleanbuild/dobuild 2013-03-15 08:29:59 UTC (rev 660) @@ -2,6 +2,7 @@ use strict; use warnings; +use Data::Dumper; my $target = shift @ARGV; @@ -20,6 +21,7 @@ $catalog{$p} = $l; } close $C; +#print Dumper( %catalog ); my $gardir = $catalog{$target}; @@ -27,11 +29,16 @@ die "The package $target is not in GAR"; } -if( 0 ) { +print "Building $target from $gardir\n"; + +if( 1 ) { + print "Halting zone\n"; system( qw(/usr/sbin/zoneadm -z cswbuild halt) ); + print "Uninstalling zone\n"; system( qw(/usr/sbin/zoneadm -z cswbuild uninstall -F) ); + print "Cloning zone\n"; system( qw(/usr/sbin/zoneadm -z cswbuild clone cswproto) ); open S, ">/zones/cswbuild/root/etc/sysidcfg"; @@ -60,8 +67,10 @@ # Bootstrap ssh host key, otherwise these will be generated on each new zone clone system( "cp ssh-proto/* /zones/cswbuild/root/etc/ssh/" ); + print "Booting zone\n"; system( qw(/usr/sbin/zoneadm -z cswbuild boot) ); + } { @@ -71,18 +80,47 @@ do { print '.'; sleep( 1 ); - chomp( $n = `ssh cswbuild\@cswbuild uname -n 2>/dev/null` ); + chomp( $n = `ping cswbuild 1 >/dev/null 2>&1 && ssh cswbuild\@cswbuild uname -n 2>/dev/null` ); } while( $n ne "cswbuild" ); + print "\n"; } -foreach my $p (sort keys %desc) { - next if( !$p ); - print "$p\t"; - print join( ",", @{$desc{$p}} ), "\t"; +system( "cp nsswitch.conf /zones/cswbuild/root/etc/" ); +system( "cp resolv.conf /zones/cswbuild/root/etc/" ); + +#foreach my $p (sort keys %desc) { +# next if( !$p ); +# print "$p\t"; +# print join( ",", @{$desc{$p}} ), "\t"; # if( !$catalog{$p} ) { # print "NOTINGAR\n"; # next; # } - my @deps = split( /\s+/, `ssh cswbuild\@cswbuild "if [ -d opencsw/$p ]; then cd opencsw/$p; mgar build-dep-pkgs; else echo DIRVANISHED-opencsw/$p; fi"` ); - print join(",", @deps ), "\n"; + + # +# my @deps = split( /\s+/, `ssh cswbuild\@cswbuild "if [ -d opencsw/$p ]; then cd opencsw/$p; mgar build-dep-pkgs; else echo DIRVANISHED-opencsw/$p; fi"` ); +# print join(",", @deps ), "\n"; +#} + +my @deps = split( /\s+/, `ssh cswbuild\@cswbuild "if [ -d opencsw/$gardir ]; then cd opencsw/$gardir; mgar build-dep-pkgs; else echo DIRVANISHED; fi"` ); + +if( $deps[0] =~ /DIRVANISHED/ ) { + print "The GAR directory $gardir is not there, terminating.\n"; + exit( 1 ); } + +print "\n--- Installing build dependencies ", join(",", @deps ), " ---\n\n"; +print( "Executing " . 'ssh cswbuild\@cswbuild "sudo pkgutil -y -i ' . join( ' ', @deps ), "\n" ); +system( 'ssh cswbuild\@cswbuild "sudo pkgutil -y -i ' . join( ' ', @deps ) ); + +print "\n--- Configuring system ---\n\n"; + +system( 'ssh cswbuild\@cswbuild "git config --global user.email dam at opencsw.org"' ); +system( 'ssh cswbuild\@cswbuild "git config --global user.name Dagobert\ Michelsen"' ); + +print "\n--- Building ---\n\n"; +system( "ssh cswbuild\@cswbuild 'cd opencsw/$gardir; mgar package'" ); + +# put package into newly built catalog area +# rebuild catalog +# add package to catalog database for further checkpkg runs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Mar 15 09:32:45 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 15 Mar 2013 08:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[20460] csw/mgar/pkg/org-mode/trunk Message-ID: Revision: 20460 http://gar.svn.sourceforge.net/gar/?rev=20460&view=rev Author: pfelecan Date: 2013-03-15 08:32:44 +0000 (Fri, 15 Mar 2013) Log Message: ----------- org-mode/trunk: installation fine tuning Modified Paths: -------------- csw/mgar/pkg/org-mode/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/org-mode/trunk/files/README.CSW Modified: csw/mgar/pkg/org-mode/trunk/Makefile =================================================================== --- csw/mgar/pkg/org-mode/trunk/Makefile 2013-03-14 22:20:16 UTC (rev 20459) +++ csw/mgar/pkg/org-mode/trunk/Makefile 2013-03-15 08:32:44 UTC (rev 20460) @@ -15,7 +15,6 @@ WORKSRC = $(WORKDIR)/$(NAME_PREFIX)-$(VERSION) PATCHDIR = $(WORKSRC) DISTFILES = $(NAME_PREFIX)-$(VERSION).tar.gz -DISTFILES += README.CSW DISTFILES += COPYING DISTFILES += local.mk @@ -25,9 +24,9 @@ BUILD_DEP_PKGS += CSWtexinfo CONFIGURE_SCRIPTS = +# skiping the tests because the scripts are supplied only in +# repository snapshots but not in the distributed sources TEST_SCRIPTS = -INSTALL_SCRIPTS = nominal -INSTALL_SCRIPTS += info ARCHALL = 1 RUNTIME_DEP_PKGS += CSWemacs @@ -35,7 +34,7 @@ CHECKPKG_OVERRIDES_CSWorg-mode += missing-dependency|CSWemacscommon CHECKPKG_OVERRIDES_CSWorg-mode += file-with-bad-content|/usr/local|root/opt/csw/share/org-mode/lisp/htmlize.el -# EXTRA_TEXINFO = $(infodir)/.* +EXTRA_TEXINFO = $(infodir)/.* include gar/category.mk @@ -43,14 +42,7 @@ pre-build-modulated: cp $(WORKDIR)/local.mk $(WORKSRC) -install-nominal: - cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) -C $(OBJDIR) $(INSTALL_ARGS) DESTDIR=$(DESTDIR) install - $(MAKECOOKIE) -install-info: - cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) -C $(OBJDIR) $(INSTALL_ARGS) DESTDIR=$(DESTDIR) install-info - $(MAKECOOKIE) - post-install-modulated: pkgdoc = $(docdir)/$(NAME) post-install-modulated: source = $(WORKSRC)/doc post-install-modulated: contrib = $(sharedstatedir)/$(NAME) Deleted: csw/mgar/pkg/org-mode/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/org-mode/trunk/files/README.CSW 2013-03-14 22:20:16 UTC (rev 20459) +++ csw/mgar/pkg/org-mode/trunk/files/README.CSW 2013-03-15 08:32:44 UTC (rev 20460) @@ -1,5 +0,0 @@ -To enable contributed extensions to org-mode, simply add -"/opt/csw/share/org-mode/lisp" to your load-path, for instance in your -.emacs with: - - (setq load-path (cons "/opt/csw/share/org-mode/lisp" load-path)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 15 10:10:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Mar 2013 09:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20461] csw/mgar/pkg/mariadb/trunk/ Message-ID: Revision: 20461 http://gar.svn.sourceforge.net/gar/?rev=20461&view=rev Author: dmichelsen Date: 2013-03-15 09:10:53 +0000 (Fri, 15 Mar 2013) Log Message: ----------- Remove External Property Changed: ---------------- csw/mgar/pkg/mariadb/trunk/ Property changes on: csw/mgar/pkg/mariadb/trunk ___________________________________________________________________ Deleted: svn:externals - 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 cgrzemba at users.sourceforge.net Fri Mar 15 10:42:05 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 15 Mar 2013 09:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20462] csw/mgar/pkg/hplip/trunk/Makefile Message-ID: Revision: 20462 http://gar.svn.sourceforge.net/gar/?rev=20462&view=rev Author: cgrzemba Date: 2013-03-15 09:42:05 +0000 (Fri, 15 Mar 2013) Log Message: ----------- hplip/trunk: - bump version - add filter hpps hpcac Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2013-03-15 09:10:53 UTC (rev 20461) +++ csw/mgar/pkg/hplip/trunk/Makefile 2013-03-15 09:42:05 UTC (rev 20462) @@ -1,8 +1,8 @@ NAME = hplip -VERSION = 3.12.2 +VERSION = 3.13.3 GARTYPE = v2 -MASTER_SITES = http://prdownloads.sourceforge.net/hplip +MASTER_SITES = http://prdownloads.sourceforge.net/hplip/ DISTFILES = $(NAME)-$(VERSION).tar.gz @@ -33,8 +33,13 @@ CONFIGURE_ARGS += --with-hpppddir=/opt/csw/share/cups/model/HP # CONFIGURE_ARGS += --enable-hpcups-only-build -CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/upgrading.html -CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/uninstalling.html +CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html +CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html include gar/category.mk +post-install: + ginstall -m 755 -d $(DESTDIR)$(libdir)/cups/filter + ginstall -m 755 $(WORKSRC)/prnt/filters/hpps $(DESTDIR)$(libdir)/cups/filter + ginstall -m 755 $(WORKSRC)/prnt/filters/hpcac $(DESTDIR)$(libdir)/cups/filter + $(MAKECOOKIES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 15 10:56:51 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Mar 2013 09:56:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20463] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 20463 http://gar.svn.sourceforge.net/gar/?rev=20463&view=rev Author: dmichelsen Date: 2013-03-15 09:56:50 +0000 (Fri, 15 Mar 2013) Log Message: ----------- libiconv/trunk: Update to latest standards Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2013-03-15 09:42:05 UTC (rev 20462) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2013-03-15 09:56:50 UTC (rev 20463) @@ -99,7 +99,7 @@ $(DESTDIR)$(datadir)/aclocal/iconv.m4 @$(MAKECOOKIE) -post-merge: +post-merge-all: @# Make the 64 bit charset-alias the same as the one for 32 bit rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/charset.alias gln -s ../charset.alias $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/charset.alias This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Mar 15 14:10:56 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 15 Mar 2013 13:10:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20464] csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd Message-ID: Revision: 20464 http://gar.svn.sourceforge.net/gar/?rev=20464&view=rev Author: phipsy Date: 2013-03-15 13:10:55 +0000 (Fri, 15 Mar 2013) Log Message: ----------- puppet3: master startup script typo Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-15 09:56:50 UTC (rev 20463) +++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd 2013-03-15 13:10:55 UTC (rev 20464) @@ -43,7 +43,7 @@ # Start daemons. printf "Starting Puppet server services:" - ${sbindir}/puppet master + ${bindir}/puppet master printf " puppetmaster" echo "" 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 Mar 15 14:18:47 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 15 Mar 2013 13:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20465] csw/mgar/pkg/hplip/trunk Message-ID: Revision: 20465 http://gar.svn.sourceforge.net/gar/?rev=20465&view=rev Author: cgrzemba Date: 2013-03-15 13:18:47 +0000 (Fri, 15 Mar 2013) Log Message: ----------- hplip/trunk: remove obsoleting package Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch.new Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2013-03-15 13:10:55 UTC (rev 20464) +++ csw/mgar/pkg/hplip/trunk/Makefile 2013-03-15 13:18:47 UTC (rev 20465) @@ -17,7 +17,7 @@ PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc PACKAGES = CSWhplip -OBSOLETED_BY_CSWhplip = CSWhpijs +# OBSOLETED_BY_CSWhplip = CSWhpijs SPKG_DESC_CSWhplip = $(DESCRIPTION) Inkjet driver RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7 Added: csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch.new =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch.new (rev 0) +++ csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch.new 2013-03-15 13:18:47 UTC (rev 20465) @@ -0,0 +1,10 @@ +--- a/prnt/hpijs/context2.cpp ++++ b/prnt/hpijs/context2.cpp +@@ -37,6 +37,7 @@ + #include "halftoner.h" + #include "colormatch.h" + //#include "bug.h" ++#include + + APDK_BEGIN_NAMESPACE + extern ColorMatcher* Create_ColorMatcher This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Mar 15 14:38:37 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 15 Mar 2013 13:38:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[20466] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 20466 http://gar.svn.sourceforge.net/gar/?rev=20466&view=rev Author: phipsy Date: 2013-03-15 13:38:37 +0000 (Fri, 15 Mar 2013) Log Message: ----------- puppet: version hup to 2.7.21; updated init scripts Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2013-03-15 13:18:47 UTC (rev 20465) +++ csw/mgar/pkg/puppet/trunk/Makefile 2013-03-15 13:38:37 UTC (rev 20466) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.20 +VERSION = 2.7.21 GARTYPE = v2 define BLURB @@ -45,6 +45,9 @@ PACKAGES += CSWpuppetmaster PACKAGES += CSWpuppet +INCOMPATIBLE_PKGS += CSWpuppet3 +INCOMPATIBLE_PKGS += CSWpuppetmaster3 + SPKG_DESC_CSWpuppet = System configuration management tool, client daemon SPKG_DESC_CSWpuppetmaster = System configuration management tool, server @@ -83,6 +86,8 @@ CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/README.CSW CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW +CHECKPKG_OVERRIDES_CSWpuppet += file-collision +CHECKPKG_OVERRIDES_CSWpuppetmaster += file-collision include gar/category.mk Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2013-03-15 13:18:47 UTC (rev 20465) +++ csw/mgar/pkg/puppet/trunk/checksums 2013-03-15 13:38:37 UTC (rev 20466) @@ -17,3 +17,4 @@ 210725704692a0ca7b8ffc312471796e puppet-2.7.18.tar.gz ba76fa7831df53db7424a8d523465ef5 puppet-2.7.19.tar.gz 746ebdd7ae734fb54e53bf6167f0928d puppet-2.7.20.tar.gz +cfea4e3f8cf268c1340aa5c295b3d7f0 puppet-2.7.21.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2013-03-15 13:18:47 UTC (rev 20465) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2013-03-15 13:38:37 UTC (rev 20466) @@ -28,6 +28,7 @@ prefix="/opt/csw" exec_prefix="/opt/csw" sysconfdir="/etc/opt/csw" +bindir="/opt/csw/bin" sbindir="/opt/csw/sbin" localstatedir="/var/opt/csw" @@ -37,14 +38,8 @@ } start_puppetd() { - cd / - #confdir=`getprop puppet/confdir` - #vardir=`getprop puppet/vardir` - #ssldir=`getprop puppet/ssldir` - - # Start daemons. - #${sbindir}/puppetd --confdir=$confdir --vardir=$vardir --ssldir=$ssldir - ${sbindir}/puppetd + # Start daemon. + ${bindir}/puppet agent } reload_puppetd() { @@ -67,7 +62,7 @@ else zoneopts="" fi - pgrep $zoneopts puppetd + pgrep -f $zoneopts puppet } # Returns a line with certain string from a config file. Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2013-03-15 13:18:47 UTC (rev 20465) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2013-03-15 13:38:37 UTC (rev 20466) @@ -17,22 +17,32 @@ prefix=/opt/csw exec_prefix=/opt/csw sysconfdir=/etc/opt/csw +bindir=/opt/csw/bin sbindir=/opt/csw/sbin -pidfile=`$prefix/bin/puppet master --genconf | awk '/pidfile/ { print $3 }'` +pidfile=`$prefix/bin/puppet master --configprint pidfile` getprop() { val=`/usr/bin/svcprop -p $1 $SMF_FMRI` [ -n "$val" ] && echo $val } +get_current_pid() { + if [ -x /usr/bin/zonename ]; then + zone=`/usr/bin/zonename` + zoneopts="-z $zone" + else + zoneopts="" + fi + pgrep -f $zoneopts 'puppet master' +} + case "$1" in start) - cd / - # Start daemons. + # Start daemon. printf "Starting Puppet server services:" - ${sbindir}/puppetmasterd + ${bindir}/puppet master printf " puppetmaster" echo "" @@ -62,7 +72,7 @@ status) if [ -f $pidfile ]; then pid=`cat $pidfile` - curpid=`pgrep puppetmasterd` + curpid=`get_current_pid` if [ "$pid" -eq "$curpid" ]; then exit 0 else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 15 16:10:17 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Mar 2013 15:10:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20467] csw/mgar/pkg/cpan Message-ID: Revision: 20467 http://gar.svn.sourceforge.net/gar/?rev=20467&view=rev Author: dmichelsen Date: 2013-03-15 15:10:16 +0000 (Fri, 15 Mar 2013) Log Message: ----------- cpan/Sys-RunAlone-User/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Sys-RunAlone-User/ csw/mgar/pkg/cpan/Sys-RunAlone-User/branches/ csw/mgar/pkg/cpan/Sys-RunAlone-User/tags/ csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/ csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/Makefile csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/checksums csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/Makefile 2013-03-15 15:10:16 UTC (rev 20467) @@ -0,0 +1,21 @@ +NAME = Sys-RunAlone-User +VERSION = 0.01 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = PEDLAR + +DESCRIPTION = Make sure only one invocation of a script is active at a time per user +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-sys-runalone-user +CATALOGNAME_CSWpm-sys-runalone-user = pm_sys_runalone_user +SPKG_DESC_CSWpm-sys-runalone-user = Make sure only one invocation of a script is active at a time per user +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-sys-runalone-user = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Sys-RunAlone-User/trunk/checksums 2013-03-15 15:10:16 UTC (rev 20467) @@ -0,0 +1 @@ +163a67d10542776a7ed0d8a9524e39be Sys-RunAlone-User-0.01.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 Fri Mar 15 22:34:46 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Mar 2013 21:34:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20468] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 20468 http://gar.svn.sourceforge.net/gar/?rev=20468&view=rev Author: bonivart Date: 2013-03-15 21:34:43 +0000 (Fri, 15 Mar 2013) Log Message: ----------- clamav/trunk: update to 0.97.7 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2013-03-15 15:10:16 UTC (rev 20467) +++ csw/mgar/pkg/clamav/trunk/Makefile 2013-03-15 21:34:43 UTC (rev 20468) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.97.6 +VERSION = 0.97.7 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest GARTYPE = v2 @@ -13,10 +13,10 @@ the package is an anti-virus engine available in a form of shared library. endef -#SF_PROJECT = clamav -#MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = clamav +MASTER_SITES = $(SF_MIRRORS) #MASTER_SITES = http://www.clamav.net/snapshot/ -MASTER_SITES = http://www.clamav.net/internal/ +#MASTER_SITES = http://www.clamav.net/internal/ DISTFILES = $(NAME)-$(VERSION).tar.gz #DISTFILES = $(NAME)-devel-latest.tar.gz @@ -107,13 +107,16 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node56.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node24.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html -CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.15 +CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.16 # We don't split to three separate packages -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.15|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.15|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.15|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.16|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.16|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.16|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +# Weirdly needed for sparc +CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6 + include gar/category.mk DOCS = AUTHORS BUGS ChangeLog Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2013-03-15 15:10:16 UTC (rev 20467) +++ csw/mgar/pkg/clamav/trunk/checksums 2013-03-15 21:34:43 UTC (rev 20468) @@ -1 +1 @@ -1dbdd803b37c0d9d222e4316049f46a2 clamav-0.97.6.tar.gz +c6e6e333d8c9bd3785cbc6ec296c146f clamav-0.97.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Mar 16 11:30:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 16 Mar 2013 10:30:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20469] csw/mgar/pkg/hevea/branches/2.0.3 Message-ID: Revision: 20469 http://gar.svn.sourceforge.net/gar/?rev=20469&view=rev Author: pfelecan Date: 2013-03-16 10:30:26 +0000 (Sat, 16 Mar 2013) Log Message: ----------- hevea/branches/2.0.3: version bump again and after our ocaml update Modified Paths: -------------- csw/mgar/pkg/hevea/branches/2.0.3/Makefile csw/mgar/pkg/hevea/branches/2.0.3/checksums Modified: csw/mgar/pkg/hevea/branches/2.0.3/Makefile =================================================================== --- csw/mgar/pkg/hevea/branches/2.0.3/Makefile 2013-03-15 21:34:43 UTC (rev 20468) +++ csw/mgar/pkg/hevea/branches/2.0.3/Makefile 2013-03-16 10:30:26 UTC (rev 20469) @@ -1,8 +1,7 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# + NAME = hevea -VERSION = 2.03 +VERSION = 2.04 GARTYPE = v2 DESCRIPTION = A fast LaTeX to HTML translator @@ -41,8 +40,6 @@ CONFIGURE_SCRIPTS = -SKIPTEST = 1 - # these are overrides for binaries called internally: CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWtexlive CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWnetpbm Modified: csw/mgar/pkg/hevea/branches/2.0.3/checksums =================================================================== --- csw/mgar/pkg/hevea/branches/2.0.3/checksums 2013-03-15 21:34:43 UTC (rev 20468) +++ csw/mgar/pkg/hevea/branches/2.0.3/checksums 2013-03-16 10:30:26 UTC (rev 20469) @@ -1 +1 @@ -1ff070baebc1e969fc89ef420bbe96f2 hevea-2.03.tar.gz +89ed5fff85d61e63540432d125c03117 hevea-2.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Mar 16 12:11:54 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 16 Mar 2013 11:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20470] csw/mgar/pkg/hevea/trunk Message-ID: Revision: 20470 http://gar.svn.sourceforge.net/gar/?rev=20470&view=rev Author: pfelecan Date: 2013-03-16 11:11:54 +0000 (Sat, 16 Mar 2013) Log Message: ----------- hevea/trunk: manually merged branches/2.0.3 Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/Makefile csw/mgar/pkg/hevea/trunk/checksums csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch Modified: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile 2013-03-16 10:30:26 UTC (rev 20469) +++ csw/mgar/pkg/hevea/trunk/Makefile 2013-03-16 11:11:54 UTC (rev 20470) @@ -1,7 +1,7 @@ # $Id$ NAME = hevea -VERSION = 1.10 +VERSION = 2.04 GARTYPE = v2 DESCRIPTION = A fast LaTeX to HTML translator @@ -40,8 +40,6 @@ CONFIGURE_SCRIPTS = -SKIPTEST = 1 - # these are overrides for binaries called internally: CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWtexlive CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWnetpbm Modified: csw/mgar/pkg/hevea/trunk/checksums =================================================================== --- csw/mgar/pkg/hevea/trunk/checksums 2013-03-16 10:30:26 UTC (rev 20469) +++ csw/mgar/pkg/hevea/trunk/checksums 2013-03-16 11:11:54 UTC (rev 20470) @@ -1 +1 @@ -24a631570bee3cc4b8350e9db39be62b hevea-1.10.tar.gz +89ed5fff85d61e63540432d125c03117 hevea-2.04.tar.gz Modified: csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch =================================================================== --- csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2013-03-16 10:30:26 UTC (rev 20469) +++ csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2013-03-16 11:11:54 UTC (rev 20470) @@ -1,17 +1,17 @@ -From f9882d5b5ac794019eba7d1f95098f19e7497c1e Mon Sep 17 00:00:00 2001 +From 8795f71f0d7a9b6ab49f7b921c869920cf5277c3 Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Wed, 13 Mar 2013 18:55:56 +0100 +Date: Thu, 21 Feb 2013 15:13:08 +0100 Subject: [PATCH] Fix installation paths --- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index dd90bcb..5816684 100644 +index e52e0f6..aa93904 100644 --- a/Makefile +++ b/Makefile -@@ -2,7 +2,7 @@ +@@ -2,13 +2,14 @@ # Compile using ocamlopt, to use ocamlc set TARGET=byte TARGET=opt # Install prefix @@ -20,15 +20,14 @@ # Library directory of hevea LIBDIR=$(PREFIX)/lib/hevea # Where to install programms -@@ -10,7 +10,7 @@ BINDIR=$(PREFIX)/bin - # Install prefix prefix - DESTDIR= + BINDIR=$(PREFIX)/bin #Where to install hevea.sty -LATEXLIBDIR=$(PREFIX)/lib/hevea +LATEXLIBDIR=$(PREFIX)/share/texmf-local/tex/latex/hevea ++ ##### Advanced configuration parameters SUF= DIR= -- -1.8.1.4 +1.8.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 Sat Mar 16 23:15:25 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 16 Mar 2013 22:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20471] csw/mgar/pkg/Botan/trunk/Makefile Message-ID: Revision: 20471 http://gar.svn.sourceforge.net/gar/?rev=20471&view=rev Author: bonivart Date: 2013-03-16 22:15:23 +0000 (Sat, 16 Mar 2013) Log Message: ----------- Botan/trunk: added configure part, does not build Modified Paths: -------------- csw/mgar/pkg/Botan/trunk/Makefile Modified: csw/mgar/pkg/Botan/trunk/Makefile =================================================================== --- csw/mgar/pkg/Botan/trunk/Makefile 2013-03-16 11:11:54 UTC (rev 20470) +++ csw/mgar/pkg/Botan/trunk/Makefile 2013-03-16 22:15:23 UTC (rev 20471) @@ -9,7 +9,10 @@ MASTER_SITES = http://botan.randombit.net/files/ DISTFILES = $(DISTNAME).tgz -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = custom include gar/category.mk +configure-custom: + (cd $(WORKSRC); \ + ./configure.py) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Mar 17 07:47:29 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 17 Mar 2013 06:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20472] csw/mgar/pkg/gwhois/trunk/Makefile Message-ID: Revision: 20472 http://gar.svn.sourceforge.net/gar/?rev=20472&view=rev Author: wilbury Date: 2013-03-17 06:47:29 +0000 (Sun, 17 Mar 2013) Log Message: ----------- gwhois/trunk: Provide also /opt/csw/gnu link Modified Paths: -------------- csw/mgar/pkg/gwhois/trunk/Makefile Modified: csw/mgar/pkg/gwhois/trunk/Makefile =================================================================== --- csw/mgar/pkg/gwhois/trunk/Makefile 2013-03-16 22:15:23 UTC (rev 20471) +++ csw/mgar/pkg/gwhois/trunk/Makefile 2013-03-17 06:47:29 UTC (rev 20472) @@ -42,10 +42,12 @@ install-gwhois: @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/$(bindir) + @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/$(gnudir) @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/$(sysconfdir)/$(NAME) @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/$(mandir)/man1 @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/$(docdir)/$(NAME) @/opt/csw/bin/ginstall -m 755 $(WORKSRC)/gwhois $(DESTDIR)/$(bindir) + @/opt/csw/bin/ginstall -m 755 $(WORKSRC)/gwhois $(DESTDIR)/$(gnudir)/whois @/opt/csw/bin/ginstall -m 644 $(WORKSRC)/pattern $(DESTDIR)/$(sysconfdir)/$(NAME) @/opt/csw/bin/ginstall -m 644 $(WORKSRC)/gwhois.1 $(DESTDIR)/$(mandir)/man1 @/opt/csw/bin/ginstall -m 644 $(WORKSRC)/INSTALL $(DESTDIR)/$(docdir)/$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Mar 17 09:24:38 2013 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 17 Mar 2013 08:24:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[20473] csw/mgar/pkg/fio/trunk Message-ID: Revision: 20473 http://gar.svn.sourceforge.net/gar/?rev=20473&view=rev Author: j_arndt Date: 2013-03-17 08:24:32 +0000 (Sun, 17 Mar 2013) Log Message: ----------- fio/trunk: update to 2.0.14 Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile csw/mgar/pkg/fio/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fio/trunk/files/0000-shell-commmands-in-configure-script.patch Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2013-03-17 06:47:29 UTC (rev 20472) +++ csw/mgar/pkg/fio/trunk/Makefile 2013-03-17 08:24:32 UTC (rev 20473) @@ -1,7 +1,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) NAME = fio -VERSION = 2.0.8 +VERSION = 2.0.14 GARTYPE = v2 DESCRIPTION = Flexible I/O Tester @@ -24,6 +24,7 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PATCHFILES += 0000-shell-commmands-in-configure-script.patch PATCHFILES += 0001-shell-commands.patch # fio compiler/compiler.h #errors out non gcc compilers Modified: csw/mgar/pkg/fio/trunk/checksums =================================================================== --- csw/mgar/pkg/fio/trunk/checksums 2013-03-17 06:47:29 UTC (rev 20472) +++ csw/mgar/pkg/fio/trunk/checksums 2013-03-17 08:24:32 UTC (rev 20473) @@ -1 +1 @@ -b745a65ed56ef629e6d1a10b20d84c75 fio-2.0.8.tar.gz +c76f0fe5404ff31da0be84344f0824f1 fio-2.0.14.tar.gz Added: csw/mgar/pkg/fio/trunk/files/0000-shell-commmands-in-configure-script.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0000-shell-commmands-in-configure-script.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0000-shell-commmands-in-configure-script.patch 2013-03-17 08:24:32 UTC (rev 20473) @@ -0,0 +1,25 @@ +From 746a61d1fabb7d3568c68e90887e961770777778 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 17 Mar 2013 08:57:37 +0100 +Subject: [PATCH] shell commmands in configure script + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index caaf30e..8125fc3 100755 +--- a/configure ++++ b/configure +@@ -349,7 +349,7 @@ int main(void) + } + EOF + if compile_prog "" "" "wordsize"; then +- wordsize=$($TMPE) ++ wordsize=`$TMPE` + fi + echo "Wordsize $wordsize" + +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Mar 17 10:48:04 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Mar 2013 09:48:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20474] csw/mgar/pkg/maven3/trunk Message-ID: Revision: 20474 http://gar.svn.sourceforge.net/gar/?rev=20474&view=rev Author: rthurner Date: 2013-03-17 09:48:01 +0000 (Sun, 17 Mar 2013) Log Message: ----------- upgrade maven-3 to maven-3.0.5 Modified Paths: -------------- csw/mgar/pkg/maven3/trunk/Makefile csw/mgar/pkg/maven3/trunk/checksums Modified: csw/mgar/pkg/maven3/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven3/trunk/Makefile 2013-03-17 08:24:32 UTC (rev 20473) +++ csw/mgar/pkg/maven3/trunk/Makefile 2013-03-17 09:48:01 UTC (rev 20474) @@ -1,5 +1,5 @@ NAME = maven3 -VERSION = 3.0 +VERSION = 3.0.5 CATEGORIES = java GARTYPE = v2 @@ -22,7 +22,8 @@ * Allowing transparent migration to new features endef -MASTER_SITES = http://www.powertech.no/apache/dist/maven/binaries/ +MASTER_SITES = http://www.eu.apache.org/dist/maven/maven-3/${VERSION}/binaries/ + DISTNAME = apache-maven-$(VERSION) DISTFILES = $(DISTNAME)-bin.tar.gz Modified: csw/mgar/pkg/maven3/trunk/checksums =================================================================== --- csw/mgar/pkg/maven3/trunk/checksums 2013-03-17 08:24:32 UTC (rev 20473) +++ csw/mgar/pkg/maven3/trunk/checksums 2013-03-17 09:48:01 UTC (rev 20474) @@ -1 +1 @@ -505560ca377b990a965c4e4f8da42daa apache-maven-3.0-bin.tar.gz +94c51f0dd139b4b8549204d0605a5859 apache-maven-3.0.5-bin.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 Sun Mar 17 11:24:57 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Mar 2013 10:24:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20475] csw/mgar/pkg/maven3/trunk/Makefile Message-ID: Revision: 20475 http://gar.svn.sourceforge.net/gar/?rev=20475&view=rev Author: rthurner Date: 2013-03-17 10:24:56 +0000 (Sun, 17 Mar 2013) Log Message: ----------- maven3, ignore local in readme Modified Paths: -------------- csw/mgar/pkg/maven3/trunk/Makefile Modified: csw/mgar/pkg/maven3/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven3/trunk/Makefile 2013-03-17 09:48:01 UTC (rev 20474) +++ csw/mgar/pkg/maven3/trunk/Makefile 2013-03-17 10:24:56 UTC (rev 20475) @@ -39,6 +39,8 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWmaven3 += file-with-bad-content|/usr/local|root/opt/csw/share/maven3/home/README.txt + include gar/category.mk install-custom: MAVENHOME=$(DESTDIR)$(sharedstatedir)/maven3/home This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Mar 18 12:15:58 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Mar 2013 11:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20476] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 20476 http://gar.svn.sourceforge.net/gar/?rev=20476&view=rev Author: janholzh Date: 2013-03-18 11:15:57 +0000 (Mon, 18 Mar 2013) Log Message: ----------- samba/branches/samba3: update to 3.6.13 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile csw/mgar/pkg/samba/branches/samba3/checksums Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-03-17 10:24:56 UTC (rev 20475) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-03-18 11:15:57 UTC (rev 20476) @@ -2,7 +2,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.12 +VERSION = 3.6.13 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) Modified: csw/mgar/pkg/samba/branches/samba3/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba3/checksums 2013-03-17 10:24:56 UTC (rev 20475) +++ csw/mgar/pkg/samba/branches/samba3/checksums 2013-03-18 11:15:57 UTC (rev 20476) @@ -1 +1 @@ -430fd21a1acd26964d3ccf366df8709a samba-3.6.12.tar.gz +b9fe8413cbb6fa4b970a159968db2fb4 samba-3.6.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Mar 18 14:47:04 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 18 Mar 2013 13:47:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20477] csw/mgar/pkg/emacs/trunk Message-ID: Revision: 20477 http://gar.svn.sourceforge.net/gar/?rev=20477&view=rev Author: pfelecan Date: 2013-03-18 13:47:04 +0000 (Mon, 18 Mar 2013) Log Message: ----------- emacs/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile csw/mgar/pkg/emacs/trunk/checksums csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch Removed Paths: ------------- csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2013-03-18 11:15:57 UTC (rev 20476) +++ csw/mgar/pkg/emacs/trunk/Makefile 2013-03-18 13:47:04 UTC (rev 20477) @@ -1,10 +1,8 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# + NAME = emacs -VERSION = 24.2 +VERSION = 24.3 GARTYPE = v2 -CATEGORIES = apps DESCRIPTION = The GNU Emacs editor define BLURB @@ -12,7 +10,7 @@ display editor. endef -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz MASTER_SITES = $(GNU_MIRROR) # this is necessary because GNU id options dialect is is used; BTW, I @@ -48,6 +46,7 @@ BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWlibotf-dev BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibpcre-dev BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibpthreadstubs BUILD_DEP_PKGS += CSWlibrsvg-dev @@ -75,7 +74,6 @@ PATCHFILES += 0001-activate-Xft-for-configure.patch PATCHFILES += 0002-Filter-ImageMagik-OpenMP-compiler-flag.patch -PATCHFILES += 0003-Satisfy-micro-tasking-library.patch EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = athena @@ -86,7 +84,7 @@ EXTRA_CONFIGURE_ARGS_athena += --without-dbus EXTRA_CONFIGURE_ARGS_athena += --without-gconf -EXTRA_CONFIGURE_ARGS_gtk = --with-x-toolkit=gtk +EXTRA_CONFIGURE_ARGS_gtk = --with-x-toolkit=gtk2 EXTRA_CONFIGURE_ARGS_nox = --with-x-toolkit=no EXTRA_CONFIGURE_ARGS_nox += --without-sound Modified: csw/mgar/pkg/emacs/trunk/checksums =================================================================== --- csw/mgar/pkg/emacs/trunk/checksums 2013-03-18 11:15:57 UTC (rev 20476) +++ csw/mgar/pkg/emacs/trunk/checksums 2013-03-18 13:47:04 UTC (rev 20477) @@ -1 +1 @@ -1676803a50e8adc817fdaaebb9234f14 emacs-24.2.tar.bz2 +ea9ed000ca165280265aabb55b9afbd7 emacs-24.3.tar.xz Modified: csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch =================================================================== --- csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch 2013-03-18 11:15:57 UTC (rev 20476) +++ csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch 2013-03-18 13:47:04 UTC (rev 20477) @@ -1,6 +1,6 @@ -From bcc80204005ab2cdce7346594ad66c3a0ba6b65a Mon Sep 17 00:00:00 2001 +From 20ef63d6434bab3158919265d81b7f3c928607ee Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Mon, 8 Oct 2012 10:47:01 +0200 +Date: Fri, 15 Mar 2013 15:26:01 +0100 Subject: [PATCH] Filter ImageMagik OpenMP compiler flag --- @@ -8,18 +8,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index fb229b7..97e73cd 100755 +index ab5f17f..f467955 100755 --- a/configure +++ b/configure -@@ -10902,7 +10902,7 @@ $as_echo "yes" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking IMAGEMAGICK_CFLAGS" >&5 - $as_echo_n "checking IMAGEMAGICK_CFLAGS... " >&6; } -- IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'` -+ IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g' | sed -e 's/-xopenmp//'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IMAGEMAGICK_CFLAGS" >&5 - $as_echo "$IMAGEMAGICK_CFLAGS" >&6; } - +@@ -10601,7 +10601,7 @@ $as_echo_n "checking for $IMAGEMAGICK_MODULE... " >&6; } + s/ -I/ $isystem/g + s/^ // + " +- IMAGEMAGICK_CFLAGS=`$as_echo "$IMAGEMAGICK_CFLAGS" | sed -e "$edit_cflags"` ++ IMAGEMAGICK_CFLAGS=`$as_echo "$IMAGEMAGICK_CFLAGS" | sed -e "$edit_cflags" | sed -e 's/-xopenmp//'` + IMAGEMAGICK_LIBS=`$as_echo "$IMAGEMAGICK_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$IMAGEMAGICK_CFLAGS' LIBS='$IMAGEMAGICK_LIBS'" >&5 + $as_echo "yes CFLAGS='$IMAGEMAGICK_CFLAGS' LIBS='$IMAGEMAGICK_LIBS'" >&6; } -- -1.7.12 +1.8.1.4 Deleted: csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch =================================================================== --- csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch 2013-03-18 11:15:57 UTC (rev 20476) +++ csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch 2013-03-18 13:47:04 UTC (rev 20477) @@ -1,25 +0,0 @@ -From 245630d8dac76f63102503ca388c51ff45afba2e Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Tue, 9 Oct 2012 11:43:31 +0200 -Subject: [PATCH] Satisfy micro-tasking library - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 9a9be4f..08c1aed 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -314,7 +314,7 @@ epaths-force: FRC - # running more than 1 process in the leim directory, especially for - # the $TIT files there. - leim: src Makefile FRC -- (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \ -+ (export PARALLEL; PARALLEL=1; cd $@; $(MAKE) all $(MFLAGS) \ - CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}') - --- -1.7.12 - 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 Mar 18 17:06:22 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Mar 2013 16:06:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[20478] csw/mgar/gar/bts Message-ID: Revision: 20478 http://gar.svn.sourceforge.net/gar/?rev=20478&view=rev Author: dmichelsen Date: 2013-03-18 16:06:19 +0000 (Mon, 18 Mar 2013) Log Message: ----------- mGAR bts: Merge in v2 changes Modified Paths: -------------- csw/mgar/gar/bts/gar.conf.mk csw/mgar/gar/bts/gar.mk csw/mgar/gar/bts/gar.pkg.mk csw/mgar/gar/bts/lib/python/catalog_gc.py csw/mgar/gar/bts/lib/python/checkpkg2.py csw/mgar/gar/bts/lib/python/common_constants.py csw/mgar/gar/bts/lib/python/csw_upload_pkg.py csw/mgar/gar/bts/lib/python/database.py csw/mgar/gar/bts/lib/python/database_test.py csw/mgar/gar/bts/lib/python/dependency_checks.py csw/mgar/gar/bts/lib/python/inspective_package.py csw/mgar/gar/bts/lib/python/inspective_package_test.py csw/mgar/gar/bts/lib/python/models.py csw/mgar/gar/bts/lib/python/package.py csw/mgar/gar/bts/lib/python/package_checks.py csw/mgar/gar/bts/lib/python/package_checks_test.py csw/mgar/gar/bts/lib/python/package_stats.py csw/mgar/gar/bts/lib/python/package_stats_test.py csw/mgar/gar/bts/lib/python/pkgdb.py csw/mgar/gar/bts/lib/python/rest.py csw/mgar/gar/bts/lib/python/safe_remove_package.py csw/mgar/gar/bts/lib/python/sharedlib_utils.py csw/mgar/gar/bts/lib/python/shell.py csw/mgar/gar/bts/lib/python/system_pkgmap.py csw/mgar/gar/bts/lib/python/system_pkgmap_test.py csw/mgar/gar/bts/lib/python/testdata/apr_util_stats.py csw/mgar/gar/bts/lib/python/testdata/bdb48_stats.py csw/mgar/gar/bts/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/bts/lib/python/testdata/ivtools_stats.py csw/mgar/gar/bts/lib/python/testdata/javasvn_stats.py csw/mgar/gar/bts/lib/python/testdata/libnet_stats.py csw/mgar/gar/bts/lib/python/testdata/mercurial_stats.py csw/mgar/gar/bts/lib/python/testdata/neon_stats.py csw/mgar/gar/bts/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/bts/lib/python/testdata/sudo_stats.py csw/mgar/gar/bts/lib/python/testdata/tree_stats.py csw/mgar/gar/bts/lib/web/pkgdb_web.py csw/mgar/gar/bts/lib/web/releases_web.py csw/mgar/gar/bts/lib/web/templates/CatalogDetail.html csw/mgar/gar/bts/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/bts/lib/python/testdata/cadaver_stats.py csw/mgar/gar/bts/lib/python/testdata/vsftpd_stats.py Removed Paths: ------------- csw/mgar/gar/bts/tests/static/example/gar csw/mgar/gar/bts/upload-application/ Property Changed: ---------------- csw/mgar/gar/bts/ Property changes on: csw/mgar/gar/bts ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678,19813-20248 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/bts/gar.conf.mk =================================================================== --- csw/mgar/gar/bts/gar.conf.mk 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/gar.conf.mk 2013-03-18 16:06:19 UTC (rev 20478) @@ -201,17 +201,20 @@ # These are the core packages which must be installed for GAR to function correctly -DEF_BASE_PKGS += CSWxz DEF_BASE_PKGS += CSWbzip2 +DEF_BASE_PKGS += CSWcoreutils DEF_BASE_PKGS += CSWdiffutils DEF_BASE_PKGS += CSWfindutils DEF_BASE_PKGS += CSWgawk DEF_BASE_PKGS += CSWgfile DEF_BASE_PKGS += CSWggrep +DEF_BASE_PKGS += CSWgit DEF_BASE_PKGS += CSWgmake DEF_BASE_PKGS += CSWgsed DEF_BASE_PKGS += CSWgtar DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpy-cjson +DEF_BASE_PKGS += CSWpy-dateutil DEF_BASE_PKGS += CSWpy-hachoir-core DEF_BASE_PKGS += CSWpy-hachoir-parser DEF_BASE_PKGS += CSWpy-libmagic @@ -219,9 +222,8 @@ DEF_BASE_PKGS += CSWpy-sqlobject DEF_BASE_PKGS += CSWpy-yaml DEF_BASE_PKGS += CSWpython -DEF_BASE_PKGS += CSWcoreutils DEF_BASE_PKGS += CSWwget -DEF_BASE_PKGS += CSWgit +DEF_BASE_PKGS += CSWxz ifdef GIT_REPOS # netcat and bash are for the gitproxy script. @@ -716,7 +718,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(PREPEND_LINKER_FLAGS) $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) Modified: csw/mgar/gar/bts/gar.mk =================================================================== --- csw/mgar/gar/bts/gar.mk 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/gar.mk 2013-03-18 16:06:19 UTC (rev 20478) @@ -157,7 +157,6 @@ $(call _modulate_target_nocookie,reset-test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) $(call _modulate_target_nocookie,reset-install,$(2),$(4)) -#$(call _modulate_target,merge,$(2),$(4)) $(call _modulate_merge,,$(2),$(4)) $(call _modulate_target_nocookie,reset-merge,$(2),$(4)) $(call _modulate_target_nocookie,clean,$(2),$(4)) @@ -428,7 +427,7 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract +extract: checksum $(COOKIEDIR) $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) @$(DONADA) extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) @@ -438,7 +437,7 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \ + $(if $(filter-out global,$(MODULATION)),pre-extract) pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated $(if $(filter-out global,$(MODULATION)),post-extract) \ $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-extract-gitsnap)) \ $(foreach FILE,$(EXPANDVARS),expandvars-$(FILE)) \ $(foreach REINPLACEMENT,$(POSTEXTRACT_REINPLACEMENTS),\ @@ -510,10 +509,10 @@ # patch - Apply any provided patches to the source. PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) -patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch +patch: $(addprefix patch-,$(MODULATIONS)) @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated post-patch @$(DONADA) # returns true if patch has completed successfully, false @@ -605,12 +604,12 @@ #CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) endif -configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure +configure: $(addprefix configure-,$(MODULATIONS)) @$(DONADA) configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if $(STRIP_LIBTOOL),strip-libtool) + pre-configure pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated post-configure $(if $(STRIP_LIBTOOL),strip-libtool) @$(DONADA) strip-libtool: @@ -626,7 +625,7 @@ @rm -f $(COOKIEDIR)/configure reset-configure-modulated: - @rm -f $(foreach C,pre-configure-modulated configure-modulated post-configure-modulated,$(COOKIEDIR)/$C) + @rm -f $(foreach C,pre-configure pre-configure-modulated configure-modulated post-configure-modulated post-configure,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-configure-$(MODULATION) $(COOKIEDIR)/post-configure-$(MODULATION) @rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) @@ -638,7 +637,7 @@ # build - Actually compile the sources. BUILD_TARGETS = $(addprefix build-,$(BUILD_CHECK_SCRIPTS)) $(addprefix build-,$(BUILD_SCRIPTS)) -build: pre-build $(addprefix build-,$(MODULATIONS)) post-build +build: $(addprefix build-,$(MODULATIONS)) $(DONADA) # Build for a specific architecture @@ -647,7 +646,7 @@ $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ ) -build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated +build-modulated: verify-isa configure-modulated pre-build pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated post-build @$(MAKECOOKIE) .PHONY: reset-build reset-build-modulated @@ -656,9 +655,8 @@ reset-build: $(addprefix reset-build-,$(MODULATIONS)) rm -f $(COOKIEDIR)/build -# XXX: pre-*, post-* reset-build-modulated: $(patsubst build-%,clean-%,$(BUILD_TARGETS)) - rm -f $(addprefix $(COOKIEDIR)/,pre-build-modulated $(BUILD_TAGRETS) post-build-modulated)) + rm -f $(addprefix $(COOKIEDIR)/,pre-build pre-build-modulated $(BUILD_TAGRETS) post-build-modulated post-build)) # returns true if build has completed successfully, false # otherwise @@ -667,10 +665,10 @@ TEST_TARGETS = $(addprefix test-,$(TEST_SCRIPTS)) -test: pre-test $(addprefix test-,$(MODULATIONS)) post-test +test: $(addprefix test-,$(MODULATIONS)) $(DONADA) -test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated +test-modulated: build-modulated pre-test pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated post-test $(DONADA) # XXX: retest @@ -704,13 +702,13 @@ # install - Test and install the results of a build. INSTALL_TARGETS = $(addprefix install-,$(INSTALL_SCRIPTS)) -install: pre-install $(addprefix install-,$(MODULATIONS)) post-install +install: $(addprefix install-,$(MODULATIONS)) $(DONADA) install-modulated: build-modulated $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test-modulated $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) \ - pre-install-modulated pre-install-$(MODULATION) \ + pre-install pre-install-modulated pre-install-$(MODULATION) \ $(INSTALL_TARGETS) \ - post-install-$(MODULATION) post-install-modulated \ + post-install-$(MODULATION) post-install-modulated post-install \ $(POST_INSTALL_TARGETS) \ $(foreach REINPLACEMENT,$(POSTINSTALL_REINPLACEMENTS),\ post-install-reinplace-$(REINPLACEMENT) \ @@ -741,7 +739,7 @@ reset-install-modulated: @$(call _pmod,Reset install state) @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work - @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) + @rm -f $(foreach C,pre-install pre-install-modulated install-modulated post-install-modulated post-install,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) @@ -879,7 +877,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge +merge: checksum merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) @banner merge @$(MAKECOOKIE) @@ -921,7 +919,7 @@ @$(MAKECOOKIE) # This merges the -merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated +merge-modulated: install-modulated pre-merge pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated post-merge @$(MAKECOOKIE) # Copy the whole tree verbatim @@ -979,13 +977,12 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src - rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge + rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge rm -rf $(PKGROOT) reset-merge-modulated: @$(call _pmod,Reset merge state) - echo rm -f $(COOKIEDIR)/merge-* - rm -f $(COOKIEDIR)/merge-* + rm -f $(COOKIEDIR)/pre-merge $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge $(COOKIEDIR)/post-merge-* # The clean rule. It must be run if you want to re-download a # file after a successful checksum (or just remove the checksum Modified: csw/mgar/gar/bts/gar.pkg.mk =================================================================== --- csw/mgar/gar/bts/gar.pkg.mk 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/gar.pkg.mk 2013-03-18 16:06:19 UTC (rev 20478) @@ -31,7 +31,7 @@ # SRCPACKAGE is the name of the package containing the sources ifeq ($(origin PACKAGES), undefined) -PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,$(PKG_STEM)$(NAME)) +PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,$(PKG_STEM)$(subst _,-,$(NAME))) CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(subst -,_,$(NAME))) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src @@ -208,7 +208,14 @@ SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) -SPKG_EXPORT ?= $(HOME)/staging/build-$(shell date '+%d.%b.%Y') +ifdef SPKG_EXPORT +# The definition may include variable parts like a call to "date". This would lead to different directory names +# for multiple invocation in longs builds and a failing checkpkg due to lookup in wrong directories, so fixate +# once what we have. +SPKG_EXPORT := $(SPKG_EXPORT) +else +SPKG_EXPORT := $(HOME)/staging/build-$(shell date '+%d.%b.%Y') +endif SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) @@ -216,8 +223,20 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db -SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),$(PKG_STEM)).pkg +# These variables could change value transiently and need to be passed to subinvocations of GAR +_PASS_GAR_SUBINVOCATION_EXPORTS += SPKG_EXPORT +_PASS_GAR_ENV = $(foreach V,$(_PASS_GAR_SUBINVOCATION_EXPORTS),$V=$($V)) +# This is the old specification being evaluated during mkpackage. The expansion of the SPKG_REVSTAMP leads to +# problems later on when need the filename for checkpkg again and too much time has passed. In the new approach +# the packagename is directly put in the gspec. +# SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg + +# The filename for a package +define _pkgfile +$(call catalogname,$(1))-$(call pkgvar,SPKG_VERSION,$(1)),$(call pkgvar,SPKG_REVSTAMP,$(1))-$(call pkgvar,SPKG_OSNAME,$(1))-$(if $(or $(ARCHALL),$(ARCHALL_$(1))),all,$(GARCH))-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +endef + MIGRATECONF ?= $(strip $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also @@ -315,6 +334,7 @@ # Where we find our mkpackage global templates PKGLIB = $(GARDIR)/pkglib +# These variables are for mkpackage and the gspec expansion PKG_EXPORTS = NAME VERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY @@ -597,6 +617,7 @@ $(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,\ (echo "%var bitname $(call catalogname,$*)"; \ echo "%var pkgname $*"; \ + echo "%var pkgfile $(call _pkgfile,$*)"; \ $(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var arch all";) \ $(if $(_CATEGORY_GSPEC_INCLUDE),echo "%include url file://%{PKGLIB}/$(_CATEGORY_GSPEC_INCLUDE)")) >$@\ ) @@ -704,6 +725,7 @@ echo "OPENCSW_BUNDLE=$(BUNDLE)"; \ echo "OPENCSW_OS_RELEASE=$(SPKG_OSNAME)"; \ echo "OPENCSW_OS_ARCH=$(GARCH)"; \ + $(if $(OBSOLETED_BY_$*),echo "OPENCSW_OBSOLETES=$(OBSOLETED_BY_$*)";) \ $(_CATEGORY_PKGINFO) \ ) >$@ $(if $(ALLOW_RELOCATE),echo "BASEDIR=$(RELOCATE_PREFIX)" >>$@) @@ -950,7 +972,7 @@ @echo @echo "The following packages have been built:" @echo - @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow @echo @$(DONADA) @@ -959,7 +981,7 @@ dirpackage: _package @echo "The following packages have been built:" @echo - @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow @echo @$(DONADA) @@ -1032,14 +1054,15 @@ _PROPAGATE_ENV += PARALLELMFLAGS _PROPAGATE_ENV += PARALLELMODULATIONS _PROPAGATE_ENV += PATH +_PROPAGATE_ENV += SKIPTEST platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms: $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) GAR_PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ + $(MAKE) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -1052,9 +1075,9 @@ $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ - $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ + $(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -1064,8 +1087,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) -s GAR_PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ + $(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ Modified: csw/mgar/gar/bts/lib/python/catalog_gc.py =================================================================== --- csw/mgar/gar/bts/lib/python/catalog_gc.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/catalog_gc.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -1,16 +1,29 @@ #!/opt/csw/bin/python2.6 -"""Garbage-collecting for a catalog. +"""Garbage-collecting for the catalog tree. The allpkgs directory may contain unused files. They should be deleted. """ +import logging import optparse -import logging -import os.path +import os +import pipes import re import common_constants +import rest +USAGE = """%prog --catalog-tree /home/mirror/opencsw-official --dest_dir /home/mirror/gc > gc_01.sh +less gc_01.sh + +# Looks good? + +bash gc_01.sh + +If everything is fine (catalog still generates, no files are missing that are +necessary), you can remove files from /home/mirror/gc. +""" + class Error(Exception): """Base error.""" @@ -20,11 +33,12 @@ class CatalogGarbageCollector(object): - ADDITIONAL_CATALOGS = ("current", "stable") + ADDITIONAL_CATALOGS = ("legacy",) - def __init__(self, d): + def __init__(self, d, dest_dir): logging.debug("CatalogGarbageCollector(%s)", repr(d)) self.catalog_dir = d + self.dest_dir = dest_dir def GarbageCollect(self): allpkgs_path = os.path.join(self.catalog_dir, "allpkgs") @@ -33,9 +47,15 @@ catalogs_by_files = {} for p in os.listdir(allpkgs_path): allpkgs.add(p) - catalogs_to_check = ( - tuple(common_constants.DEFAULT_CATALOG_RELEASES) - + self.ADDITIONAL_CATALOGS) + catalogs_to_check = tuple(common_constants.DEFAULT_CATALOG_RELEASES) + catalogs_to_check += self.ADDITIONAL_CATALOGS + rest_client = rest.RestClient() + catalog_triplet_list = rest_client.GetCatalogList() + catalogs_to_check += tuple(set([x[2] for x in catalog_triplet_list])) + catalogs_to_check = tuple(set(catalogs_to_check)) + logging.info("Collecting packages from catalogs: %s", + catalogs_to_check) + file_sizes = {} for catrel in catalogs_to_check: for arch in common_constants.PHYSICAL_ARCHITECTURES: for osrel_long in common_constants.OS_RELS: @@ -49,25 +69,42 @@ for p in os.listdir(catalog_path): if pkg_re.search(p): # It's a package + full_path = os.path.join(catalog_path, p) files_in_catalogs.add(p) l = catalogs_by_files.setdefault(p, []) l.append((catrel, arch, osrel_short)) - for p in allpkgs.difference(files_in_catalogs): - logging.debug("File %s is not used by any catalogs.", p) - print "rm %s/%s" % (allpkgs_path, p) + if full_path not in file_sizes: + s = os.stat(full_path) + file_sizes[full_path] = s.st_size + logging.info( + "Collected from %r, found references to %d files (out of %d in allpkgs)", + catrel, len(files_in_catalogs), len(allpkgs)) + to_remove = allpkgs.difference(files_in_catalogs) + logging.debug("Collecting file sizes.") + total_size = sum(os.stat(os.path.join(allpkgs_path, x)).st_size + for x in to_remove) + logging.info("Found %d packages to remove, total size: %.1fMB.", + len(to_remove), float(total_size) / 1024 ** 2) + for p in to_remove: + full_path = os.path.join(allpkgs_path, p) + print "mv", pipes.quote(full_path), pipes.quote(self.dest_dir) def main(): parser = optparse.OptionParser() - parser.add_option("-c", "--catalog", - dest="catalog", - help="Catalog path") + parser.add_option("--catalog-tree", + dest="catalog_tree", + help=("Path to the catalog tree, that is the directory " + "containing subdirectories unstable, testing, etc.")) + parser.add_option("--dest-dir", + dest="dest_dir", + help=("Move files out to this catalog.")) options, args = parser.parse_args() logging.basicConfig(level=logging.DEBUG) - if not options.catalog: + if not options.catalog_tree or not options.dest_dir: parser.print_usage() - raise UsageError("Missing catalog option, see --help.") - gcg = CatalogGarbageCollector(options.catalog) + raise UsageError("Missing the catalog tree option, see --help.") + gcg = CatalogGarbageCollector(options.catalog_tree, options.dest_dir) gcg.GarbageCollect() Modified: csw/mgar/gar/bts/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/bts/lib/python/checkpkg2.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/checkpkg2.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -134,7 +134,7 @@ tags_for_all_osrels = [] try: sqo_catrel = models.CatalogRelease.selectBy(name=options.catrel).getOne() - except sqlobject.main.SQLObjectNotFound, e: + except sqlobject.main.SQLObjectNotFound as e: logging.fatal("Fetching from the db has failed: catrel=%s", repr(str(options.catrel))) logging.fatal("Available catalog releases:") @@ -173,7 +173,7 @@ tags_for_all_osrels.extend(tags_after_overrides) if not options.quiet: if tags_after_overrides: - print textwrap.fill(BEFORE_OVERRIDES, 80) + print(textwrap.fill(BEFORE_OVERRIDES, 80)) for checkpkg_tag in tags_after_overrides: print checkpkg_tag.ToGarSyntax() print textwrap.fill(AFTER_OVERRIDES, 80) Modified: csw/mgar/gar/bts/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/bts/lib/python/common_constants.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/common_constants.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -34,6 +34,7 @@ DEFAULT_INSTALL_CONTENTS_FILE = "/var/sadm/install/contents" DUMP_BIN = "/usr/ccs/bin/dump" +ELFDUMP_BIN = "/usr/ccs/bin/elfdump" OWN_PKGNAME_PREFIXES = frozenset(["CSW"]) @@ -73,6 +74,7 @@ 'dublin', 'unstable', 'legacy', + 'kiel', ]) # At some point, it was used to prevent people from linking against Modified: csw/mgar/gar/bts/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/bts/lib/python/csw_upload_pkg.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/csw_upload_pkg.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -22,8 +22,8 @@ import file_set_checker import sys import getpass +import urllib2 - BASE_URL = "http://buildfarm.opencsw.org" RELEASES_APP = "/releases" DEFAULT_CATREL = "unstable" @@ -240,8 +240,11 @@ for osrel in osrels: logging.debug("%s %s %s", catrel, arch, osrel) cat_key = (catrel, arch, osrel) - srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( - catrel, arch, osrel, catalogname) + try: + srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( + catrel, arch, osrel, catalogname) + except urllib2.HTTPError, e: + srv4_in_catalog = None if srv4_in_catalog: logging.debug("Catalog %s %s contains version %s of the %s package", arch, osrel, srv4_in_catalog["osrel"], catalogname) Modified: csw/mgar/gar/bts/lib/python/database.py =================================================================== --- csw/mgar/gar/bts/lib/python/database.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/database.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -10,23 +10,28 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 7L +DB_SCHEMA_VERSION = 9L TABLES_THAT_NEED_UPDATES = (m.CswFile,) -TABLES = TABLES_THAT_NEED_UPDATES + ( - m.Architecture, - m.CatalogRelease, - m.CatalogReleaseType, - m.CheckpkgErrorTag, - m.CheckpkgOverride, - m.CswConfig, - m.Host, - m.Maintainer, - m.OsRelease, - m.Pkginst, - m.Srv4DependsOn, - m.Srv4FileInCatalog, - m.Srv4FileStats, - m.Srv4FileStatsBlob) + +# This list of tables is sensitive to the order in which tables are created. +# After you change the order here, you need to make sure that the tables can +# still be created. +TABLES = (m.Architecture, + m.CatalogReleaseType, + m.CatalogRelease, + m.CswConfig, + m.Host, + m.Maintainer, + m.OsRelease, + m.Pkginst, + m.Srv4FileStatsBlob, + m.Srv4FileStats, + m.CheckpkgErrorTag, +) + TABLES_THAT_NEED_UPDATES + ( + m.CheckpkgOverride, # needs Srv4FileStats + m.Srv4DependsOn, + m.Srv4FileInCatalog, +) # Shouldn't this be in common_constants? SYSTEM_PKGMAP = "/var/sadm/install/contents" CONFIG_MTIME = "mtime" @@ -87,7 +92,7 @@ "the application expects: %s. " % (ldm.GetDatabaseSchemaVersion(), DB_SCHEMA_VERSION)) if DB_SCHEMA_VERSION < ldm.GetDatabaseSchemaVersion(): - msg += "Make sure your application sources are up to date." + msg += "When did you last run 'mgar up --all'?." elif DB_SCHEMA_VERSION > ldm.GetDatabaseSchemaVersion(): msg += ("Make sure your database is up to date. " "Re-create it if necessary.") @@ -153,8 +158,14 @@ def CreateTables(self): for table in TABLES: - table.createTable(ifNotExists=True) + try: + logging.debug("Creating table %r", table) + table.createTable(ifNotExists=True) + except sqlobject.dberrors.OperationalError, e: + logging.error("Could not create table %r: %s", table, e) + raise + def InitialDataImport(self): """Imports initial data into the db. @@ -183,10 +194,6 @@ pass self.SetDatabaseSchemaVersion() - def CreateTables(self): - for table in TABLES: - table.createTable(ifNotExists=True) - def ClearTablesForUpdates(self): for table in TABLES_THAT_NEED_UPDATES: table.clearTable() @@ -287,7 +294,7 @@ logging.warning("Could not get file mtime: %s", e) d_mtime = time.gmtime(int(d_mtime_epoch)) logging.debug("IsDatabaseUpToDate: f_mtime %s, d_time: %s", f_mtime, d_mtime) - # Rounding up to integer seconds. There is a race condition: + # Rounding up to integer seconds. There is a race condition: # pkgadd finishes at 100.1 # checkpkg reads /var/sadm/install/contents at 100.2 # new pkgadd runs and finishes at 100.3 Modified: csw/mgar/gar/bts/lib/python/database_test.py =================================================================== --- csw/mgar/gar/bts/lib/python/database_test.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/database_test.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -8,6 +8,18 @@ class DatabaseManagerUnitTest(mox.MoxTestBase): + def testCanCreateTables(self): + # This test succeeds when run with sqlite, but fails with MySQL. + # We don't want to add a dependency on a running MySQL database to run tests, so + # we'll leave it unsolved for now. + dbc = database.CatalogDatabase(uri="sqlite:/:memory:") + dbc.CreateTables() + + def testCanCreateTablesAndImportData(self): + dbc = database.CatalogDatabase(uri="sqlite:/:memory:") + dbc.CreateTables() + dbc.InitialDataImport() + def testNoSystemFiles(self): # This test shows that stubbing out sqlite classes is quite laborious. saved_s = database.m.Srv4FileStats Modified: csw/mgar/gar/bts/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/bts/lib/python/dependency_checks.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/dependency_checks.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -39,6 +39,29 @@ PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) +BASE_SOLARIS_LIBRARIES = set([ + "libsocket.so.1", "libnsl.so.1", "libdl.so.1", "librt.so.1", + "libresolv.so.2", "libpthread.so.1", + # linked by default with C++, see "Default C++ Libraries" + # in Solaris Studio C++ User's Guide + "libCstd.so.1", "libCrun.so.1", "libm.so.1", "libm.so.2", + "libw.so.1", "libcx.so.1", "libc.so.1", "libC.so.3", "libC.so.5", +]) + +ALLOWED_VERSION_DEPENDENCIES = { + "libc.so.1": ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.22.6', + 'SUNW_1.22.5', 'SUNW_1.22.4', 'SUNW_1.22.3', 'SUNW_1.22.2', + 'SUNW_1.22.1', 'SUNW_1.22', 'SUNW_1.21.3', 'SUNW_1.21.2', + 'SUNW_1.21.1', 'SUNW_1.21', 'SUNW_1.20.4', 'SUNW_1.20.1', + 'SUNW_1.20', 'SUNW_1.19', 'SUNW_1.18.1', 'SUNW_1.18', + 'SUNW_1.17', 'SUNW_1.16', 'SUNW_1.15', 'SUNW_1.14', + 'SUNW_1.13', 'SUNW_1.12', 'SUNW_1.11', 'SUNW_1.10', + 'SUNW_1.9', 'SUNW_1.8', 'SUNW_1.7', 'SUNW_1.6', 'SUNW_1.5', + 'SUNW_1.4', 'SUNW_1.3', 'SUNW_1.2', 'SUNW_1.1', 'SUNW_0.9', + 'SUNW_0.8', 'SUNW_0.7', 'SISCD_2.3'], +} + + def ProcessSoname( ldd_emulator, soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger, @@ -147,6 +170,83 @@ error_mgr, pkgname, messenger) orphan_sonames.extend(orphan_sonames_tmp) + + sonames_unused = set() + ldd_info = pkg_data['ldd_info'][binary_info["path"]] + for ldd_response in ldd_info: + if (ldd_response['state'] == 'soname-unused' + and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES): + sonames_unused.add(ldd_response['soname']) + messenger.Message( + "Binary %s links to library %s but doesn't seem to use any" + " of its symbols. It usually happens because superfluous" + " libraries were added to the linker options, either because" + " of the configure script itself or because of the" + " \"pkg-config --libs\" output of one the dependency." + % ("/" + binary_info["path"], ldd_response['soname'])) + error_mgr.ReportError( + pkgname, "soname-unused", + "%s is needed by %s but never used" + % (ldd_response['soname'], "/" + binary_info["path"])) + + # Even when direct binding is enabled, some symbols might not be + # directly bound because the library explicitely requested the symbol + # not to be drectly bound to. + # For example, libc.so.1 does it for symbol sigaction, free, malloc... + # So we consider that direct binding is enabled if at least one + # symbol is directly bound to because that definitely means that + # -B direct or -z direct was used. + binary_elf_info = pkg_data["binaries_elf_info"][binary_info["path"]] + libs = set(binary_info["needed sonames"]) + + # we skip the standard Solaris libraries: a lot of plugins only + # link to non directly bindable symbols of libc.so.1, librt.so.1 + # which trigger false positives. + # Direct binding really matters for opencsw libraries so it's + # easier and riskless to just skip theses libraries + libs.difference_update(BASE_SOLARIS_LIBRARIES) + + db_libs = set() + for syminfo in binary_elf_info['symbol table']: + if (syminfo['shndx'] == 'UNDEF' and syminfo['flags'] + and 'D' in syminfo['flags'] and 'B' in syminfo['flags']): + db_libs.add(syminfo['soname']) + no_db_libs = libs.difference(db_libs) + + # no symbol used means no way to detect if direct binding was + # enabled so we must ignore the libraries which were linked + # without being used + no_db_libs.difference_update(sonames_unused) + + if no_db_libs: + messenger.Message( + "No symbol of binary %s is directly bound against the following" + " libraries: %s. Please make sure the binaries are compiled using" + " the \"-Bdirect\" linker option." + % ("/" + binary_info["path"], ", ".join(no_db_libs))) + for soname in no_db_libs: + error_mgr.ReportError( + pkgname, "no-direct-binding", + "%s is not directly bound to soname %s" + % ("/" + binary_info["path"], soname)) + + + for version_dep in binary_elf_info['version needed']: + if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and + not version_dep['version'] in + ALLOWED_VERSION_DEPENDENCIES[version_dep['soname']]): + messenger.Message( + "Binary %s requires interface version %s in library %s which is" + " only available in recent Solaris releases." + % ("/" + binary_info["path"], version_dep['version'], + version_dep['soname'])) + error_mgr.ReportError( + pkgname, "forbidden-version-interface-dependencies", + "%s requires forbidden interface version %s in library %s" + % ("/" + binary_info["path"], version_dep['version'], + version_dep['soname'])) + + orphan_sonames = set(orphan_sonames) for soname, binary_path in orphan_sonames: if soname not in ALLOWED_ORPHAN_SONAMES: Modified: csw/mgar/gar/bts/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/bts/lib/python/inspective_package.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/inspective_package.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -1,15 +1,17 @@ import package import os import re +import sys import logging import hachoir_parser import sharedlib_utils import magic import copy import common_constants -import subprocess import ldd_emul import configuration as c +import time +import shell """This file isolates code dependent on hachoir parser. @@ -53,15 +55,26 @@ "You have to restart your process - it " "will probably finish successfully when do you that." % full_path) - raise package.PackageError(msg) - if sharedlib_utils.IsBinary(file_info): + if "/opt/csw/share" in full_path: + file_info["mime_type"] = "application/octet-stream; fallback" + logging.error(msg) + else: + raise package.PackageError(msg) + if sharedlib_utils.IsBinary(file_info, check_consistency=False): parser = hachoir_parser.createParser(full_path) if not parser: logging.warning("Can't parse file %s", file_path) else: try: + machine_id = parser["/header/machine"].value + except hachoir_core.field.field.MissingField, e: + logging.fatal( + "hachoir_parser failed to retrieve machine_id for %r. " + "checkpkg cannot continue.", + file_info) + raise + try: file_info["mime_type_by_hachoir"] = parser.mime_type - machine_id = parser["/header/machine"].value file_info["machine_id"] = machine_id file_info["endian"] = parser["/header/endian"].display except hachoir_core.field.field.MissingField, e: @@ -69,7 +82,6 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info - class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -167,24 +179,15 @@ binaries_dump_info = [] basedir = self.GetBasedir() for binary in self.ListBinaries(): - # Relocatable packages complicate things. Binaries returns paths with - # the basedir, but files in reloc are in paths without the basedir, so - # we need to strip that bit. - binary_in_tmp_dir = binary + binary_abs_path = os.path.join(self.directory, self.GetFilesDir(), binary) if basedir: - binary_in_tmp_dir = binary_in_tmp_dir[len(basedir):] - binary_in_tmp_dir = binary_in_tmp_dir.lstrip("/") - binary_abs_path = os.path.join(self.directory, self.GetFilesDir(), binary_in_tmp_dir) - binary_base_name = os.path.basename(binary_in_tmp_dir) + binary = os.path.join(basedir, binary) + binary_base_name = os.path.basename(binary) + args = [common_constants.DUMP_BIN, "-Lv", binary_abs_path] - logging.debug("Running: %s", args) - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() + retcode, stdout, stderr = shell.ShellCommand(args, env) binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary - if basedir: - binary_data["path"] = os.path.join(basedir, binary_data["path"]) binary_data["base_name"] = binary_base_name binaries_dump_info.append(binary_data) return binaries_dump_info @@ -204,17 +207,13 @@ defined_symbols = {} for binary in binaries: - binary_abspath = os.path.join(self.directory, "root", binary) + binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] - nm_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = nm_proc.communicate() - retcode = nm_proc.wait() + retcode, stdout, stderr = shell.ShellCommand(args) if retcode: logging.error("%s returned an error: %s", args, stderr) + # Should it just skip over an error? continue nm_out = stdout.splitlines() @@ -229,29 +228,176 @@ return defined_symbols + def GetBinaryElfInfo(self): + """Returns various informations symbol and versions present in elf header + + To do this we parse output lines from elfdump -syv, it's the + only command that will give us all informations we need on + symbols and versions. + + We will analyse 3 sections: + - version section: contains soname needed, version interface required + for each soname, and version definition + - symbol table section: contains list of symbol and soname/version + interface providing it + - syminfo section: contains special linking flags for each symbol + """ + binaries = self.ListBinaries() + binaries_elf_info = {} + base_dir = self.GetBasedir() + + for binary in binaries: + binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) + if base_dir: + binary = os.path.join(base_dir, binary) + # elfdump is the only tool that give us all informations + args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] + retcode, stdout, stderr = shell.ShellCommand(args) + if retcode or stderr: + # we ignore for now these elfdump errors which can be catched + # later by check functions, + ignored_error_re = re.compile( + r"""[^:]+:(\s\.((SUNW_l)?dynsym|symtab):\s + ((index\[\d+\]:\s)? + (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\slies + \swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) + + |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)? + :\s(symbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) + \slies\soutside\sof\scontaining\ssection + |is\ssmaller\sthan\ssymbol\ssize:\s\d+) + + |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+ + |) + + |invalid\ssh_link:\s0) + + |\smemory\soverlap\sbetween\ssection\[\d+\]:\s[^:]+:\s + [0-9a-f]+:[0-9a-f]+\sand\ssection\[\d+\]:\s[^:]+: + \s[0-9a-f]+:[0-9a-f]+) + \n""", + re.VERBOSE) + + stderr = re.sub(ignored_error_re, "", stderr) + if stderr: + with open("/tmp/elfdump_stdout.log", "w") as fd: + fd.write(stdout) + with open("/tmp/elfdump_stderr.log", "w") as fd: + fd.write(stderr) + msg = ("%s returned one or more errors: %s" % (args, stderr) + + "\n\n" + + "ERROR: elfdump invocation failed. Please copy this message " + + "and the above messages into your report and send " + + "as path of the error report. Logs are saved in " + + "/tmp/elfdump_std(out|err).log for your inspection.") + raise package.Error(msg) + elfdump_out = stdout.splitlines() + + symbols = {} + binary_info = {'version definition': [], + 'version needed': []} + + cur_section = None + for line in elfdump_out: + + try: + elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) + except package.StdoutSyntaxError as e: + sys.stderr.write("elfdump out:\n") + sys.stderr.write(stdout) + raise + + # header or blank line contains no information + if not elf_info: + continue + + # symbol table and syminfo section store various informations + # about the same symbols, so we merge them in a dict + if cur_section in ('symbol table', 'syminfo'): + symbols.setdefault(elf_info['symbol'], {}).update(elf_info) + else: + binary_info[cur_section].append(elf_info) + + # elfdump doesn't repeat the name of the soname in the version section + # if it's the same on two contiguous line, e.g.: + # libc.so.1 SUNW_1.1 + # SUNWprivate_1.1 + # so we have to make sure the information is present in each entry + for i, version in enumerate(binary_info['version needed'][1:]): + if not version['soname']: + version['soname'] = binary_info['version needed'][i]['soname'] + + # soname version needed are usually displayed sorted by index ... + # but that's not always the case :( so we have to reorder + # the list by index if they are present + if any ( v['index'] for v in binary_info['version needed'] ): + binary_info['version needed'].sort(key=lambda m: int(m['index'])) + for version in binary_info['version needed']: + del version['index'] + + # if it exists, the first "version definition" entry is the base soname + # we don't need this information + if binary_info['version definition']: + binary_info['version definition'].pop(0) + + binary_info['symbol table'] = symbols.values() + binary_info['symbol table'].sort(key=lambda m: m['symbol']) + # To not rely of the section order output of elfdump, we resolve + # symbol version informations here after having parsed all output + self._ResolveSymbolsVersionInfo(binary_info) + + binaries_elf_info[binary] = binary_info + + return binaries_elf_info + def GetLddMinusRlines(self): """Returns ldd -r output.""" - dir_pkg = self.GetInspectivePkg() - binaries = dir_pkg.ListBinaries() + binaries = self.ListBinaries() + base_dir = self.GetBasedir() ldd_output = {} for binary in binaries: - binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) + if base_dir: + binary = os.path.join(base_dir, binary) + # this could be potentially moved into the DirectoryFormatPackage class. # ldd needs the binary to be executable os.chmod(binary_abspath, 0755) - args = ["ldd", "-r", binary_abspath] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() + args = ["ldd", "-Ur", binary_abspath] + # ldd can be stuck while ran on a some binaries, so we define + # a timeout (problem encountered with uconv) + retcode, stdout, stderr = shell.ShellCommand(args, timeout=10) if retcode: - logging.error("%s returned an error: %s", args, stderr) + # There three cases where we will ignore an ldd error + # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 + # solaris 9 exists only in 32 bits, so we can't do this + # We ignore the error as it is likely that the ldd infos will be + # the same on the 32 bits binaries + # - if we are trying to analyze a binary from another architecture + # we ignore this error as it will be caught by another checkpkg test + # - if we are trying to analyze a statically linked binaries + # we care only about dynamic binary so we ignore the error + # + uname_info = os.uname() + if ((uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and + '/amd64/' in binary_abspath and + 'has wrong class or data encoding' in stderr) or + re.search(r'ELF machine type: EM_\w+: ' + r'is incompatible with system', stderr) + or 'file is not a dynamic executable or shared object' in stderr): + ldd_output[binary] = [] + continue + + raise package.SystemUtilityError("%s returned an error: %s" % (args, stderr)) + ldd_info = [] for line in stdout.splitlines(): - ldd_info.append(self._ParseLddDashRline(line)) + result = self._ParseLddDashRline(line, binary_abspath) + if result: + ldd_info.append(result) + ldd_output[binary] = ldd_info + return ldd_output def _ParseNmSymLine(self, line): @@ -263,7 +409,111 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym - def _ParseLddDashRline(self, line): + def _ResolveSymbolsVersionInfo(self, binary_info): + + version_info = (binary_info['version definition'] + + binary_info['version needed']) + + for sym_info in binary_info['symbol table']: + # sym_info version field is an 1-based index on the version + # information table + # we don't care about 0 and 1 values: + # 0 is for external symbol with no version information available + # 1 is for a symbol defined by the binary and not binded + # to a version interface + version_index = int(sym_info['version']) - 2 + if version_index >= 0: + version = version_info[version_index] + sym_info['version'] = version['version'] + if 'soname' in version: + sym_info['soname'] = version['soname'] + else: + sym_info['version'] = None + + # we make sure these fields are present + # even if the syminfo section is not + sym_info.setdefault('soname') + sym_info.setdefault('flags') + + def _ParseElfdumpLine(self, line, section=None): + + headers_re = ( + r""" + (?P
Version\sNeeded|Symbol\sTable # Section header + |Version\sDefinition|Syminfo) + \sSection: + \s+(?:\.SUNW_version|\.gnu\.version_[rd] + |\.(SUNW_l)?dynsym|\.SUNW_syminfo|.symtab)\s*$ + + |\s*(?:index\s+)?version\s+dependency\s*$ # Version needed header + + |\s*(?:index\s+)?file\s+version\s*$ # Version definition header + + |\s*index\s*value\s+size\s+type\s+bind # Symbol table header + \s+oth\s+ver\s+shndx\s+name\s*$ + + |\s*index\s+fla?gs\s+bound\sto\s+symbol\s*$ # Syminfo header + + |\s*$ # There is always a blank + # line before a new section + """) + + re_by_section = { + 'version definition': (r""" + \s*(?:\[\d+\]\s+)? # index: might be not present if no + # version binding is enabled + (?P\S+) # version + (?:\s+(?P\S+))? # dependency + (?:\s+\[\s(?:BASE|WEAK)\s\])?\s*$ + """), + 'version needed': (r""" + \s*(?:\[(?P\d+)\]\s+)? # index: might be not present if no + # version binding is enabled + (?:(?P\S+)\s+ # file: can be absent if the same as + (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, + # we make sure there is no + # confusion with version + (?P\S+) # version + (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # + """), + 'symbol table': (r""" + \s*\[\d+\] # index + \s+(?:0x[0-9a-f]+|REG_G\d+) # value + \s+(?:0x[0-9a-f]+) # size + \s+(?P\S+) # type + \s+(?P\S+) # bind + \s+(?:\S+) # oth + \s+(?P\S+) # ver + \s+(?P\S+) # shndx + (?:\s+(?P\S+))?\s*$ # name + """), + 'syminfo': (r""" + \s*(?:\[\d+\]) # index + \s+(?P[ABCDFILNPS]+) # flags + + \s+(?:(?:\[\d+\] # bound to: contains either + \s+(?P\S+)|)\s+)? # - library index and library name + # - for non external symbols + + (?P\S+)\s* # symbol + """)} + + elfdump_data = None + m = re.match(headers_re, line, re.VERBOSE) + if m: + if m.lastindex: + section = m.group('section').lower() + elif section: + m = re.match(re_by_section[section], line, re.VERBOSE) + if m: + elfdump_data = m.groupdict() + + if not m: + raise package.StdoutSyntaxError("Could not parse %s" % (repr(line))) + + return elfdump_data, section + + def _ParseLddDashRline(self, line, binary=None): found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" symbol_not_found_re = (r"^\tsymbol not found:\s(?P\S+)\s+" r"\((?P\S+)\)") @@ -276,16 +526,38 @@ r'with STV_PROTECTED visibility$') sizes_differ = (r'^\trelocation \S+ sizes differ: ' r'(?P\S+)$') - sizes_info = (r'^\t\t\(file (?P\S+) size=(?P0x\w+); ' + sizes_info = (r'^\t\t\(file (?P\S+)' + r' size=(?P0x\w+); ' r'file (?P\S+) size=(?P0x\w+)\)$') sizes_one_used = (r'^\t\t(?P\S+) size used; ' r'possible insufficient data copied$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" + unreferenced_object = (r'^\s*unreferenced object=(?P.*);' + r' unused dependency of (?P.*)$') + unused_object = (r'^\s*unused object=.*$') + unused_search_path = (r'^\s*unused search path=.*' + r' \(RUNPATH/RPATH from file .*\)$') + move_offset_error = (r'^\tmove (?P\d+) offset invalid: ' + r'\(unknown\): offset=(?P0x[0-9a-f]+) ' + 'lies outside memory image; move discarded') + relocation_error = (r'relocation R_(386|AMD64|X86_64|SPARC)_\w+ ' + r'sizes differ: (?P.*)' + r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .*' + r'size=0x(?:[0-9a-f]+)?\)' + r'|\t.* size used; possible data truncation') + copy_relocation_error = (r'\tsymbol (?P\S+):' + r' file \S+: copy relocation symbol' + r' may have been displacement relocated') + blank_line = (r'^\s*$') + common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so, - stv_protected, sizes_differ, sizes_info, sizes_one_used)) + stv_protected, sizes_differ, sizes_info, + sizes_one_used, unreferenced_object, unused_object, + unused_search_path, blank_line, move_offset_error, + relocation_error, copy_relocation_error)) m = re.match(common_re, line) - response = {} + response = None if m: + response = {} d = m.groupdict() if "soname" in d and d["soname"]: # it was found @@ -298,6 +570,11 @@ response["soname"] = None response["path"] = d["path_not_found"] response["symbol"] = d["symbol"] + elif "binary" in d and d["binary"] and binary == d["binary"]: + response["state"] = "soname-unused" + response["soname"] = os.path.basename(d["object"]) + response["path"] = None + response["symbol"] = None elif d["path_only"]: response["state"] = "OK" response["soname"] = None @@ -328,12 +605,28 @@ response["soname"] = None response["path"] = "%s" % (d["sizediffused_file"]) response["symbol"] = None - else: - raise StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) + elif d["move_offset"]: + response["state"] = 'move-offset-error' + response["soname"] = None + response["path"] = None + response["symbol"] = None + response["move_offset"] = d['move_offset'] + response["move_index"] = d['move_index'] + elif d["reloc_symbol"]: + response["state"] = 'relocation-issue' + response["soname"] = None + response["path"] = None + response["symbol"] = d['reloc_symbol'] + elif d["copy_reloc_symbol"]: + response["state"] = 'relocation-issue' + response["soname"] = None + response["path"] = None + response["symbol"] = d['copy_reloc_symbol'] + else: - raise StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) + raise package.StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) + return response def GetDependencies(self): @@ -436,10 +729,11 @@ """Trying to run magic.file() a few times, not accepting None.""" self._LazyInit() mime = None + logging.debug("GetFileMimeType(%r)", full_path) for i in xrange(10): mime = self.magic_cookie.file(full_path) if mime: - break; + break else: # Returned mime is null. Re-initializing the cookie and trying again. logging.error("magic_cookie.file(%s) returned None. Retrying.", Modified: csw/mgar/gar/bts/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/bts/lib/python/inspective_package_test.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/inspective_package_test.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -1,11 +1,14 @@ -#!/usr/bin/env python2.6 +#!/opt/csw/bin/python2.6 import unittest2 as unittest import inspective_package +import package +import shell import mox import hachoir_parser import magic import os +import common_constants LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 \tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) @@ -19,6 +22,118 @@ \t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/kslideshow.kss size=0x28; file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20) """ +DUMP_OUTPUT = ''' + **** DYNAMIC SECTION INFORMATION **** +.dynamic: +[INDEX] Tag Value +[1] NEEDED libXext.so.0 +[2] NEEDED libX11.so.4 +[3] NEEDED libsocket.so.1 +[4] NEEDED libnsl.so.1 +[5] NEEDED libc.so.1 +[6] INIT 0x80531e4 +[7] FINI 0x8053200 +[8] HASH 0x80500e8 +[9] STRTAB 0x8050cb0 +[10] STRSZ 0x511 +[11] SYMTAB 0x80504e0 +[12] SYMENT 0x10 +[13] CHECKSUM 0x9e8 +[14] VERNEED 0x80511c4 +[15] VERNEEDNUM 0x2 +[16] PLTSZ 0x1a0 +[17] PLTREL 0x11 +[18] JMPREL 0x8051224 +[19] REL 0x8051214 +[20] RELSZ 0x1b0 +[21] RELENT 0x8 +[22] DEBUG 0 +[23] FEATURE_1 PARINIT +[24] FLAGS 0 +[25] FLAGS_1 0 +[26] PLTGOT 0x806359c +''' + +BINARY_DUMP_INFO = { + 'base_name': 'foo', + 'RUNPATH RPATH the same': True, + 'runpath': (), + 'RPATH set': False, + 'needed sonames': ( + 'libXext.so.0', + 'libX11.so.4', + 'libsocket.so.1', + 'libnsl.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bin/foo', + 'RUNPATH set': False, + } + +ELFDUMP_OUTPUT = ''' +Version Definition Section: .SUNW_version + index version dependency + [1] libssl.so.1.0.0 [ BASE ] + [2] OPENSSL_1.0.0 + [3] OPENSSL_1.0.1 OPENSSL_1.0.0 + +Version Needed Section: .SUNW_version + index file version + [4] libcrypto.so.1.0.0 OPENSSL_1.0.0 [ INFO ] + [5] OPENSSL_1.0.1 + [6] libnsl.so.1 SUNW_1.9.1 + +Symbol Table Section: .dynsym + index value size type bind oth ver shndx name + [0] 0x00000000 0x00000000 NOTY LOCL D 0 UNDEF + [1] 0x00000000 0x00000000 FUNC GLOB D 4 UNDEF EVP_DigestSignFinal + [2] 0x0003ead4 0x000000dc FUNC GLOB P 2 .text SSL_get_shared_ciphers + [3] 0x0004f8f8 0x00000014 FUNC GLOB P 3 .text SSL_CTX_set_srp_client_pwd_callback + [4] 0x00000000 0x00000000 FUNC GLOB D 5 UNDEF SRP_Calc_client_key + [5] 0x000661a0 0x00000000 OBJT GLOB P 1 .got _GLOBAL_OFFSET_TABLE_ + +Syminfo Section: .SUNW_syminfo + index flags bound to symbol + [1] DBL [1] libcrypto.so.1.0.0 EVP_DigestSignFinal + [2] DB SSL_get_shared_ciphers + [3] DB SSL_CTX_set_srp_client_pwd_callback + [4] DBL [1] libcrypto.so.1.0.0 SRP_Calc_client_key + [5] DB _GLOBAL_OFFSET_TABLE_ +''' + +BINARY_ELFINFO = {'opt/csw/lib/libssl.so.1.0.0': { + 'symbol table': [ + {'shndx': 'UNDEF', 'soname': None, 'bind': 'LOCL', + 'symbol': None, 'version': None, 'flags': None, 'type': 'NOTY'}, + {'shndx': 'UNDEF', 'soname': 'libcrypto.so.1.0.0', 'bind': 'GLOB', + 'symbol': 'EVP_DigestSignFinal', 'version': 'OPENSSL_1.0.0', + 'flags': 'DBL', 'type': 'FUNC'}, + {'shndx': 'UNDEF', 'soname': 'libcrypto.so.1.0.0', 'bind': 'GLOB', + 'symbol': 'SRP_Calc_client_key', 'version': 'OPENSSL_1.0.1', + 'flags': 'DBL', 'type': 'FUNC'}, + {'shndx': '.text', 'soname': None, 'bind': 'GLOB', + 'symbol': 'SSL_CTX_set_srp_client_pwd_callback', + 'version': 'OPENSSL_1.0.1', 'flags': 'DB', 'type': 'FUNC'}, + {'shndx': '.text', 'soname': None, 'bind': 'GLOB', + 'symbol': 'SSL_get_shared_ciphers', 'version': 'OPENSSL_1.0.0', + 'flags': 'DB', 'type': 'FUNC'}, + {'shndx': '.got', 'soname': None, 'bind': 'GLOB', + 'symbol': '_GLOBAL_OFFSET_TABLE_', 'version': None, + 'flags': 'DB', 'type': 'OBJT'}, + ], + 'version definition': [ + {'dependency': None, 'version': 'OPENSSL_1.0.0'}, + {'dependency': 'OPENSSL_1.0.0', 'version': 'OPENSSL_1.0.1'}, + ], + 'version needed': [ + {'version': 'OPENSSL_1.0.0', 'soname': 'libcrypto.so.1.0.0'}, + {'version': 'OPENSSL_1.0.1', 'soname': 'libcrypto.so.1.0.0'}, + {'version': 'SUNW_1.9.1', 'soname': 'libnsl.so.1'}, + ] + } + } + + + class InspectivePackageUnitTest(mox.MoxTestBase): def testListBinaries(self): @@ -68,12 +183,250 @@ } self.assertEqual([u'foo-file'], ip.ListBinaries()) + def testGetBinaryDumpInfoRoot(self): + fake_binary = 'opt/csw/bin/foo' + fake_package_path = '/fake/path/CSWfoo' + ip = inspective_package.InspectivePackage(fake_package_path) + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + ip.ListBinaries().AndReturn([fake_binary]) + ip.GetBasedir().AndReturn('') + ip.GetFilesDir().AndReturn('root') + + self.mox.StubOutWithMock(shell, 'ShellCommand') + args = [common_constants.DUMP_BIN, + '-Lv', + os.path.join(fake_package_path, "root", fake_binary)] + shell.ShellCommand(args, mox.IgnoreArg()).AndReturn((0, DUMP_OUTPUT, "")) + self.mox.ReplayAll() + + self.assertEqual([BINARY_DUMP_INFO], ip.GetBinaryDumpInfo()) + + def testGetBinaryDumpInfoReloc(self): + fake_binary = 'bin/foo' + fake_package_path = '/fake/path/CSWfoo' + + ip = inspective_package.InspectivePackage(fake_package_path) + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + ip.ListBinaries().AndReturn([fake_binary]) + ip.GetBasedir().AndReturn('opt/csw') + ip.GetFilesDir().AndReturn('reloc') + + self.mox.StubOutWithMock(shell, 'ShellCommand') + args = [common_constants.DUMP_BIN, + '-Lv', + os.path.join(fake_package_path, "reloc", fake_binary)] + shell.ShellCommand(args, mox.IgnoreArg()).AndReturn((0, DUMP_OUTPUT, "")) + self.mox.ReplayAll() + + self.assertEqual([BINARY_DUMP_INFO], ip.GetBinaryDumpInfo()) + + + def testGetBinaryElfInfoRoot(self): + fake_binary = 'opt/csw/lib/libssl.so.1.0.0' + fake_package_path = '/fake/path/CSWfoo' + + ip = inspective_package.InspectivePackage(fake_package_path) + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + ip.ListBinaries().AndReturn([fake_binary]) + ip.GetBasedir().AndReturn('') + ip.GetFilesDir().AndReturn('root') + + self.mox.StubOutWithMock(shell, 'ShellCommand') + args = [common_constants.ELFDUMP_BIN, + '-svy', + os.path.join(fake_package_path, "root", fake_binary)] + shell.ShellCommand(args).AndReturn((0, ELFDUMP_OUTPUT, "")) + self.mox.ReplayAll() + + self.assertEqual(BINARY_ELFINFO, ip.GetBinaryElfInfo()) + + def testGetBinaryElfInfoReloc(self): + fake_binary = 'lib/libssl.so.1.0.0' + fake_package_path = '/fake/path/CSWfoo' + + ip = inspective_package.InspectivePackage(fake_package_path) + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + ip.ListBinaries().AndReturn([fake_binary]) + ip.GetBasedir().AndReturn('opt/csw') + ip.GetFilesDir().AndReturn('reloc') + + self.mox.StubOutWithMock(shell, 'ShellCommand') + args = [common_constants.ELFDUMP_BIN, + '-svy', + os.path.join(fake_package_path, "reloc", fake_binary)] + shell.ShellCommand(args).AndReturn((0, ELFDUMP_OUTPUT, "")) + self.mox.ReplayAll() + + self.assertEqual(BINARY_ELFINFO, ip.GetBinaryElfInfo()) + + def testGetBinaryElfInfoWithIgnoredErrors(self): + fake_binary = 'opt/csw/bin/foo' + fake_package_path = '/fake/path/CSWfoo' + fake_elfdump_output = ''' +Version Needed Section: .SUNW_version + index file version + [2] libc.so.1 SUNW_1.1 + +Symbol Table Section: .dynsym + index value size type bind oth ver shndx name + [1] 0x00000000 0x00000000 FUNC GLOB D 2 UNDEF fopen64 + +Syminfo Section: .SUNW_syminfo + index flags bound to symbol + [1] DBL [1] libc.so.1 fopen64 +''' + fake_elfdump_errors = ''' +/opt/csw/bin/foo: .dynsym: index[26]: bad symbol entry: : invalid shndx: 26 +/opt/csw/bin/foo: .dynsym: bad symbol entry: : invalid shndx: 23 +/opt/csw/bin/foo: .dynsym: index[108]: suspicious local symbol entry: _END_: lies within global symbol range (index >= 27) +/opt/csw/bin/foo: .dynsym: index[4]: bad symbol entry: toto: section[24] size: 0: symbol (address 0x36b7fc, size 0x4) lies outside of containing section +/opt/csw/bin/foo: .dynsym: bad symbol entry: Xt_app_con: section[28] size: 0: is smaller than symbol size: 4 +''' + fake_binary_elfinfo = {'opt/csw/bin/foo': { + 'symbol table': [ + {'shndx': 'UNDEF', 'soname': 'libc.so.1', 'bind': 'GLOB', + 'symbol': 'fopen64', 'version': 'SUNW_1.1', + 'flags': 'DBL', 'type': 'FUNC'}, + ], + 'version needed': [ + {'version': 'SUNW_1.1', 'soname': 'libc.so.1'}, + ], + 'version definition': [], + } + } + ip = inspective_package.InspectivePackage(fake_package_path) + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + ip.ListBinaries().AndReturn([fake_binary]) + ip.GetBasedir().AndReturn('') + ip.GetFilesDir().AndReturn('root') + + self.mox.StubOutWithMock(shell, 'ShellCommand') + args = [common_constants.ELFDUMP_BIN, + '-svy', + os.path.join(fake_package_path, "root", fake_binary)] + shell.ShellCommand(args).AndReturn((0, fake_elfdump_output, fake_elfdump_errors)) + self.mox.ReplayAll() + + self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) + + def testGetLddMinusRlinesRoot(self): + ip = inspective_package.InspectivePackage("/tmp/CSWfake") + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + self.mox.StubOutWithMock(os, 'chmod') + self.mox.StubOutWithMock(os, 'uname') + ip.GetBasedir().AndReturn('') + os.chmod('/tmp/CSWfake/root/opt/csw/bin/foo', 0755) + ip.ListBinaries().AndReturn(['opt/csw/bin/foo']) + ip.GetFilesDir().AndReturn('root') + self.mox.StubOutWithMock(shell, 'ShellCommand') + shell.ShellCommand( + ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'], + timeout=10).AndReturn((0, "", "")) + self.mox.StubOutWithMock(ip, '_ParseLddDashRline') + self.mox.ReplayAll() + self.assertEqual({'opt/csw/bin/foo': []}, ip.GetLddMinusRlines()) + + def testGetLddMinusRlinesReloc(self): + ip = inspective_package.InspectivePackage("/tmp/CSWfake") + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + self.mox.StubOutWithMock(os, 'chmod') + self.mox.StubOutWithMock(os, 'uname') + ip.GetBasedir().AndReturn('opt/csw') + os.chmod('/tmp/CSWfake/reloc/bin/foo', 0755) + ip.ListBinaries().AndReturn(['bin/foo']) + ip.GetFilesDir().AndReturn('reloc') + self.mox.StubOutWithMock(shell, 'ShellCommand') + shell.ShellCommand( + ['ldd', '-Ur', '/tmp/CSWfake/reloc/bin/foo'], + timeout=10).AndReturn((0, "", "")) + self.mox.StubOutWithMock(ip, '_ParseLddDashRline') + self.mox.ReplayAll() + self.assertEqual({'opt/csw/bin/foo': []}, ip.GetLddMinusRlines()) + + def testGetLddMinusRlinesThrows(self): + ip = inspective_package.InspectivePackage("/tmp/CSWfake") + self.mox.StubOutWithMock(ip, 'GetBasedir') + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(ip, 'GetFilesDir') + self.mox.StubOutWithMock(os, 'chmod') + self.mox.StubOutWithMock(os, 'uname') + ip.GetBasedir().AndReturn('/') + os.chmod('/tmp/CSWfake/root/opt/csw/bin/foo', 0755) + os.uname().AndReturn('i86pc') + ip.GetFilesDir().AndReturn('root') + ip.ListBinaries().AndReturn(['opt/csw/bin/foo']) + self.mox.StubOutWithMock(shell, 'ShellCommand') + shell.ShellCommand( + ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'], + timeout=10).AndReturn((1, "", "boo")) + self.mox.StubOutWithMock(ip, '_ParseLddDashRline') + self.mox.ReplayAll() + self.assertRaises(package.SystemUtilityError, + ip.GetLddMinusRlines) + + class PackageStatsUnitTest(unittest.TestCase): def setUp(self): self.ip = inspective_package.InspectivePackage("/fake/path/CSWfoo") + def test_ParseElfdumpLineSectionHeader(self): + line = 'Symbol Table Section: .dynsym' + self.assertEqual((None, "symbol table"), self.ip._ParseElfdumpLine(line, None)) + + def test_ParseElfdumpLineVersionNeeded(self): + line = '[13] SUNW_0.9 [ INFO ]' + expected = { + 'index': '13', + 'version': 'SUNW_0.9', + 'soname': None + } + self.assertEqual((expected, "version needed"), self.ip._ParseElfdumpLine(line, 'version needed')) + + def test_ParseElfdumpLineSymbolTable(self): + line = ' [9] 0x000224b8 0x0000001c FUNC GLOB D 1 .text vsf_log_line' + expected = { + 'bind': 'GLOB', + 'shndx': '.text', + 'symbol': 'vsf_log_line', + 'version': '1', + 'type': 'FUNC', + } + self.assertEqual((expected, 'symbol table'), self.ip._ParseElfdumpLine(line, 'symbol table')) + + def test_ParseElfdumpLineNeededSymbol(self): + line = ' [152] DB [4] libc.so.1 strlen' + expected = { + 'flags': 'DB', + 'soname': 'libc.so.1', + 'symbol': 'strlen', + } + self.assertEqual((expected, "syminfo"), self.ip._ParseElfdumpLine(line, "syminfo")) + + def test_ParseElfdumpLineExportedSymbol(self): + line = ' [116] DB environ' + expected = { + 'flags': 'DB', + 'soname': None, + 'symbol': 'environ', + } + self.assertEqual((expected, "syminfo"), self.ip._ParseElfdumpLine(line, "syminfo")) + def test_ParseNmSymLineGoodLine(self): line = '0000097616 T aliases_lookup' expected = { Modified: csw/mgar/gar/bts/lib/python/models.py =================================================================== --- csw/mgar/gar/bts/lib/python/models.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/models.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -229,7 +229,13 @@ % (self.catalogname, self.version_string, self.arch.name)) def GetUnicodeOrNone(self, s): - """Tries to decode UTF-8""" + """Tries to decode UTF-8. + + If the object does not decode as UTF-8, it's forced to do so, while + ignoring any potential errors. + + Returns: a unicode object or a None type. + """ if s is None: return None if type(s) != unicode: Modified: csw/mgar/gar/bts/lib/python/package.py =================================================================== --- csw/mgar/gar/bts/lib/python/package.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/package.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -39,9 +39,14 @@ pass +class SystemUtilityError(Error): + """A problem occurred while running system utility, e.g. ldd.""" + class PackageError(Error): pass +class StdoutSyntaxError(Error): + pass class CswSrv4File(shell.ShellMixin, object): """Represents a package in the srv4 format (pkg).""" @@ -65,10 +70,9 @@ def GetWorkDir(self): if not self.workdir: - self.workdir = tempfile.mkdtemp(prefix="pkg_") - fd = open(os.path.join(self.workdir, "admin"), "w") - fd.write(ADMIN_FILE_CONTENT) - fd.close() + self.workdir = tempfile.mkdtemp(prefix="pkg_", dir="/var/tmp") + with open(os.path.join(self.workdir, "admin"), "w") as fd: + fd.write(ADMIN_FILE_CONTENT) return self.workdir def GetAdminFilePath(self): @@ -108,11 +112,7 @@ src_file, destdir, pkgname ] - pkgtrans_proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = pkgtrans_proc.communicate() - ret = pkgtrans_proc.wait() + ret, stdout, stderr = shell.ShellCommand(args) if ret: logging.error(stdout) logging.error(stderr) @@ -125,9 +125,7 @@ if not self.pkgname: gunzipped_path = self.GetGunzippedPath() args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] - nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = nawk_proc.communicate() - ret_code = nawk_proc.wait() + ret_code, stdout, stderr = shell.ShellCommand(args) self.pkgname = stdout.strip() logging.debug("GetPkgname(): %s", repr(self.pkgname)) return self.pkgname @@ -138,6 +136,10 @@ return self.stat def GetMtime(self): + """The mtime of the svr4 file. + + Returns: a datetime.datetime object (not encodable with json!). + """ if not self.mtime: s = self._Stat() t = time.gmtime(s.st_mtime) @@ -145,8 +147,7 @@ return self.mtime def GetSize(self): - s = self._Stat() - return s.st_size + return self._Stat().st_size def TransformToDir(self): """Transforms the file to the directory format. @@ -190,21 +191,16 @@ def GetMd5sum(self): if not self.md5sum: logging.debug("GetMd5sum() reading file %s", repr(self.pkg_path)) - fp = open(self.pkg_path) hash = hashlib.md5() - hash.update(fp.read()) - fp.close() + with open(self.pkg_path) as fp: + hash.update(fp.read()) self.md5sum = hash.hexdigest() return self.md5sum def GetPkgchkOutput(self): """Returns: (exit code, stdout, stderr).""" args = ["/usr/sbin/pkgchk", "-d", self.GetGunzippedPath(), "all"] - pkgchk_proc = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = pkgchk_proc.communicate() - ret = pkgchk_proc.wait() - return ret, stdout, stderr + return shell.ShellCommand(args) def __del__(self): if self.workdir: @@ -304,13 +300,10 @@ # 4: sum pkginfo_path = os.path.join(self.directory, "pkginfo") args = ["cksum", pkginfo_path] - cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = cksum_process.communicate() - cksum_process.wait() + _, stdout, stderr = shell.ShellCommand(args) size = ws_re.split(stdout)[1] args = ["sum", pkginfo_path] - sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = sum_process.communicate() + _, stdout, stderr = shell.ShellCommand(args) sum_process.wait() sum_value = ws_re.split(stdout)[0] fields[3] = size @@ -474,7 +467,6 @@ if not self.dir_pkg: self.dir_pkg = self.srv4.GetDirFormatPkg() logging.debug(repr(self.dir_pkg)) - # subprocess.call(["tree", self.dir_pkg.directory]) def Export(self, dest_dir): self.Transform() Modified: csw/mgar/gar/bts/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/bts/lib/python/package_checks.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/package_checks.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -503,7 +503,10 @@ pkgmap_paths = [x["path"] for x in pkgmap] for pkgmap_path in pkgmap_paths: try: - path_str = str(pkgmap_path) + if type(pkgmap_path) is unicode: + path_str = pkgmap_path.encode("utf-8") + else: + path_str = str(pkgmap_path) if re.search(ARCH_RE, path_str): reasons_to_be_arch_specific.append(( "archall-with-arch-paths", Modified: csw/mgar/gar/bts/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/bts/lib/python/package_checks_test.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/package_checks_test.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -8,7 +8,6 @@ import package_checks as pc import checkpkg import checkpkg_lib -import yaml import os.path import mox import logging @@ -25,6 +24,8 @@ from testdata.neon_stats import pkgstats as neon_stats from testdata.bdb48_stats import pkgstat_objs as bdb48_stats from testdata.mercurial_stats import pkgstat_objs as mercurial_stats +from testdata.cadaver_stats import pkgstats as cadaver_stats +from testdata.vsftpd_stats import pkgstats as vsftpd_stats from testdata import stubs DEFAULT_PKG_STATS = None @@ -498,6 +499,13 @@ binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] self.pkg_data["depends"] = (("CSWfoo", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/lib': [u'CSWfoo'], u'/opt/csw/lib/sparcv9': [u'CSWfoo'], @@ -526,6 +534,13 @@ binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/bdb47/lib': [u'CSWbad'], u'/opt/csw/bdb47lib/sparcv9': [u'CSWbad'], @@ -554,6 +569,15 @@ binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [{ 'symbol': 'foo', + 'soname': 'libdb-4.7.so', + 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL' }], + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/bdb47/lib': [u'CSWbad'], u'/opt/csw/bdb47lib/sparcv9': [u'CSWbad'], @@ -591,6 +615,15 @@ binaries_dump_info[0]["needed sonames"] = ["libm.so.2"] self.pkg_data["depends"] = ((u"CSWcommon", ""),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/bin/sparcv8/rsync': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn({ }) self.error_mgr_mock.GetPkgByPath( @@ -634,6 +667,15 @@ }], 'depends': (('CSWlibfoo', None),), 'isalist': (), + 'ldd_info': { 'opt/csw/bin/bar': [] }, + 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + ] + } + }, 'pkgmap': [], 'files_metadata': [ {'endian': 'Little endian', @@ -650,6 +692,7 @@ 'binaries_dump_info': [], 'depends': [], 'isalist': (), + 'ldd_info': {}, 'pkgmap': [], } @@ -687,6 +730,20 @@ # 'depends': (), 'depends': ((u"CSWcommon", ""),), 'isalist': ('foo'), + 'ldd_info': { 'opt/csw/bin/bar': [], 'opt/csw/lib/libfoo.so.1': []}, + 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + ] + }, + 'opt/csw/lib/libfoo.so.1': { + 'version definition': [], + 'version needed': [], + 'symbol table': [], + } + }, 'pkgmap': [ { 'path': '/opt/csw/lib/libfoo.so.1', }, { 'path': '/opt/csw/bin/bar', }, @@ -712,6 +769,16 @@ binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so' self.pkg_data["depends"] = ((u"CSWcommon", "This one provides directories"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["ldd_info"] = { 'opt/csw/lib/python/site-packages/foo.so': [] } + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/lib/python/site-packages/foo.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libbar.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libbar.so').AndReturn({ u'/opt/csw/lib': [u'CSWlibbar'], u'/opt/csw/lib/sparcv9': [u'CSWlibbar'], @@ -738,6 +805,16 @@ binaries_dump_info[0]["path"] = 'opt/csw/lib/foo.so' self.pkg_data["depends"] = ((u"CSWcommon","This is needed"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["ldd_info"] = { 'opt/csw/lib/foo.so': [] } + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/lib/foo.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libnotfound.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename( 'libnotfound.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath( @@ -1333,7 +1410,174 @@ self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(unicode), mox.IsA(str)) +class TestCheckUnusedSoname(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def testUnusedSoname(self): + self.pkg_data = cadaver_stats + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcurses.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libexpat.so.1').AndReturn({ + "/opt/csw/lib": [u'CSWexpat'], u'/opt/csw/lib/sparcv9': [u'CSWexpat']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libiconv.so.2').AndReturn({ + "/opt/csw/lib": [u'CSWlibiconv2'], u'/opt/csw/lib/sparcv9': [u'CSWlibiconv2']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libintl.so.8').AndReturn({ + "/opt/csw/lib": (u"CSWggettextrt",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn( + {'/lib': [u'SUNWlibmsr'], + '/lib/sparcv9': [u'SUNWlibmsr'], + '/usr/lib': [u'SUNWlibms'], + '/usr/lib/sparcv9': [u'SUNWlibms']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libmd.so.1').AndReturn( + {'/lib': [u'SUNWclsr'], + '/lib/sparcv9': [u'SUNWclsr'], + '/usr/lib': [u'SUNWcls'], + '/usr/lib/sparcv9': [u'SUNWcls']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libmp.so.2').AndReturn( + {'/lib': [u'SUNWclsr'], + '/lib/sparcv9': [u'SUNWclsr'], + '/usr/lib': [u'SUNWcls'], + '/usr/lib/sparcv9': [u'SUNWcls']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libncurses.so.5').AndReturn({ + "/opt/csw/lib": [u'CSWlibncurses5'], u'/opt/csw/lib/sparcv9': [u'CSWlibncurses5']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libneon.so.27').AndReturn({ + "/opt/csw/lib": [u'CSWlibneon27'], u'/opt/csw/lib/sparcv9': [u'CSWlibneon27']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libreadline.so.6').AndReturn({ + "/opt/csw/lib": [u'CSWlibreadline6'], u'/opt/csw/lib/sparcv9': [u'CSWlibreadline6']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libz.so.1').AndReturn({ + "/opt/csw/lib": (u"CSWlibz1",), + "/opt/csw/lib/sparcv9": (u"CSWlibz1",), + "/usr/lib": (u"SUNWzlib")}) + + + for common_path in ["/opt/csw/share/locale/it/LC_MESSAGES", "/opt/csw/bin", + "/opt/csw/share/locale/en at quot/LC_MESSAGES", "/opt/csw/share/man", + "/opt/csw/share/doc", "/opt/csw/share/locale/es/LC_MESSAGES"]: + self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) + + for i in range(21): + self.error_mgr_mock.NeedFile( + mox.IsA(str), mox.IsA(str), mox.IsA(str)) + + for soname in [ 'libcurses.so.1', 'libz.so.1', 'libssl.so.1.0.0', + 'libcrypto.so.1.0.0', 'libexpat.so.1' ]: + self.error_mgr_mock.ReportError( + 'CSWcadaver', 'soname-unused', + soname + ' is needed by /opt/csw/bin/cadaver but never used') + +class TestCheckDirectBinding(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def testDirectBinding(self): + self.pkg_data = vsftpd_stats + + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libpam.so.1').AndReturn({ + "/usr/dt/lib": (u"SUNWdtbas",), + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"), + }) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('librt.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsendfile.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + + for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", + "/opt/csw/share/doc", "/etc/opt/csw"]: + self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) + + for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libc.so.1' ]: + self.error_mgr_mock.NeedFile( + mox.IsA(str), mox.IsA(str), mox.IsA(str)) + + for soname in ['libssl.so.1.0.0']: + self.error_mgr_mock.ReportError( + 'CSWvsftpd', + 'no-direct-binding', + '/opt/csw/sbin/vsftpd is not directly bound to soname ' + soname) + + def testDirectBindingNoSyminfo(self): + self.pkg_data = vsftpd_stats + self.pkg_data[0]['binaries_elf_info']['opt/csw/sbin/vsftpd'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [] } + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libpam.so.1').AndReturn({ + "/usr/dt/lib": (u"SUNWdtbas",), + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"), + }) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('librt.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsendfile.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + + for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", + "/opt/csw/share/doc", "/etc/opt/csw"]: + self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) + + for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libc.so.1' ]: + self.error_mgr_mock.NeedFile( + mox.IsA(str), mox.IsA(str), mox.IsA(str)) + + for soname in ['libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libpam.so.1']: + self.error_mgr_mock.ReportError( + 'CSWvsftpd', + 'no-direct-binding', + '/opt/csw/sbin/vsftpd is not directly bound to soname ' + soname) + + class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckWrongArchitecture' def testSparcBinariesInIntelPackage(self): Modified: csw/mgar/gar/bts/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/bts/lib/python/package_stats.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/package_stats.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -6,6 +6,7 @@ import logging import os import progressbar +import mute_progressbar import re import sqlobject @@ -35,19 +36,19 @@ class Error(Exception): - pass + """Generic error.""" class PackageError(Error): - pass + """Problem with the package file examined.""" class DatabaseError(Error): - pass + """Problem with the database contents or schema.""" class StdoutSyntaxError(Error): - pass + """A utility's output is bad, e.g. impossible to parse.""" class PackageStatsMixin(object): @@ -121,6 +122,10 @@ return self.dir_format_pkg def GetMtime(self): + """Get svr4 file mtime value. + + Returns: a datetime.datetime object. + """ return self.srv4_pkg.GetMtime() def GetSize(self): @@ -185,7 +190,7 @@ """ dir_pkg = self.GetInspectivePkg() - logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname)) + logging.debug("Collecting %r (%r) package statistics.", dir_pkg, dir_pkg.pkgname) override_dicts = self.GetOverrides() basic_stats = self.GetBasicStats() # This would be better inferred from pkginfo, and not from the filename, but @@ -208,9 +213,12 @@ "basic_stats": basic_stats, "files_metadata": dir_pkg.GetFilesMetadata(), "mtime": self.GetMtime(), + "ldd_info": dir_pkg.GetLddMinusRlines(), + "binaries_elf_info": dir_pkg.GetBinaryElfInfo(), } self.SaveStats(pkg_stats) - logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) + logging.debug("Statistics of %s have been collected and saved in the db.", + repr(dir_pkg.pkgname)) return pkg_stats @classmethod @@ -228,6 +236,7 @@ Does not require an instance. """ + logging.debug("SaveStats()") pkgname = pkg_stats["basic_stats"]["pkgname"] # Getting sqlobject representations. pkginst = cls.GetOrSetPkginst(pkgname) @@ -246,7 +255,8 @@ except sqlobject.main.SQLObjectNotFound, e: filename_arch = m.Architecture( name=pkg_stats["basic_stats"]["parsed_basename"]["arch"]) - parsed_basename = pkg_stats["basic_stats"]["parsed_basename"] + basename = pkg_stats["basic_stats"]["parsed_basename"] + parsed_basename = basename os_rel_name = parsed_basename["osrel"] try: os_rel = m.OsRelease.select( @@ -284,7 +294,8 @@ logging.debug("Cleaning %s before saving it again", db_pkg_stats) db_pkg_stats.DeleteAllDependentObjects() except sqlobject.main.SQLObjectNotFound, e: - logging.debug("Package %s not present in the db, proceeding with insert.") + logging.debug("Package %s not present in the db, proceeding with insert.", + basename) pass # Creating the object in the database. data_obj = m.Srv4FileStatsBlob( @@ -335,15 +346,6 @@ for override_dict in pkg_stats["overrides"]: o = m.CheckpkgOverride(srv4_file=db_pkg_stats, **override_dict) - # The ldd -r reporting breaks on bigger packages during yaml saving. - # It might work when yaml is disabled - # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") - # This check is currently disabled, let's save time by not collecting - # these data. - # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") - # This one should be last, so that if the collection is interrupted - # in one of the previous runs, the basic_stats.pickle file is not there - # or not updated, and the collection is started again. return db_pkg_stats @classmethod @@ -375,11 +377,16 @@ line_u = pkgmap_entry["line"].decode("utf-8") f_path, basename = os.path.split( pkgmap_entry["path"].decode('utf-8')) - except UnicodeDecodeError, e: + except UnicodeDecodeError as e: line_u = pkgmap_entry["line"].decode("latin1") f_path, basename = os.path.split( pkgmap_entry["path"].decode('latin1')) + except UnicodeEncodeError as e: + # the line was already in unicode + line_u = pkgmap_entry['line'] + f_path, basename = os.path.split(pkgmap_entry["path"]) # If this fails too, code change will be needed. + f = m.CswFile( basename=basename, path=f_path, @@ -446,9 +453,11 @@ def StatsListFromCatalog(file_name_list, catalog_file_name=None, debug=False): - packages = [inspective_package.InspectiveCswSrv4File(x, debug) for x in file_name_list] + packages = [inspective_package.InspectiveCswSrv4File(x, debug) + for x in file_name_list] if catalog_file_name: - catalog_obj = catalog.OpencswCatalog(open(catalog_file_name, "rb")) + with open(catalog_file_name, "rb") as fd: + catalog_obj = catalog.OpencswCatalog(fd) md5s_by_basename = catalog_obj.GetDataByBasename() for pkg in packages: basename = os.path.basename(pkg.pkg_path) @@ -471,6 +480,7 @@ self.debug = debug def CollectStatsFromFiles(self, file_list, catalog_file, force_unpack=False): + """Returns: A list of md5 sums of collected statistics.""" args_display = file_list if len(args_display) > 5: args_display = args_display[:5] + ["...more..."] @@ -487,9 +497,12 @@ raise PackageError("The length of package list is zero.") counter = itertools.count(1) self.logger.info("Juicing the svr4 package stream files...") - pbar = progressbar.ProgressBar() - pbar.maxval = total_packages - pbar.start() + if not self.debug: + pbar = progressbar.ProgressBar() + pbar.maxval = total_packages + pbar.start() + else: + pbar = mute_progressbar.MuteProgressBar() while stats_list: # This way objects will get garbage collected as soon as they are removed # from the list by pop(). The destructor (__del__()) of the srv4 class Modified: csw/mgar/gar/bts/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/bts/lib/python/package_stats_test.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/package_stats_test.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -60,6 +60,8 @@ mock_dirpkg.GetFilesContaining(mox.IsA(tuple)).AndReturn([]) mock_dirpkg.GetFilesMetadata().AndReturn([]) mock_srv4.GetMtime().AndReturn(datetime.datetime(2010, 12, 8, 7, 52, 54)) + mock_dirpkg.GetLddMinusRlines().AndReturn({}) + mock_dirpkg.GetBinaryElfInfo().AndReturn({}) pkgstats = package_stats.PackageStats(mock_srv4) self.mox.ReplayAll() data_structure = pkgstats._CollectStats(True) Modified: csw/mgar/gar/bts/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/bts/lib/python/pkgdb.py 2013-03-18 13:47:04 UTC (rev 20477) +++ csw/mgar/gar/bts/lib/python/pkgdb.py 2013-03-18 16:06:19 UTC (rev 20478) @@ -20,6 +20,7 @@ import package_checks import package_stats import re +import shell import socket import sqlobject import struct_util @@ -82,9 +83,10 @@ "dublin", "kiel", "bratislava", + "beanie", ]) CATALOGS_ALLOWED_TO_BE_IMPORTED = frozenset([ - "current", + "unstable", ]) @@ -213,7 +215,6 @@ cat_entry_by_md5[catalog_entry["md5sum"]] = catalog_entry cat_entry_by_basename[catalog_entry["file_basename"]] = catalog_entry # - import all srv4 files that were not in the database so far - sqo_objects = set() entries_to_import = [] logging.debug("Checking which srv4 files are already in the db.") for md5 in cat_entry_by_md5: @@ -326,10 +327,18 @@ "The catalog release %s is not one of the default releases.", @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Mar 19 00:27:43 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 18 Mar 2013 23:27:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20479] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 20479 http://gar.svn.sourceforge.net/gar/?rev=20479&view=rev Author: jake_goerzen Date: 2013-03-18 23:27:43 +0000 (Mon, 18 Mar 2013) Log Message: ----------- dovecot: version bump; remove old ssl dependancy Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-03-18 16:06:19 UTC (rev 20478) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-03-18 23:27:43 UTC (rev 20479) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.1.12 +VERSION = 2.1.15 GARTYPE = v2 DESCRIPTION = Secure IMAP server @@ -38,7 +38,6 @@ RUNTIME_DEP_PKGS_CSWdovecot += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibpq5 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWdovecot += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibldap2-4-2 Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2013-03-18 16:06:19 UTC (rev 20478) +++ csw/mgar/pkg/dovecot/trunk/checksums 2013-03-18 23:27:43 UTC (rev 20479) @@ -1 +1 @@ -b575dfb5db954132f41e7c390e7e11ff dovecot-2.1.12.tar.gz +8ce198c5ee22f4fe8ab525b9bd753d56 dovecot-2.1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Mar 19 14:28:10 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Mar 2013 13:28:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[20480] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 20480 http://gar.svn.sourceforge.net/gar/?rev=20480&view=rev Author: janholzh Date: 2013-03-19 13:28:09 +0000 (Tue, 19 Mar 2013) Log Message: ----------- subversion/trunk: reenable solaris 9 builds Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2013-03-18 23:27:43 UTC (rev 20479) +++ csw/mgar/pkg/subversion/trunk/Makefile 2013-03-19 13:28:09 UTC (rev 20480) @@ -36,8 +36,8 @@ LICENSE = LICENSE -# solaris9 does not have the newest glib2 any more -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# solaris9 does not have the newest glib2 any more so no gnome-keychain on Solaris9 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 BUILD_DEP_PKGS += CSWlibexpat-dev BUILD_DEP_PKGS += CSWlibserf-dev @@ -57,16 +57,23 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibneon27 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0 CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL)) + + PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support PKGFILES_CSWsvn-dev = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW +#Needed for Solaris9 again: +OBSOLETED_BY_CSWsvn-dev_5.9 = CSWsvn-devel +OBSOLETED_BY_CSWsvn-dev += $(OBSOLETED_BY_CSWsvn-dev_$(GAROSREL)) + PACKAGES += CSWap2svn SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion @@ -182,18 +189,21 @@ NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation -CONFIGURE_ARGS += --with-jdk=/usr/jdk/j2sdk1.4.2_02/j2se +CONFIGURE_ARGS_5.9 += --with-jdk=/usr/jdk1.6.0_20 CONFIGURE_ARGS += --enable-javahl CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs -CONFIGURE_ARGS += --with-gnome-keyring=$(prefix) -CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) +CONFIGURE_ARGS_5.10 += --with-jdk=$(JAVA_HOME) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) +#No Keyring on Solaris9 +CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) + # Once you have verified that a new upstream release passes the tests, you can use # "SKIPTEST=1 gmake " to skip the tests for simple repackaging tasks. # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Mar 19 15:58:09 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 19 Mar 2013 14:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20481] csw/mgar/pkg/emacs/trunk Message-ID: Revision: 20481 http://gar.svn.sourceforge.net/gar/?rev=20481&view=rev Author: pfelecan Date: 2013-03-19 14:58:08 +0000 (Tue, 19 Mar 2013) Log Message: ----------- emacs/trunk: adapt native installation for clean alternatives Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/emacs/trunk/files/CSWemacs-common.preinstall Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2013-03-19 13:28:09 UTC (rev 20480) +++ csw/mgar/pkg/emacs/trunk/Makefile 2013-03-19 14:58:08 UTC (rev 20481) @@ -10,8 +10,9 @@ display editor. endef +MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz -MASTER_SITES = $(GNU_MIRROR) +DISTFILES += CSWemacs-common.preinstall # this is necessary because GNU id options dialect is is used; BTW, I # think that adding this systematically at the beginning of the PATH @@ -106,6 +107,9 @@ CONFIGURE_ARGS += --without-compress-info CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_$(FEATURES)) +# this is part of texinfo package: +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/info/info.info + MERGE_SCRIPTS_isa-default-features-athena = copy-all MERGE_DIRS_isa-default-features-gtk = $(bindir) @@ -407,8 +411,9 @@ post-install-modulated: @echo "executing $@" - mv -f $(DESTDIR)$(bindir)/emacs $(DESTDIR)$(bindir)/emacs-$(FEATURES) + rm -f $(DESTDIR)$(bindir)/emacs mv -f $(DESTDIR)$(bindir)/emacs-$(VERSION) $(DESTDIR)$(bindir)/emacs-$(VERSION)-$(FEATURES) + cd $(DESTDIR)$(bindir) && ln -s emacs-$(VERSION)-$(FEATURES) emacs-$(FEATURES) $(MAKECOOKIE) # this is private and not available publicly Added: csw/mgar/pkg/emacs/trunk/files/CSWemacs-common.preinstall =================================================================== --- csw/mgar/pkg/emacs/trunk/files/CSWemacs-common.preinstall (rev 0) +++ csw/mgar/pkg/emacs/trunk/files/CSWemacs-common.preinstall 2013-03-19 14:58:08 UTC (rev 20481) @@ -0,0 +1,34 @@ +#!/bin/sh + +theGroup=games +theUser=games + +# test if the group exist, if not create it +eval getent group ${theGroup} > /dev/null +if test $? -gt 0 +then + groupadd ${theGroup} > /dev/null + echo group ${theGroup} has been added + + eval getent group ${theGroup} > /dev/null + if test $? -gt 0 + then + echo ERROR: Failed to add group ${theGroup} + exit 1 + fi +fi + +# test if the user exist, if not create it +eval getent passwd ${theUser} > /dev/null +if test $? -gt 0 +then + useradd -c "${theUser} user" -g ${theGroup} -d /opt/csw/ -s /bin/sh ${theUser} > /dev/null + echo user ${theUser} has been added + + eval getent passwd ${theUser} > /dev/null + if test $? -gt 0 + then + echo ERROR: Failed to add user ${theUser} + exit 1 + fi +fi Property changes on: csw/mgar/pkg/emacs/trunk/files/CSWemacs-common.preinstall ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 19 23:36:56 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Mar 2013 22:36:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20482] csw/mgar/pkg/dialog/trunk Message-ID: Revision: 20482 http://gar.svn.sourceforge.net/gar/?rev=20482&view=rev Author: bonivart Date: 2013-03-19 22:36:55 +0000 (Tue, 19 Mar 2013) Log Message: ----------- dialog/trunk: update to new upstream version, build separate lib, split package, remove unnecessary minimal package Modified Paths: -------------- csw/mgar/pkg/dialog/trunk/Makefile csw/mgar/pkg/dialog/trunk/checksums Modified: csw/mgar/pkg/dialog/trunk/Makefile =================================================================== --- csw/mgar/pkg/dialog/trunk/Makefile 2013-03-19 14:58:08 UTC (rev 20481) +++ csw/mgar/pkg/dialog/trunk/Makefile 2013-03-19 22:36:55 UTC (rev 20482) @@ -1,65 +1,54 @@ -# Reminder: to build dialog_minimal, use -# gmake package-CSWdialog-minimal +# Source file not versioned, remember to remove /home/src/dialog.tar.gz +# when updating NAME = dialog -VERSION = 1.1r20120706 -VERSION2 = 1.1 -RELEASE = 20120706 +VERSION = 1.2r20121230 +VERSION2 = 1.2 +RELEASE = 20121230 DISTNAME = $(NAME)-$(VERSION2)-$(RELEASE) WORKSRC = $(WORKDIR)/$(DISTNAME) GARTYPE = v2 DESCRIPTION = A script-interpreter which provides a set of curses widgets define BLURB - A script-interpreter which provides a set of curses widgets endef MASTER_SITES = http://invisible-island.net/datafiles/release/ DISTFILES = $(NAME).tar.gz VENDOR_URL = http://invisible-island.net/dialog -EXTRA_MODULATORS = CURSES -MODULATIONS_CURSES = ncurses minimal -MERGE_SCRIPTS_isa-default-curses-ncurses = copy-all -MERGE_SCRIPTS_isa-default-curses-minimal = copy-all - -PACKAGES = CSWdialog CSWdialog-minimal -SPKG_DESC_CSWdialog = A script-interpreter which provides a set of curses widgets -SPKG_DESC_CSWdialog-minimal = A script-interpreter which provides a set of curses widgets (traditional curses version) +PACKAGES = CSWdialog CATALOGNAME_CSWdialog = dialog -CATALOGNAME_CSWdialog-minimal = dialog_minimal - +SPKG_DESC_CSWdialog = A script-interpreter which provides a set of curses widgets RUNTIME_DEP_PKGS_CSWdialog += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWdialog += CSWlibdialog11 +RUNTIME_DEP_PKGS_CSWdialog += CSWpython -CHECKPKG_OVERRIDES_CSWdialog += file-with-bad-content -CHECKPKG_OVERRIDES_CSWdialog += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWdialog += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWdialog-minimal += surplus-dependency|CSWalternatives +PACKAGES += CSWlibdialog11 +CATALOGNAME_CSWlibdialog11 = libdialog11 +PKGFILES_CSWlibdialog11 += $(call baseisadirs,$(libdir),libdialog\.so\.11\.0\.0) +PKGFILES_CSWlibdialog11 += $(call baseisadirs,$(libdir),libdialog\.so\.11(\.\d+)*) +SPKG_DESC_CSWlibdialog11 += $(DESCRIPTION), libdialog.so.11 +RUNTIME_DEP_PKGS_CSWlibdialog11 += CSWlibncurses5 -PKGFILES_CSWdialog-minimal = $(bindir).*minimal $(mandir).*minimal +PACKAGES += CSWdialog-dev +CATALOGNAME_CSWdialog-dev = dialog_dev +SPKG_DESC_CSWdialog-dev += $(DESCRIPTION), development files +PKGFILES_CSWdialog-dev += /opt/csw/lib/libdialog.so +PKGFILES_CSWdialog-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWdialog-dev += CSWlibdialog11 -ALTERNATIVES_CSWdialog = ncurses -ALTERNATIVES_CSWdialog-minimal = minimal -ALTERNATIVE_ncurses = $(bindir)/dialog dialog $(bindir)/dialog.ncurses 50 $(mandir)/man1/dialog.1 dialog.man $(mandir)/man1/dialog.1.ncurses -ALTERNATIVE_minimal = $(bindir)/dialog dialog $(bindir)/dialog.minimal 25 $(mandir)/man1/dialog.1 dialog.man $(mandir)/man1/dialog.1.minimal +CHECKPKG_OVERRIDES_CSWdialog += file-with-bad-content # There are no tests SKIPTEST = 1 -CONFIGURE_ARGS = $(DIRPATHS) -ifeq ($(CURSES),ncurses) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libtool CONFIGURE_ARGS += --with-ncurses -endif include gar/category.mk -post-install-modulated: - @echo " ==> Post-install for $(NAME) (custom)" - - @mv $(DESTDIR)$(bindir)/dialog $(DESTDIR)$(bindir)/dialog.$(CURSES) - @mv $(DESTDIR)$(mandir)/man1/dialog.1 $(DESTDIR)$(mandir)/man1/dialog.1.$(CURSES) - @$(MAKECOOKIE) - post-merge: @echo " ==> Post-merge for $(NAME) (custom)" @ginstall -d $(PKGROOT)$(docdir)/$(NAME)/samples Modified: csw/mgar/pkg/dialog/trunk/checksums =================================================================== --- csw/mgar/pkg/dialog/trunk/checksums 2013-03-19 14:58:08 UTC (rev 20481) +++ csw/mgar/pkg/dialog/trunk/checksums 2013-03-19 22:36:55 UTC (rev 20482) @@ -1 +1 @@ -2e538305977178eb085a9859511c299d dialog.tar.gz +ef823b46a68d82c42620b42ffc0c04e7 dialog.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 20 00:10:05 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Mar 2013 23:10:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20483] csw/mgar/pkg/dialog/trunk/Makefile Message-ID: Revision: 20483 http://gar.svn.sourceforge.net/gar/?rev=20483&view=rev Author: bonivart Date: 2013-03-19 23:10:04 +0000 (Tue, 19 Mar 2013) Log Message: ----------- dialog/trunk: remove python dep Modified Paths: -------------- csw/mgar/pkg/dialog/trunk/Makefile Modified: csw/mgar/pkg/dialog/trunk/Makefile =================================================================== --- csw/mgar/pkg/dialog/trunk/Makefile 2013-03-19 22:36:55 UTC (rev 20482) +++ csw/mgar/pkg/dialog/trunk/Makefile 2013-03-19 23:10:04 UTC (rev 20483) @@ -22,13 +22,12 @@ SPKG_DESC_CSWdialog = A script-interpreter which provides a set of curses widgets RUNTIME_DEP_PKGS_CSWdialog += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWdialog += CSWlibdialog11 -RUNTIME_DEP_PKGS_CSWdialog += CSWpython PACKAGES += CSWlibdialog11 CATALOGNAME_CSWlibdialog11 = libdialog11 +SPKG_DESC_CSWlibdialog11 += $(DESCRIPTION), libdialog.so.11 PKGFILES_CSWlibdialog11 += $(call baseisadirs,$(libdir),libdialog\.so\.11\.0\.0) PKGFILES_CSWlibdialog11 += $(call baseisadirs,$(libdir),libdialog\.so\.11(\.\d+)*) -SPKG_DESC_CSWlibdialog11 += $(DESCRIPTION), libdialog.so.11 RUNTIME_DEP_PKGS_CSWlibdialog11 += CSWlibncurses5 PACKAGES += CSWdialog-dev @@ -39,6 +38,7 @@ RUNTIME_DEP_PKGS_CSWdialog-dev += CSWlibdialog11 CHECKPKG_OVERRIDES_CSWdialog += file-with-bad-content +CHECKPKG_OVERRIDES_CSWdialog += missing-dependency|CSWpython # 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 dmichelsen at users.sourceforge.net Wed Mar 20 10:27:57 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Mar 2013 09:27:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20484] csw/mgar/pkg Message-ID: Revision: 20484 http://gar.svn.sourceforge.net/gar/?rev=20484&view=rev Author: dmichelsen Date: 2013-03-20 09:27:56 +0000 (Wed, 20 Mar 2013) Log Message: ----------- giblib/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/giblib/ csw/mgar/pkg/giblib/Makefile csw/mgar/pkg/giblib/branches/ csw/mgar/pkg/giblib/tags/ csw/mgar/pkg/giblib/trunk/ csw/mgar/pkg/giblib/trunk/Makefile csw/mgar/pkg/giblib/trunk/checksums csw/mgar/pkg/giblib/trunk/files/ csw/mgar/pkg/giblib/trunk/files/0001-Do-not-add-Wall.patch Added: csw/mgar/pkg/giblib/Makefile =================================================================== --- csw/mgar/pkg/giblib/Makefile (rev 0) +++ csw/mgar/pkg/giblib/Makefile 2013-03-20 09:27:56 UTC (rev 20484) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/giblib/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/giblib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giblib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/giblib/trunk/Makefile 2013-03-20 09:27:56 UTC (rev 20484) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = giblib +VERSION = 1.2.4 + +DESCRIPTION = A library wrapper to imlib2 + +MASTER_SITES = http://linuxbrit.co.uk/downloads/ +DISTFILES += $(DISTNAME).tar.gz + +PATCHFILES += 0001-Do-not-add-Wall.patch + +VENDOR_URL = http://freecode.com/projects/giblib + +BUILD_DEP_PKGS += CSWimlib2 + +PACKAGES += CSWlibgiblib1 +SPKG_DESC_CSWlibgiblib1 = A library wrapper to imlib2, libgiblib.so.1 +PKGFILES_CSWlibgiblib1 += $(call pkgfiles_lib,libgiblib.so.1) +RUNTIME_DEP_PKGS_CSWlibgiblib1 += CSWimlib2 + +PACKAGES += CSWlibgiblib-dev +SPKG_DESC_CSWlibgiblib-dev = Development files for libgiblib.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgiblib-dev += CSWlibgiblib1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/giblib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/giblib/trunk/checksums =================================================================== --- csw/mgar/pkg/giblib/trunk/checksums (rev 0) +++ csw/mgar/pkg/giblib/trunk/checksums 2013-03-20 09:27:56 UTC (rev 20484) @@ -0,0 +1 @@ +c810ef5389baf24882a1caca2954385e giblib-1.2.4.tar.gz Added: csw/mgar/pkg/giblib/trunk/files/0001-Do-not-add-Wall.patch =================================================================== --- csw/mgar/pkg/giblib/trunk/files/0001-Do-not-add-Wall.patch (rev 0) +++ csw/mgar/pkg/giblib/trunk/files/0001-Do-not-add-Wall.patch 2013-03-20 09:27:56 UTC (rev 20484) @@ -0,0 +1,50 @@ +From ae5a7d27a1bceb4b5ded203d8445227a7d28b5ed Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Mar 2013 10:17:18 +0100 +Subject: [PATCH] Do not add -Wall + +--- + configure | 1 - + configure.ac | 1 - + configure.in | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/configure b/configure +index 94937fa..aacdc7d 100755 +--- a/configure ++++ b/configure +@@ -19872,7 +19872,6 @@ IMLIB_CFLAGS=`imlib2-config --cflags` + + + LIBS="$LIBS -lm" +-CFLAGS="$CFLAGS -Wall" + + + ac_config_files="$ac_config_files Makefile giblib-config giblib.pc giblib/Makefile" +diff --git a/configure.ac b/configure.ac +index 6807d86..d0a994e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,6 @@ AC_SUBST(IMLIB_LIBS) + AC_SUBST(IMLIB_CFLAGS) + + LIBS="$LIBS -lm" +-CFLAGS="$CFLAGS -Wall" + + + AC_CONFIG_FILES([ +diff --git a/configure.in b/configure.in +index 432cb16..1e2506a 100644 +--- a/configure.in ++++ b/configure.in +@@ -28,7 +28,6 @@ AC_SUBST(IMLIB_LIBS) + AC_SUBST(IMLIB_CFLAGS) + + LIBS="$LIBS -lm" +-CFLAGS="$CFLAGS -Wall" + + + AC_OUTPUT([ +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 20 10:45:08 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Mar 2013 09:45:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20485] csw/mgar/pkg Message-ID: Revision: 20485 http://gar.svn.sourceforge.net/gar/?rev=20485&view=rev Author: dmichelsen Date: 2013-03-20 09:45:08 +0000 (Wed, 20 Mar 2013) Log Message: ----------- scrot/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/scrot/ csw/mgar/pkg/scrot/Makefile csw/mgar/pkg/scrot/branches/ csw/mgar/pkg/scrot/tags/ csw/mgar/pkg/scrot/trunk/ csw/mgar/pkg/scrot/trunk/Makefile csw/mgar/pkg/scrot/trunk/checksums csw/mgar/pkg/scrot/trunk/files/ csw/mgar/pkg/scrot/trunk/files/0001-Do-not-add-Wall.patch Added: csw/mgar/pkg/scrot/Makefile =================================================================== --- csw/mgar/pkg/scrot/Makefile (rev 0) +++ csw/mgar/pkg/scrot/Makefile 2013-03-20 09:45:08 UTC (rev 20485) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/scrot/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/scrot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scrot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scrot/trunk/Makefile 2013-03-20 09:45:08 UTC (rev 20485) @@ -0,0 +1,26 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = scrot +VERSION = 0.8 + +DESCRIPTION = Screen capture utility + +MASTER_SITES = http://linuxbrit.co.uk/downloads/ +DISTFILES += $(DISTNAME).tar.gz + +PATCHFILES += 0001-Do-not-add-Wall.patch + +VENDOR_URL = http://freecode.com/projects/scrot + +BUILD_DEP_PKGS += CSWlibgiblib-dev +BUILD_DEP_PKGS += CSWimlib2 + +PACKAGES += CSWscrot +SPKG_DESC_CSWscrot = Screen capture utility +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWscrot += CSWlibgiblib1 +RUNTIME_DEP_PKGS_CSWscrot += CSWimlib2 + +include gar/category.mk + Property changes on: csw/mgar/pkg/scrot/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/scrot/trunk/checksums =================================================================== --- csw/mgar/pkg/scrot/trunk/checksums (rev 0) +++ csw/mgar/pkg/scrot/trunk/checksums 2013-03-20 09:45:08 UTC (rev 20485) @@ -0,0 +1 @@ +ccae904d225609571bdd3b03445c1e88 scrot-0.8.tar.gz Added: csw/mgar/pkg/scrot/trunk/files/0001-Do-not-add-Wall.patch =================================================================== --- csw/mgar/pkg/scrot/trunk/files/0001-Do-not-add-Wall.patch (rev 0) +++ csw/mgar/pkg/scrot/trunk/files/0001-Do-not-add-Wall.patch 2013-03-20 09:45:08 UTC (rev 20485) @@ -0,0 +1,39 @@ +From 5e71974c9e2c7e8cb7c3e49520fbe9b82059f636 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Mar 2013 10:39:54 +0100 +Subject: [PATCH] Do not add -Wall + +--- + src/Makefile.am | 2 +- + src/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index ebd54b0..146b5f5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,7 @@ + MAINTAINERCLEANFILES = Makefile.in + + LDFLAGS = -L/usr/X11R6/lib +-INCLUDES = -g -O3 -Wall -I/usr/X11R6/include \ ++INCLUDES = -I/usr/X11R6/include \ + $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \ + -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ + LIBOBJS = @LIBOBJS@ +diff --git a/src/Makefile.in b/src/Makefile.in +index d424a63..2671ce5 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -74,7 +74,7 @@ VERSION = @VERSION@ + MAINTAINERCLEANFILES = Makefile.in + + LDFLAGS = -L/usr/X11R6/lib +-INCLUDES = -g -O3 -Wall -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ ++INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ + + LIBOBJS = @LIBOBJS@ + +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 20 13:54:07 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Mar 2013 12:54:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[20486] csw/mgar/pkg/imlib2/trunk Message-ID: Revision: 20486 http://gar.svn.sourceforge.net/gar/?rev=20486&view=rev Author: dmichelsen Date: 2013-03-20 12:54:06 +0000 (Wed, 20 Mar 2013) Log Message: ----------- imlib2/trunk: Update to 1.4.5, split package Modified Paths: -------------- csw/mgar/pkg/imlib2/trunk/Makefile csw/mgar/pkg/imlib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch Modified: csw/mgar/pkg/imlib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2/trunk/Makefile 2013-03-20 09:45:08 UTC (rev 20485) +++ csw/mgar/pkg/imlib2/trunk/Makefile 2013-03-20 12:54:06 UTC (rev 20486) @@ -1,5 +1,5 @@ NAME = imlib2 -VERSION = 1.4.4 +VERSION = 1.4.5 GARTYPE = v2 DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library @@ -12,33 +12,55 @@ SF_PROJECT = enlightenment MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(NAME)-$(VERSION).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PATCHFILES += 0001-Make-sure-we-have-XK_q.patch -RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag -RUNTIME_DEP_PKGS += CSWpng CSWtiff CSWzlib +BUILD_DEP_PKGS += CSWlibbz2-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibid3-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibtiff-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibgif-dev -BUILD64_LIBS_ONLY = 1 +PACKAGES += CSWlibimlib2-1 +SPKG_DESC_CSWlibimlib2-1 = A powerful graphics library, libImlib2.so.1 +PKGFILES_CSWlibimlib2-1 += $(call pkgfiles_lib,libImlib2.so.1) +PKGFILES_CSWlibimlib2-1 += $(call baseisadirs,$(libdir),imlib2/.*) +PKGFILES_CSWlibimlib2-1 += $(sharedstatedir)/imlib2/.* +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibimlib2-1 += CSWlibgif4 + +# This path is in addition to the correct /usr/openwin/lib/X11/rgb.txt +CHECKPKG_OVERRIDES_CSWlibimlib2-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/imlib2/loaders/xpm.so +CHECKPKG_OVERRIDES_CSWlibimlib2-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/imlib2/loaders/xpm.so +CHECKPKG_OVERRIDES_CSWlibimlib2-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/imlib2/loaders/xpm.so + +PACKAGES += CSWlibimlib2-dev +SPKG_DESC_CSWlibimlib2-dev = Development files for libImlib2.so.1 +PKGFILES_CSWlibimlib2-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibimlib2-dev += CSWlibimlib2-1 + +PACKAGES += CSWimlib2 +SPKG_DESC_CSWimlib2 = Imlib2 tools +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWimlib2 += CSWlibimlib2-1 + +BUILD64 = 1 +ISAEXEC = 1 + +# giflib needs this for stdbool.h +#EXTRA_CFLAGS += -xc99 +EXTRA_CPPFLAGS += -xc99 + CONFIGURE_ARGS = $(DIRPATHS) -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bmp.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/tiff.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bz2.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/jpeg.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/pnm.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/zlib.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/lbm.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/xpm.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/gif.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libImlib2.so.1.4.4 -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/tga.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/png.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/argb.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/filters/colormod.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/filters/bumpmap.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/filters/testfilter.so -CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/id3.so - include gar/category.mk Modified: csw/mgar/pkg/imlib2/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib2/trunk/checksums 2013-03-20 09:45:08 UTC (rev 20485) +++ csw/mgar/pkg/imlib2/trunk/checksums 2013-03-20 12:54:06 UTC (rev 20486) @@ -1 +1 @@ -b6de51879502e857d5b1f7622267a030 imlib2-1.4.4.tar.bz2 +859e5fede51ec819f4314eee11da3ea5 imlib2-1.4.5.tar.bz2 Added: csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch =================================================================== --- csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch (rev 0) +++ csw/mgar/pkg/imlib2/trunk/files/0001-Make-sure-we-have-XK_q.patch 2013-03-20 12:54:06 UTC (rev 20486) @@ -0,0 +1,25 @@ +From cc3650373623cda65498902e964aa985e128eaad Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Mar 2013 10:51:03 +0100 +Subject: [PATCH] Make sure we have XK_q + +--- + src/bin/imlib2_view.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c +index 7a84211..ded57f8 100644 +--- a/src/bin/imlib2_view.c ++++ b/src/bin/imlib2_view.c +@@ -5,6 +5,8 @@ + #include + #include + #include ++#define XK_LATIN1 1 ++#include + #include + #include + #include +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Mar 20 16:47:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Mar 2013 15:47:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20487] csw/mgar/pkg/emacs/trunk Message-ID: Revision: 20487 http://gar.svn.sourceforge.net/gar/?rev=20487&view=rev Author: pfelecan Date: 2013-03-20 15:47:25 +0000 (Wed, 20 Mar 2013) Log Message: ----------- emacs/trunk: - addition of alternatives related messages - implemented alternatives for ctags - verified and validated new proposed overrides Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/emacs/trunk/files/CSWemacs-bin-common.postmsg csw/mgar/pkg/emacs/trunk/files/emacsalt.postmsg Property Changed: ---------------- csw/mgar/pkg/emacs/trunk/files/ Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2013-03-20 12:54:06 UTC (rev 20486) +++ csw/mgar/pkg/emacs/trunk/Makefile 2013-03-20 15:47:25 UTC (rev 20487) @@ -118,14 +118,26 @@ MERGE_DIRS_isa-default-features-nox = $(bindir) MERGE_SCRIPTS_isa-default-features-nox = copy-only -ALTERNATIVES_CSWemacs-athena= athena -ALTERNATIVES_CSWemacs-gtk = gtk -ALTERNATIVES_CSWemacs-nox = nox +ALTERNATIVES_CSWemacs-athena = athena +ALTERNATIVES_CSWemacs-gtk = gtk +ALTERNATIVES_CSWemacs-nox = nox +ALTERNATIVES_CSWemacs-bin-common = ctags ALTERNATIVE_athena = $(bindir)/emacs emacs $(bindir)/emacs-athena 200 ALTERNATIVE_gtk = $(bindir)/emacs emacs $(bindir)/emacs-gtk 100 ALTERNATIVE_nox = $(bindir)/emacs emacs $(bindir)/emacs-nox 300 +ALTERNATIVE_ctags = $(bindir)/ctags ctags $(bindir)/ctags.emacs 100 +POSTMSG_EMACS = emacsalt.postmsg +POSTMSG_EMACS_ATHENA = $(docdir)/$(CATALOGNAME_CSWemacs-athena)/CSWemacs-athena.postmsg +DISTFILES += $(notdir $(POSTMSG_EMACS_ATHENA)) +POSTMSG_EMACS_GTK = $(docdir)/$(CATALOGNAME_CSWemacs-gtk)/CSWemacs-gtk.postmsg +DISTFILES += $(notdir $(POSTMSG_EMACS_GTK)) +POSTMSG_EMACS_NOX = $(docdir)/$(CATALOGNAME_CSWemacs-nox)/CSWemacs-nox.postmsg +DISTFILES += $(notdir $(POSTMSG_EMACS_NOX)) +POSTMSG_CTAGS = $(docdir)/$(CATALOGNAME_CSWemacs-bin-common)/CSWemacs-bin-common.postmsg +DISTFILES += $(notdir $(POSTMSG_CTAGS)) + PACKAGES = CSWemacs-common SPKG_DESC_CSWemacs-common = $(DESCRIPTION) - architecture neutral common components CATALOGNAME_CSWemacs-common = emacs_common @@ -210,6 +222,29 @@ # specialize the variable: EXTRA_TEXINFO = $(infodir)/.* ARCHALL_CSWemacs-common = 1 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnus.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/tramp.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/reftex.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/efaq.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eshell.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/woman.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/mh-e.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/idlwave.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/info.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/nnspool.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp.info +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/ldefs-boot.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/loaddefs.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-version.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-odt.elc PACKAGES += CSWemacs-el SPKG_DESC_CSWemacs-el = $(DESCRIPTION) - elisp sources @@ -228,10 +263,10 @@ CATALOGNAME_CSWemacsbincommon = emacsbincommon_stub RUNTIME_DEP_PKGS_CSWemacs-bin-common = CSWemacs-common RUNTIME_DEP_PKGS_CSWemacs-common += CSWperl -RUNTIME_DEP_PKGS_CSWemacs-common += CSWpython CHECKPKG_OVERRIDES_CSWemacs-bin-common += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-bin-common += no-direct-binding|/opt/csw/libexec/emacs/24.3/sparc-sun-solaris2.10/movemail|is|not|directly|bound|to|soname|libmail.so.1 PKGFILES_CSWemacs-bin-common = /opt/csw/bin/b2m -PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ctags +PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ctags.emacs PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ebrowse PKGFILES_CSWemacs-bin-common += /opt/csw/bin/emacsclient PKGFILES_CSWemacs-bin-common += /opt/csw/bin/etags @@ -263,10 +298,8 @@ RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgif4 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibintl8 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibjbig2 @@ -279,7 +312,7 @@ RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf-utils RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibthai0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibtiff3 @@ -311,6 +344,42 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig +CHECKPKG_OVERRIDES_CSWemacs-athena += soname-unused|libz.so.1|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-athena += soname-unused|libXext.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-athena += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-athena += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-athena += soname-unused|libbz2.so.1.0|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXft.so.2 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXt.so.4 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-flt.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgnutls.so.26 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libjpeg.so.7 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libotf.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXpm.so.4 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickCore.so.5 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|librsvg-2.so.2 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libxml2.so.2 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXaw.so.5 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libSM.so.6 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXmu.so.4 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libncurses.so.5 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXrender.so.1 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libpng15.so.15 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libICE.so.6 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand.so.5 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-core.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand.so.5 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-core.so.0 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgif.so.4 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libtiff.so.3 PKGFILES_CSWemacs-athena = /opt/csw/bin/emacs-athena PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena @@ -341,7 +410,6 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibintl8 @@ -355,7 +423,7 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf-utils RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibthai0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibtiff3 @@ -385,6 +453,45 @@ CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWfconfig CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWorbit2 +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libz.so.1|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libatk-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libpangoft2-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libpangocairo-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libpango-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libgmodule-2.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += soname-unused|libbz2.so.1.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libm17n-flt.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgnutls.so.26 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libjpeg.so.7 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgtk-x11-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libXpm.so.4 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libMagickCore.so.5 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|librsvg-2.so.2 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libXft.so.2 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgdk-x11-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libxml2.so.2 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgconf-2.so.4 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libotf.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libSM.so.6 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libthread.so.1 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libdbus-1.so.3 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libncurses.so.5 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libXrender.so.1 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libpng15.so.15 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libICE.so.6 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libMagickWand.so.5 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libm17n-core.so.0 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgif.so.4 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWemacs-gtk += no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libtiff.so.3 PKGFILES_CSWemacs-gtk = /opt/csw/bin/emacs-gtk PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk @@ -404,16 +511,39 @@ CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-nox CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-bin-common CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-nox += no-direct-binding|/opt/csw/bin/emacs-24.3-nox|is|not|directly|bound|to|soname|libncurses.so.5 +CHECKPKG_OVERRIDES_CSWemacs-nox += no-direct-binding|/opt/csw/bin/emacs-24.3-nox|is|not|directly|bound|to|soname|libxml2.so.2 +CHECKPKG_OVERRIDES_CSWemacs-nox += no-direct-binding|/opt/csw/bin/emacs-24.3-nox|is|not|directly|bound|to|soname|libgnutls.so.26 PKGFILES_CSWemacs-nox = /opt/csw/bin/emacs-nox PKGFILES_CSWemacs-nox += /opt/csw/bin/emacs-$(VERSION)-nox include gar/category.mk +pre-fetch: + @echo "executing $@" + cp $(FILEDIR)/$(POSTMSG_EMACS) $(FILEDIR)/$(notdir $(POSTMSG_EMACS_ATHENA)) + cp $(FILEDIR)/$(POSTMSG_EMACS) $(FILEDIR)/$(notdir $(POSTMSG_EMACS_GTK)) + cp $(FILEDIR)/$(POSTMSG_EMACS) $(FILEDIR)/$(notdir $(POSTMSG_EMACS_NOX)) + $(MAKECOOKIE) + +post-merge: + @echo "executing $@" + ginstall -d $(PKGROOT)$(dir $(POSTMSG_EMACS_ATHENA)) + ginstall $(WORKDIR)/$(notdir $(POSTMSG_EMACS_ATHENA)) $(PKGROOT)$(POSTMSG_EMACS_ATHENA) + ginstall -d $(PKGROOT)$(dir $(POSTMSG_EMACS_GTK)) + ginstall $(WORKDIR)/$(notdir $(POSTMSG_EMACS_GTK)) $(PKGROOT)$(POSTMSG_EMACS_GTK) + ginstall -d $(PKGROOT)$(dir $(POSTMSG_EMACS_NOX)) + ginstall $(WORKDIR)/$(notdir $(POSTMSG_EMACS_NOX)) $(PKGROOT)$(POSTMSG_EMACS_NOX) + ginstall -d $(PKGROOT)$(dir $(POSTMSG_CTAGS)) + ginstall $(WORKDIR)/$(notdir $(POSTMSG_CTAGS)) $(PKGROOT)$(POSTMSG_CTAGS) + $(MAKECOOKIE) + post-install-modulated: @echo "executing $@" rm -f $(DESTDIR)$(bindir)/emacs mv -f $(DESTDIR)$(bindir)/emacs-$(VERSION) $(DESTDIR)$(bindir)/emacs-$(VERSION)-$(FEATURES) cd $(DESTDIR)$(bindir) && ln -s emacs-$(VERSION)-$(FEATURES) emacs-$(FEATURES) + mv -f $(DESTDIR)$(bindir)/ctags $(DESTDIR)$(bindir)/ctags.emacs $(MAKECOOKIE) # this is private and not available publicly Property changes on: csw/mgar/pkg/emacs/trunk/files ___________________________________________________________________ Added: svn:ignore + CSWemacs-athena.postmsg CSWemacs-gtk.postmsg CSWemacs-nox.postmsg Added: csw/mgar/pkg/emacs/trunk/files/CSWemacs-bin-common.postmsg =================================================================== --- csw/mgar/pkg/emacs/trunk/files/CSWemacs-bin-common.postmsg (rev 0) +++ csw/mgar/pkg/emacs/trunk/files/CSWemacs-bin-common.postmsg 2013-03-20 15:47:25 UTC (rev 20487) @@ -0,0 +1,14 @@ +The tags generator is offered in many flavors. + +This package provides its specific implementation: ctags. + +You can easily select between the versions with the alternatives(8) +system by executing: + + /opt/csw/sbin/alternatives --config ctags + +To see which are the other installed flavors, try: + + /opt/csw/sbin/alternatives --display ctags + +See http://wiki.opencsw.org/alternatives-package for further details. Added: csw/mgar/pkg/emacs/trunk/files/emacsalt.postmsg =================================================================== --- csw/mgar/pkg/emacs/trunk/files/emacsalt.postmsg (rev 0) +++ csw/mgar/pkg/emacs/trunk/files/emacsalt.postmsg 2013-03-20 15:47:25 UTC (rev 20487) @@ -0,0 +1,12 @@ +The GNU Emacs editor is offered in 3 flavors: + + * athena : based on the Athena toolkit + * gtk : based on the GTK toolkit + * nox : without any XWindows dependencies + +You can easily select between the versions with the alternatives(8) +system by executing: + + /opt/csw/sbin/alternatives --config emacs + +See http://wiki.opencsw.org/alternatives-package for further details. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 21 09:21:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Mar 2013 08:21:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20488] csw/mgar/pkg/imlib2_loaders/trunk Message-ID: Revision: 20488 http://gar.svn.sourceforge.net/gar/?rev=20488&view=rev Author: dmichelsen Date: 2013-03-21 08:21:52 +0000 (Thu, 21 Mar 2013) Log Message: ----------- imlib2_loaders/trunk: Update to 1.4.5 Modified Paths: -------------- csw/mgar/pkg/imlib2_loaders/trunk/Makefile csw/mgar/pkg/imlib2_loaders/trunk/checksums Modified: csw/mgar/pkg/imlib2_loaders/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2_loaders/trunk/Makefile 2013-03-20 15:47:25 UTC (rev 20487) +++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile 2013-03-21 08:21:52 UTC (rev 20488) @@ -1,6 +1,5 @@ NAME = imlib2_loaders -VERSION = 1.4.3 -GARTYPE = v2 +VERSION = 1.4.5 DESCRIPTION = Imlib 2 image loaders for XCF, EDB and EET @@ -16,25 +15,21 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +BUILD_DEP_PKGS += CSWlibimlib2-dev +PACKAGES = CSWlibimlib2-loaders +SPKG_DESC_CSWlibimlib2-loaders = Imlib2 loaders for ani, ico and scf +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibimlib2-loaders += CSWlibimlib2-1 +OBSOLETED_BY_CSWlibimlib2-loaders += CSWimlib2loaders +CATALOGNAME_CSWimlib2loaders = imlib2_loaders_stub + +EXTRA_LINKER_FLAGS += -lImlib2 + # TBD: # - libeet missing # - libedb missing -PACKAGES = CSWimlib2loaders -CATALOGNAME = imlib2_loaders - -DEP_PKGS = CSWimlib2 - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) include gar/category.mk Modified: csw/mgar/pkg/imlib2_loaders/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib2_loaders/trunk/checksums 2013-03-20 15:47:25 UTC (rev 20487) +++ csw/mgar/pkg/imlib2_loaders/trunk/checksums 2013-03-21 08:21:52 UTC (rev 20488) @@ -1 +1 @@ -9dd8f9258b5088e8523e08ac63466ed8 imlib2_loaders-1.4.3.tar.bz2 +10aee97505ed8d8472918f2efe5371ca imlib2_loaders-1.4.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Mar 21 10:19:53 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 21 Mar 2013 09:19:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20489] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 20489 http://gar.svn.sourceforge.net/gar/?rev=20489&view=rev Author: pfelecan Date: 2013-03-21 09:19:52 +0000 (Thu, 21 Mar 2013) Log Message: ----------- emacs/trunk: - name change for ctags manual page - prune unused overrides Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2013-03-21 08:21:52 UTC (rev 20488) +++ csw/mgar/pkg/emacs/trunk/Makefile 2013-03-21 09:19:52 UTC (rev 20489) @@ -142,12 +142,6 @@ SPKG_DESC_CSWemacs-common = $(DESCRIPTION) - architecture neutral common components CATALOGNAME_CSWemacs-common = emacs_common CHECKPKG_OVERRIDES_CSWemacs-common += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp-3 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-3 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs-6 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr-2 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/compilation.txt CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/PROBLEMS CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1 @@ -162,35 +156,12 @@ CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-xface.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-alias.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-3 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-9 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-10 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-4 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr-3 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-5 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr-1 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-2 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/woman -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-5 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eshell -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-6 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/mh-e-1 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr-2 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/reftex -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/tramp -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnus-3 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnus-4 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/idlwave -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/efaq CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/MH-E-NEWS CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/NEWS.20 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/emacs.bash -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/MACHINES CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/PROBLEMS CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/NEWS.19 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/man.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/paths.el CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ffap.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ps-bdf.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/find-file.elc @@ -208,7 +179,6 @@ CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-setup.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/mailcap.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-loaddefs.el CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-sh.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1 @@ -326,9 +296,6 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-athena CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-athena CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-athena -CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibm17n-utils -CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibotf-utils -CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibfontconfig1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibcroco CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibiconv2 @@ -340,7 +307,6 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibjbig2 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWpango CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-bin-common -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxml2-2 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig @@ -447,7 +413,6 @@ CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibm17n0 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibjbig2 -CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibxml2-2 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWemacs-bin-common CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibpixman1-0 @@ -544,6 +509,7 @@ mv -f $(DESTDIR)$(bindir)/emacs-$(VERSION) $(DESTDIR)$(bindir)/emacs-$(VERSION)-$(FEATURES) cd $(DESTDIR)$(bindir) && ln -s emacs-$(VERSION)-$(FEATURES) emacs-$(FEATURES) mv -f $(DESTDIR)$(bindir)/ctags $(DESTDIR)$(bindir)/ctags.emacs + mv -f $(DESTDIR)$(mandir)/man1/ctags.1 $(DESTDIR)$(mandir)/man1/ctags-emacs.1 $(MAKECOOKIE) # this is private and not available publicly This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 21 10:52:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Mar 2013 09:52:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20490] csw/mgar/pkg/giblib/trunk/Makefile Message-ID: Revision: 20490 http://gar.svn.sourceforge.net/gar/?rev=20490&view=rev Author: dmichelsen Date: 2013-03-21 09:52:47 +0000 (Thu, 21 Mar 2013) Log Message: ----------- giblib/trunk: Update dependency to imlib2 Modified Paths: -------------- csw/mgar/pkg/giblib/trunk/Makefile Modified: csw/mgar/pkg/giblib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giblib/trunk/Makefile 2013-03-21 09:19:52 UTC (rev 20489) +++ csw/mgar/pkg/giblib/trunk/Makefile 2013-03-21 09:52:47 UTC (rev 20490) @@ -13,12 +13,12 @@ VENDOR_URL = http://freecode.com/projects/giblib -BUILD_DEP_PKGS += CSWimlib2 +BUILD_DEP_PKGS += CSWlibimlib2-dev PACKAGES += CSWlibgiblib1 SPKG_DESC_CSWlibgiblib1 = A library wrapper to imlib2, libgiblib.so.1 PKGFILES_CSWlibgiblib1 += $(call pkgfiles_lib,libgiblib.so.1) -RUNTIME_DEP_PKGS_CSWlibgiblib1 += CSWimlib2 +RUNTIME_DEP_PKGS_CSWlibgiblib1 += CSWlibimlib2-1 PACKAGES += CSWlibgiblib-dev SPKG_DESC_CSWlibgiblib-dev = Development files for libgiblib.so.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 21 11:08:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Mar 2013 10:08:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20491] csw/mgar/pkg/scrot/trunk/Makefile Message-ID: Revision: 20491 http://gar.svn.sourceforge.net/gar/?rev=20491&view=rev Author: dmichelsen Date: 2013-03-21 10:08:35 +0000 (Thu, 21 Mar 2013) Log Message: ----------- scrot/trunk: Update dependency to imlib2 Modified Paths: -------------- csw/mgar/pkg/scrot/trunk/Makefile Modified: csw/mgar/pkg/scrot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scrot/trunk/Makefile 2013-03-21 09:52:47 UTC (rev 20490) +++ csw/mgar/pkg/scrot/trunk/Makefile 2013-03-21 10:08:35 UTC (rev 20491) @@ -14,13 +14,13 @@ VENDOR_URL = http://freecode.com/projects/scrot BUILD_DEP_PKGS += CSWlibgiblib-dev -BUILD_DEP_PKGS += CSWimlib2 +BUILD_DEP_PKGS += CSWlibimlib2-dev PACKAGES += CSWscrot SPKG_DESC_CSWscrot = Screen capture utility # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWscrot += CSWlibgiblib1 -RUNTIME_DEP_PKGS_CSWscrot += CSWimlib2 +RUNTIME_DEP_PKGS_CSWscrot += CSWlibimlib2-1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Mar 21 14:09:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 21 Mar 2013 13:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20492] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 20492 http://gar.svn.sourceforge.net/gar/?rev=20492&view=rev Author: pfelecan Date: 2013-03-21 13:09:46 +0000 (Thu, 21 Mar 2013) Log Message: ----------- emacs/trunk: - addition of a new override - prune unused overrides Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2013-03-21 10:08:35 UTC (rev 20491) +++ csw/mgar/pkg/emacs/trunk/Makefile 2013-03-21 13:09:46 UTC (rev 20492) @@ -235,6 +235,7 @@ RUNTIME_DEP_PKGS_CSWemacs-common += CSWperl CHECKPKG_OVERRIDES_CSWemacs-bin-common += surplus-dependency|CSWemacs-common CHECKPKG_OVERRIDES_CSWemacs-bin-common += no-direct-binding|/opt/csw/libexec/emacs/24.3/sparc-sun-solaris2.10/movemail|is|not|directly|bound|to|soname|libmail.so.1 +CHECKPKG_OVERRIDES_CSWemacs-bin-common += no-direct-binding|/opt/csw/libexec/emacs/24.3/i386-pc-solaris2.10/movemail|is|not|directly|bound|to|soname|libmail.so.1 PKGFILES_CSWemacs-bin-common = /opt/csw/bin/b2m PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ctags.emacs PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ebrowse @@ -340,7 +341,6 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libICE.so.6 CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand.so.5 CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-core.so.0 -CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand.so.5 CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-core.so.0 CHECKPKG_OVERRIDES_CSWemacs-athena += no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgif.so.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Mar 21 14:48:34 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 21 Mar 2013 13:48:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20493] csw/mgar/pkg/facter/trunk Message-ID: Revision: 20493 http://gar.svn.sourceforge.net/gar/?rev=20493&view=rev Author: phipsy Date: 2013-03-21 13:48:34 +0000 (Thu, 21 Mar 2013) Log Message: ----------- facter: version ramp to 1.6.18 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2013-03-21 13:09:46 UTC (rev 20492) +++ csw/mgar/pkg/facter/trunk/Makefile 2013-03-21 13:48:34 UTC (rev 20493) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.6.14 +VERSION = 1.6.18 GARTYPE = v2 DESCRIPTION = A system fact gatherer Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2013-03-21 13:09:46 UTC (rev 20492) +++ csw/mgar/pkg/facter/trunk/checksums 2013-03-21 13:48:34 UTC (rev 20493) @@ -7,3 +7,4 @@ 945a332e46ccc59663b09fc7d3ce1086 facter-1.6.11.tar.gz 573bf01ff662f4a3391a7e558b91d65d facter-1.6.12.tar.gz b6c3df8ad1781c10d30785c58a4504ef facter-1.6.14.tar.gz +c209df5909ccd4112c19cf4b535027a7 facter-1.6.18.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 21 20:57:45 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Mar 2013 19:57:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[20494] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 20494 http://gar.svn.sourceforge.net/gar/?rev=20494&view=rev Author: dmichelsen Date: 2013-03-21 19:57:44 +0000 (Thu, 21 Mar 2013) Log Message: ----------- openssl1/trunk: Relocate amd64 libs to lib/64 Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-21 13:48:34 UTC (rev 20493) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-21 19:57:44 UTC (rev 20494) @@ -175,19 +175,24 @@ sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc-sunw sparcv9_OS_COMPILER = solaris64-sparcv9-cc-sunw -CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) +# --libdir must only be given if the directory is actually different from lib or the creation will fail +# as the directory is already there +LIBDIR_64 = --libdir=lib/64 +LIBDIR = $(LIBDIR_$(MEMORYMODEL)) +CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) $(LIBDIR) + # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages ifneq ($(shell /usr/bin/uname -r),5.9) CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) endif # For now we want the sun perl to be used -CONFIGURE_ENV += PERL="/usr/bin/perl" +EXTRA_CONFIGURE_ENV += PERL="/usr/bin/perl" # Configure uses make and sun make is not happy # with the shell command added by the t4 patch -CONFIGURE_ENV += MAKE="/opt/csw/bin/gmake" +EXTRA_CONFIGURE_ENV += MAKE="/opt/csw/bin/gmake" # The new compiler options taken from https://hg.openindiana.org/upstream/oracle/userland-gate/ # added "-z defs" to the linker options. That causes object compilation to fail because @@ -196,7 +201,7 @@ # By default, the install target put man pages under # /opt/csw/ssl/man, but we want them under /opt/csw/share/man -INSTALL_ARGS += MANDIR=$(mandir) +EXTRA_INSTALL_ARGS += MANDIR=$(mandir) # library files are not automatically stripped STRIP_DIRS = $(DESTDIR)/$(libdir) $(DESTDIR)/$(libdir)/openssl-$(SONAME)/engines/ @@ -233,5 +238,5 @@ done @$(MAKECOOKIE) -post-merge: merge-doc install-conf-misc +post-merge-all: merge-doc install-conf-misc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Mar 22 23:10:26 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 22 Mar 2013 22:10:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20495] csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Message-ID: Revision: 20495 http://gar.svn.sourceforge.net/gar/?rev=20495&view=rev Author: chninkel Date: 2013-03-22 22:10:24 +0000 (Fri, 22 Mar 2013) Log Message: ----------- openssl1/trunk: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-03-21 19:57:44 UTC (rev 20494) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-03-22 22:10:24 UTC (rev 20495) @@ -1,3 +1,9 @@ +openssl (1.0.1e,rev=2013.03.22) unstable + + * Fixed missing 64 bits libraries bug + + -- Yann Rouillard Fri, 22 Mar 2013 23:07:58 +0100 + openssl (1.0.1e,rev=2013.03.12) unstable * New upstream release. 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 Mar 23 00:18:54 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 22 Mar 2013 23:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20496] csw/mgar/pkg Message-ID: Revision: 20496 http://gar.svn.sourceforge.net/gar/?rev=20496&view=rev Author: bonivart Date: 2013-03-22 23:18:52 +0000 (Fri, 22 Mar 2013) Log Message: ----------- ansible/trunk: first commit Added Paths: ----------- csw/mgar/pkg/ansible/ csw/mgar/pkg/ansible/Makefile csw/mgar/pkg/ansible/branches/ csw/mgar/pkg/ansible/tags/ csw/mgar/pkg/ansible/trunk/ csw/mgar/pkg/ansible/trunk/Makefile csw/mgar/pkg/ansible/trunk/checksums csw/mgar/pkg/ansible/trunk/files/ Added: csw/mgar/pkg/ansible/Makefile =================================================================== --- csw/mgar/pkg/ansible/Makefile (rev 0) +++ csw/mgar/pkg/ansible/Makefile 2013-03-22 23:18:52 UTC (rev 20496) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/ansible/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ansible/trunk/Makefile 2013-03-22 23:18:52 UTC (rev 20496) @@ -0,0 +1,17 @@ +NAME = ansible +VERSION = 1.0 +GARTYPE = v2 + +DESCRIPTION = Deploy, manage, and orchestrate computer systems +define BLURB +endef + +MASTER_SITES = http://ansible.cc/releases/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/ansible/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ansible/trunk/checksums =================================================================== --- csw/mgar/pkg/ansible/trunk/checksums (rev 0) +++ csw/mgar/pkg/ansible/trunk/checksums 2013-03-22 23:18:52 UTC (rev 20496) @@ -0,0 +1 @@ +03d9ebc5a830642bd25f0eef6382a27c ansible-1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Mar 23 08:44:53 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 23 Mar 2013 07:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20497] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 20497 http://gar.svn.sourceforge.net/gar/?rev=20497&view=rev Author: guengel Date: 2013-03-23 07:44:53 +0000 (Sat, 23 Mar 2013) Log Message: ----------- cfengine3/trunk: Bumped to 3.4.4. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-03-22 23:18:52 UTC (rev 20496) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-03-23 07:44:53 UTC (rev 20497) @@ -1,7 +1,7 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.4.1 +VERSION = 3.4.4 GARTYPE = v2 GARCOMPILER = SOS12U2 Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2013-03-22 23:18:52 UTC (rev 20496) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2013-03-23 07:44:53 UTC (rev 20497) @@ -1 +1 @@ -96e2221ca0e1341f4abacde81df41ac2 cfengine-3.4.1.tar.gz +81d574a6d68f3f0a91f0803349a8b8f5 cfengine-3.4.4.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 Mar 23 13:01:44 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 23 Mar 2013 12:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20498] csw/mgar/pkg/dialog/trunk/Makefile Message-ID: Revision: 20498 http://gar.svn.sourceforge.net/gar/?rev=20498&view=rev Author: bonivart Date: 2013-03-23 12:01:43 +0000 (Sat, 23 Mar 2013) Log Message: ----------- dialog/trunk: build with wide ncurses instead of normal Modified Paths: -------------- csw/mgar/pkg/dialog/trunk/Makefile Modified: csw/mgar/pkg/dialog/trunk/Makefile =================================================================== --- csw/mgar/pkg/dialog/trunk/Makefile 2013-03-23 07:44:53 UTC (rev 20497) +++ csw/mgar/pkg/dialog/trunk/Makefile 2013-03-23 12:01:43 UTC (rev 20498) @@ -20,7 +20,7 @@ PACKAGES = CSWdialog CATALOGNAME_CSWdialog = dialog SPKG_DESC_CSWdialog = A script-interpreter which provides a set of curses widgets -RUNTIME_DEP_PKGS_CSWdialog += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWdialog += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWdialog += CSWlibdialog11 PACKAGES += CSWlibdialog11 @@ -28,7 +28,7 @@ SPKG_DESC_CSWlibdialog11 += $(DESCRIPTION), libdialog.so.11 PKGFILES_CSWlibdialog11 += $(call baseisadirs,$(libdir),libdialog\.so\.11\.0\.0) PKGFILES_CSWlibdialog11 += $(call baseisadirs,$(libdir),libdialog\.so\.11(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibdialog11 += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWlibdialog11 += CSWlibncursesw5 PACKAGES += CSWdialog-dev CATALOGNAME_CSWdialog-dev = dialog_dev @@ -45,7 +45,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libtool -CONFIGURE_ARGS += --with-ncurses +CONFIGURE_ARGS += --with-ncursesw include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 23 13:15:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 23 Mar 2013 12:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20499] csw/mgar/gar/v2/lib/python/safe_remove_package.py Message-ID: Revision: 20499 http://gar.svn.sourceforge.net/gar/?rev=20499&view=rev Author: wahwah Date: 2013-03-23 12:15:09 +0000 (Sat, 23 Mar 2013) Log Message: ----------- Cleanup Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-03-23 12:01:43 UTC (rev 20498) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-03-23 12:15:09 UTC (rev 20499) @@ -30,7 +30,7 @@ for p in $(cat pkg-list.txt) do - if ! ggrep "^$p\$" packages_dropped_cache.txt > /dev/null + if ! ggrep "^$p\$" packages_dropped_cache.txt > /dev/null then ./safe_remove_package.py \\ --os-releases=SunOS5.10,SunOS5.11 \\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 23 13:15:23 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 23 Mar 2013 12:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20500] csw/mgar/gar/v2/lib/python/safe_remove_package.py Message-ID: Revision: 20500 http://gar.svn.sourceforge.net/gar/?rev=20500&view=rev Author: wahwah Date: 2013-03-23 12:15:22 +0000 (Sat, 23 Mar 2013) Log Message: ----------- safe-remove-package: Display progress Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-03-23 12:15:09 UTC (rev 20499) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-03-23 12:15:22 UTC (rev 20500) @@ -41,6 +41,7 @@ UNSTABLE = "unstable" +EVERY_N_DOTS = 100 class Error(Exception): """A generic error.""" @@ -55,7 +56,7 @@ self.rest_client = rest.RestClient() self.cp = rest.CachedPkgstats("pkgstats") - def MakeRevIndex(self, catrel, arch, osrel): + def MakeRevIndex(self, catrel, arch, osrel, quiet=False): key = (catrel, arch, osrel) if key in self.cached_catalogs: return @@ -64,8 +65,12 @@ with open(fn, "r") as fd: self.cached_catalogs[key] = cjson.decode(fd.read()) return + logging.info( + "Building a database of reverse dependencies. " + "This can take up to multiple hours.") catalog = self.rest_client.GetCatalog(*key) rev_deps = {} + counter = 0 for pkg_simple in catalog: md5 = pkg_simple["md5_sum"] # pkg = self.cp.GetPkgstats(md5) @@ -74,6 +79,11 @@ for dep_pkgname, _ in short_data["deps"]: rev_dep_set = rev_deps.setdefault(dep_pkgname, list()) rev_dep_set.append((md5, pkgname)) + if not quiet and not counter % EVERY_N_DOTS: + sys.stdout.write(".") + sys.stdout.flush() + counter += 1 + sys.stdout.write("\n") self.cached_catalogs[key] = rev_deps with open(fn, "w") as fd: fd.write(cjson.encode(self.cached_catalogs[key])) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Mar 23 15:22:30 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:22:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[20501] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20501 http://gar.svn.sourceforge.net/gar/?rev=20501&view=rev Author: pfelecan Date: 2013-03-23 14:22:30 +0000 (Sat, 23 Mar 2013) Log Message: ----------- .buildsys/v2: replaced all the references to old Emacs catalog names Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/dependency_checks_test.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/testdata/uwatch_regexes_data.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-03-23 12:15:22 UTC (rev 20500) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-03-23 14:22:30 UTC (rev 20501) @@ -33,7 +33,7 @@ (r".*\.pm$", (u"CSWperl",)), (r".*\.py$", (u"CSWpython",)), (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby191", u"CSWlibruby1-9-1-1")), - (r".*\.elc?$", (u"CSWemacscommon",)), + (r".*\.elc?$", (u"CSWemacs-common",)), (r"/opt/csw/apache2/", (u"CSWapache2",)), ) Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2013-03-23 12:15:22 UTC (rev 20500) +++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2013-03-23 14:22:30 UTC (rev 20501) @@ -85,7 +85,7 @@ '/opt/csw/bin': [ u'CSWautogen', u'CSWbinutils', u'CSWbonobo2', u'CSWcommon', u'CSWcryptopp', u'CSWcvs', u'CSWdejagnu', u'CSWemacs', - u'CSWemacsbincommon', u'CSWemacschooser', u'CSWenscript', + u'CSWemacs-bin-common', u'CSWenscript', u'CSWevince', u'CSWexpect', u'CSWfacter', u'CSWfakeroot', u'CSWfindutils', u'CSWflex', u'CSWfltk', u'CSWfoomaticfilters', u'CSWgawk', u'CSWgdb', u'CSWgedit', u'CSWggv', u'CSWglib', @@ -124,8 +124,8 @@ u'CSWgcc3g++rt', u'CSWlibofxrt', u'CSWgcc3adart', u'CSWgcc3rt', u'CSWgcc3g++', u'CSWgcc3ada', u'CSWgcc3', u'CSWlibm17n', u'CSWm17ndb', u'CSWlibm17ndevel', u'CSWgcc2core', u'CSWgcc2g++', - u'CSWgcc3g77rt', u'CSWgcc3g77', u'CSWgcc4g95', u'CSWemacscommon', - u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt', + u'CSWgcc3g77rt', u'CSWgcc3g77', u'CSWgcc4g95', u'CSWemacs-common', + u'CSWemacs-bin-common', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt', u'CSWcacertificates', u'CSWgstplugins', u'CSWgnomemenus', u'CSWgnomedesktop', u'CSWnautilus', u'CSWlibofx', u'CSWgamin', u'CSWpkgutil', u'CSWgcc3core', u'CSWgnomemime2'], @@ -148,7 +148,7 @@ u'CSWpmmimetools', u'CSWpmclsautouse', u'CSWpmlogmessage', u'CSWpmlogmsgsimple', u'CSWpmsvnsimple', u'CSWpmlistmoreut', u'CSWpmunivrequire', u'CSWpmiodigest', u'CSWpmsvnmirror', - u'CSWpmhtmltmpl', u'CSWemacscommon', u'CSWcommon', u'CSWgnuplot', + u'CSWpmhtmltmpl', u'CSWemacs-common', u'CSWcommon', u'CSWgnuplot', u'CSWpkgget', u'CSWsamefile', u'CSWpmnetdnsreslvprg', u'CSWpmx11protocol', u'CSWmono', u'CSWgstplugins', u'CSWgnomedesktop', u'CSWevince', u'CSWgedit', u'CSWfacter', @@ -176,7 +176,7 @@ '/opt/csw/bin': [u'CSWautogen', u'CSWbinutils', u'CSWcommon'], '/opt/csw/bin/tree': ['CSWtree'], '/opt/csw/share/doc': [ - u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt'], + u'CSWemacs-bin-common', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt'], '/opt/csw/share/doc/tree': ['CSWtree'], '/opt/csw/share/doc/tree/license': ['CSWtree'], '/opt/csw/share/man': [u'CSWcommon', u'CSWgnuplot'], @@ -252,7 +252,7 @@ '/opt/csw/bin': [u'CSWautogen', u'CSWbinutils', u'CSWcommon'], '/opt/csw/bin/tree': ['CSWtree'], '/opt/csw/share/doc': [ - u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt'], + u'CSWemacs-bin-common', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt'], '/opt/csw/share/doc/tree': ['CSWtree'], '/opt/csw/share/doc/tree/license': ['CSWtree'], '/opt/csw/share/man': [u'CSWcommon', u'CSWgnuplot'], Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-03-23 12:15:22 UTC (rev 20500) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-03-23 14:22:30 UTC (rev 20501) @@ -1146,7 +1146,7 @@ u'CSWpmmimetools', u'CSWpmclsautouse', u'CSWpmlogmessage', u'CSWpmlogmsgsimple', u'CSWpmsvnsimple', u'CSWpmlistmoreut', u'CSWpmunivrequire', u'CSWpmiodigest', u'CSWpmsvnmirror', - u'CSWpmhtmltmpl', u'CSWemacscommon', u'CSWcommon', u'CSWgnuplot', + u'CSWpmhtmltmpl', u'CSWemacs-common', u'CSWcommon', u'CSWgnuplot', u'CSWpkgget', u'CSWsamefile', u'CSWpmnetdnsreslvprg', u'CSWpmx11protocol', u'CSWmono', u'CSWgstplugins', u'CSWgnomedesktop', u'CSWevince', u'CSWgedit', u'CSWfacter', @@ -1160,7 +1160,7 @@ u'CSWtcl', u'CSWtk', u'CSWocaml', u'CSWpmlclemktxtsimple', u'CSWpmnetsnmp', u'CSWpstree', u'CSWqt', u'CSWrdist', u'CSWsbcl', u'CSWsdlsound', u'CSWt1lib', u'CSWtaglibgcc', u'CSWtetex', u'CSWcvs', - u'CSWnetcat', u'CSWemacschooser', u'CSWhtmltidy', u'CSWgperf', + u'CSWnetcat', u'CSWhtmltidy', u'CSWgperf', u'CSWjikes', u'CSWfoomaticfilters', u'CSWlibgnome', u'CSWlibbonoboui', u'CSWexpect', u'CSWdejagnu', u'CSWnetpbm', u'CSWgnomedocutils', u'CSWmbrowse', u'CSWnmap', u'CSWsetoolkit', u'CSWntop', u'CSWtransfig', @@ -1170,7 +1170,7 @@ u'CSWstar', u'CSWlatex2html', u'CSWfindutils', u'CSWfakeroot', u'CSWautogen', u'CSWlibotf', u'CSWlibotfdevel', u'CSWpmsvnmirror', u'CSWlibm17n', u'CSWm17ndb', u'CSWlibm17ndevel', u'CSWzope', - u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWgnuplot', + u'CSWemacs-bin-common', u'CSWemacs', u'CSWcommon', u'CSWgnuplot', u'CSWpkgget', u'CSWsamefile', u'CSWmono', u'CSWgstplugins', u'CSWgnomemenus', u'CSWgnomedesktop', u'CSWnautilus', u'CSWevince', u'CSWggv', u'CSWgedit', u'CSWlibofx', u'CSWfacter', u'CSWxpm', @@ -1192,7 +1192,7 @@ u'CSWgcc3adart', u'CSWgcc3rt', u'CSWgcc3g++', u'CSWgcc3ada', u'CSWgcc3', u'CSWlibm17n', u'CSWm17ndb', u'CSWlibm17ndevel', u'CSWgcc2core', u'CSWgcc2g++', u'CSWgcc3g77rt', u'CSWgcc3g77', - u'CSWgcc4g95', u'CSWemacscommon', u'CSWemacsbincommon', u'CSWemacs', + u'CSWgcc4g95', u'CSWemacs-common', u'CSWemacs-bin-common', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt', u'CSWcacertificates', u'CSWgstplugins', u'CSWgnomemenus', u'CSWgnomedesktop', u'CSWnautilus', u'CSWlibofx', u'CSWgamin', u'CSWpkgutil', u'CSWgcc3core', u'CSWgnomemime2']) @@ -1400,8 +1400,8 @@ u'CSWgcc3corert', u'CSWgcc3g++rt', u'CSWlibofxrt', u'CSWgcc3adart', u'CSWgcc3rt', u'CSWgcc3g++', u'CSWgcc3ada', u'CSWgcc3', u'CSWlibm17n', u'CSWm17ndb', u'CSWlibm17ndevel', u'CSWgcc2core', u'CSWgcc2g++', - u'CSWgcc3g77rt', u'CSWgcc3g77', u'CSWgcc4g95', u'CSWemacscommon', - u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt', + u'CSWgcc3g77rt', u'CSWgcc3g77', u'CSWgcc4g95', u'CSWemacs-common', + u'CSWemacs-bin-common', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt', u'CSWcacertificates', u'CSWgstplugins', u'CSWgnomemenus', u'CSWgnomedesktop', u'CSWnautilus', u'CSWlibofx', u'CSWgamin', u'CSWpkgutil', u'CSWgcc3core', u'CSWgnomemime2', u'CSWglib']) Modified: csw/mgar/gar/v2/lib/python/testdata/uwatch_regexes_data.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/uwatch_regexes_data.py 2013-03-23 12:15:22 UTC (rev 20500) +++ csw/mgar/gar/v2/lib/python/testdata/uwatch_regexes_data.py 2013-03-23 14:22:30 UTC (rev 20501) @@ -1411,43 +1411,33 @@ {'catalogname': u'emacs_bin_common', 'distfiles': None, 'gar_regex': None, - 'pkgname': u'CSWemacsbincommon', + 'pkgname': u'CSWemacs-bin-common', 'target_regex': None}, - {'catalogname': u'emacs_chooser', - 'distfiles': None, - 'gar_regex': None, - 'pkgname': u'CSWemacschooser', - 'target_regex': None}, {'catalogname': u'emacs_common', 'distfiles': None, 'gar_regex': None, - 'pkgname': u'CSWemacscommon', + 'pkgname': u'CSWemacs-common', 'target_regex': None}, {'catalogname': u'emacs_el', 'distfiles': None, 'gar_regex': None, - 'pkgname': u'CSWemacsel', + 'pkgname': u'CSWemacs-el', 'target_regex': None}, {'catalogname': u'emacs_gtk', 'distfiles': None, 'gar_regex': None, - 'pkgname': u'CSWemacsgtk', + 'pkgname': u'CSWemacs-gtk', 'target_regex': None}, {'catalogname': u'emacs_nox', 'distfiles': None, 'gar_regex': None, - 'pkgname': u'CSWemacsnox', + 'pkgname': u'CSWemacs-nox', 'target_regex': None}, {'catalogname': u'emacs_template', 'distfiles': None, 'gar_regex': None, - 'pkgname': u'CSWemacstemplate', + 'pkgname': u'CSWemacs-template', 'target_regex': None}, - {'catalogname': u'emacscalc', - 'distfiles': None, - 'gar_regex': None, - 'pkgname': u'CSWemacscalc', - 'target_regex': None}, {'catalogname': u'enigma', 'distfiles': None, 'gar_regex': None, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Mar 23 15:50:05 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:50:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20502] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 20502 http://gar.svn.sourceforge.net/gar/?rev=20502&view=rev Author: guengel Date: 2013-03-23 14:50:01 +0000 (Sat, 23 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-8.3: Bumped to latest version. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2013-03-23 14:22:30 UTC (rev 20501) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2013-03-23 14:50:01 UTC (rev 20502) @@ -90,9 +90,8 @@ BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 22 +PATCHLEVEL = 23 VERSION = $(BASE_VERSION).$(PATCHLEVEL) -CATEGORIES = apps PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2013-03-23 14:22:30 UTC (rev 20501) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2013-03-23 14:50:01 UTC (rev 20502) @@ -1 +1 @@ -d72e9d6681ff2a18ff19ad587236d098 postgresql-8.3.22.tar.bz2 +0c783fb7741f415bd610a8035f816b02 postgresql-8.3.23.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Mar 23 15:50:26 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:50:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20503] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: Revision: 20503 http://gar.svn.sourceforge.net/gar/?rev=20503&view=rev Author: guengel Date: 2013-03-23 14:50:26 +0000 (Sat, 23 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-8.4: Bumped to latest version. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-03-23 14:50:01 UTC (rev 20502) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-03-23 14:50:26 UTC (rev 20503) @@ -90,9 +90,8 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 15 +PATCHLEVEL = 16 VERSION = $(BASE_VERSION).$(PATCHLEVEL) -CATEGORIES = apps PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2013-03-23 14:50:01 UTC (rev 20502) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2013-03-23 14:50:26 UTC (rev 20503) @@ -1 +1 @@ -8363dd4b1629094dcb9134075eee134b postgresql-8.4.15.tar.bz2 +a59090ab397ee4357df8ced48e11b94d postgresql-8.4.16.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Mar 23 15:50:50 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[20504] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 20504 http://gar.svn.sourceforge.net/gar/?rev=20504&view=rev Author: guengel Date: 2013-03-23 14:50:50 +0000 (Sat, 23 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-9.0: Bumped to latest version. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-03-23 14:50:26 UTC (rev 20503) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-03-23 14:50:50 UTC (rev 20504) @@ -90,9 +90,8 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 11 +PATCHLEVEL = 12 VERSION = $(BASE_VERSION).$(PATCHLEVEL) -CATEGORIES = apps PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2013-03-23 14:50:26 UTC (rev 20503) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2013-03-23 14:50:50 UTC (rev 20504) @@ -1 +1 @@ -b6080b9d902126e452249aa750ef10cd postgresql-9.0.11.tar.bz2 +ed4dce92b432a099084128c3d26a4b6b postgresql-9.0.12.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Mar 23 15:51:10 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[20505] csw/mgar/pkg/postgresql/branches/postgresql-9.1 Message-ID: Revision: 20505 http://gar.svn.sourceforge.net/gar/?rev=20505&view=rev Author: guengel Date: 2013-03-23 14:51:10 +0000 (Sat, 23 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-9.1: Bumped to latest version. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-03-23 14:50:50 UTC (rev 20504) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-03-23 14:51:10 UTC (rev 20505) @@ -90,9 +90,8 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 7 +PATCHLEVEL = 8 VERSION = $(BASE_VERSION).$(PATCHLEVEL) -CATEGORIES = apps GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2013-03-23 14:50:50 UTC (rev 20504) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2013-03-23 14:51:10 UTC (rev 20505) @@ -1 +1 @@ -eaf7b67493d59d1a60767ffdfbd65ce9 postgresql-9.1.7.tar.bz2 +54783b516880a586dcd7c07992d8c0b3 postgresql-9.1.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Mar 23 15:51:28 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:51:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[20506] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 20506 http://gar.svn.sourceforge.net/gar/?rev=20506&view=rev Author: guengel Date: 2013-03-23 14:51:27 +0000 (Sat, 23 Mar 2013) Log Message: ----------- postgresql/trunk: Bumped to latest version. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-03-23 14:51:10 UTC (rev 20505) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-03-23 14:51:27 UTC (rev 20506) @@ -90,7 +90,7 @@ BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 2 +PATCHLEVEL = 3 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2013-03-23 14:51:10 UTC (rev 20505) +++ csw/mgar/pkg/postgresql/trunk/checksums 2013-03-23 14:51:27 UTC (rev 20506) @@ -1 +1 @@ -1cc388988e69bf75c6b55d59070100f6 postgresql-9.2.2.tar.bz2 +59f42a93695b0186ed5eb03c2653a7d4 postgresql-9.2.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 23 15:58:48 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 23 Mar 2013 14:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[20507] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 20507 http://gar.svn.sourceforge.net/gar/?rev=20507&view=rev Author: wahwah Date: 2013-03-23 14:58:47 +0000 (Sat, 23 Mar 2013) Log Message: ----------- version bump to 0.50.2 Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/intltool/trunk/Makefile Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2013-03-23 14:51:27 UTC (rev 20506) +++ csw/mgar/pkg/intltool/trunk/Makefile 2013-03-23 14:58:47 UTC (rev 20507) @@ -1,6 +1,8 @@ +# $Id$ + NAME = intltool -MAJOR_VER = 0.40 -MINOR_VER = 6 +MAJOR_VER = 0.50 +MINOR_VER = 2 VERSION = $(MAJOR_VER).$(MINOR_VER) GNOME_SUBV = $(MAJOR_VER) GARTYPE = v2 @@ -11,14 +13,14 @@ The intltool package is a set of tools for translating the contents of data files using the gettext translation framework. endef -MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = https://launchpad.net/$(NAME)/trunk/$(VERSION)/+download/ +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - RUNTIME_DEP_PKGS_CSWintltool = CSWperl CSWpmxmlparser CONFIGURE_ARGS = $(DIRPATHS) +CHECKPKG_OVERRIDES_CSWintltool += surplus-dependency|CSWpmxmlparser +CHECKPKG_OVERRIDES_CSWintltool += surplus-dependency|CSWperl + include gar/category.mk Property changes on: csw/mgar/pkg/intltool/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums 2013-03-23 14:51:27 UTC (rev 20506) +++ csw/mgar/pkg/intltool/trunk/checksums 2013-03-23 14:58:47 UTC (rev 20507) @@ -1 +1 @@ -8e40f9d1c7308eddbfd24b22cd540631 download/intltool-0.40.6.tar.gz +23fbd879118253cb99aeac067da5f591 intltool-0.50.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 23 21:33:16 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 23 Mar 2013 20:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[20508] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 20508 http://gar.svn.sourceforge.net/gar/?rev=20508&view=rev Author: wahwah Date: 2013-03-23 20:33:15 +0000 (Sat, 23 Mar 2013) Log Message: ----------- pkgdb: Don't cache anything in sqlobject instances These instances seem to be kept around by sqlobject, so if we bind larger amounts of data to them, we run out of memory. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-23 14:58:47 UTC (rev 20507) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-23 20:33:15 UTC (rev 20508) @@ -163,7 +163,6 @@ def __init__(self, *args, **kwargs): super(Srv4FileStats, self).__init__(*args, **kwargs) - self._cached_pkgstats = None def DeleteAllDependentObjects(self): data_obj = self.data_obj @@ -247,22 +246,21 @@ return s def GetStatsStruct(self): - if not self._cached_pkgstats: - self._cached_pkgstats = cPickle.loads(str(self.data_obj.pickle)) - # There was a problem with bad utf-8 in the VENDOR field. - # This is a workaround. - if "VENDOR" in self._cached_pkgstats["pkginfo"]: - self._cached_pkgstats["pkginfo"]["VENDOR"] = self.GetUnicodeOrNone( - self._cached_pkgstats["pkginfo"]["VENDOR"]) - # The end of the hack. - # - # One more workaround - for d in self._cached_pkgstats["pkgmap"]: - if "path" in d: - d["path"] = self.GetUnicodeOrNone(d["path"]) - d["line"] = self.GetUnicodeOrNone(d["line"]) - # End of the workaround - return self._cached_pkgstats + pkgstats = cPickle.loads(str(self.data_obj.pickle)) + # There was a problem with bad utf-8 in the VENDOR field. + # This is a workaround. + if "VENDOR" in pkgstats["pkginfo"]: + pkgstats["pkginfo"]["VENDOR"] = self.GetUnicodeOrNone( + pkgstats["pkginfo"]["VENDOR"]) + # The end of the hack. + # + # One more workaround + for d in pkgstats["pkgmap"]: + if "path" in d: + d["path"] = self.GetUnicodeOrNone(d["path"]) + d["line"] = self.GetUnicodeOrNone(d["line"]) + # End of the workaround + return pkgstats def _GetBuildSource(self): data = self.GetStatsStruct() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Sun Mar 24 14:02:37 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Sun, 24 Mar 2013 13:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[20509] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 20509 http://gar.svn.sourceforge.net/gar/?rev=20509&view=rev Author: janholzh Date: 2013-03-24 13:02:36 +0000 (Sun, 24 Mar 2013) Log Message: ----------- gcc4/trunk: disable direct linking do to problems with amd64 build Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-03-23 20:33:15 UTC (rev 20508) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-03-24 13:02:36 UTC (rev 20509) @@ -26,6 +26,9 @@ # PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# there is a problem with direct linking on amd64 libs +LINKER_DIRECT = + # GIT init takes a long time. NOGITPATCH ?= 1 @@ -502,16 +505,30 @@ # We're building with the default GAR maps, currently U5. # LINKER_MAP_RELEASE = solaris10u8 -# No direct binding errors. These will be hard to fix (if they're real) -# because of GCC's build system complexity. +#Direct binding is disabled to to problem with amd64 libs CHECKPKG_OVERRIDES_CSWgcc4java += no-direct-binding CHECKPKG_OVERRIDES_CSWgcc4core += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgij13 += no-direct-binding +CHECKPKG_OVERRIDES_CSWgcc4g++ += no-direct-binding +CHECKPKG_OVERRIDES_CSWgcc4ada += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgcj13 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgo0 += no-direct-binding +CHECKPKG_OVERRIDES_CSWgcc4gfortran += no-direct-binding +CHECKPKG_OVERRIDES_CSWgcc4objc += no-direct-binding CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib13 += soname-unused CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib13 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgcj-tools13 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibobjc4 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibstdc++6 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibquadmath0 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibssp0 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding + include files/scripts.mk include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Mar 24 15:55:20 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 24 Mar 2013 14:55:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[20510] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 20510 http://gar.svn.sourceforge.net/gar/?rev=20510&view=rev Author: guengel Date: 2013-03-24 14:55:20 +0000 (Sun, 24 Mar 2013) Log Message: ----------- postgresql/trunk: Accommodated to build system changes. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-03-24 13:02:36 UTC (rev 20509) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-03-24 14:55:20 UTC (rev 20510) @@ -659,7 +659,7 @@ done @echo " ===> Checking for extra libraries in SO_NAMES_*" @for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ - if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ : ; \ else \ echo "Extra library defined $$n" ; \ @@ -688,7 +688,7 @@ fi ; \ done @echo " ===> Checking for missing binaries in SO_NAMES_*" - @for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + @for n in `gfind $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ if [ $$? -eq 0 ] ; then \ : ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Mar 24 15:55:34 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 24 Mar 2013 14:55:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20511] csw/mgar/pkg/postgresql/branches/postgresql-9.1/ Makefile Message-ID: Revision: 20511 http://gar.svn.sourceforge.net/gar/?rev=20511&view=rev Author: guengel Date: 2013-03-24 14:55:34 +0000 (Sun, 24 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-9.1: Accommodated to build system changes. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-03-24 14:55:20 UTC (rev 20510) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-03-24 14:55:34 UTC (rev 20511) @@ -647,7 +647,7 @@ done @echo " ===> Checking for extra libraries in SO_NAMES_*" @for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ - if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ : ; \ else \ echo "Extra library defined $$n" ; \ @@ -676,7 +676,7 @@ fi ; \ done @echo " ===> Checking for missing binaries in SO_NAMES_*" - @for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + @for n in `gfind $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ if [ $$? -eq 0 ] ; then \ : ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Mar 24 15:55:51 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 24 Mar 2013 14:55:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20512] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 20512 http://gar.svn.sourceforge.net/gar/?rev=20512&view=rev Author: guengel Date: 2013-03-24 14:55:51 +0000 (Sun, 24 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-9.0: Accommodated to build system changes. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-03-24 14:55:34 UTC (rev 20511) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-03-24 14:55:51 UTC (rev 20512) @@ -587,7 +587,7 @@ done @echo " ===> Checking for extra libraries in SO_NAMES_*" @for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ - if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ : ; \ else \ echo "Extra library defined $$n" ; \ @@ -607,7 +607,7 @@ fi ; \ done @echo " ===> Checking for missing binaries in SO_NAMES_*" - @for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + @for n in `gfind $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ if [ $$? -eq 0 ] ; then \ : ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Mar 24 15:56:09 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 24 Mar 2013 14:56:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20513] csw/mgar/pkg/postgresql/branches/postgresql-8.4/ Makefile Message-ID: Revision: 20513 http://gar.svn.sourceforge.net/gar/?rev=20513&view=rev Author: guengel Date: 2013-03-24 14:56:09 +0000 (Sun, 24 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-8.4: Accommodated to build system changes. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-03-24 14:55:51 UTC (rev 20512) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-03-24 14:56:09 UTC (rev 20513) @@ -587,7 +587,7 @@ done @echo " ===> Checking for extra libraries in SO_NAMES_*" @for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ - if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ : ; \ else \ echo "Extra library defined $$n" ; \ @@ -607,7 +607,7 @@ fi ; \ done @echo " ===> Checking for missing binaries in SO_NAMES_*" - @for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + @for n in `gfind $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ if [ $$? -eq 0 ] ; then \ : ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Mar 24 15:56:24 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 24 Mar 2013 14:56:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[20514] csw/mgar/pkg/postgresql/branches/postgresql-8.3/ Makefile Message-ID: Revision: 20514 http://gar.svn.sourceforge.net/gar/?rev=20514&view=rev Author: guengel Date: 2013-03-24 14:56:24 +0000 (Sun, 24 Mar 2013) Log Message: ----------- postgresql/branches/postgresql-8.3: Accommodated to build system changes. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2013-03-24 14:56:09 UTC (rev 20513) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2013-03-24 14:56:24 UTC (rev 20514) @@ -583,8 +583,8 @@ fi ; \ done @echo " ===> Checking for extra libraries in SO_NAMES_*" - @for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ - if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ + if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ : ; \ else \ echo "Extra library defined $$n" ; \ @@ -604,7 +604,7 @@ fi ; \ done @echo " ===> Checking for missing binaries in SO_NAMES_*" - @for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + @for n in `gfind $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ if [ $$? -eq 0 ] ; then \ : ; \ 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 Sun Mar 24 19:34:58 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 24 Mar 2013 18:34:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20515] csw/mgar/pkg/tor/trunk Message-ID: Revision: 20515 http://gar.svn.sourceforge.net/gar/?rev=20515&view=rev Author: jake_goerzen Date: 2013-03-24 18:34:56 +0000 (Sun, 24 Mar 2013) Log Message: ----------- tor: update version to 0.2.3.25 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2013-03-24 14:56:24 UTC (rev 20514) +++ csw/mgar/pkg/tor/trunk/Makefile 2013-03-24 18:34:56 UTC (rev 20515) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.2.37 +VERSION = 0.2.3.25 GARTYPE = v2 DESCRIPTION = Secure network traffic router Modified: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2013-03-24 14:56:24 UTC (rev 20514) +++ csw/mgar/pkg/tor/trunk/checksums 2013-03-24 18:34:56 UTC (rev 20515) @@ -1 +1 @@ -5aafdca4fb6af6e12b503d32b03f14a7 tor-0.2.2.37.tar.gz +a1c364189a9a66ed9daa8e6436489daf tor-0.2.3.25.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 Sun Mar 24 20:11:58 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 24 Mar 2013 19:11:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20516] csw/mgar/pkg/bluefish/trunk Message-ID: Revision: 20516 http://gar.svn.sourceforge.net/gar/?rev=20516&view=rev Author: jake_goerzen Date: 2013-03-24 19:11:58 +0000 (Sun, 24 Mar 2013) Log Message: ----------- bluefish: update to 2.2.4 Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile csw/mgar/pkg/bluefish/trunk/checksums Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2013-03-24 18:34:56 UTC (rev 20515) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2013-03-24 19:11:58 UTC (rev 20516) @@ -1,5 +1,5 @@ NAME = bluefish -VERSION = 2.2.3 +VERSION = 2.2.4 DESCRIPTION = Advanced Gtk+ HTML editor define BLURB Modified: csw/mgar/pkg/bluefish/trunk/checksums =================================================================== --- csw/mgar/pkg/bluefish/trunk/checksums 2013-03-24 18:34:56 UTC (rev 20515) +++ csw/mgar/pkg/bluefish/trunk/checksums 2013-03-24 19:11:58 UTC (rev 20516) @@ -1 +1 @@ -d55e3db378caef00e9c178ff0c3981fd bluefish-2.2.3.tar.gz +0998038a10b2892f99139e7f0c3adfab bluefish-2.2.4.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 Sun Mar 24 20:31:28 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 24 Mar 2013 19:31:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[20517] csw/mgar/pkg/bluefish/trunk/Makefile Message-ID: Revision: 20517 http://gar.svn.sourceforge.net/gar/?rev=20517&view=rev Author: jake_goerzen Date: 2013-03-24 19:31:27 +0000 (Sun, 24 Mar 2013) Log Message: ----------- bluefish: remove unused dependencies Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2013-03-24 19:11:58 UTC (rev 20516) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2013-03-24 19:31:27 UTC (rev 20517) @@ -19,15 +19,11 @@ RUNTIME_DEP_PKGS_CSWbluefish += CSWenchant RUNTIME_DEP_PKGS_CSWbluefish += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWpango -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWpython RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWlibglib2-0-0 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 Sun Mar 24 22:11:15 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 24 Mar 2013 21:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20518] csw/mgar/pkg/freeciv/trunk Message-ID: Revision: 20518 http://gar.svn.sourceforge.net/gar/?rev=20518&view=rev Author: jake_goerzen Date: 2013-03-24 21:11:14 +0000 (Sun, 24 Mar 2013) Log Message: ----------- freeciv: update to 2.3.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 2013-03-24 19:31:27 UTC (rev 20517) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2013-03-24 21:11:14 UTC (rev 20518) @@ -1,5 +1,5 @@ NAME = freeciv -VERSION = 2.3.1 +VERSION = 2.3.4 GARTYPE = v2 DESCRIPTION = Free turn-based multiplayer strategy game @@ -18,21 +18,17 @@ RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibz1 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWftype2 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWgtk2 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWpango RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWfconfig RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWsdlmixer -RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgdk-x11-2-0-0 GARCOMPILER = GNU Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2013-03-24 19:31:27 UTC (rev 20517) +++ csw/mgar/pkg/freeciv/trunk/checksums 2013-03-24 21:11:14 UTC (rev 20518) @@ -1 +1 @@ -86ec3fc7f03ac2a2e5a52d9605f41acc freeciv-2.3.1.tar.gz +36dc4dade12a85ed06b93730c4ee2c1a freeciv-2.3.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Mar 25 08:40:02 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 25 Mar 2013 07:40:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[20519] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 20519 http://gar.svn.sourceforge.net/gar/?rev=20519&view=rev Author: janholzh Date: 2013-03-25 07:40:00 +0000 (Mon, 25 Mar 2013) Log Message: ----------- subversion/trunk: add dep back for obsolte devel package Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2013-03-24 21:11:14 UTC (rev 20518) +++ csw/mgar/pkg/subversion/trunk/Makefile 2013-03-25 07:40:00 UTC (rev 20519) @@ -72,6 +72,8 @@ #Needed for Solaris9 again: OBSOLETED_BY_CSWsvn-dev_5.9 = CSWsvn-devel OBSOLETED_BY_CSWsvn-dev += $(OBSOLETED_BY_CSWsvn-dev_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWSWsvn-devel_5.9 += CSWsvn-dev +RUNTIME_DEP_PKGS_CSWSWsvn-devel += $(RUNTIME_DEP_PKGS_CSWSWsvn-devel_$(GAROSREL)) PACKAGES += CSWap2svn This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 25 21:21:03 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 25 Mar 2013 20:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20520] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 20520 http://gar.svn.sourceforge.net/gar/?rev=20520&view=rev Author: chninkel Date: 2013-03-25 20:21:03 +0000 (Mon, 25 Mar 2013) Log Message: ----------- openssl1/trunk: added 64 bits binaries Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-25 07:40:00 UTC (rev 20519) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-25 20:21:03 UTC (rev 20520) @@ -41,7 +41,8 @@ RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-0-0 SPKG_DESC_CSWopenssl-utils = Openssl 1.0 binaries and related tools -PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* +PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(bindir)/.*/openssl +PKGFILES_CSWopenssl-utils += $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* PKGFILES_CSWopenssl-utils += $(prefix)/ssl/misc/.* PKGFILES_CSWopenssl-utils += $(prefix)/ssl/openssl\.cnf.* PKGFILES_CSWopenssl-utils += $(sysconfdir)/ssl/openssl\.cnf.* @@ -152,11 +153,13 @@ EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 -# we include *.a files in the devel package so we don't want them excluded -#MERGE_EXCLUDE_STATICLIBS = +# the openssl build system doesn't honor bindir +# aso it doesn't install 64 bits binaries in bin/amd64 +# we fix at the merge step +EXTRA_MERGE_DIRS_isa-extra = $(bindir_install) -# No .so files in libraries -#EXTRA_MERGE_EXCLUDE_FILES = .*/libcrypto.so .*/libssl.so +# c_rehash is shell script: no isaexec please +EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/bin/c_rehash # We use Studio 12.3 to have the "-Qoption cg" option # but this version is not available under Solaris 9 Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-03-25 07:40:00 UTC (rev 20519) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-03-25 20:21:03 UTC (rev 20520) @@ -1,6 +1,7 @@ openssl (1.0.1e,rev=2013.03.22) unstable * Fixed missing 64 bits libraries bug + * Added 64 bits binaries (Closes: #5028) -- Yann Rouillard Fri, 22 Mar 2013 23:07:58 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Mar 25 22:59:00 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 25 Mar 2013 21:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[20521] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20521 http://gar.svn.sourceforge.net/gar/?rev=20521&view=rev Author: chninkel Date: 2013-03-25 21:58:58 +0000 (Mon, 25 Mar 2013) Log Message: ----------- gar/v2: added test for 64 bits binaries presence Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2013-03-25 20:21:03 UTC (rev 20520) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2013-03-25 21:58:58 UTC (rev 20521) @@ -1337,3 +1337,32 @@ error_mgr.ReportError( "shared-library-missing-dot-so", "file=%s" % shared_lib) + + +def Check64bitsBinariesPresence(pkg_data, error_mgr, logger, messenger): + pkginfo = pkg_data['pkginfo'] + if not ('OPENCSW_MODE64' in pkginfo and '64' in pkginfo['OPENCSW_MODE64']): + return + + if 'isaexec' in pkginfo['OPENCSW_MODE64']: + binaries = pkg_data['binaries_dump_info'] + binaries_path = 'bin|sbin|lib|libexec' + else: + binaries = [ x for x in pkg_data['binaries_dump_info'] if 'soname' in x ] + binaries_path = 'lib|libexec' + + if binaries: + paths_64 = { 'i386': su.AMD64_PATHS, 'sparc': su.SPARCV9_PATHS } + paths_64_re = re.compile(r"opt/csw/(%s)/(%s)" % + (binaries_path, + '|'.join(paths_64[pkginfo['ARCH']]))) + for binary_info in binaries: + if paths_64_re.search(binary_info['path']): + return + + error_mgr.ReportError('64bits-binaries-missing') + messenger.Message( + "The package is supposed to contains 64 bits binaries " + "but it doesn't contain any in the usual 64 bits " + "binaries locations.") + Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-03-25 20:21:03 UTC (rev 20520) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-03-25 21:58:58 UTC (rev 20521) @@ -1965,7 +1965,25 @@ self.error_mgr_mock.ReportError( 'shared-library-missing-dot-so', 'file=foo.1') +class TestCheck64bitsBinariesPresence(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'Check64bitsBinariesPresence' + def testFull32bitsPackage(self): + self.pkg_data = copy.deepcopy(vsftpd_stats[0]) + def testMissingIntel64bitsLibraries(self): + self.pkg_data = copy.deepcopy(neon_stats[0]) + self.error_mgr_mock.ReportError('64bits-binaries-missing') + + def testMissingSparc64bitsLibraries(self): + self.pkg_data = copy.deepcopy(neon_stats[0]) + self.pkg_data["pkginfo"]["OPENCSW_MODE64"] = '32/64' + self.error_mgr_mock.ReportError('64bits-binaries-missing') + + def testMissing64bitsExecutable(self): + self.pkg_data = bdb48_stats[0] + self.pkg_data["pkginfo"]["OPENCSW_MODE64"] = '32/64/isaexec' + self.error_mgr_mock.ReportError('64bits-binaries-missing') + class TestRemovePackagesUnderInstallation(unittest.TestCase): def testRemoveNone(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Mar 26 11:25:56 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 26 Mar 2013 10:25:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20522] csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Message-ID: Revision: 20522 http://gar.svn.sourceforge.net/gar/?rev=20522&view=rev Author: guengel Date: 2013-03-26 10:25:55 +0000 (Tue, 26 Mar 2013) Log Message: ----------- cfengine3/trunk: Updated changelog. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2013-03-25 21:58:58 UTC (rev 20521) +++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2013-03-26 10:25:55 UTC (rev 20522) @@ -1,3 +1,9 @@ +cfengine3 (3.4.4,REV=2013.03.26) + + * New upstream release 3.4.4. + + -- Rafael Ostertag Tue, 26 Mar 2013 11:24:16 +0100 + cfengine3 (3.4.1,REV=2012.12.09) * New upstream release 3.4.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 Tue Mar 26 18:21:47 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 26 Mar 2013 17:21:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20523] csw/mgar/pkg/bind/trunk Message-ID: Revision: 20523 http://gar.svn.sourceforge.net/gar/?rev=20523&view=rev Author: bonivart Date: 2013-03-26 17:21:46 +0000 (Tue, 26 Mar 2013) Log Message: ----------- bind/trunk: update to 9.9.2-P2 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 2013-03-26 10:25:55 UTC (rev 20522) +++ csw/mgar/pkg/bind/trunk/Makefile 2013-03-26 17:21:46 UTC (rev 20523) @@ -2,13 +2,12 @@ # owner/group for device files? (root:sys) NAME = bind -#VERSION = 9.8.4 VERSION = 9.9.2 GARTYPE = v2 # Enable these for Px-releases #RELEASE = rc1 -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) @@ -119,6 +118,7 @@ CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils 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/liblwres.so.90.0.1|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.2|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 @@ -127,6 +127,10 @@ CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.95.1.1|soname=libdns.so.95|pkgname=CSWlibbind|expected=CSWlibdns95 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.5|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 +# Some new checks, have no idea about their relevance +CHECKPKG_OVERRIDES_CSWlibbind += soname-unused +CHECKPKG_OVERRIDES_CSWlibbind += no-direct-binding + include gar/category.mk DOCLIST = README.CSW db.127.0.0 db.localhost named.conf named.root rndc.key Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2013-03-26 10:25:55 UTC (rev 20522) +++ csw/mgar/pkg/bind/trunk/checksums 2013-03-26 17:21:46 UTC (rev 20523) @@ -1 +1 @@ -44b9d1feb11de09811160775f94c2554 bind-9.9.2-P1.tar.gz +2be7763c99b7e7b42ac3a18a267ce1aa bind-9.9.2-P2.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 Tue Mar 26 20:38:03 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 26 Mar 2013 19:38:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20524] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 20524 http://gar.svn.sourceforge.net/gar/?rev=20524&view=rev Author: bonivart Date: 2013-03-26 19:38:02 +0000 (Tue, 26 Mar 2013) Log Message: ----------- dhcp/trunk: update to 4.2.5-P1 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2013-03-26 17:21:46 UTC (rev 20523) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2013-03-26 19:38:02 UTC (rev 20524) @@ -2,11 +2,11 @@ VERSION = 4.2.5 # Enable these for Px-releases -#RELEASE = P2 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) GARTYPE = v2 @@ -19,10 +19,10 @@ endef # Toggle between these for normal/Px-releases -MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ -#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -#DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ +MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ +#DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2013-03-26 17:21:46 UTC (rev 20523) +++ csw/mgar/pkg/dhcp/trunk/checksums 2013-03-26 19:38:02 UTC (rev 20524) @@ -1 +1 @@ -6489e919ac093d17249270ee9be1020e dhcp-4.2.5.tar.gz +f68e3c1f00a9af5742bc5e71d567cf93 dhcp-4.2.5-P1.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 Wed Mar 27 10:07:26 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Mar 2013 09:07:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20525] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 20525 http://gar.svn.sourceforge.net/gar/?rev=20525&view=rev Author: wahwah Date: 2013-03-27 09:07:24 +0000 (Wed, 27 Mar 2013) Log Message: ----------- gcc4/trunk: update to 4.8.0 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-03-26 19:38:02 UTC (rev 20524) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-03-27 09:07:24 UTC (rev 20525) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.7.2 +VERSION = 4.8.0 GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') PKG_VERSION_TOKEN = gcc4 @@ -16,8 +16,9 @@ endef DISTFILES = $(DISTNAME).tar.bz2 -MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ -MASTER_SITES += http://ftp.heanet.ie/mirrors/gnu/gcc/$(NAME)-$(VERSION)/ +# MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ +# MASTER_SITES += http://ftp.heanet.ie/mirrors/gnu/gcc/$(NAME)-$(VERSION)/ +MASTER_SITES += ftp://ftp.gnu.org/gnu/gcc/gcc-$(VERSION)/ LIBOBJC = 4 @@ -98,26 +99,25 @@ SKIPTEST ?= 1 # Used multiple times in package definitions -JAVA_LIB_VERSION = 13 +JAVA_LIB_VERSION = 14 ALTERNATIVES_PRIO = 470 PACKAGES = $(PKG_BASENAME)core SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibcloog-isl2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibatomic1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibffi4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo0 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 @@ -157,6 +157,7 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_call.3|$(PKG_BASENAME)core|CSWlibffi-dev CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi.3|$(PKG_BASENAME)core|CSWlibffi-dev CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_prep_cif.3|$(PKG_BASENAME)core|CSWlibffi-dev +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|/opt/csw/share/info/libffi.info|$(PKG_BASENAME)core|CSWlibffi-dev # The .a files are necessary CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap @@ -191,7 +192,6 @@ PKGFILES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) SPKG_DESC_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += $(DESCRIPTION), lib-gnu-awt-xlib.so.$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += CSWlibstdc++$(LIBSTDCXX_VERSION) RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += CSWlibgcc-s1 PACKAGES += CSWlibffi4 @@ -259,12 +259,12 @@ SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0 RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 -PACKAGES += CSWlibgo0 -PKGFILES_CSWlibgo0 += $(call baseisadirs,$(libdir),libgo\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibgo0 += $(DESCRIPTION), libgo.so.0 -RUNTIME_DEP_PKGS_CSWlibgo0 += CSWlibgcc-s1 +PACKAGES += CSWlibgo3 +PKGFILES_CSWlibgo3 += $(call baseisadirs,$(libdir),libgo\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibgo3 += $(DESCRIPTION), libgo.so.3 +RUNTIME_DEP_PKGS_CSWlibgo3 += CSWlibgcc-s1 # Hasn't been investigated. I feel lucky. -CHECKPKG_OVERRIDES_CSWlibgo0 += file-with-bad-content +CHECKPKG_OVERRIDES_CSWlibgo3 += file-with-bad-content PACKAGES += CSWlibitm1 PKGFILES_CSWlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) @@ -292,6 +292,11 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)) RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH)) +PACKAGES += CSWlibatomic1 +PKGFILES_CSWlibatomic1 += $(call baseisadirs,$(libdir),libatomic\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibatomic1 += $(DESCRIPTION), libatomic.so.1 +RUNTIME_DEP_PKGS_CSWlibatomic1 += CSWlibgcc-s1 + PACKAGES += $(PKG_BASENAME)g++ SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler PKGFILES_$(PKG_BASENAME)g++ = $(foreach F,$(CXX_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) @@ -304,11 +309,9 @@ # I do not understand this regular expression. PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.* -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmp10 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1 @@ -330,12 +333,10 @@ PKGFILES_$(PKG_BASENAME)gfortran += $(mandir)/.*gfortran.1 PKGFILES_$(PKG_BASENAME)gfortran += $(infodir)/gfortran.* PKGFILES_$(PKG_BASENAME)gfortran += $(call baseisadirs,$(libdir),libgfortran\.so) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgfortran3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 ALTERNATIVES_$(PKG_BASENAME)gfortran += gfortran @@ -343,7 +344,6 @@ PACKAGES += $(PKG_BASENAME)java SPKG_DESC_$(PKG_BASENAME)java = GNU Java Compiler -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj-tools$(JAVA_LIB_VERSION) @@ -352,7 +352,6 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWecj RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1 CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += surplus-dependency|CSWecj @@ -427,13 +426,11 @@ PKGFILES_$(PKG_BASENAME)objc += $(libdir)/.*/include/objc/.* PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc.so) PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc_gc.so) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmp10 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1 # libiconv deps cropped up relatively late in the porting process. Perhaps @@ -460,13 +457,11 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += file-with-bad-content -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 # This is an obsolete package. Nothing depends on it, so we can remove it. @@ -506,29 +501,32 @@ # LINKER_MAP_RELEASE = solaris10u8 #Direct binding is disabled to to problem with amd64 libs -CHECKPKG_OVERRIDES_CSWgcc4java += no-direct-binding -CHECKPKG_OVERRIDES_CSWgcc4core += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgij13 += no-direct-binding -CHECKPKG_OVERRIDES_CSWgcc4g++ += no-direct-binding -CHECKPKG_OVERRIDES_CSWgcc4ada += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgcj13 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgo0 += no-direct-binding -CHECKPKG_OVERRIDES_CSWgcc4gfortran += no-direct-binding -CHECKPKG_OVERRIDES_CSWgcc4objc += no-direct-binding -CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib13 += soname-unused -CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib13 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgcj-tools13 += no-direct-binding +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += no-direct-binding +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += soname-unused +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += no-direct-binding +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += soname-unused +CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += no-direct-binding +CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += no-direct-binding +CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += no-direct-binding +CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += soname-unused +CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += no-direct-binding +CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += soname-unused +CHECKPKG_OVERRIDES_CSWlibatomic1 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibobjc4 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibstdc++6 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgo3 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibobjc4 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibquadmath0 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibssp0 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibstdc++6 += no-direct-binding - include files/scripts.mk include gar/category.mk Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2013-03-26 19:38:02 UTC (rev 20524) +++ csw/mgar/pkg/gcc4/trunk/checksums 2013-03-27 09:07:24 UTC (rev 20525) @@ -1 +1 @@ -cc308a0891e778cfda7a151ab8a6e762 gcc-4.7.2.tar.bz2 +e6040024eb9e761c3bea348d1fa5abb0 gcc-4.8.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 27 10:26:31 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Mar 2013 09:26:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[20526] csw/mgar/pkg/gcc4/branches/gcc-4.7.x/ Message-ID: Revision: 20526 http://gar.svn.sourceforge.net/gar/?rev=20526&view=rev Author: wahwah Date: 2013-03-27 09:26:30 +0000 (Wed, 27 Mar 2013) Log Message: ----------- gcc4: Make branch for the 4.7 version family Added Paths: ----------- csw/mgar/pkg/gcc4/branches/gcc-4.7.x/ Property changes on: csw/mgar/pkg/gcc4/branches/gcc-4.7.x ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:mergeinfo + /csw/mgar/pkg/gcc4/branches/ada-enable:16158-16379 /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435 /csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 28 14:00:23 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Mar 2013 13:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20527] csw/mgar/pkg/lsof/trunk Message-ID: Revision: 20527 http://gar.svn.sourceforge.net/gar/?rev=20527&view=rev Author: dmichelsen Date: 2013-03-28 13:00:23 +0000 (Thu, 28 Mar 2013) Log Message: ----------- lsof/trunk: Update to 4.87 Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lsof/trunk/checksums Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2013-03-27 09:26:30 UTC (rev 20526) +++ csw/mgar/pkg/lsof/trunk/Makefile 2013-03-28 13:00:23 UTC (rev 20527) @@ -1,7 +1,7 @@ # TBD: NAME = lsof -VERSION = 4.86 +VERSION = 4.87 GARTYPE = v2 DESCRIPTION = List open files Modified: csw/mgar/pkg/lsof/trunk/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2013-03-27 09:26:30 UTC (rev 20526) +++ csw/mgar/pkg/lsof/trunk/checksums 2013-03-28 13:00:23 UTC (rev 20527) @@ -1 +1 @@ -9f1cda41f35add068c7b81f873fa56b5 lsof_4.86.tar.bz2 +80e2a76d0e05826db910ec88e631296c lsof_4.87.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 28 16:23:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Mar 2013 15:23:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20528] csw/mgar/pkg/lsof/trunk/Makefile Message-ID: Revision: 20528 http://gar.svn.sourceforge.net/gar/?rev=20528&view=rev Author: dmichelsen Date: 2013-03-28 15:23:26 +0000 (Thu, 28 Mar 2013) Log Message: ----------- lsof/trunk: Override Solaris 9 brand lib Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2013-03-28 13:00:23 UTC (rev 20527) +++ csw/mgar/pkg/lsof/trunk/Makefile 2013-03-28 15:23:26 UTC (rev 20528) @@ -31,6 +31,11 @@ VENDOR_URL = http://people.freebsd.org/~abe/ LICENSE = lsof-license +# This is because we build Solaris 9 Sparc on a branded zone +CHECKPKG_OVERRIDES_CSWlsof += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sparcv9/lsof|but|never|used +CHECKPKG_OVERRIDES_CSWlsof += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sparcv8plus/lsof|but|never|used +CHECKPKG_OVERRIDES_CSWlsof += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sparcv8/lsof|but|never|used + # Do not build a unified 32/64 bit package for Solaris 9 i386 BUILD64-sparc-5.9 = 1 BUILD64-sparc-5.10 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 28 21:47:04 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Mar 2013 20:47:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20529] csw/mgar/pkg/wget/trunk Message-ID: Revision: 20529 http://gar.svn.sourceforge.net/gar/?rev=20529&view=rev Author: dmichelsen Date: 2013-03-28 20:47:04 +0000 (Thu, 28 Mar 2013) Log Message: ----------- wget/trunk: Update to 1.14 and switch back to OpenSSL instead of GnuTLS Modified Paths: -------------- csw/mgar/pkg/wget/trunk/Makefile csw/mgar/pkg/wget/trunk/checksums Modified: csw/mgar/pkg/wget/trunk/Makefile =================================================================== --- csw/mgar/pkg/wget/trunk/Makefile 2013-03-28 15:23:26 UTC (rev 20528) +++ csw/mgar/pkg/wget/trunk/Makefile 2013-03-28 20:47:04 UTC (rev 20529) @@ -4,8 +4,7 @@ # https://lists.gnu.org/archive/html/bug-wget/2011-09/msg00001.html NAME = wget -VERSION = 1.13.4 -GARTYPE = v2 +VERSION = 1.14 DESCRIPTION = A network utility to retrieve files from the Web define BLURB @@ -19,6 +18,7 @@ endef MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += ftp://alpha.gnu.org/gnu/wget/ DISTFILES = $(NAME)-$(VERSION).tar.xz VENDOR_URL = http://www.gnu.org/software/wget/ @@ -27,11 +27,10 @@ SPKG_DESC_CSWwget = A network utility to retrieve files from the web RUNTIME_DEP_PKGS_CSWwget += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwget += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWwget += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWwget += CSWlibz1 -RUNTIME_DEP_PKGS_CSWwget += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWwget += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWwget += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWwget += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWwget += CSWlibpcre1 EXTRA_MODULATORS = STATIC MODULATIONS_STATIC = disable enable @@ -60,6 +59,10 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += $(EXTRA_CONFIGURE_STATIC-$(STATIC)) +# Switch back to OpenSSL as reported in +# https://www.opencsw.org/mantis/view.php?id=4969 +CONFIGURE_ARGS += --with-ssl=openssl + PRESERVECONF = $(sysconfdir)/wgetrc MIGRATE_FILES = wgetrc Modified: csw/mgar/pkg/wget/trunk/checksums =================================================================== --- csw/mgar/pkg/wget/trunk/checksums 2013-03-28 15:23:26 UTC (rev 20528) +++ csw/mgar/pkg/wget/trunk/checksums 2013-03-28 20:47:04 UTC (rev 20529) @@ -1 +1 @@ -7f518b3a71e9efd330e9a0c3714f8463 wget-1.13.4.tar.xz +316f6f59292c9098ad81fd54f658c579 wget-1.14.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 17:10:37 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 16:10:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[20530] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20530 http://gar.svn.sourceforge.net/gar/?rev=20530&view=rev Author: wahwah Date: 2013-03-29 16:10:36 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb: Variou cleanup Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog_notifier_test.py csw/mgar/gar/v2/lib/python/checkpkg2.py csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/find_missing_bins.py csw/mgar/gar/v2/lib/python/makeStdLibDb.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/patch_package.py csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/catalog_notifier_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_notifier_test.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/catalog_notifier_test.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -11,7 +11,7 @@ class NotificationFormatterTest(mox.MoxTestBase): - + def disabled_testOne(self): """This tested too much.""" f = catalog_notifier.NotificationFormatter() Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -79,6 +79,7 @@ help="Enable profiling (a developer option).") options, args = parser.parse_args() assert len(args), "The list of files or md5 sums must be not empty." + logging_level = logging.INFO if options.quiet: logging_level = logging.WARNING @@ -92,7 +93,6 @@ dm = database.DatabaseManager() dm.AutoManage() - err_msg_list = [] if not options.osrel_commas: err_msg_list.append("Please specify --os-releases.") Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -835,7 +835,7 @@ return sliced -class CatalogMixin(SqlobjectHelperMixin): +class Catalog(SqlobjectHelperMixin): """Responsible for functionality related to catalog operations. These include: @@ -1086,7 +1086,3 @@ sqo_srv4_in_cat.destroySelf() except sqlobject.main.SQLObjectNotFound, e: logging.warning(e) - - -class Catalog(CatalogMixin): - pass Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -364,7 +364,7 @@ def _CheckpkgSets(self, planned_modifications): """Groups packages according to catalogs. - + Used to determine groups of packages to check together, against a specific catalog. Modified: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -63,7 +63,7 @@ if not pkg: logging.warning("MakeRevIndex: No package for %r", md5) continue - try: + try: pkg_name = pkg["basic_stats"]["pkgname"] for p in pkg['binaries_dump_info']: for b in p['needed sonames']: @@ -77,7 +77,7 @@ for pm in pkg['pkgmap']: if pm['type'] == 's': # symbolic link cl.append(pm['line'].split(' ')[3].split('=')[0]) # take the linkname - + except KeyError: logging.warning("MakeRevIndex: no pkg structure: ") # logging.warning(pkg) @@ -155,7 +155,7 @@ break if found: break if not found: - # second search is there a link with this name + # second search is there a link with this name for lpkg in links: for l in links[lpkg]: # if lib in the package @@ -170,13 +170,13 @@ found = True # logging.debug ("\nfound %s" % nb) # at last search the lib in earlier os releases - if not found: + if not found: fl.write("%s:%s:%s:%s\n" % (nb,pkg,arch,osrel) ) print "\nNOT FOUND: %s, needed in pkg %s %s %s" % (nb,pkg,arch,osrel) sys.stdout.write("\rscanPackage %4d %s" % (i,pkg)) sys.stdout.flush() fl.close() - + def main(): parser = optparse.OptionParser() parser.add_option("--debug", dest="debug", action="store_true") Modified: csw/mgar/gar/v2/lib/python/makeStdLibDb.py =================================================================== --- csw/mgar/gar/v2/lib/python/makeStdLibDb.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/makeStdLibDb.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -1,6 +1,6 @@ #!/bin/env python -"""Builds a list of standard libs and stores this in stdlib.json +"""Builds a list of standard libs and stores this in stdlib.json this list/file is needed by find_missing_bins.py """ Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -285,7 +285,7 @@ if line.startswith("#"): continue if "BEGIN PGP SIGNED MESSAGE" in line: continue if line.startswith("Hash:"): continue - if len(line.strip()) <= 0: continue + if len(line.strip()) <= 0: continue if "BEGIN PGP SIGNATURE" in line: break fields = re.split(r"\s+", line) try: Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/package.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -274,7 +274,7 @@ basedir = pkginfo[basedir_id] else: basedir = "" - # The convention in checkpkg is to not include the leading slash in paths. + # The convention in checkpkg is to not include the leading slash in paths. basedir = basedir.lstrip("/") return basedir Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -156,7 +156,7 @@ def testImportPkg(self): """Registers the package in the database.""" package_stats.PackageStats.ImportPkg(neon_stats[0]) - # basename=u'libneon.so.26.0.4' path=u'/opt/csw/lib' + # basename=u'libneon.so.26.0.4' path=u'/opt/csw/lib' res = m.CswFile.select( sqlobject.AND( m.CswFile.q.basename==u'libneon.so.26.0.4', Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -1,7 +1,7 @@ #!/usr/bin/env python2.6 # # A utility to patch an existing package. -# +# # Usage: # patchpkg --srv4-file /tmp/foo-1.0-sparc-CSW.pkg.gz --export /work/dir # cd /work/dir/CSWfoo Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-03-28 20:47:04 UTC (rev 20529) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-03-29 16:10:36 UTC (rev 20530) @@ -150,7 +150,7 @@ t = Template(tmpl_str, searchList=[{ "pkgstats": pkgstats, "hachoir_machines": package_checks.HACHOIR_MACHINES, - }]) + }]) return unicode(t) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 17:10:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 16:10:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20531] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 20531 http://gar.svn.sourceforge.net/gar/?rev=20531&view=rev Author: wahwah Date: 2013-03-29 16:10:56 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb: Use VARCHAR instead of TEXT in MySQL It's enough to declare field length in the model. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:10:36 UTC (rev 20530) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:10:56 UTC (rev 20531) @@ -82,13 +82,13 @@ option_key = sqlobject.UnicodeCol(length=255, unique=True) float_value = sqlobject.FloatCol(default=None) int_value = sqlobject.IntCol(default=None) - str_value = sqlobject.UnicodeCol(default=None) + str_value = sqlobject.UnicodeCol(default=None, length=250) class Pkginst(sqlobject.SQLObject): - pkgname = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) - catalogname = sqlobject.UnicodeCol(default=None) - pkg_desc = sqlobject.UnicodeCol(default=None) + pkgname = sqlobject.UnicodeCol(length=50, unique=True, notNone=True) + catalogname = sqlobject.UnicodeCol(default=None, length=50) + pkg_desc = sqlobject.UnicodeCol(default=None, length=250) srv4_files = sqlobject.MultipleJoin('Srv4FileStats') @@ -137,8 +137,8 @@ It focuses on the stats, but it can as well represent just a srv4 file. """ arch = sqlobject.ForeignKey('Architecture', notNone=True) - basename = sqlobject.UnicodeCol(notNone=True) - catalogname = sqlobject.UnicodeCol(notNone=True) + basename = sqlobject.UnicodeCol(notNone=True, length=250) + catalogname = sqlobject.UnicodeCol(notNone=True, length=250) # The data structure can be missing - necessary for fake SUNW # packages. data_obj = sqlobject.ForeignKey('Srv4FileStatsBlob', notNone=False) @@ -152,9 +152,9 @@ pkginst = sqlobject.ForeignKey('Pkginst', notNone=True) registered = sqlobject.BoolCol(notNone=True) use_to_generate_catalogs = sqlobject.BoolCol(notNone=True) - rev = sqlobject.UnicodeCol(notNone=False) + rev = sqlobject.UnicodeCol(notNone=False, length=250) stats_version = sqlobject.IntCol(notNone=True) - version_string = sqlobject.UnicodeCol(notNone=True) + version_string = sqlobject.UnicodeCol(notNone=True, length=250) in_catalogs = sqlobject.MultipleJoin( 'Srv4FileInCatalog', joinColumn='srv4file_id') @@ -354,10 +354,10 @@ class CheckpkgErrorTag(CheckpkgErrorTagMixin, sqlobject.SQLObject): srv4_file = sqlobject.ForeignKey('Srv4FileStats', notNone=True) - pkgname = sqlobject.UnicodeCol(default=None) - tag_name = sqlobject.UnicodeCol(notNone=True) - tag_info = sqlobject.UnicodeCol(default=None) - msg = sqlobject.UnicodeCol(default=None) + pkgname = sqlobject.UnicodeCol(default=None, length=250) + tag_name = sqlobject.UnicodeCol(notNone=True, length=250) + tag_info = sqlobject.UnicodeCol(default=None, length=250) + msg = sqlobject.UnicodeCol(default=None, length=250) # To cache results from checkpkg overridden = sqlobject.BoolCol(default=False) # The same package might have different sets of errors for different @@ -374,9 +374,9 @@ class CheckpkgOverride(sqlobject.SQLObject): # Overrides don't need to contain catalog parameters. srv4_file = sqlobject.ForeignKey('Srv4FileStats', notNone=True) - pkgname = sqlobject.UnicodeCol(default=None) - tag_name = sqlobject.UnicodeCol(notNone=True) - tag_info = sqlobject.UnicodeCol(default=None) + pkgname = sqlobject.UnicodeCol(default=None, length=250) + tag_name = sqlobject.UnicodeCol(notNone=True, length=250) + tag_info = sqlobject.UnicodeCol(default=None, length=250) def __unicode__(self): return (u"Override: %s: %s %s" % This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 17:11:24 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 16:11:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[20532] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20532 http://gar.svn.sourceforge.net/gar/?rev=20532&view=rev Author: wahwah Date: 2013-03-29 16:11:23 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb: Use JSON for internal storage Also: Increase the database schema version JSON data in tests Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py csw/mgar/gar/v2/lib/python/testdata/neon_stats.py csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2/lib/python/testdata/tree_stats.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/database.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -10,7 +10,7 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 9L +DB_SCHEMA_VERSION = 10L TABLES_THAT_NEED_UPDATES = (m.CswFile,) # This list of tables is sensitive to the order in which tables are created. Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -7,8 +7,17 @@ import sqlobject import os.path from sqlobject import sqlbuilder +import cjson import cPickle +class Error(Exception): + """Generic error.""" + + +class DataError(Error): + """A problem with data in the database.""" + + class CatalogReleaseType(sqlobject.SQLObject): "Unstable, testing, stable." name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) @@ -142,6 +151,7 @@ # The data structure can be missing - necessary for fake SUNW # packages. data_obj = sqlobject.ForeignKey('Srv4FileStatsBlob', notNone=False) + data_obj_mimetype = sqlobject.UnicodeCol(notNone=True, length=250) filename_arch = sqlobject.ForeignKey('Architecture', notNone=True) latest = sqlobject.BoolCol(notNone=True) maintainer = sqlobject.ForeignKey('Maintainer', notNone=False) @@ -246,7 +256,12 @@ return s def GetStatsStruct(self): - pkgstats = cPickle.loads(str(self.data_obj.pickle)) + if self.data_obj_mimetype == 'application/json': + pkgstats = cjson.decode(str(self.data_obj.pickle)) + elif self.data_obj_mimetype == 'application/python-pickle': + pkgstats = cPickle.loads(str(self.data_obj.pickle)) + else: + raise DataError("Unrecognized mime type: %s" % self.data_obj_mimetype) # There was a problem with bad utf-8 in the VENDOR field. # This is a workaround. if "VENDOR" in pkgstats["pkginfo"]: @@ -308,7 +323,7 @@ 'file_basename': self.basename, 'catalogname': self.catalogname, 'md5_sum': self.md5_sum, - 'mtime': unicode(self.mtime), + 'mtime': self.mtime, 'rev': self.rev, 'size': self.size, 'version_string': self.version_string, Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,13 +1,15 @@ #!/usr/bin/env python2.6 -import cPickle +import cjson import copy +import dateutil.parser import itertools import logging import os import progressbar import mute_progressbar import re +import pprint import sqlobject import catalog @@ -204,7 +206,8 @@ "depends": depends, "i_depends": i_depends, "obsoleteness_info": dir_pkg.GetObsoletedBy(), - "isalist": sharedlib_utils.GetIsalist(arch), + # GetIsaList returns a frozenset, but we need a list. + "isalist": list(sharedlib_utils.GetIsalist(arch)), "overrides": override_dicts, "pkgchk": self.GetPkgchkData(), "pkginfo": dir_pkg.GetParsedPkginfo(), @@ -212,7 +215,10 @@ "bad_paths": dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), "basic_stats": basic_stats, "files_metadata": dir_pkg.GetFilesMetadata(), - "mtime": self.GetMtime(), + # Data in json must be stored using simple structures such as numbers + # or strings. We cannot store a datetime.datetime object, we must + # convert it into a string. + "mtime": self.GetMtime().isoformat(), "ldd_info": dir_pkg.GetLddMinusRlines(), "binaries_elf_info": dir_pkg.GetBinaryElfInfo(), } @@ -298,8 +304,12 @@ basename) pass # Creating the object in the database. - data_obj = m.Srv4FileStatsBlob( - pickle=cPickle.dumps(pkg_stats)) + try: + data_obj = m.Srv4FileStatsBlob(pickle=cjson.encode(pkg_stats)) + data_obj_mimetype = 'application/json' + except cjson.EncodeError as e: + logging.fatal(pprint.pformat(pkg_stats)) + raise if db_pkg_stats: # If the database row exists already, update it. # @@ -310,13 +320,14 @@ db_pkg_stats.basename = pkg_stats["basic_stats"]["pkg_basename"] db_pkg_stats.catalogname = pkg_stats["basic_stats"]["catalogname"] db_pkg_stats.data_obj = data_obj + db_pkg_stats.data_obj_mimetype = data_obj_mimetype db_pkg_stats.use_to_generate_catalogs = True db_pkg_stats.filename_arch = filename_arch db_pkg_stats.latest = True db_pkg_stats.maintainer = maintainer db_pkg_stats.md5_sum = pkg_stats["basic_stats"]["md5_sum"] db_pkg_stats.size = pkg_stats["basic_stats"]["size"] - db_pkg_stats.mtime = pkg_stats["mtime"] + db_pkg_stats.mtime = dateutil.parser.parser(pkg_stats["mtime"]) db_pkg_stats.os_rel = os_rel db_pkg_stats.pkginst = pkginst db_pkg_stats.registered = register @@ -329,13 +340,14 @@ basename=pkg_stats["basic_stats"]["pkg_basename"], catalogname=pkg_stats["basic_stats"]["catalogname"], data_obj=data_obj, + data_obj_mimetype=data_obj_mimetype, use_to_generate_catalogs=True, filename_arch=filename_arch, latest=True, maintainer=maintainer, md5_sum=pkg_stats["basic_stats"]["md5_sum"], size=pkg_stats["basic_stats"]["size"], - mtime=pkg_stats["mtime"], + mtime=dateutil.parser.parse(pkg_stats["mtime"]), os_rel=os_rel, pkginst=pkginst, registered=register, Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -69,7 +69,7 @@ self.assertEqual( "1234.12.11", data_structure["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) - self.assertEqual(datetime.datetime(2010, 12, 8, 7, 52, 54), + self.assertEqual('2010-12-08T07:52:54', data_structure["mtime"]) Modified: csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstats = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'apr_util', 'md5_sum': 'e19f2b377884db51cc20a88ff06c8eb7', @@ -241,7 +240,7 @@ 'path': 'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so', 'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'), 'soname': 'apr_dbd_odbc-1.so'}, - 'mtime': datetime.datetime(2010, 8, 27, 11, 0, 10), + 'mtime': '2010-08-27T11:00:10', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', Modified: csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstat_objs = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'berkeleydb48', 'md5_sum': '884e86c865b6cf30d21da6436318c289', @@ -807,7 +806,7 @@ 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so': {}, 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so': {}, 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so': {}}, - 'mtime': datetime.datetime(2010, 3, 2, 18, 9, 30), + 'mtime': '2010-03-02T18:09:30', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', Modified: csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstats = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'cadaver', 'md5_sum': 'd74a2f65ef0caff0bdde7310007764a8', @@ -146,7 +145,7 @@ 'libexpat1 - XML parser toolkit, libexpat.so.1'), ('CSWlibz1', 'libz1 - Zlib data compression library, libz.so.1')], - 'isalist': frozenset(['amd64', + 'isalist': (['amd64', 'i386', 'i486', 'i86', @@ -186,7 +185,7 @@ 'soname': 'libexpat.so.1', 'state': 'soname-unused', 'symbol': None}]}, - 'mtime': datetime.datetime(2012, 6, 6, 20, 21, 14), + 'mtime': '2012-06-06T20:21:14', 'overrides': [], 'pkgmap': [{'class': None, 'group': None, Modified: csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstats = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'javasvn', 'md5_sum': 'd759d2536a8ecb46530a9ca218efe210', @@ -121,7 +120,7 @@ ] } }, - 'mtime': datetime.datetime(2010, 7, 12, 19, 6, 15), + 'mtime': '2010-07-12T19:06:15', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', Modified: csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstat_objs = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'libnet', 'md5_sum': '903c6ab7e055fd7a732f69544f84e05a', @@ -33,7 +32,7 @@ 'sparc'), 'ldd_info': {}, 'binaries_elf_info': {}, - 'mtime': datetime.datetime(2008, 8, 20, 10, 26, 15), + 'mtime': '2008-08-20T10:26:15', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', Modified: csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstat_objs = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'mercurial', 'md5_sum': '0783020e5628f432b92d1f97903fd15e', @@ -693,7 +692,7 @@ 'path': 'opt/csw/bin/hg'}, {'mime_type': 'text/plain; charset=us-ascii', 'path': 'opt/csw/share/doc/mercurial/license'}], - 'isalist': frozenset(['sparc', + 'isalist': (['sparc', 'sparcv7', 'sparcv8', 'sparcv8-fsmuld', @@ -738,7 +737,7 @@ 'symbol table': [] }, }, - 'mtime': datetime.datetime(2011, 2, 15, 7, 46, 49), + 'mtime': '2011-02-15T07:46:49', 'overrides': [{'pkgname': 'CSWmercurial', 'tag_info': None, 'tag_name': 'pkgname-does-not-start-with-CSWpy-'}, Modified: csw/mgar/gar/v2/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstats = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'neon', 'md5_sum': 'd74a2f65ef0caff0bdde7310007764a8', @@ -155,7 +154,7 @@ 'mime_type': 'application/x-sharedlib; charset=binary', 'mime_type_by_hachoir': u'application/x-executable', 'path': 'opt/csw/lib/sparcv9/libneon.so.26.0.4'}], - 'isalist': frozenset(['amd64', + 'isalist': (['amd64', 'i386', 'i486', 'i86', @@ -191,7 +190,7 @@ 'symbol table': [], }, }, - 'mtime': datetime.datetime(2009, 9, 23, 20, 21, 14), + 'mtime': '2009-09-23T20:21:14', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': [], Modified: csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstats = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'sudo_common', 'md5_sum': '2b3bb1d2a9190b5d1813562fb2d1472a', @@ -92,7 +91,7 @@ ], } }, - 'mtime': datetime.datetime(2010, 3, 2, 22, 34, 40), + 'mtime': '2010-03-02T22:34:40', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', @@ -328,7 +327,7 @@ ] } }, - 'mtime': datetime.datetime(2010, 3, 2, 22, 34, 39), + 'mtime': '2010-03-02T22:34:39', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', Modified: csw/mgar/gar/v2/lib/python/testdata/tree_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-03-29 16:10:56 UTC (rev 20531) +++ csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-03-29 16:11:23 UTC (rev 20532) @@ -1,4 +1,3 @@ -import datetime pkgstats = [{'bad_paths': {}, 'basic_stats': {'catalogname': 'tree', 'md5_sum': '1e43fa1c7e637b25d9356ad516ae0403', @@ -37,7 +36,7 @@ 'mime_type': 'application/x-executable; charset=binary', 'mime_type_by_hachoir': u'application/x-executable', 'path': 'opt/csw/bin/tree'}], - 'isalist': frozenset(['sparc', + 'isalist': (['sparc', 'sparcv7', 'sparcv8', 'sparcv8-fsmuld', @@ -58,7 +57,7 @@ } ] } }, - 'mtime': datetime.datetime(2010, 7, 5, 23, 48, 10), + 'mtime': '2010-07-05T23:48:10', 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': [], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 17:11:39 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 16:11:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20533] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20533 http://gar.svn.sourceforge.net/gar/?rev=20533&view=rev Author: wahwah Date: 2013-03-29 16:11:39 +0000 (Fri, 29 Mar 2013) Log Message: ----------- Remove the 'latest' field. It's not used. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/models_test.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/pkgdb.py csw/mgar/gar/v2/lib/python/system_pkgmap.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:11:23 UTC (rev 20532) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:11:39 UTC (rev 20533) @@ -153,7 +153,6 @@ data_obj = sqlobject.ForeignKey('Srv4FileStatsBlob', notNone=False) data_obj_mimetype = sqlobject.UnicodeCol(notNone=True, length=250) filename_arch = sqlobject.ForeignKey('Architecture', notNone=True) - latest = sqlobject.BoolCol(notNone=True) maintainer = sqlobject.ForeignKey('Maintainer', notNone=False) md5_sum = sqlobject.UnicodeCol(notNone=True, unique=True, length=32) size = sqlobject.IntCol() Modified: csw/mgar/gar/v2/lib/python/models_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/models_test.py 2013-03-29 16:11:23 UTC (rev 20532) +++ csw/mgar/gar/v2/lib/python/models_test.py 2013-03-29 16:11:39 UTC (rev 20533) @@ -52,7 +52,6 @@ catalogname="foo", data_obj=None, filename_arch=self.sqo_arch, - latest=True, maintainer=self.maintainer, md5_sum="not a real one", size=1L, Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-03-29 16:11:23 UTC (rev 20532) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-03-29 16:11:39 UTC (rev 20533) @@ -278,16 +278,6 @@ logging.debug(e) maintainer = m.Maintainer(email=maint_email) - # If there are any previous records of the same pkginst, arch and os_rel, - # we're marking them as not-latest. - # This assumes that the packages are examined in a chronological order. - res = m.Srv4FileStats.select(sqlobject.AND( - m.Srv4FileStats.q.pkginst==pkginst, - m.Srv4FileStats.q.arch==arch, - m.Srv4FileStats.q.os_rel==os_rel)) - for obj in res: - obj.latest = False - rev=None if "revision_info" in parsed_basename: if "REV" in parsed_basename["revision_info"]: @@ -323,7 +313,6 @@ db_pkg_stats.data_obj_mimetype = data_obj_mimetype db_pkg_stats.use_to_generate_catalogs = True db_pkg_stats.filename_arch = filename_arch - db_pkg_stats.latest = True db_pkg_stats.maintainer = maintainer db_pkg_stats.md5_sum = pkg_stats["basic_stats"]["md5_sum"] db_pkg_stats.size = pkg_stats["basic_stats"]["size"] @@ -343,7 +332,6 @@ data_obj_mimetype=data_obj_mimetype, use_to_generate_catalogs=True, filename_arch=filename_arch, - latest=True, maintainer=maintainer, md5_sum=pkg_stats["basic_stats"]["md5_sum"], size=pkg_stats["basic_stats"]["size"], Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-03-29 16:11:23 UTC (rev 20532) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-03-29 16:11:39 UTC (rev 20533) @@ -71,7 +71,6 @@ arch: $arch.name os_rel: $os_rel.short_name maintainer: $maintainer.email -latest: $latest version_string: $version_string rev: $rev stats_version: $stats_version Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-03-29 16:11:23 UTC (rev 20532) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-03-29 16:11:39 UTC (rev 20533) @@ -485,7 +485,6 @@ data_obj=None, use_to_generate_catalogs=False, filename_arch=sqo_arch, - latest=True, maintainer=maintainer, md5_sum=fake_srv4_md5, mtime=datetime.datetime.now(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 17:11:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 16:11:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20534] csw/mgar/gar/v2/lib Message-ID: Revision: 20534 http://gar.svn.sourceforge.net/gar/?rev=20534&view=rev Author: wahwah Date: 2013-03-29 16:11:55 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb: Store user and datestamp who added a pkg An additional timestamp to keep track which package was added when to a catalog in the database. It doesn't have to be the package maintainer, just someone who did the adding. User name is retrieved from HTTP auth, or it's the system user when run from the console. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/pkgdb.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-03-29 16:11:39 UTC (rev 20533) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-03-29 16:11:55 UTC (rev 20534) @@ -6,6 +6,7 @@ import copy from Cheetah import Template import logging +import getpass import package_stats import package_checks import sqlobject @@ -1014,10 +1015,12 @@ m.Srv4FileInCatalog.q.srv4file!=sqo_srv4)) return res - def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel): + def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel, who=None): """Registers a srv4 file in a catalog.""" - logging.debug("AddSrv4ToCatalog(%s, %s, %s, %s)", - sqo_srv4, osrel, arch, catrel) + logging.debug("AddSrv4ToCatalog(%s, %s, %s, %s, %s)", + sqo_srv4, osrel, arch, catrel, who) + if not who: + who = 'unknown' # There are only i386 and sparc catalogs. if arch != 'i386' and arch != 'sparc': raise CatalogDatabaseError("Wrong architecture: %s" % arch) @@ -1069,7 +1072,8 @@ arch=sqo_arch, osrel=sqo_osrel, catrel=sqo_catrel, - srv4file=sqo_srv4) + srv4file=sqo_srv4, + created_by=getpass.getuser()) def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel): sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-03-29 16:11:39 UTC (rev 20533) +++ csw/mgar/gar/v2/lib/python/database.py 2013-03-29 16:11:55 UTC (rev 20534) @@ -10,7 +10,7 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 10L +DB_SCHEMA_VERSION = 12L TABLES_THAT_NEED_UPDATES = (m.CswFile,) # This list of tables is sensitive to the order in which tables are created. Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:11:39 UTC (rev 20533) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:11:55 UTC (rev 20534) @@ -423,6 +423,10 @@ osrel = sqlobject.ForeignKey('OsRelease', notNone=True) catrel = sqlobject.ForeignKey('CatalogRelease', notNone=True) srv4file = sqlobject.ForeignKey('Srv4FileStats', notNone=True) + created_on = sqlobject.DateTimeCol( + notNone=True, + default=sqlobject.DateTimeCol.now) + created_by = sqlobject.UnicodeCol(length=50, notNone=True) uniqueness_idx = sqlobject.DatabaseIndex( 'arch', 'osrel', 'catrel', 'srv4file', unique=True) Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-03-29 16:11:39 UTC (rev 20533) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-03-29 16:11:55 UTC (rev 20534) @@ -12,6 +12,7 @@ import configuration import database import datetime +import getpass import logging import models as m import optparse @@ -283,6 +284,7 @@ logging.info( " + %s", cat_entry_by_md5[md5]["file_basename"]) + user = getpass.getuser() # Remove # We could use checkpkg_lib.Catalog.RemoveSrv4(), but it would redo # many of the database queries and would be much slower. @@ -309,7 +311,8 @@ package_stats.PackageStats.ImportPkg(stats, True) try: db_catalog.AddSrv4ToCatalog( - sqo_srv4, osrel, arch, catrel) + sqo_srv4, osrel, arch, catrel, + who=user) except checkpkg_lib.CatalogDatabaseError, e: logging.warning( "Could not insert %s (%s) into the database. %s", @@ -489,6 +492,7 @@ elif command == 'add-to-cat': if len(args) <= 3: raise UsageError("Not enough arguments, see usage.") + user = getpass.getuser() osrel, arch, catrel= args[:3] c = checkpkg_lib.Catalog() md5_sums = args[3:] @@ -497,7 +501,7 @@ try: sqo_srv4 = m.Srv4FileStats.select( m.Srv4FileStats.q.md5_sum==md5_sum).getOne() - c.AddSrv4ToCatalog(sqo_srv4, osrel, arch, catrel) + c.AddSrv4ToCatalog(sqo_srv4, osrel, arch, catrel, who=user) except sqlobject.main.SQLObjectNotFound, e: logging.warning("Srv4 file %s was not found in the database.", md5_sum) Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-03-29 16:11:39 UTC (rev 20533) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-03-29 16:11:55 UTC (rev 20534) @@ -6,6 +6,7 @@ import os sys.path.append(os.path.join(os.path.split(__file__)[0], "..", "..")) +import base64 import web import sqlobject import json @@ -189,7 +190,16 @@ for pkg_in_catalog in res: srv4_to_remove = pkg_in_catalog.srv4file c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name) - c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name) + + # Retrieving authentication data from the HTTP environment. + # If the auth data isn't there, this code will fail. + auth = web.ctx.env.get('HTTP_AUTHORIZATION') + if not auth: + raise web.forbidden() + auth = re.sub('^Basic ','',auth) + username, password = base64.decodestring(auth).split(':') + + c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name, who=username) web.header( 'Content-type', 'application/x-vnd.opencsw.pkg;type=catalog-update') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 17:50:43 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 16:50:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20535] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20535 http://gar.svn.sourceforge.net/gar/?rev=20535&view=rev Author: wahwah Date: 2013-03-29 16:50:43 +0000 (Fri, 29 Mar 2013) Log Message: ----------- checkpkg: Fixes after refactoring. I did not run unit test before committing, bad me. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/models_test.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/system_pkgmap.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-03-29 16:11:55 UTC (rev 20534) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-03-29 16:50:43 UTC (rev 20535) @@ -846,7 +846,7 @@ """ def __init__(self): - super(CatalogMixin, self).__init__() + super(Catalog, self).__init__() self.pkgs_by_path_cache = {} def GetInstalledPackages(self, osrel, arch, catrel): Modified: csw/mgar/gar/v2/lib/python/models_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/models_test.py 2013-03-29 16:11:55 UTC (rev 20534) +++ csw/mgar/gar/v2/lib/python/models_test.py 2013-03-29 16:50:43 UTC (rev 20535) @@ -51,6 +51,7 @@ basename="foo.pkg", catalogname="foo", data_obj=None, + data_obj_mimetype='text/plain', filename_arch=self.sqo_arch, maintainer=self.maintainer, md5_sum="not a real one", Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-03-29 16:11:55 UTC (rev 20534) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-03-29 16:50:43 UTC (rev 20535) @@ -79,7 +79,7 @@ class TestPackageStats(package_stats.PackageStatsMixin): pass - class TestCatalog(checkpkg_lib.CatalogMixin): + class TestCatalog(checkpkg_lib.Catalog): pass def testWithoutInitialDataImport(self): Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-03-29 16:11:55 UTC (rev 20534) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-03-29 16:50:43 UTC (rev 20535) @@ -483,6 +483,7 @@ basename=("%s-fake_version" % catalogname), catalogname=catalogname, data_obj=None, + data_obj_mimetype='text/plain', use_to_generate_catalogs=False, filename_arch=sqo_arch, maintainer=maintainer, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 18:56:26 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 17:56:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20536] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 20536 http://gar.svn.sourceforge.net/gar/?rev=20536&view=rev Author: wahwah Date: 2013-03-29 17:56:25 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb: Handle pickled datetime. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-29 16:50:43 UTC (rev 20535) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-29 17:56:25 UTC (rev 20536) @@ -9,6 +9,7 @@ from sqlobject import sqlbuilder import cjson import cPickle +import datetime class Error(Exception): """Generic error.""" @@ -316,13 +317,18 @@ # - self.maintainer_id # - GetVendorUrl unpickles the object (very slow) # - GetSvnUrl unpickles the object (very slow) + def SanitizeDatetime(d): + if isinstance(d, datetime.datetime): + return d.isoformat() + else: + return d data = { 'basename': self.basename, # For compatibility with the catalog parser from catalog.py 'file_basename': self.basename, 'catalogname': self.catalogname, 'md5_sum': self.md5_sum, - 'mtime': self.mtime, + 'mtime': SanitizeDatetime(self.mtime), 'rev': self.rev, 'size': self.size, 'version_string': self.version_string, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 21:44:04 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 20:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20537] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20537 http://gar.svn.sourceforge.net/gar/?rev=20537&view=rev Author: wahwah Date: 2013-03-29 20:44:04 +0000 (Fri, 29 Mar 2013) Log Message: ----------- checkpkg: More fixes after refactoring Some wrinkles around earlier laziness in handling dates. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-03-29 17:56:25 UTC (rev 20536) +++ csw/mgar/gar/v2/lib/python/models.py 2013-03-29 20:44:04 UTC (rev 20537) @@ -11,6 +11,14 @@ import cPickle import datetime + +def SanitizeDatetime(d): + if isinstance(d, datetime.datetime): + return d.isoformat() + else: + return d + + class Error(Exception): """Generic error.""" @@ -259,7 +267,7 @@ if self.data_obj_mimetype == 'application/json': pkgstats = cjson.decode(str(self.data_obj.pickle)) elif self.data_obj_mimetype == 'application/python-pickle': - pkgstats = cPickle.loads(str(self.data_obj.pickle)) + pkgstats = cPickle.loads(str(self.data_obj.pickle)) else: raise DataError("Unrecognized mime type: %s" % self.data_obj_mimetype) # There was a problem with bad utf-8 in the VENDOR field. @@ -275,6 +283,9 @@ d["path"] = self.GetUnicodeOrNone(d["path"]) d["line"] = self.GetUnicodeOrNone(d["line"]) # End of the workaround + pkgstats['mtime'] = SanitizeDatetime(pkgstats['mtime']) + if isinstance(pkgstats['isalist'], frozenset): + pkgstats['isalist'] = list(pkgstats['isalist']) return pkgstats def _GetBuildSource(self): @@ -317,11 +328,6 @@ # - self.maintainer_id # - GetVendorUrl unpickles the object (very slow) # - GetSvnUrl unpickles the object (very slow) - def SanitizeDatetime(d): - if isinstance(d, datetime.datetime): - return d.isoformat() - else: - return d data = { 'basename': self.basename, # For compatibility with the catalog parser from catalog.py Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-03-29 17:56:25 UTC (rev 20536) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-03-29 20:44:04 UTC (rev 20537) @@ -316,7 +316,7 @@ db_pkg_stats.maintainer = maintainer db_pkg_stats.md5_sum = pkg_stats["basic_stats"]["md5_sum"] db_pkg_stats.size = pkg_stats["basic_stats"]["size"] - db_pkg_stats.mtime = dateutil.parser.parser(pkg_stats["mtime"]) + db_pkg_stats.mtime = dateutil.parser.parse(pkg_stats["mtime"]) db_pkg_stats.os_rel = os_rel db_pkg_stats.pkginst = pkginst db_pkg_stats.registered = register This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 21:44:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 20:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20538] csw/mgar/gar/v2/lib/web Message-ID: Revision: 20538 http://gar.svn.sourceforge.net/gar/?rev=20538&view=rev Author: wahwah Date: 2013-03-29 20:44:17 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb-web: Do not show pkginfo Sometimes data_obj is missing from a row and 500 error is served. Also, displaying pkgmap requires deserializing of the whole data structure, which is currently very slow. Therefore, we won't be showing pkgmap by default. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-29 20:44:04 UTC (rev 20537) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-29 20:44:17 UTC (rev 20538) @@ -123,6 +123,8 @@ archs = models.Architecture.select(models.Architecture.q.name!='all') else: archs = [pkg.arch] + # pkgmap is disabled for now. + pkgmap = [] for catrel in catrels: for arch in archs: for osrel in osrels: @@ -132,7 +134,7 @@ tags_by_cat[key] = tags tags_and_catalogs.append((osrel, arch, catrel, tags)) return render.Srv4Detail(pkg, overrides, tags_by_cat, all_tags, - tags_and_catalogs, pkgstats_raw) + tags_and_catalogs, pkgstats_raw, pkgmap) class Catalogname(object): Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2013-03-29 20:44:04 UTC (rev 20537) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2013-03-29 20:44:17 UTC (rev 20538) @@ -1,4 +1,4 @@ -$def with (pkg, overrides, tags_by_cat, tags, tags_and_catalogs, pkgstats_raw) +$def with (pkg, overrides, tags_by_cat, tags, tags_and_catalogs, pkgstats_raw, pkgmap) @@ -84,13 +84,14 @@ </li> </ul> -<h3>pkgmap</h3> +$if pkgmap: + <h3>pkgmap</h3> -<div style="background-color: #DDD; font-family: monospace;"> -<pre> -$for entry in pkg.GetStatsStruct()["pkgmap"]: $entry["line"] -</pre> -</div> + <div style="background-color: #DDD; font-family: monospace;"> + <pre> + $for line in pkgmap: $line + </pre> + </div> <h3>Raw dump of the Python data structure</h3> <pre> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 21:44:30 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 20:44:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[20539] csw/mgar/gar/v2/lib/web Message-ID: <E1ULgA2-000830-18@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20539 http://gar.svn.sourceforge.net/gar/?rev=20539&view=rev Author: wahwah Date: 2013-03-29 20:44:29 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb-web: Show time information in catalog view When displaying catalog info, show how much time did the query take. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-29 20:44:17 UTC (rev 20538) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-29 20:44:29 UTC (rev 20539) @@ -12,6 +12,7 @@ import pprint import sqlobject import web +import time from lib.python import models from lib.python import configuration @@ -198,8 +199,12 @@ cat_name = " ".join((catrel_name, arch_name, osrel_name)) sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( osrel_name, arch_name, catrel_name) + t2 = time.time() pkgs = models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel) - return render.CatalogDetail(cat_name, pkgs) + pkgs = list(pkgs) + t3 = time.time() + timeinfo = "Query evaluation: %.2fs" % (t3-t2) + return render.CatalogDetail(cat_name, pkgs, timeinfo, len(pkgs)) class MaintainerList(object): Modified: csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2013-03-29 20:44:17 UTC (rev 20538) +++ csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2013-03-29 20:44:29 UTC (rev 20539) @@ -1,4 +1,4 @@ -$def with (cat_name, pkgs) +$def with (cat_name, pkgs, timeinfo, n_of_pkgs) <html> <head> <title> @@ -8,7 +8,7 @@ </head> <body> <h3>$cat_name</h3> - <p>$pkgs.count() packages</p> + <p>$n_of_pkgs packages</p> <table> <tr> <th>filename</th> @@ -22,5 +22,6 @@ <td>$pkg.version_string</td> </tr> </table> +<p><code>$timeinfo</code></p> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 29 21:44:39 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Mar 2013 20:44:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20540] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: <E1ULgAB-00083Q-PB@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20540 http://gar.svn.sourceforge.net/gar/?rev=20540&view=rev Author: wahwah Date: 2013-03-29 20:44:39 +0000 (Fri, 29 Mar 2013) Log Message: ----------- pkgdb: Don't recode JSON when not needed This is potentially a big time saver. When retrieving data from the database and serving over HTTP in JSON, we can just send the data as they are without recoding. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-29 20:44:29 UTC (rev 20539) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-29 20:44:39 UTC (rev 20540) @@ -386,9 +386,13 @@ pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() - data_structure = pkg.GetStatsStruct() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=pkg-stats') - return json.dumps(data_structure, cls=PkgStatsEncoder) + if pkg.data_obj_mimetype == 'application/json': + # If data are in JSON already, we can send them without decoding. + return pkg.data_obj.pickle + else: + data_structure = pkg.GetStatsStruct() + return json.dumps(data_structure, cls=PkgStatsEncoder) class Srv4ByCatAndCatalogname(object): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 30 16:41:04 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 30 Mar 2013 15:41:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20541] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: <E1ULxtw-0002xM-8i@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20541 http://gar.svn.sourceforge.net/gar/?rev=20541&view=rev Author: chninkel Date: 2013-03-30 15:41:03 +0000 (Sat, 30 Mar 2013) Log Message: ----------- openssl1/trunk: only tweak MERGE_DIRS for 64 bits ISA Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-29 20:44:39 UTC (rev 20540) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-03-30 15:41:03 UTC (rev 20541) @@ -154,9 +154,10 @@ EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 # the openssl build system doesn't honor bindir -# aso it doesn't install 64 bits binaries in bin/amd64 -# we fix at the merge step -EXTRA_MERGE_DIRS_isa-extra = $(bindir_install) +# as it doesn't install 64 bits binaries in bin/{amd64,sparcv9} +# we fix this at the merge step +EXTRA_MERGE_DIRS_isa-amd64 = $(bindir_install) +EXTRA_MERGE_DIRS_isa-sparcv9 = $(bindir_install) # c_rehash is shell script: no isaexec please EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/bin/c_rehash This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 30 18:07:42 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 30 Mar 2013 17:07:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20542] csw/mgar/pkg/mailx/trunk Message-ID: <E1ULzFm-00052S-L5@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20542 http://gar.svn.sourceforge.net/gar/?rev=20542&view=rev Author: chninkel Date: 2013-03-30 17:07:42 +0000 (Sat, 30 Mar 2013) Log Message: ----------- mailx/trunk: updated recipe to build against libssl1.0.0 Modified Paths: -------------- csw/mgar/pkg/mailx/trunk/Makefile csw/mgar/pkg/mailx/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch Modified: csw/mgar/pkg/mailx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailx/trunk/Makefile 2013-03-30 15:41:03 UTC (rev 20541) +++ csw/mgar/pkg/mailx/trunk/Makefile 2013-03-30 17:07:42 UTC (rev 20542) @@ -17,13 +17,14 @@ SF_PROJECT = heirloom DISTFILES = $(NAME)-$(VERSION).tar.bz2 -SPKG_CLASSES = none cswcpsampleconf +RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibiconv2 -RUNTIME_DEP_PKGS = CSWcswclassutils CSWosslrt CSWiconv - # nail _is_ mailx now INCOMPATIBLE_PKGS = CSWnail +# Taken from upstream CVS to be able to build with libssl1.0.0 +PATCHFILES = build_with_openssl1.0.0.patch + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=106236 UPSTREAM_USE_SF = 1 @@ -32,9 +33,7 @@ CONFIGURE_SCRIPTS = TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /nail.rc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +SAMPLECONF = /etc/opt/csw/mailx/nail.rc include gar/category.mk @@ -56,7 +55,5 @@ @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @mv $(DESTDIR)$(sysconfdir)/$(NAME)/nail.rc \ - $(DESTDIR)$(sysconfdir)/$(NAME)/nail.rc.CSW @cd $(DESTDIR)$(bindir) && ln -s mailx nail @$(MAKECOOKIE) Added: csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch =================================================================== --- csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch (rev 0) +++ csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch 2013-03-30 17:07:42 UTC (rev 20542) @@ -0,0 +1,167 @@ +--- mailx/makeconfig 2007/04/14 15:26:00 1.14 ++++ mailx.new/makeconfig 2009/05/26 21:04:15 1.15 +@@ -1,7 +1,7 @@ + #!/bin/sh + + # +-# Sccsid @(#)makeconfig 1.43 (gritter) 4/14/07 ++# Sccsid @(#)makeconfig 1.44 (gritter) 5/26/09 + # + + tmp=___build$$ +@@ -393,6 +393,25 @@ + ! + fi + ++if test x$have_openssl = xyes ++then ++ compile_check stack_of 'for STACK_OF()' '#define HAVE_STACK_OF' <<\! ++#include <openssl/ssl.h> ++#include <openssl/err.h> ++#include <openssl/x509v3.h> ++#include <openssl/x509.h> ++#include <openssl/rand.h> ++ ++int main(void) ++{ ++ STACK_OF(GENERAL_NAME) *gens = NULL; ++ printf("%p", gens); /* to make it used */ ++ SSLv23_client_method(); ++ PEM_read_PrivateKey(0, 0, 0, 0); ++ return 0; ++} ++! ++fi + + cat >$tmp2.c <<\! + #include <gssapi/gssapi.h> +--- mailx/openssl.c 2007/08/04 11:41:36 1.12 ++++ mailx.new/openssl.c 2009/05/26 21:04:15 1.13 +@@ -38,7 +38,7 @@ + + #ifndef lint + #ifdef DOSCCS +-static char sccsid[] = "@(#)openssl.c 1.25 (gritter) 8/4/07"; ++static char sccsid[] = "@(#)openssl.c 1.26 (gritter) 5/26/09"; + #endif + #endif /* not lint */ + +@@ -101,12 +101,17 @@ + static int ssl_rand_init(void); + static void ssl_init(void); + static int ssl_verify_cb(int success, X509_STORE_CTX *store); +-static SSL_METHOD *ssl_select_method(const char *uhp); ++static const SSL_METHOD *ssl_select_method(const char *uhp); + static void ssl_load_verifications(struct sock *sp); + static void ssl_certificate(struct sock *sp, const char *uhp); + static enum okay ssl_check_host(const char *server, struct sock *sp); ++#ifdef HAVE_STACK_OF ++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain, ++ X509_STORE *store); ++#else + static int smime_verify(struct message *m, int n, STACK *chain, + X509_STORE *store); ++#endif + static EVP_CIPHER *smime_cipher(const char *name); + static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata); + static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn); +@@ -203,10 +208,10 @@ + return 1; + } + +-static SSL_METHOD * ++static const SSL_METHOD * + ssl_select_method(const char *uhp) + { +- SSL_METHOD *method; ++ const SSL_METHOD *method; + char *cp; + + cp = ssl_method_string(uhp); +@@ -308,7 +313,11 @@ + X509 *cert; + X509_NAME *subj; + char data[256]; ++#ifdef HAVE_STACK_OF ++ STACK_OF(GENERAL_NAME) *gens; ++#else + /*GENERAL_NAMES*/STACK *gens; ++#endif + GENERAL_NAME *gen; + int i; + +@@ -357,7 +366,8 @@ + + ssl_init(); + ssl_set_vrfy_level(uhp); +- if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) { ++ if ((sp->s_ctx = ++ SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) { + ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed")); + return STOP; + } +@@ -496,7 +506,11 @@ + } + + static int ++#ifdef HAVE_STACK_OF ++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store) ++#else + smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store) ++#endif + { + struct message *x; + char *cp, *sender, *to, *cc, *cnttype; +@@ -505,7 +519,12 @@ + off_t size; + BIO *fb, *pb; + PKCS7 *pkcs7; ++#ifdef HAVE_STACK_OF ++ STACK_OF(X509) *certs; ++ STACK_OF(GENERAL_NAME) *gens; ++#else + STACK *certs, *gens; ++#endif + X509 *cert; + X509_NAME *subj; + char data[LINESIZE]; +@@ -614,7 +633,11 @@ + { + int *msgvec = vp, *ip; + int ec = 0; ++#ifdef HAVE_STACK_OF ++ STACK_OF(X509) *chain = NULL; ++#else + STACK *chain = NULL; ++#endif + X509_STORE *store; + char *ca_dir, *ca_file; + +@@ -687,7 +710,11 @@ + X509 *cert; + PKCS7 *pkcs7; + BIO *bb, *yb; ++#ifdef HAVE_STACK_OF ++ STACK_OF(X509) *certs; ++#else + STACK *certs; ++#endif + EVP_CIPHER *cipher; + + certfile = expand((char *)certfile); +@@ -950,9 +977,14 @@ + off_t size; + BIO *fb, *pb; + PKCS7 *pkcs7; ++#ifdef HAVE_STACK_OF ++ STACK_OF(X509) *certs; ++ STACK_OF(X509) *chain = NULL; ++#else + STACK *certs; +- X509 *cert; + STACK *chain = NULL; ++#endif ++ X509 *cert; + enum okay ok = OKAY; + + message_number = n; Modified: csw/mgar/pkg/mailx/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mailx/trunk/files/changelog.CSW 2013-03-30 15:41:03 UTC (rev 20541) +++ csw/mgar/pkg/mailx/trunk/files/changelog.CSW 2013-03-30 17:07:42 UTC (rev 20542) @@ -1,3 +1,10 @@ +mailx (12.4,REV=2013.03.30) + + * Non maintainer upload. + * Rebuilt again libssl 1.0.0. + + -- Yann Rouillard <yann at opencsw.org> Sat, 30 Mar 2013 17:10:56 +0100 + mailx (12.4,REV=2009.05.21) * Package name change, was formerly known as nail. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 30 18:34:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 30 Mar 2013 17:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20543] csw/mgar/pkg/httping/trunk Message-ID: <E1ULzfz-0005k6-8Q@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20543 http://gar.svn.sourceforge.net/gar/?rev=20543&view=rev Author: chninkel Date: 2013-03-30 17:34:46 +0000 (Sat, 30 Mar 2013) Log Message: ----------- httping/trunk: fixed build failuure Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/httping/trunk/files/0002-Define-strndup-function.patch Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2013-03-30 17:07:42 UTC (rev 20542) +++ csw/mgar/pkg/httping/trunk/Makefile 2013-03-30 17:34:46 UTC (rev 20543) @@ -27,6 +27,11 @@ # Already submitted upstream, feedback pending. PATCHFILES = 0001-Makefile-make-options-and-tools-configurable.patch +# strndup is not defined anymore in httping source (file str.c) +# but it still doesn't exist under Solaris 9 so we have to define +# the function +PATCHFILES += 0002-Define-strndup-function.patch + CONFIGURE_SCRIPTS = TEST_SCRIPTS = @@ -37,7 +42,7 @@ OFLAGS = # Install options (see $(WORKSRC)/Makefile) -INSTALL_EXPORTS = PREFIX INSTALL STRIP +EXTRA_INSTALL_EXPORTS = PREFIX INSTALL STRIP PREFIX = $(prefix) INSTALL = ginstall STRIP = /usr/ccs/bin/strip Added: csw/mgar/pkg/httping/trunk/files/0002-Define-strndup-function.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0002-Define-strndup-function.patch (rev 0) +++ csw/mgar/pkg/httping/trunk/files/0002-Define-strndup-function.patch 2013-03-30 17:34:46 UTC (rev 20543) @@ -0,0 +1,30 @@ +From 852d6ca70fda0d1b21c3743801b43857061f9467 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard <yann at pleiades.fr.eu.org> +Date: Sat, 30 Mar 2013 18:25:40 +0100 +Subject: [PATCH] Define strndup function + +--- + str.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/str.c b/str.c +index aa6206a..7f7e0ee 100644 +--- a/str.c ++++ b/str.c +@@ -20,6 +20,7 @@ + + /* + Most unixes have this function already. ++But not Solaris 9 */ + + #ifndef _GNU_SOURCE + char *strndup(char *in, int size) +@@ -32,4 +33,4 @@ char *strndup(char *in, int size) + return out; + } + #endif +-*/ ++/**/ +-- +1.8.1.4 + Modified: csw/mgar/pkg/httping/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httping/trunk/files/changelog.CSW 2013-03-30 17:07:42 UTC (rev 20542) +++ csw/mgar/pkg/httping/trunk/files/changelog.CSW 2013-03-30 17:34:46 UTC (rev 20543) @@ -1,3 +1,10 @@ +httping (1.5.3,REV=2013.03.30) + + * Non maintainer upload. + * New upstream release. + + -- Yann Rouillard <yann at opencsw.org> Sat, 30 Mar 2013 18:28:09 +0100 + httping (1.4.1,REV=2010.01.15) * Updated to 1.4.1 (Closes #4157) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 30 19:13:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 30 Mar 2013 18:13:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20544] csw/mgar/pkg/mcabber/trunk/Makefile Message-ID: <E1UM0HV-0004Me-IK@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 20544 http://gar.svn.sourceforge.net/gar/?rev=20544&view=rev Author: chninkel Date: 2013-03-30 18:13:31 +0000 (Sat, 30 Mar 2013) Log Message: ----------- mcabber/trunk: rebuild against libssl1.0.0 Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/Makefile Modified: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile 2013-03-30 17:34:46 UTC (rev 20543) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2013-03-30 18:13:31 UTC (rev 20544) @@ -16,18 +16,19 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_DEP_PKGS = CSWncurses CSWossldevel CSWotrdevel -BUILD_DEP_PKGS += CSWaspell CSWggettext CSWglib2devel CSWpkgconfig -BUILD_DEP_PKGS += CSWgpgerr CSWgpgme CSWiconv +BUILD_DEP_PKGS = CSWlibncurses-dev CSWlibssl-dev CSWotrdevel +BUILD_DEP_PKGS += CSWaspell CSWggettext CSWlibglib2-dev CSWpkgconfig +BUILD_DEP_PKGS += CSWlibgpg-error-dev CSWgpgme CSWlibiconv-dev -RUNTIME_DEP_PKGS = CSWncurses CSWosslrt CSWotr -RUNTIME_DEP_PKGS += CSWaspell CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS += CSWgpgerr CSWgpgme CSWiconv +RUNTIME_DEP_PKGS = CSWlibncursesw5 CSWlibssl1-0-0 CSWotr +RUNTIME_DEP_PKGS += CSWlibaspell15 CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibintl8 CSWlibpanelw5 CSWgpgme + TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-openssl=/opt/csw/lib +CONFIGURE_ARGS += --with-openssl=/opt/csw/include CONFIGURE_ARGS += --enable-otr CONFIGURE_ARGS += --enable-aspell CONFIGURE_ARGS += --enable-sigwinch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 30 21:00:23 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 30 Mar 2013 20:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20545] csw/mgar/gar/v2/lib/web Message-ID: <E1UM1wt-0001Hp-Eq@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20545 http://gar.svn.sourceforge.net/gar/?rev=20545&view=rev Author: wahwah Date: 2013-03-30 20:00:22 +0000 (Sat, 30 Mar 2013) Log Message: ----------- pkgdb-web: Display catalogs as a table With a little bit of CSS. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/static/pkgdb.css csw/mgar/gar/v2/lib/web/templates/CatalogList.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-30 18:13:31 UTC (rev 20544) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-30 20:00:22 UTC (rev 20545) @@ -178,20 +178,37 @@ class CatalogList(object): def GET(self): + """Return a list of catalogs. + + Make it table: + + 5.8 5.9 5.10 5.11 + beanie i386 sparc i386 sparc i386 sparc i386 sparc + dublin i386 sparc i386 sparc i386 sparc i386 sparc + kiel i386 sparc i386 sparc i386 sparc i386 sparc + legacy i386 sparc i386 sparc i386 sparc i386 sparc + """ archs = models.Architecture.select() osrels = models.OsRelease.select() catrels = models.CatalogRelease.select() - catalogs = [] + table = [] for catrel in catrels: - for arch in archs: - if arch.name in ('all'): continue - for osrel in osrels: - if osrel.full_name == 'unspecified': continue + row = [catrel.name] + for osrel in osrels: + cell = [] + if osrel.full_name == 'unspecified': continue + for arch in archs: + if arch.name in ('all'): continue # tags = pkg.GetErrorTagsResult(osrel, arch, catrel) - key = (osrel, arch, catrel) + cell.append({ + 'osrel': osrel, + 'arch': arch, + 'catrel': catrel + }) # tags_by_cat[key] = list(tags) - catalogs.append(key) - return render.CatalogList(catalogs) + row.append(cell) + table.append(row) + return render.CatalogList(table, osrels) class CatalogDetail(object): Modified: csw/mgar/gar/v2/lib/web/static/pkgdb.css =================================================================== --- csw/mgar/gar/v2/lib/web/static/pkgdb.css 2013-03-30 18:13:31 UTC (rev 20544) +++ csw/mgar/gar/v2/lib/web/static/pkgdb.css 2013-03-30 20:00:22 UTC (rev 20545) @@ -20,3 +20,37 @@ td.wordbag { width: 30em; } + +/* Catalog matrix related settings */ + +table.catalog-matrix { + margin-top: 1em; + border-collapse: separate; + border-spacing: 0px 0px; +} +table.catalog-matrix tr.top-row th { + border-bottom: 2px solid black; + border-left: 0px; + border-right: 0px; + margin: 0; + padding: 0; + font-size: 14px; +} +table.catalog-matrix td { + margin: 0.0em; + padding: 0.2em 0.7em 0.2em 0.7em; +} +table.catalog-matrix td.catalog { + border-left: 1px solid #DDD; +} +table.catalog-matrix th { + margin: 0.5em; + padding: 0.5em; +} +table.catalog-matrix td.catalog a { + margin: 0.1em; +} +table.catalog-matrix th.catalog-release { + color: gray; + font-size: 120%; +} Modified: csw/mgar/gar/v2/lib/web/templates/CatalogList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogList.html 2013-03-30 18:13:31 UTC (rev 20544) +++ csw/mgar/gar/v2/lib/web/templates/CatalogList.html 2013-03-30 20:00:22 UTC (rev 20545) @@ -1,4 +1,4 @@ -$def with (keys) +$def with (table, osrels) <html> <head> <title> @@ -7,13 +7,23 @@ <link rel="stylesheet" type="text/css" href="/pkgdb-static/pkgdb.css" /> </head> <body> - <ul> -$for osrel, arch, catrel in keys: - <li> - <a href="$catrel.name-$arch.name-$osrel.short_name/"> - $catrel.name-$arch.name-$osrel.short_name - </a> - </li> -</ul> + <table class="catalog-matrix"> + <tbody> + <tr class="top-row"> + <th> <!-- this cell intentionally left blank --></th> +$for osrel in osrels + <th class="catalog-release">$osrel.short_name</th> +</tr> +$for row in table: + <tr> + <th>$row[0]</th> + $for cell in row[1:]: + <td class="catalog"> + $for i in cell: + <a href="$i['catrel'].name-$i['arch'].name-$i['osrel'].short_name/">$i['arch'].name</a> + </td> + </tr> +</tbody> +</table> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 31 10:22:36 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 31 Mar 2013 08:22:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20546] csw/mgar/pkg/proxytunnel/trunk/Makefile Message-ID: <E1UMDXA-0006tS-8D@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20546 http://gar.svn.sourceforge.net/gar/?rev=20546&view=rev Author: chninkel Date: 2013-03-31 08:22:35 +0000 (Sun, 31 Mar 2013) Log Message: ----------- proxytunnel/trunk: rebuilt against openssl 1.0. Modified Paths: -------------- csw/mgar/pkg/proxytunnel/trunk/Makefile Modified: csw/mgar/pkg/proxytunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/proxytunnel/trunk/Makefile 2013-03-30 20:00:22 UTC (rev 20545) +++ csw/mgar/pkg/proxytunnel/trunk/Makefile 2013-03-31 08:22:35 UTC (rev 20546) @@ -16,8 +16,8 @@ SPKG_SOURCEURL = http://proxytunnel.sourceforge.net/ -BUILD_DEP_PKGS = CSWossldevel -RUNTIME_DEP_PKGS = CSWosslrt +BUILD_DEP_PKGS = CSWlibssl-dev +RUNTIME_DEP_PKGS = CSWlibssl1-0-0 # UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz # UPSTREAM_MASTER_SITES = @@ -27,6 +27,9 @@ CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CFLAGS = -I/opt/csw/include +EXTRA_LDFLAGS = -lnsl -lsocket + include gar/category.mk post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 31 13:35:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Mar 2013 11:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20547] csw/mgar/gar/v2/lib/web Message-ID: <E1UMGYH-0002iK-3O@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20547 http://gar.svn.sourceforge.net/gar/?rev=20547&view=rev Author: wahwah Date: 2013-03-31 11:35:54 +0000 (Sun, 31 Mar 2013) Log Message: ----------- pkgdb-web: Display catalognames grouped by initial Display catalognames not as one long list, but group them by the initial letter. Also, add a TOC with the list of available initial letters. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/static/pkgdb.css csw/mgar/gar/v2/lib/web/templates/CatalognameList.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-31 08:22:35 UTC (rev 20546) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-31 11:35:54 UTC (rev 20547) @@ -161,7 +161,12 @@ models.Srv4FileStats.q.use_to_generate_catalogs==True, models.Srv4FileStats.q.registered==True), orderBy=models.Srv4FileStats.q.catalogname))) - return render.CatalognameList(rows) + rows_by_letter = {} + for row in rows: + initial = row[0][0] + rows_by_letter.setdefault(initial, []) + rows_by_letter[initial].append(row) + return render.CatalognameList(rows_by_letter, sorted(rows_by_letter)) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() Modified: csw/mgar/gar/v2/lib/web/static/pkgdb.css =================================================================== --- csw/mgar/gar/v2/lib/web/static/pkgdb.css 2013-03-31 08:22:35 UTC (rev 20546) +++ csw/mgar/gar/v2/lib/web/static/pkgdb.css 2013-03-31 11:35:54 UTC (rev 20547) @@ -16,7 +16,23 @@ ul.catalogname-list > li { margin: 0.2em; padding: 0; + display: inline-block; + min-width: 10em; } +ul.toc { + background-color: #DDD; + padding: 5px; + list-style: none; +} +ul.toc li { + display: inline-block; + min-width: 1.5em; +} +ul.toc li a { + padding: 5px; + font-size: 15px; + text-decoration: none; +} td.wordbag { width: 30em; } Modified: csw/mgar/gar/v2/lib/web/templates/CatalognameList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalognameList.html 2013-03-31 08:22:35 UTC (rev 20546) +++ csw/mgar/gar/v2/lib/web/templates/CatalognameList.html 2013-03-31 11:35:54 UTC (rev 20547) @@ -1,4 +1,4 @@ -$def with (catalognames) +$def with (catalognames_by_letter, letters) <html> <head> <title> @@ -7,12 +7,16 @@ <link rel="stylesheet" type="text/css" href="/pkgdb-static/pkgdb.css" /> </head> <body> - <ul class="catalogname-list"> -$for catalogname in catalognames: - <li> - <a href="$catalogname[0]/">$catalogname[0]</a> - </li> + <ul class="toc"> +$for letter in letters: + <li><a href="#letter-$letter">$letter</a></li> </ul> +$for letter in letters: + <h2 class="initial clear-float"><a name="letter-$letter"></a>$letter</h2> + <ul class="catalogname-list"> + $for catalogname in catalognames_by_letter[letter]: + <li><a href="$catalogname[0]/">$catalogname[0]</a></li> + </ul> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 31 13:36:08 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Mar 2013 11:36:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20548] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: <E1UMGYS-0002vb-9V@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 20548 http://gar.svn.sourceforge.net/gar/?rev=20548&view=rev Author: wahwah Date: 2013-03-31 11:36:07 +0000 (Sun, 31 Mar 2013) Log Message: ----------- pkgdb-web: Small cleanup Darn tabs. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-31 11:35:54 UTC (rev 20547) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-03-31 11:36:07 UTC (rev 20548) @@ -239,7 +239,7 @@ if len(email) >= 2: names.append((email[0], email[1], m)) else: - names.append((email[0], "no domain", m)) + names.append((email[0], "no domain", m)) return render.MaintainerList(names) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Mar 31 15:39:05 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 31 Mar 2013 13:39:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20549] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: <E1UMITR-0006Bl-Bn@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 20549 http://gar.svn.sourceforge.net/gar/?rev=20549&view=rev Author: pfelecan Date: 2013-03-31 13:39:03 +0000 (Sun, 31 Mar 2013) Log Message: ----------- qt4-gcc/trunk: configuration without user interaction Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-03-31 11:36:07 UTC (rev 20548) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-03-31 13:39:03 UTC (rev 20549) @@ -42,6 +42,7 @@ CONFIGURE_ARGS += -platform solaris-g++ CONFIGURE_ARGS += -opensource +CONFIGURE_ARGS += -confirm-license CONFIGURE_ARGS += -prefix $(prefix) CONFIGURE_ARGS += -no-qt3support CONFIGURE_ARGS += -no-xshape This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Mar 31 17:05:50 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 31 Mar 2013 15:05:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[20550] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: <E1UMJpO-0008D1-0s@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 20550 http://gar.svn.sourceforge.net/gar/?rev=20550&view=rev Author: pfelecan Date: 2013-03-31 15:05:49 +0000 (Sun, 31 Mar 2013) Log Message: ----------- qt4-gcc/trunk: the master site is no more Nokia Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-03-31 13:39:03 UTC (rev 20549) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-03-31 15:05:49 UTC (rev 20550) @@ -13,7 +13,7 @@ prefix = $(BUILD_PREFIX)/gxx GARCOMPILER = GNU -MASTER_SITES = http://get.qt.nokia.com/qt/source/ +MASTER_SITES = ftp://ftp.qt-project.org/qt/source/ DISTNAME = qt-everywhere-opensource-src-$(VERSION) DISTFILES = $(DISTNAME).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 31 19:38:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 31 Mar 2013 17:38:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20551] csw/mgar/pkg/mcabber/trunk/Makefile Message-ID: <E1UMMDU-0003rZ-6o@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 20551 http://gar.svn.sourceforge.net/gar/?rev=20551&view=rev Author: chninkel Date: 2013-03-31 17:38:51 +0000 (Sun, 31 Mar 2013) Log Message: ----------- mcabber/trunk: added gpg-errors dependency for sparc Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/Makefile Modified: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile 2013-03-31 15:05:49 UTC (rev 20550) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2013-03-31 17:38:51 UTC (rev 20551) @@ -22,9 +22,13 @@ RUNTIME_DEP_PKGS = CSWlibncursesw5 CSWlibssl1-0-0 CSWotr RUNTIME_DEP_PKGS += CSWlibaspell15 CSWlibglib2-0-0 -RUNTIME_DEP_PKGS += CSWlibintl8 CSWlibpanelw5 CSWgpgme +RUNTIME_DEP_PKGS += CSWlibintl8 CSWlibpanelw5 CSWgpgme +# Don't know yet why but this dependency is only picked under sparc +RUNTIME_DEP_PKGS += $(RUNTIME_DEP_PKGS_$(GARCH)) +RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 + TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 31 21:45:18 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 31 Mar 2013 19:45:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[20552] csw/mgar/pkg/links/trunk/Makefile Message-ID: <E1UMOBq-0006hs-S2@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 20552 http://gar.svn.sourceforge.net/gar/?rev=20552&view=rev Author: chninkel Date: 2013-03-31 19:45:18 +0000 (Sun, 31 Mar 2013) Log Message: ----------- removed libz1 dependency which was unecessary Modified Paths: -------------- csw/mgar/pkg/links/trunk/Makefile Modified: csw/mgar/pkg/links/trunk/Makefile =================================================================== --- csw/mgar/pkg/links/trunk/Makefile 2013-03-31 17:38:51 UTC (rev 20551) +++ csw/mgar/pkg/links/trunk/Makefile 2013-03-31 19:45:18 UTC (rev 20552) @@ -23,7 +23,6 @@ PACKAGES = CSWlinks RUNTIME_DEP_PKGS_CSWlinks += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlinks += CSWlibz1 ###### Upstream and opencsw files information ####### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 31 23:01:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 31 Mar 2013 21:01:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20553] csw/mgar/gar/v2/lib/map.solaris10 Message-ID: <E1UMPNV-0006Lu-Kl@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20553 http://gar.svn.sourceforge.net/gar/?rev=20553&view=rev Author: dmichelsen Date: 2013-03-31 21:01:25 +0000 (Sun, 31 Mar 2013) Log Message: ----------- mGAR v2: Update links to mapfiles Modified Paths: -------------- csw/mgar/gar/v2/lib/map.solaris10 Modified: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 2013-03-31 19:45:18 UTC (rev 20552) +++ csw/mgar/gar/v2/lib/map.solaris10 2013-03-31 21:01:25 UTC (rev 20553) @@ -1,7 +1,7 @@ # Solaris 10 mapfile with libc Version 1.22.2 which is Update?? Kernel Version -# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 +# https://github.com/illumos/illumos-gate/blob/master/usr/src/lib/libc/port/mapfile-vers#L339 libc.so - SUNW_1.22.2 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.2; -# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers +# https://github.com/illumos/illumos-gate/blob/master/usr/src/lib/libresolv2/common/mapfile-vers#L46 libresolv.so - SUNW_2.2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2.2; -# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers +# https://github.com/illumos/illumos-gate/blob/master/usr/src/lib/libnsl/common/mapfile-vers#L47 libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 31 23:58:21 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 31 Mar 2013 21:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20554] csw/mgar/pkg/httping/trunk Message-ID: <E1UMQGb-0007cv-2B@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 20554 http://gar.svn.sourceforge.net/gar/?rev=20554&view=rev Author: chninkel Date: 2013-03-31 21:58:20 +0000 (Sun, 31 Mar 2013) Log Message: ----------- httping/trunk: reverted version to 1.4.1 to rebuild against libssl1.0.0 Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch csw/mgar/pkg/httping/trunk/files/changelog.CSW Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2013-03-31 21:01:25 UTC (rev 20553) +++ csw/mgar/pkg/httping/trunk/Makefile 2013-03-31 21:58:20 UTC (rev 20554) @@ -3,7 +3,7 @@ # feedback pending. # NAME = httping -VERSION = 1.5.3 +VERSION = 1.4.1 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -28,9 +28,9 @@ PATCHFILES = 0001-Makefile-make-options-and-tools-configurable.patch # strndup is not defined anymore in httping source (file str.c) -# but it still doesn't exist under Solaris 9 so we have to define -# the function -PATCHFILES += 0002-Define-strndup-function.patch +# starting from at least 1.5.3 but it still doesn't exist under +# Solaris 9 so we have to define the function +#PATCHFILES += 0002-Define-strndup-function.patch CONFIGURE_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2013-03-31 21:01:25 UTC (rev 20553) +++ csw/mgar/pkg/httping/trunk/checksums 2013-03-31 21:58:20 UTC (rev 20554) @@ -1 +1 @@ -62879f0a2d70e32279081276d42aaa28 httping-1.5.3.tgz +bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz Modified: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2013-03-31 21:01:25 UTC (rev 20553) +++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2013-03-31 21:58:20 UTC (rev 20554) @@ -1,26 +1,25 @@ -From acfa6600510090092bd64b759400fbee81827f3b Mon Sep 17 00:00:00 2001 -From: Ben Walton <bwalton at opencsw.org> -Date: Fri, 22 Jun 2012 04:15:19 +0200 +From 93f4891fa7d19a152dcd0d10a4207933010b2fc9 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard <yann at pleiades.fr.eu.org> +Date: Sun, 31 Mar 2013 23:49:28 +0200 Subject: [PATCH] Makefile: make options and tools configurable -Signed-off-by: Ben Walton <bwalton at opencsw.org> --- - Makefile | 20 ++++++++++---------- + Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile -index 1351e33..da3695b 100644 +index c27bf22..0133741 100644 --- a/Makefile +++ b/Makefile -@@ -17,26 +17,26 @@ include version +@@ -16,26 +16,26 @@ include version + TARGET=httping - DEBUG=yes -WFLAGS=-Wall -W -OFLAGS=-O2 +WFLAGS?=-Wall -W +OFLAGS?=-O2 - CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -g + CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" PACKAGE=$(TARGET)-$(VERSION) -PREFIX=/usr @@ -48,7 +47,7 @@ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o -@@ -63,7 +63,7 @@ endif +@@ -62,7 +62,7 @@ endif all: $(TARGET) $(TARGET): $(OBJS) @@ -58,5 +57,5 @@ # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html -- -1.7.10.3 +1.8.1.4 Modified: csw/mgar/pkg/httping/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httping/trunk/files/changelog.CSW 2013-03-31 21:01:25 UTC (rev 20553) +++ csw/mgar/pkg/httping/trunk/files/changelog.CSW 2013-03-31 21:58:20 UTC (rev 20554) @@ -1,7 +1,7 @@ -httping (1.5.3,REV=2013.03.30) +httping (1.4.1,REV=2013.03.30) * Non maintainer upload. - * New upstream release. + * Rebuilt against libssl1.0.0 -- Yann Rouillard <yann at opencsw.org> Sat, 30 Mar 2013 18:28:09 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.