From 17f207cf444d1a9e2f6bc9bda58b6ac6194cdadf Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Sat, 16 Mar 2013 18:50:05 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- chat/mu-conference/Makefile | 4 +- devel/SOPE/DESCR | 2 + devel/SOPE/Makefile | 8 +- devel/SOPE/distinfo | 8 +- devel/gitolite/Makefile | 17 +- doc/CHANGES-2013 | 37 +- doc/TODO | 5 +- fonts/ghostscript-cidfonts-ryumin/Makefile | 10 +- fonts/ghostscript-cidfonts/Makefile | 8 +- geography/gpsbabel/Makefile | 12 +- geography/gpsbabel/distinfo | 12 +- geography/gpsbabel/patches/patch-ad | 4 +- geography/gpsbabel/patches/patch-af | 70 +-- graphics/GraphicsMagick/Makefile | 3 +- graphics/GraphicsMagick/buildlink3.mk | 4 +- graphics/GraphicsMagick/options.mk | 4 +- graphics/ImageMagick/Makefile | 3 +- graphics/ImageMagick/buildlink3.mk | 4 +- graphics/ImageMagick/options.mk | 4 +- graphics/asymptote/Makefile | 7 +- graphics/camlimages/Makefile | 6 +- graphics/graphviz/Makefile | 4 +- graphics/graphviz/options.mk | 4 +- graphics/tex-pst-pdf/Makefile | 5 +- inputmethod/skk/Makefile | 8 +- inputmethod/skk/distinfo | 8 +- mail/poppy/Makefile | 6 +- mail/poppy/distinfo | 8 +- math/R-CGIwithR/Makefile | 6 +- meta-pkgs/bulk-medium/Makefile | 5 +- meta-pkgs/bulk-small/Makefile | 6 +- meta-pkgs/netbsd-www/Makefile | 8 +- mk/tools/replace.mk | 16 +- net/net-snmp/Makefile | 5 +- net/net-snmp/PLIST | 19 +- net/net-snmp/distinfo | 81 +-- net/net-snmp/patches/patch-aa | 16 - net/net-snmp/patches/patch-ab | 160 ------ net/net-snmp/patches/patch-ac | 27 +- net/net-snmp/patches/patch-ae | 15 - net/net-snmp/patches/patch-af | 579 +++------------------ net/net-snmp/patches/patch-ag | 6 +- .../patches/patch-agent_mibgroup_agent_extend.c | 20 - ...agent_mibgroup_hardware_memory_memory__netbsd.c | 13 + ...agent_mibgroup_host_data__access_swrun__kinfo.c | 4 +- .../patches/patch-agent_mibgroup_mibII_ipAddr.c | 8 +- net/net-snmp/patches/patch-ah | 142 ----- net/net-snmp/patches/patch-ai | 8 +- net/net-snmp/patches/patch-aj | 8 +- net/net-snmp/patches/patch-ak | 8 +- net/net-snmp/patches/patch-al | 37 -- net/net-snmp/patches/patch-am | 99 +--- net/net-snmp/patches/patch-an | 134 ----- net/net-snmp/patches/patch-ao | 44 -- net/net-snmp/patches/patch-ap | 6 +- net/net-snmp/patches/patch-aq | 25 +- net/net-snmp/patches/patch-da | 4 +- net/net-snmp/patches/patch-db | 4 +- net/net-snmp/patches/patch-dc | 32 -- net/net-snmp/patches/patch-dd | 12 - net/net-snmp/patches/patch-de | 369 ------------- net/net-snmp/patches/patch-df | 20 - net/net-snmp/patches/patch-dg | 12 - net/net-snmp/patches/patch-dh | 14 - net/net-snmp/patches/patch-di | 10 - net/net-snmp/patches/patch-dl | 8 +- net/net-snmp/patches/patch-dm | 167 ------ net/net-snmp/patches/patch-dn | 70 --- net/net-snmp/patches/patch-do | 16 - net/net-snmp/patches/patch-dp | 16 - net/net-snmp/patches/patch-dq | 16 - net/net-snmp/patches/patch-dr | 47 -- net/net-snmp/patches/patch-ds | 47 -- net/net-snmp/patches/patch-dt | 10 +- net/net-snmp/patches/patch-du | 23 +- net/net-snmp/patches/patch-el | 6 +- net/net-snmp/patches/patch-es | 4 +- net/net-snmp/patches/patch-et | 39 -- net/net-snmp/patches/patch-eu | 39 -- net/net-snmp/patches/patch-ev | 203 -------- net/net-snmp/patches/patch-ew | 96 ---- net/net-snmp/patches/patch-ex | 14 - net/net-snmp/patches/patch-ey | 39 -- net/net-snmp/patches/patch-ez | 50 -- net/net-snmp/patches/patch-fa | 37 +- net/net-snmp/patches/patch-fb | 13 - net/net-snmp/patches/patch-fc | 40 -- net/net-snmp/patches/patch-fd | 67 --- print/Makefile | 4 +- print/cups-drivers-Magicolor5440DL/Makefile | 12 +- print/{ghostscript => ghostscript-agpl}/DESCR | 0 print/{ghostscript => ghostscript-agpl}/Makefile | 3 +- .../Makefile.common | 4 +- print/{ghostscript => ghostscript-agpl}/PLIST | 2 +- .../buildlink3.mk | 20 +- print/{ghostscript => ghostscript-agpl}/distinfo | 2 +- print/{ghostscript => ghostscript-agpl}/hacks.mk | 2 +- print/{ghostscript => ghostscript-agpl}/options.mk | 2 +- .../patches/patch-af | 2 +- .../patches/patch-ah | 2 +- .../patches/patch-ai | 2 +- .../patches/patch-aj | 2 +- .../patches/patch-al | 2 +- .../patches/patch-base_gdevpng.c | 2 +- .../patches/patch-base_gserrors_h | 2 +- .../patches/patch-configure.ac | 2 +- .../patch-openjpeg_libopenjpeg_opj_malloc_h | 2 +- print/{ghostscript => ghostscript-gpl}/DESCR | 0 print/{ghostscript => ghostscript-gpl}/Makefile | 29 +- print/ghostscript-gpl/Makefile.common | 6 + print/{ghostscript => ghostscript-gpl}/PLIST | 17 +- print/ghostscript-gpl/buildlink3.mk | 33 ++ print/ghostscript-gpl/distinfo | 16 + print/{ghostscript => ghostscript-gpl}/hacks.mk | 2 +- print/{ghostscript => ghostscript-gpl}/options.mk | 2 + print/ghostscript-gpl/patches/patch-CVE-2012-4405 | 18 + .../patches/patch-af | 2 +- .../patches/patch-ah | 2 +- .../patches/patch-ai | 2 +- .../patches/patch-aj | 2 +- .../patches/patch-al | 2 +- print/ghostscript-gpl/patches/patch-an | 22 + .../patches/patch-base_gdevpng.c | 2 +- .../patches/patch-base_gserrors_h | 11 +- .../patches/patch-configure.ac | 2 +- .../patch-openjpeg_libopenjpeg_opj_malloc_h | 10 +- print/ghostscript/ghostscript.buildlink3.mk | 22 + print/ghostscript/ghostscript.mk | 30 ++ print/hplip/Makefile | 6 +- print/libspectre/Makefile | 6 +- print/libspectre/buildlink3.mk | 6 +- print/p5-LaTeX-Driver/Makefile | 7 +- print/tex-musixtex/Makefile | 6 +- print/xdvik/Makefile | 6 +- security/Makefile | 3 +- security/libyubikey/Makefile | 4 +- security/libyubikey/distinfo | 8 +- security/oath-toolkit/Makefile | 6 +- security/oath-toolkit/PLIST | 128 ++++- security/oath-toolkit/distinfo | 14 +- .../oath-toolkit/patches/patch-liboath_gl_fflush.c | 26 +- security/pam-yubico/Makefile | 5 +- security/pam-yubico/distinfo | 8 +- security/stud/DESCR | 5 + security/stud/Makefile | 62 +++ security/stud/PLIST | 5 + security/stud/distinfo | 9 + security/stud/files/stud.conf | 121 +++++ security/stud/files/stud.sh | 33 ++ security/stud/patches/patch-Makefile | 51 ++ security/stud/patches/patch-configuration.c | 48 ++ security/stud/patches/patch-stud.8 | 15 + security/stud/patches/patch-stud.c | 65 +++ security/ykpers/Makefile | 4 +- security/ykpers/PLIST | 3 +- security/ykpers/distinfo | 8 +- www/SOGo/Makefile | 15 +- www/SOGo/PLIST | 335 +++--------- www/SOGo/distinfo | 13 +- .../patch-SoObjects_SOGo_GNUmakefile.preamble | 14 - .../patches/patch-SoObjects_SOGo_NSData+Crypto.m | 10 +- www/calamaris/Makefile | 5 +- www/calamaris/distinfo | 8 +- www/php-owncloud/Makefile | 4 +- www/php-owncloud/distinfo | 3 +- .../patches/patch-apps_user_ldap_lib_access.php | 11 + 166 files changed, 1367 insertions(+), 3344 deletions(-) rewrite net/net-snmp/distinfo (99%) delete mode 100644 net/net-snmp/patches/patch-aa delete mode 100644 net/net-snmp/patches/patch-ab rewrite net/net-snmp/patches/patch-ac (84%) delete mode 100644 net/net-snmp/patches/patch-ae rewrite net/net-snmp/patches/patch-af (82%) delete mode 100644 net/net-snmp/patches/patch-agent_mibgroup_agent_extend.c create mode 100644 net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c delete mode 100644 net/net-snmp/patches/patch-ah delete mode 100644 net/net-snmp/patches/patch-al rewrite net/net-snmp/patches/patch-am (94%) delete mode 100644 net/net-snmp/patches/patch-an delete mode 100644 net/net-snmp/patches/patch-ao rewrite net/net-snmp/patches/patch-aq (94%) delete mode 100644 net/net-snmp/patches/patch-dc delete mode 100644 net/net-snmp/patches/patch-dd delete mode 100644 net/net-snmp/patches/patch-de delete mode 100644 net/net-snmp/patches/patch-df delete mode 100644 net/net-snmp/patches/patch-dg delete mode 100644 net/net-snmp/patches/patch-dh delete mode 100644 net/net-snmp/patches/patch-di delete mode 100644 net/net-snmp/patches/patch-dm delete mode 100644 net/net-snmp/patches/patch-dn delete mode 100644 net/net-snmp/patches/patch-do delete mode 100644 net/net-snmp/patches/patch-dp delete mode 100644 net/net-snmp/patches/patch-dq delete mode 100644 net/net-snmp/patches/patch-dr delete mode 100644 net/net-snmp/patches/patch-ds delete mode 100644 net/net-snmp/patches/patch-et delete mode 100644 net/net-snmp/patches/patch-eu delete mode 100644 net/net-snmp/patches/patch-ev delete mode 100644 net/net-snmp/patches/patch-ew delete mode 100644 net/net-snmp/patches/patch-ex delete mode 100644 net/net-snmp/patches/patch-ey delete mode 100644 net/net-snmp/patches/patch-ez rewrite net/net-snmp/patches/patch-fa (64%) delete mode 100644 net/net-snmp/patches/patch-fb delete mode 100644 net/net-snmp/patches/patch-fc delete mode 100644 net/net-snmp/patches/patch-fd copy print/{ghostscript => ghostscript-agpl}/DESCR (100%) copy print/{ghostscript => ghostscript-agpl}/Makefile (96%) rename print/{ghostscript => ghostscript-agpl}/Makefile.common (52%) copy print/{ghostscript => ghostscript-agpl}/PLIST (99%) rename print/{ghostscript => ghostscript-agpl}/buildlink3.mk (52%) rename print/{ghostscript => ghostscript-agpl}/distinfo (93%) copy print/{ghostscript => ghostscript-agpl}/hacks.mk (92%) copy print/{ghostscript => ghostscript-agpl}/options.mk (96%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-af (97%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-ah (94%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-ai (91%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-aj (86%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-al (91%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-base_gdevpng.c (93%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-base_gserrors_h (86%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-configure.ac (85%) copy print/{ghostscript => ghostscript-agpl}/patches/patch-openjpeg_libopenjpeg_opj_malloc_h (90%) rename print/{ghostscript => ghostscript-gpl}/DESCR (100%) rename print/{ghostscript => ghostscript-gpl}/Makefile (90%) create mode 100644 print/ghostscript-gpl/Makefile.common rename print/{ghostscript => ghostscript-gpl}/PLIST (98%) create mode 100644 print/ghostscript-gpl/buildlink3.mk create mode 100644 print/ghostscript-gpl/distinfo rename print/{ghostscript => ghostscript-gpl}/hacks.mk (92%) rename print/{ghostscript => ghostscript-gpl}/options.mk (95%) create mode 100644 print/ghostscript-gpl/patches/patch-CVE-2012-4405 rename print/{ghostscript => ghostscript-gpl}/patches/patch-af (97%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-ah (94%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-ai (91%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-aj (86%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-al (91%) create mode 100644 print/ghostscript-gpl/patches/patch-an rename print/{ghostscript => ghostscript-gpl}/patches/patch-base_gdevpng.c (93%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-base_gserrors_h (54%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-configure.ac (95%) rename print/{ghostscript => ghostscript-gpl}/patches/patch-openjpeg_libopenjpeg_opj_malloc_h (58%) create mode 100644 print/ghostscript/ghostscript.buildlink3.mk create mode 100644 print/ghostscript/ghostscript.mk rewrite security/oath-toolkit/distinfo (81%) rewrite security/oath-toolkit/patches/patch-liboath_gl_fflush.c (71%) create mode 100644 security/stud/DESCR create mode 100644 security/stud/Makefile create mode 100644 security/stud/PLIST create mode 100644 security/stud/distinfo create mode 100644 security/stud/files/stud.conf create mode 100644 security/stud/files/stud.sh create mode 100644 security/stud/patches/patch-Makefile create mode 100644 security/stud/patches/patch-configuration.c create mode 100644 security/stud/patches/patch-stud.8 create mode 100644 security/stud/patches/patch-stud.c rewrite www/SOGo/distinfo (99%) delete mode 100644 www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble create mode 100644 www/php-owncloud/patches/patch-apps_user_ldap_lib_access.php diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile index a04941cc6e8..c8d02b2c131 100644 --- a/chat/mu-conference/Makefile +++ b/chat/mu-conference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/09/15 10:03:52 obache Exp $ +# $NetBSD: Makefile,v 1.28 2012/10/03 00:02:41 asau Exp $ DISTNAME= mu-conference_0.8 PKGNAME= ${DISTNAME:S/_/-/} @@ -7,7 +7,7 @@ CATEGORIES= chat MASTER_SITES= http://download.gna.org/mu-conference/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://jabber.terrapin.com/JCR/ +HOMEPAGE= https://gna.org/projects/mu-conference/ COMMENT= Implementation of the XEP-0045 Multi-User Chat protocol LICENSE= gnu-gpl-v2 diff --git a/devel/SOPE/DESCR b/devel/SOPE/DESCR index 8ee0176a91c..231e13bbb27 100644 --- a/devel/SOPE/DESCR +++ b/devel/SOPE/DESCR @@ -3,3 +3,5 @@ framework for mapping dynamic objects into the HTTP infrastructure, that is, the web. A lot of ideas in SOPE are actually inspired by ZOPE (the Z Object Publishing Environment), but the implementation and details are quite different. + +This version of SOPE is maintained by SOGo team. diff --git a/devel/SOPE/Makefile b/devel/SOPE/Makefile index 442ee083b2c..8fa83e642ab 100644 --- a/devel/SOPE/Makefile +++ b/devel/SOPE/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.10 2013/02/27 06:12:25 taca Exp $ +# $NetBSD: Makefile,v 1.11 2013/03/02 20:33:25 wiz Exp $ # -DISTNAME= SOPE-2.0.2a -PKGREVISION= 4 +DISTNAME= SOPE-2.0.4b CATEGORIES= devel MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://sope.opengroupware.org/ +HOMEPAGE= https://github.com/inverse-inc/sope +# Original SOPE: http://sope.opengroupware.org/ COMMENT= Framework for writing clever web servers driven by objects LICENSE= gnu-lgpl-v2 diff --git a/devel/SOPE/distinfo b/devel/SOPE/distinfo index ac204b757bf..fab3e3a62cd 100644 --- a/devel/SOPE/distinfo +++ b/devel/SOPE/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2012/09/01 10:02:34 marino Exp $ +$NetBSD: distinfo,v 1.4 2012/11/24 14:06:43 manu Exp $ -SHA1 (SOPE-2.0.2a.tar.gz) = 8dcb2a1ea3b90b860969878bdca5a2685eb37296 -RMD160 (SOPE-2.0.2a.tar.gz) = f9fd9ba7ed6ea550e86343f784fd64beac008df8 -Size (SOPE-2.0.2a.tar.gz) = 2243113 bytes +SHA1 (SOPE-2.0.4b.tar.gz) = c2443b39f152c201d8e34a9f2dbee2fda8753ad3 +RMD160 (SOPE-2.0.4b.tar.gz) = 8703bbd079de91f59a9ddd2b42c38dafb17bacf3 +Size (SOPE-2.0.4b.tar.gz) = 2248548 bytes SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = 5309786f9208e3799d3b659b912f1c263c63427c SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = f5c6cb90d64ea48316175390d973ba59e44f29b9 SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 23dfa6732f3af2165b1adcf2637fc77bfeadfe3c diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile index e53a77e5991..0a9810ab2a8 100644 --- a/devel/gitolite/Makefile +++ b/devel/gitolite/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2013/03/02 23:41:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2013/03/16 16:02:06 ryoon Exp $ # GLVER= 3.4 DISTNAME= gitolite-${GLVER} +PKGREVISION= 1 CATEGORIES= devel net MASTER_SITES= -https://github.com/sitaramc/gitolite/archive/v${GLVER}.tar.gz @@ -23,16 +24,16 @@ FETCH_USING= curl NO_BUILD= yes REPLACE_PERL= src/lib/* src/VREF/* src/triggers/* src/triggers/*/* \ - src/commands/* src/gitolite* src/lib/Gitolite/Test/* + src/commands/* src/gitolite* src/lib/Gitolite/*/* REPLACE_SH= src/VREF/* src/triggers/* src/triggers/post-compile/* \ src/commands/* -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= pre-configure -SUBST_MESSAGE.prefix= Set PREFIX -SUBST_FILES.prefix= src/gitolite -SUBST_FILES.prefix+= src/lib/Gitolite/Rc.pm -SUBST_VARS.prefix= PREFIX +SUBST_CLASSES+= perl +SUBST_STAGE.perl= pre-configure +SUBST_MESSAGE.perl= Set PERL5 +SUBST_FILES.perl= src/gitolite +SUBST_FILES.perl+= src/lib/Gitolite/Hooks/* +SUBST_SED.perl= -e 's,/usr/bin/perl,${PERL5},g' INSTALLATION_DIRS+= bin lib \ share/doc/gitolite \ diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index fa72aeeb91d..b42fa5f5499 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.974 2013/03/16 13:18:29 obache Exp $ +$NetBSD: CHANGES-2013,v 1.991 2013/03/16 23:05:00 dholland Exp $ Changes to the packages collection and infrastructure in 2013: @@ -1392,3 +1392,38 @@ Changes to the packages collection and infrastructure in 2013: Updated databases/openldap-smbk5pwd to 2.4.34 [adam 2013-03-16] Updated net/ruby-twitter-stream to 0.1.16nb1 [obache 2013-03-16] Added net/rabbiter version 2.0.0 [obache 2013-03-16] + Updated inputmethod/skk to 15.1 [ryoon 2013-03-16] + Updated devel/SOPE to 2.0.4b [taca 2013-03-16] + Updated www/SOGo to 2.0.4b [taca 2013-03-16] + Updated devel/gitolite to 3.4nb1 [ryoon 2013-03-16] + Updated www/php-owncloud to 4.5.7nb1 [bouyer 2013-03-16] + Updated mail/poppy to 4.0.1 [shattered 2013-03-16] + Updated www/calamaris to 2.59 [shattered 2013-03-16] + Updated geography/gpsbabel to 1.4.4 [gdt 2013-03-16] + Added security/stud version 0.3p53 [jym 2013-03-16] + Updated security/libyubikey to 1.10 [pettai 2013-03-16] + Updated security/ykpers to 1.11.3 [pettai 2013-03-16] + Updated security/pam-yubico to 2.13 [pettai 2013-03-16] + Updated security/oath-toolkit to 2.0.2 [pettai 2013-03-16] + Added print/ghostscript-gpl version 9.05nb3 [dholland 2013-03-16] + Added print/ghostscript-agpl version 9.07nb1 [dholland 2013-03-16] + Updated print/libspectre to 0.2.7nb4 [dholland 2013-03-16] + Updated graphics/GraphicsMagick to 1.3.18nb1 [dholland 2013-03-16] + Updated graphics/ImageMagick to 6.8.3.7nb1 [dholland 2013-03-16] + Updated graphics/graphviz to 2.26.3nb22 [dholland 2013-03-16] + Updated print/cups-drivers-Magicolor5440DL to 1.2.1nb8 [dholland 2013-03-16] + Updated print/hplip to 3.12.11nb3 [dholland 2013-03-16] + Updated print/p5-LaTeX-Driver to 0.10nb2 [dholland 2013-03-16] + Updated print/tex-musixtex to 1.15nb2 [dholland 2013-03-16] + Updated print/xdvik to 22.84.16nb3 [dholland 2013-03-16] + Updated graphics/asymptote to 2.15nb2 [dholland 2013-03-16] + Updated graphics/camlimages to 4.0.1nb21 [dholland 2013-03-16] + Updated graphics/tex-pst-pdf to 1.1vnb1 [dholland 2013-03-16] + Updated math/R-CGIwithR to 0.73.0nb6 [dholland 2013-03-16] + Updated meta-pkgs/netbsd-www to 1.8 [dholland 2013-03-16] + Updated meta-pkgs/bulk-small to 20130316 [dholland 2013-03-16] + Updated fonts/ghostscript-cidfonts to 20000901nb4 [dholland 2013-03-16] + Updated fonts/ghostscript-cidfonts-ryumin to 9.05nb4 [dholland 2013-03-16] + Updated meta-pkgs/netbsd-www to 1.8 [dholland 2013-03-16] + Removed print/ghostscript successor print/ghostscript-gpl [dholland 2013-03-16] + Updated net/net-snmp to 5.7.2 [gdt 2013-03-17] diff --git a/doc/TODO b/doc/TODO index f6339f11fbe..501cbff7f51 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.12009 2013/03/15 23:21:47 wiz Exp $ +$NetBSD: TODO,v 1.12011 2013/03/16 18:52:04 shattered Exp $ Suggested new packages ====================== @@ -438,7 +438,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o byacc-20130304 o c4-1.10 [schmonz] o cal3d-0.11.0 - o calamaris-2.59 o calibre-0.9.22 o calligra-2.4.3 [in wip; koffice successor] o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/] @@ -892,7 +891,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o ncview-2.1.1 o ne-2.01 o nessus-4.4.1 - o net-snmp-5.7.2 o netatalk-3.0.1 o netcdf-4.2.1.1 o netramet-50 @@ -977,7 +975,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o polsms-2.1.0 o poppass-4.0.14 o poppler-0.22.1 - o poppy-4.01 o posh-0.5.5 o postal-0.72 o powermanga-0.91 diff --git a/fonts/ghostscript-cidfonts-ryumin/Makefile b/fonts/ghostscript-cidfonts-ryumin/Makefile index d8ac3924e41..dcf4c83be7d 100644 --- a/fonts/ghostscript-cidfonts-ryumin/Makefile +++ b/fonts/ghostscript-cidfonts-ryumin/Makefile @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.3 2013/02/06 23:22:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2013/02/16 11:21:11 wiz Exp $ DISTNAME= ghostscript-cidfonts-ryumin-${GS_VERSION} DISTFILES= # empty -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= fonts MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Enable Ryumin-Light and GothicBBB for ghostscript LICENSE= generic-nonlicense -.include "../../print/ghostscript/Makefile.common" +.include "../../print/ghostscript-gpl/Makefile.common" GS_RESOURCEDIR= share/ghostscript/${PKGVERSION}/Resource WRKSRC= ${WRKDIR}/gcr INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Font INSTALLATION_DIRS+= ${GS_RESOURCEDIR}/Init -DEPENDS+= ghostscript>=9.05:../../print/ghostscript +DEPENDS+= ghostscript-gpl>=9.05:../../print/ghostscript-gpl DEPENDS+= ghostscript-cidfonts>=20000901nb3:../../fonts/ghostscript-cidfonts BUILD_DEFS+= GS_CIDFMAP # used in options.mk to switch adobe or ttf @@ -54,7 +54,7 @@ NO_BUILD= yes NO_CHECKSUM= yes NO_CONFIGURE= yes -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript-gpl/buildlink3.mk" .if empty(PKG_BUILD_OPTIONS.ghostscript:Mdisable-compile-inits) PKG_FAIL_REASON+= 'You need to set PKG_OPTIONS.ghostscript+= disable-compile-inits, at its compile time.' diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile index 8603f0350e7..bff62c070a8 100644 --- a/fonts/ghostscript-cidfonts/Makefile +++ b/fonts/ghostscript-cidfonts/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2009/04/09 00:48:08 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2012/10/07 14:21:48 mef Exp $ DISTNAME= ghostscript-cidfonts-20000901 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= fonts MASTER_SITES= # empty DISTFILES= # empty @@ -10,10 +10,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= CIDFont resources for Ghostscript DEPENDS+= adobe-cidfonts>=20000901:../../fonts/adobe-cidfonts -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript +DEPENDS+= ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl GHOSTSCRIPT_REQD= 9.05 -.include "../../print/ghostscript/Makefile.common" +.include "../../print/ghostscript-gpl/Makefile.common" ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile index 181230671e1..8287b843c22 100644 --- a/geography/gpsbabel/Makefile +++ b/geography/gpsbabel/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2011/04/27 18:57:11 schwarz Exp $ +# $NetBSD: Makefile,v 1.12 2012/10/04 09:19:17 asau Exp $ # -DISTNAME= gpsbabel-1.4.2 +DISTNAME= gpsbabel-1.4.4 CATEGORIES= geography -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsbabel/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsbabel/} # Download from official site apparently only via interactive form, -# but code is gnu-gpl-v2 so hosted elsewhere as a convenience to -# pkgsrc users. -MASTER_SITES+= http://www.lexort.com/pkgsrc/distfiles/ +# but code is gnu-gpl-v2 so hosted elsewhere. MASTER_SITES+= http://archlinux-stuff.googlecode.com/files/ MAINTAINER= gdt@NetBSD.org @@ -15,6 +13,8 @@ HOMEPAGE= http://www.gpsbabel.org/ COMMENT= Utility to convert and fetch GPS related data LICENSE= gnu-gpl-v2 +TEST_TARGET= check + LIBS.Darwin+= -lexpat GNU_CONFIGURE= yes diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo index f32f6fed5b2..06c0580d877 100644 --- a/geography/gpsbabel/distinfo +++ b/geography/gpsbabel/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/07/05 00:05:22 gdt Exp $ +$NetBSD: distinfo,v 1.6 2011/04/27 18:57:11 schwarz Exp $ -SHA1 (gpsbabel-1.4.2.tar.gz) = e97f949716d786638af7235d7a2979bf50547426 -RMD160 (gpsbabel-1.4.2.tar.gz) = 45987878b811f7b146511e859e89d0e28ccc1fb3 -Size (gpsbabel-1.4.2.tar.gz) = 5551502 bytes -SHA1 (patch-ad) = 25e49b539668163359a0ff7d9b4a4a8d88bcd014 -SHA1 (patch-af) = a2f891ca6242b0bd3564e037a0ccd651f587cbdc +SHA1 (gpsbabel-1.4.4.tar.gz) = d7ff40f044a0ee5d81c5554da51394204e75599c +RMD160 (gpsbabel-1.4.4.tar.gz) = 95a042fb035a5aaa2dcb50d430e36f384a575f4f +Size (gpsbabel-1.4.4.tar.gz) = 7811264 bytes +SHA1 (patch-ad) = 19a1319a33a0ee131557ac07ef58f388e99b1f3e +SHA1 (patch-af) = 3ebde4baa1f34733520e08c89dbdab938358c71a diff --git a/geography/gpsbabel/patches/patch-ad b/geography/gpsbabel/patches/patch-ad index 2531576d225..ba511878bdc 100644 --- a/geography/gpsbabel/patches/patch-ad +++ b/geography/gpsbabel/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.2 2009/02/21 18:54:41 gdt Exp $ +$NetBSD: patch-ad,v 1.3 2010/07/05 00:05:23 gdt Exp $ This patch was rejected by upstream. There is a comment in upstream Makefile.in that explains why there is no space, and output flag is @@ -8,7 +8,7 @@ On NetBSD, the upstream versoni works, but there is some mysterious failure on Mac OS X. This patch therefore needs investigation and resolution to be filed with upstream. ---- Makefile.in.orig 2010-06-20 04:16:20.000000000 +0000 +--- Makefile.in.orig 2012-03-29 00:19:29.000000000 +0000 +++ Makefile.in @@ -102,7 +102,7 @@ LIBOBJS = queue.o route.o waypt.o filter OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ diff --git a/geography/gpsbabel/patches/patch-af b/geography/gpsbabel/patches/patch-af index b6b362478ea..ff116aef5dc 100644 --- a/geography/gpsbabel/patches/patch-af +++ b/geography/gpsbabel/patches/patch-af @@ -1,16 +1,16 @@ -$NetBSD: patch-af,v 1.2 2009/02/21 18:54:41 gdt Exp $ +$NetBSD: patch-af,v 1.3 2010/07/05 00:05:23 gdt Exp $ From Giles Lean, who places it in the public domain. Workarounds for problems with buggy USB serial adapators. Not applied by upstream 2009-02-21 because it's too dangerous to work around problems without understanding them. ---- jeeps/gpsread.c.orig 2010-03-26 03:09:20.000000000 +0000 +--- jeeps/gpsread.c.orig 2011-07-26 01:56:33.000000000 +0000 +++ jeeps/gpsread.c -@@ -103,6 +103,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd +@@ -98,6 +98,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd + GPS_Diag("%02x ", u); - if(!len) - { + if (!len) { + /* + * Missed DLE characters have been observed with Geko + * 201 and Legend GPSRs with Prolific USB-serial @@ -41,35 +41,35 @@ understanding them. + goto dle_missed; + } + - if(u != DLE) - { - (void) fprintf(stderr,"GPS_Packet_Read: No DLE. Data received, but probably not a garmin packet.\n"); -@@ -113,6 +143,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd - continue; - } + if (u != DLE) { + (void) fprintf(stderr,"GPS_Packet_Read: No DLE. Data received, but probably not a garmin packet.\n"); + (void) fflush(stderr); +@@ -107,6 +137,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd + continue; + } +dle_missed: - if(len==1) - { - (*packet)->type = u; -@@ -215,6 +246,20 @@ int32 GPS_Serial_Get_Ack(gpsdevh *fd, GP - - if(*(*rec)->data != (*tra)->type) - { -+ /* -+ * When used with a buggy Prolific USB-serial converter the -+ * calling sequence GPS_A000() -> GPS_Get_Ack() sometimes -+ * returns data != type causing this routine to fail and the -+ * following error message to be emitted: -+ * -+ * GARMIN:Can't init /dev/cu.usbserial -+ * -+ * Manually retrying usually works, and subsequent -+ * investigation shows that the call that fails is made from -+ * GPS_Init() which in this case is GPS_Serial_Init(). Simply -+ * retrying the call a workaround: see note and retry loop in -+ * gpsapp.c:GPS_Init(). -+ */ - gps_error = FRAMING_ERROR; - return 0; - } + if (len==1) { + (*packet)->type = u; + ++len; +@@ -130,6 +161,20 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd + if (u == ETX) + if (isDLE) { + if (p-(*packet)->data-2 != (*packet)->n) { ++ /* ++ * When used with a buggy Prolific USB-serial converter the ++ * calling sequence GPS_A000() -> GPS_Get_Ack() sometimes ++ * returns data != type causing this routine to fail and the ++ * following error message to be emitted: ++ * ++ * GARMIN:Can't init /dev/cu.usbserial ++ * ++ * Manually retrying usually works, and subsequent ++ * investigation shows that the call that fails is made from ++ * GPS_Init() which in this case is GPS_Serial_Init(). Simply ++ * retrying the call a workaround: see note and retry loop in ++ * gpsapp.c:GPS_Init(). ++ */ + GPS_Error("GPS_Packet_Read: Bad count"); + gps_errno = FRAMING_ERROR; + return 0; diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 2ef3cd6e5ad..ff2f1d326a8 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2013/02/19 00:23:36 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2013/03/11 17:45:05 adam Exp $ .include "Makefile.common" +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.graphicsmagick.org/ COMMENT= X application for displaying and manipulating images diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index 427fcc3283e..03bb279fda9 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2013/02/06 23:21:20 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2013/02/16 11:20:00 wiz Exp $ BUILDLINK_TREE+= GraphicsMagick @@ -13,7 +13,7 @@ pkgbase := GraphicsMagick .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mghostscript) -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mx11) .include "../../x11/libSM/buildlink3.mk" diff --git a/graphics/GraphicsMagick/options.mk b/graphics/GraphicsMagick/options.mk index f16381362d1..3ff9812f7ae 100755 --- a/graphics/GraphicsMagick/options.mk +++ b/graphics/GraphicsMagick/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2012/01/08 05:25:54 obache Exp $ +# $NetBSD: options.mk,v 1.4 2012/10/23 10:24:05 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.GraphicsMagick PKG_SUPPORTED_OPTIONS= bzip2 lzma x11 jasper ghostscript wmf @@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --without-jp2 .endif .if !empty(PKG_OPTIONS:Mghostscript) -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" CONFIGURE_ARGS+= --with-gslib .else CONFIGURE_ARGS+= --without-gslib diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 28449e502c6..718a4afa02f 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.190 2013/02/16 11:17:59 wiz Exp $ +# $NetBSD: Makefile,v 1.191 2013/03/05 16:50:25 adam Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} +PKGREVISION= 1 MAINTAINER= adam@NetBSD.org COMMENT= Package for display and interactive manipulation of images diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index db6ad2a5ed1..51c3e8b109e 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2013/02/06 23:21:21 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2013/02/16 11:17:59 wiz Exp $ BUILDLINK_TREE+= ImageMagick @@ -16,7 +16,7 @@ pkgbase := ImageMagick .include "../../graphics/djvulibre-lib/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mghostscript) -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper) .include "../../graphics/jasper/buildlink3.mk" diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 3da51c70b6c..0f1b1e35e33 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2011/05/13 12:55:39 abs Exp $ +# $NetBSD: options.mk,v 1.12 2012/10/23 10:24:05 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick PKG_SUPPORTED_OPTIONS= x11 jasper djvu ghostscript wmf @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --without-djvu .endif .if !empty(PKG_OPTIONS:Mghostscript) -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" CONFIGURE_ARGS+= --with-gslib .else CONFIGURE_ARGS+= --without-gslib diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile index 11f9497c742..a4d80461b79 100644 --- a/graphics/asymptote/Makefile +++ b/graphics/asymptote/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2012/10/03 21:56:07 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/10/06 14:10:41 asau Exp $ # DISTNAME= asymptote-2.15 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asymptote/} EXTRACT_SUFX= .tgz @@ -16,7 +16,8 @@ LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3 BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex BUILD_DEPENDS+= tex-parskip-[0-9]*:../../print/tex-parskip -BUILD_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript +#BUILD_DEPENDS+=ghostscript-[0-9]*:../../print/ghostscript +USE_TOOLS+= gs UNLIMIT_RESOURCES= datasize diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index b60cbfb4bd4..e91eb1c9420 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2013/02/06 23:22:25 jperkin Exp $ +# $NetBSD: Makefile,v 1.54 2013/02/16 11:21:40 wiz Exp $ VERSION= 4.0.1 PKGNAME= camlimages-${VERSION} -PKGREVISION= 20 +PKGREVISION= 21 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/ DISTNAME= v${VERSION} @@ -51,7 +51,7 @@ BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.11.0 .include "../../mk/giflib.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .include "../../x11/lablgtk/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index f4307439f6b..f41fbd8bbd5 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.112 2013/02/06 23:22:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.113 2013/02/16 11:22:03 wiz Exp $ DISTNAME= graphviz-2.26.3 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk index bbf1cd4f13e..09629fe620a 100644 --- a/graphics/graphviz/options.mk +++ b/graphics/graphviz/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2012/08/21 21:44:00 marino Exp $ +# $NetBSD: options.mk,v 1.16 2012/09/29 23:34:11 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz PKG_SUPPORTED_OPTIONS= gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl @@ -30,7 +30,7 @@ PLIST.x11= yes PLIST.pangocairo= yes . if !empty(PKG_OPTIONS:Mghostscript) -. include "../../print/ghostscript/buildlink3.mk" +. include "../../print/ghostscript/ghostscript.buildlink3.mk" PLIST.ghostscript= yes . else CONFIGURE_ARGS+= --without-ghostscript diff --git a/graphics/tex-pst-pdf/Makefile b/graphics/tex-pst-pdf/Makefile index 2e443353077..bdbe6a2d4c0 100644 --- a/graphics/tex-pst-pdf/Makefile +++ b/graphics/tex-pst-pdf/Makefile @@ -1,15 +1,15 @@ -# $NetBSD$ +# $NetBSD: Makefile,v 1.1.1.1 2011/10/27 18:24:57 minskim Exp $ DISTNAME= pst-pdf PKGNAME= tex-${DISTNAME}-1.1v TEXLIVE_REV= 15878 +PKGREVISION= 1 MAINTAINER= minskim@NetBSD.org COMMENT= Make PDF versions of graphics by processing between runs CONFLICTS= texlive-pdftools<2011 DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript DEPENDS+= tex-environ-[0-9]*:../../print/tex-environ DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin @@ -47,4 +47,5 @@ post-extract: ${MKDIR} ${WRKSRC}/bin ${MV} ${WRKSRC}/scripts/pst-pdf/ps4pdf ${WRKSRC}/bin/ +.include "../../print/ghostscript/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile index cf6e21c02c5..a89f71e83d3 100644 --- a/inputmethod/skk/Makefile +++ b/inputmethod/skk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2013/02/17 19:18:04 dholland Exp $ +# $NetBSD: Makefile,v 1.28 2013/03/10 06:25:10 hiramatsu Exp $ # -DISTNAME= ddskk-14.4 +DISTNAME= ddskk-15.1 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/} -PKGREVISION= 1 CATEGORIES= japanese inputmethod MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/ \ http://openlab.ring.gr.jp/skk/maintrunk/old-releases/ @@ -18,8 +17,7 @@ CONFLICTS= ddskk-[0-9]* EMACS_MODULES+= base leim EMACS_BUILDLINK=YES -EMACS_VERSIONS_ACCEPTED= emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox \ - emacs21 emacs21nox +EMACS_VERSIONS_ACCEPTED= emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox MAKE_FLAGS+= EMACS=${EMACS_BIN:Q} MAKE_ENV= prefix=${DESTDIR:Q}${PREFIX:Q} \ diff --git a/inputmethod/skk/distinfo b/inputmethod/skk/distinfo index 73957b50c30..20ed6ba7f9a 100644 --- a/inputmethod/skk/distinfo +++ b/inputmethod/skk/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2011/10/12 11:20:46 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2012/02/21 09:51:25 ryoon Exp $ -SHA1 (ddskk-14.4.tar.gz) = 85f7dd5a800b3467e325db344321cb9ec42afaae -RMD160 (ddskk-14.4.tar.gz) = c6fb6ee02d4be8da3c21b3f54236e63dd1dc37b7 -Size (ddskk-14.4.tar.gz) = 847188 bytes +SHA1 (ddskk-15.1.tar.gz) = df4e7305c94cb8966e843dff9a0c9f1fabdcb082 +RMD160 (ddskk-15.1.tar.gz) = 30cc05ff1ebb082a0b0d3c351678cc093041093f +Size (ddskk-15.1.tar.gz) = 837942 bytes diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile index 36c9107fc49..a110ddc22ea 100644 --- a/mail/poppy/Makefile +++ b/mail/poppy/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2012/10/03 21:56:33 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2012/10/08 12:19:27 asau Exp $ # -DISTNAME= poppy-3.1 -PKGREVISION= 1 +DISTNAME= poppy-4.01 +#KGREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.cnpbagwell.com/ diff --git a/mail/poppy/distinfo b/mail/poppy/distinfo index 5cb21ab9be9..d8d810b03d1 100644 --- a/mail/poppy/distinfo +++ b/mail/poppy/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/13 14:54:22 zuntum Exp $ +$NetBSD: distinfo,v 1.2 2005/02/24 09:59:26 agc Exp $ -SHA1 (poppy-3.1.tar.gz) = b282cbd81a10a705e0d02d475820484f34a2f524 -RMD160 (poppy-3.1.tar.gz) = 3c0468450112632e18d29b68c831740ceb4e7c8a -Size (poppy-3.1.tar.gz) = 93897 bytes +SHA1 (poppy-4.01.tar.gz) = fe0c2c1c5d2e793cd1196d3309eb123a57e8d392 +RMD160 (poppy-4.01.tar.gz) = 73dfefeefffdf6a24e16d050e83e811c6865695d +Size (poppy-4.01.tar.gz) = 133367 bytes diff --git a/math/R-CGIwithR/Makefile b/math/R-CGIwithR/Makefile index 163c2d7029a..3dc5d3326ff 100644 --- a/math/R-CGIwithR/Makefile +++ b/math/R-CGIwithR/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2013/02/06 23:22:51 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2013/02/16 11:23:02 wiz Exp $ # -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/} @@ -24,5 +24,5 @@ SUBST_FILES.fix-paths= inst/cgi-bin/R.cgi SUBST_SED.fix-paths= -e 's,/usr/local,${PREFIX},g' .include "../../math/R/Makefile.extension" -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile index 280fe66ce62..0c7eb2734bb 100644 --- a/meta-pkgs/bulk-medium/Makefile +++ b/meta-pkgs/bulk-medium/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2013/02/18 09:27:19 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2013/02/23 02:53:59 obache Exp $ -DISTNAME= bulk-medium-20130223 +DISTNAME= bulk-medium-20130316 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -117,6 +117,7 @@ BUILD_DEPENDS+= xymonclient-[0-9]*:../../net/xymonclient BUILD_DEPENDS+= youtube-dl-[0-9]*:../../net/youtube-dl BUILD_DEPENDS+= lintpkgsrc-[0-9]*:../../pkgtools/lintpkgsrc BUILD_DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint +BUILD_DEPENDS+= ghostscript-agpl-[0-9]*:../../print/ghostscript-agpl BUILD_DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils BUILD_DEPENDS+= xpdf-[0-9]*:../../print/xpdf BUILD_DEPENDS+= gnupg-[0-9]*:../../security/gnupg diff --git a/meta-pkgs/bulk-small/Makefile b/meta-pkgs/bulk-small/Makefile index fff176b41b8..35625944f77 100644 --- a/meta-pkgs/bulk-small/Makefile +++ b/meta-pkgs/bulk-small/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2013/02/18 09:27:19 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2013/02/23 02:53:59 obache Exp $ -DISTNAME= bulk-small-20130223 +DISTNAME= bulk-small-20130316 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -67,7 +67,7 @@ BUILD_DEPENDS+= pkg_chk-[0-9]*:../../pkgtools/pkg_chk BUILD_DEPENDS+= pkg_rolling-replace-[0-9]*:../../pkgtools/pkg_rolling-replace BUILD_DEPENDS+= pkgin-[0-9]*:../../pkgtools/pkgin BUILD_DEPENDS+= enscript-[0-9]*:../../print/enscript -BUILD_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript +BUILD_DEPENDS+= ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl BUILD_DEPENDS+= papersize-[0-9]*:../../print/papersize BUILD_DEPENDS+= psutils-[0-9]*:../../print/psutils BUILD_DEPENDS+= sudo-[0-9]*:../../security/sudo diff --git a/meta-pkgs/netbsd-www/Makefile b/meta-pkgs/netbsd-www/Makefile index 39b0a1be0a7..59d52ba6264 100644 --- a/meta-pkgs/netbsd-www/Makefile +++ b/meta-pkgs/netbsd-www/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2012/09/11 23:26:14 asau Exp $ +# $NetBSD: Makefile,v 1.29 2012/10/03 21:56:42 wiz Exp $ -DISTNAME= netbsd-www-1.7 -PKGREVISION= 1 +DISTNAME= netbsd-www-1.8 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -16,7 +15,6 @@ DEPENDS+= ImageMagick>=5.5.7.11nb1:../../graphics/ImageMagick DEPENDS+= docbook-website>=2.6.0nb1:../../textproc/docbook-website DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript DEPENDS+= libxslt>=1.0.20:../../textproc/libxslt DEPENDS+= netbsd-doc-print>=1.3:../../meta-pkgs/netbsd-doc-print DEPENDS+= opensp>=1.1:../../textproc/opensp @@ -24,7 +22,7 @@ DEPENDS+= psutils>=1.17:../../print/psutils DEPENDS+= w3m>=0.4:../../www/w3m DEPENDS+= xplanet>=1.2.0nb3:../../x11/xplanet -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run ps2pdf:run META_PACKAGE= yes diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 6d9f25a21c0..926fa947a7e 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.252 2012/10/01 10:45:16 ryoon Exp $ +# $NetBSD: replace.mk,v 1.254 2013/03/16 21:47:14 dholland Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1074,8 +1074,18 @@ GHOSTSCRIPT_REQD?= 6.01 # various package options. # .if !defined(TOOLS_DEPENDS.ghostscript) -_TOOLS_DEP.ghostscript:= ghostscript -TOOLS_DEPENDS.ghostscript= ghostscript>=${GHOSTSCRIPT_REQD}:../../print/ghostscript +_TOOLS_DEP.ghostscript:= ghostscript-gpl +_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-agpl +# +# Determine the default Ghostscript package to build based on +# ACCEPTABLE_LICENSES. +# +. if !empty(ACCEPTABLE_LICENSES:Mgnu-agpl-*) +_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-agpl +. else +_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gpl +. endif +TOOLS_DEPENDS.ghostscript= {${_TOOLS_DEP.ghostscript}}>=${GHOSTSCRIPT_REQD}:${_TOOLS_PKGSRCDIR.ghostscript} MAKEVARS+= TOOLS_DEPENDS.ghostscript .endif diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 3039fbd9f78..82d410c1cc8 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.93 2012/12/22 11:23:59 tron Exp $ +# $NetBSD: Makefile,v 1.94 2013/02/06 23:23:19 jperkin Exp $ -DISTNAME= net-snmp-5.6.1.1 -PKGREVISION= 6 +DISTNAME= net-snmp-5.7.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST index cab1e7f0431..9ec40cb3055 100644 --- a/net/net-snmp/PLIST +++ b/net/net-snmp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2011/05/27 10:55:24 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2011/06/24 09:46:10 adam Exp $ bin/agentxtrap bin/encode_keychange ${PLIST.perl}bin/fixproc @@ -66,6 +66,7 @@ include/net-snmp/agent/snmp_get_statistic.h include/net-snmp/agent/snmp_vars.h include/net-snmp/agent/stash_cache.h include/net-snmp/agent/stash_to_next.h +include/net-snmp/agent/struct.h include/net-snmp/agent/sysORTable.h include/net-snmp/agent/table.h include/net-snmp/agent/table_array.h @@ -75,6 +76,9 @@ include/net-snmp/agent/table_dataset.h include/net-snmp/agent/table_iterator.h include/net-snmp/agent/table_tdata.h include/net-snmp/agent/util_funcs.h +include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h +include/net-snmp/agent/util_funcs/header_generic.h +include/net-snmp/agent/util_funcs/header_simple_table.h include/net-snmp/agent/var_struct.h include/net-snmp/agent/watcher.h include/net-snmp/config_api.h @@ -84,7 +88,6 @@ include/net-snmp/library/asn1.h include/net-snmp/library/callback.h include/net-snmp/library/cert_util.h include/net-snmp/library/check_varbind.h -include/net-snmp/library/cmu_compat.h include/net-snmp/library/container.h include/net-snmp/library/container_binary_array.h include/net-snmp/library/container_iterator.h @@ -121,8 +124,8 @@ include/net-snmp/library/snmpTCPDomain.h ${PLIST.inet6}include/net-snmp/library/snmpTCPIPv6Domain.h include/net-snmp/library/snmpUDPBaseDomain.h include/net-snmp/library/snmpUDPDomain.h -${PLIST.inet6}include/net-snmp/library/snmpUDPIPv6Domain.h include/net-snmp/library/snmpUDPIPv4BaseDomain.h +${PLIST.inet6}include/net-snmp/library/snmpUDPIPv6Domain.h include/net-snmp/library/snmpUnixDomain.h include/net-snmp/library/snmp_alarm.h include/net-snmp/library/snmp_api.h @@ -151,6 +154,7 @@ include/net-snmp/library/winservice.h include/net-snmp/machine/generic.h include/net-snmp/mib_api.h include/net-snmp/net-snmp-config.h +include/net-snmp/net-snmp-features.h include/net-snmp/net-snmp-includes.h include/net-snmp/output_api.h include/net-snmp/pdu_api.h @@ -170,11 +174,15 @@ include/net-snmp/system/darwin9.h include/net-snmp/system/dragonfly.h include/net-snmp/system/dynix.h include/net-snmp/system/freebsd.h +include/net-snmp/system/freebsd10.h include/net-snmp/system/freebsd2.h include/net-snmp/system/freebsd3.h include/net-snmp/system/freebsd4.h include/net-snmp/system/freebsd5.h include/net-snmp/system/freebsd6.h +include/net-snmp/system/freebsd7.h +include/net-snmp/system/freebsd8.h +include/net-snmp/system/freebsd9.h include/net-snmp/system/generic.h include/net-snmp/system/hpux.h include/net-snmp/system/irix.h @@ -183,6 +191,8 @@ include/net-snmp/system/mingw32.h include/net-snmp/system/mips.h include/net-snmp/system/netbsd.h include/net-snmp/system/openbsd.h +include/net-snmp/system/openbsd4.h +include/net-snmp/system/openbsd5.h include/net-snmp/system/osf5.h include/net-snmp/system/solaris.h include/net-snmp/system/solaris2.3.h @@ -387,6 +397,7 @@ ${PLIST.perl}share/snmp/mib2c-data/generic-ctx-get.m2i ${PLIST.perl}share/snmp/mib2c-data/generic-ctx-set.m2i ${PLIST.perl}share/snmp/mib2c-data/generic-data-allocate.m2i ${PLIST.perl}share/snmp/mib2c-data/generic-data-context.m2i +${PLIST.perl}share/snmp/mib2c-data/generic-get-U64.m2i ${PLIST.perl}share/snmp/mib2c-data/generic-get-char.m2i ${PLIST.perl}share/snmp/mib2c-data/generic-get-decl-bot.m2i ${PLIST.perl}share/snmp/mib2c-data/generic-get-decl.m2i @@ -483,6 +494,7 @@ share/snmp/mibs/IF-MIB.txt share/snmp/mibs/INET-ADDRESS-MIB.txt share/snmp/mibs/IP-FORWARD-MIB.txt share/snmp/mibs/IP-MIB.txt +share/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt share/snmp/mibs/IPV6-ICMP-MIB.txt share/snmp/mibs/IPV6-MIB.txt share/snmp/mibs/IPV6-TC.txt @@ -519,6 +531,7 @@ share/snmp/mibs/SNMPv2-TC.txt share/snmp/mibs/SNMPv2-TM.txt share/snmp/mibs/TCP-MIB.txt share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +share/snmp/mibs/TUNNEL-MIB.txt share/snmp/mibs/UCD-DEMO-MIB.txt share/snmp/mibs/UCD-DISKIO-MIB.txt share/snmp/mibs/UCD-DLMOD-MIB.txt diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo dissimilarity index 99% index c69b5f3ae2f..52909fc5e65 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,56 +1,25 @@ -$NetBSD: distinfo,v 1.68 2013/03/12 14:56:13 garbled Exp $ - -SHA1 (net-snmp-5.6.1.1.tar.gz) = ec88ba3e0dff4d1b3d342ccebb48ea84c9fa6fa9 -RMD160 (net-snmp-5.6.1.1.tar.gz) = 9a4a83f7fe9431a0694b5fee33866ccea80fcab4 -Size (net-snmp-5.6.1.1.tar.gz) = 5937279 bytes -SHA1 (patch-aa) = 699f6a6770c51c8976d8ec352ad213893e749032 -SHA1 (patch-ab) = d23ddbce52b54462ea2f7c695533a41eaf0046ee -SHA1 (patch-ac) = f947f2fb88cee7bf92b5aa8cfe94ade079df1a66 -SHA1 (patch-ae) = 54541bffecdbf4c526280bc82ffd370a59963d88 -SHA1 (patch-af) = d7641e502fd0a2969fa838fc67244cdfc6995369 -SHA1 (patch-ag) = 8f9dedcf741c4b0ea2c0150c8b0a22747ca8a313 -SHA1 (patch-agent_mibgroup_agent_extend.c) = b3b04c51e7059426963fdb4712a711e2da053a28 -SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = ef82011e34f61e0bd606ee497647a605d9c81d23 -SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = 1dc4f353d042fe8ceb31ab2ad66a7661790ac458 -SHA1 (patch-ah) = 7cea4194c858d7a8a9093eaf4426404e9202c3f1 -SHA1 (patch-ai) = 1eb3b72dcfff90c8e973590265bdb1c07b717eaa -SHA1 (patch-aj) = e3337d01e96cc0739dbf3b1c7bde44d1126c32ae -SHA1 (patch-ak) = 8a7b26b29dcce292355c8239d6b5a2b9fe0b3253 -SHA1 (patch-al) = 468394dc540329449c074a6f19ab3e0287041607 -SHA1 (patch-am) = db771145f72a043beeb589e450617e42ca5d5c00 -SHA1 (patch-an) = 6f47b44697f22d322e35b83d47aa5f7383a8c7cd -SHA1 (patch-ao) = 989b410de3a28c37a50581a6f8d109f448b2b421 -SHA1 (patch-ap) = 36032fefe04671a0a5f7db765bdd2115963d01f1 -SHA1 (patch-aq) = b639bceac59a987ec779fe472fa4e97aa7b24204 -SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1 -SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582 -SHA1 (patch-dc) = f84beba7fae731bb0e38b9635dd2f7009c3659aa -SHA1 (patch-dd) = 08da0d1da485959549ac461e5cbb7030f800e643 -SHA1 (patch-de) = 532045f8e509b4df0acc46bf5e778d10d3b36012 -SHA1 (patch-df) = 8851ce05e61345496d2abe65cac2896268d72624 -SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c -SHA1 (patch-dh) = 41530526190fb9a0419db1c604c2ac6025417706 -SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348 -SHA1 (patch-dl) = 0619c8c9fc2e382a57fc127fa6bc52121d2bf288 -SHA1 (patch-dm) = 5c990fb3286453534d9c02fa1ab6eda76abd9d33 -SHA1 (patch-dn) = 1410274fc6774e4aa043485a21b97c3b644c46b7 -SHA1 (patch-do) = 5144514d78c5cdd1f289749fc958e0d491c9ba98 -SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d -SHA1 (patch-dq) = 75d25b51db74151e4956498c9730006b8ff57992 -SHA1 (patch-dr) = 6a0c80e2edea934917939c2745bf86e2e7142bf5 -SHA1 (patch-ds) = 3fbd86bffb76cbf11bc8c958320dc669c1b750ec -SHA1 (patch-dt) = 33036d099682ba9882b9ffe73ee25a8d626bdbaa -SHA1 (patch-du) = c3c053c95c24c3fecfdcb7dfe649168a866206ba -SHA1 (patch-el) = f32d387045854686d9fc036de7d884cf889134ae -SHA1 (patch-es) = 222de078a45ae2e80a3903342916783aec43cc43 -SHA1 (patch-et) = 5cb3d9c96e78b9f3e85ef3c5af96059cca865762 -SHA1 (patch-eu) = 606d9952dc9a994d8058004d5ba411c3c9dddcec -SHA1 (patch-ev) = 966e9686d826e530323baad5a10e6bd251a08526 -SHA1 (patch-ew) = 503c4db9c3e784a16854a6b5aa40a79798f2e381 -SHA1 (patch-ex) = 911c5ca0186ef806f0ffb9e7cfbc0e14f79d9e62 -SHA1 (patch-ey) = b96fd2f4abb53bc1233753623128fe2e7f99089c -SHA1 (patch-ez) = a2d8ed3f0895b1f5908b8f311ad86dd79a7ffe04 -SHA1 (patch-fa) = f0102bf99b003b143fa3279e2187616b89e3b678 -SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb -SHA1 (patch-fc) = 4e0b9841cbff0da02748efc9105096ffcbe58e81 -SHA1 (patch-fd) = efab8fe5cb1e6bdc7799dbdfd27e88d734d843ad +$NetBSD: distinfo,v 1.70 2013/03/17 00:15:28 gdt Exp $ + +SHA1 (net-snmp-5.7.2.tar.gz) = c493027907f32400648244d81117a126aecd27ee +RMD160 (net-snmp-5.7.2.tar.gz) = 392d643e9f2f42ee4fa688b4702329ad005ee12e +Size (net-snmp-5.7.2.tar.gz) = 6281352 bytes +SHA1 (patch-ac) = 59987ecb9467b1cead9af3d4432a4dd69be93480 +SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101 +SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa +SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = fe812fa13dffb4c3716d008381211dda9746c11e +SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 054866e7c3ac90f183fd4a6d53763a5bba50572c +SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e +SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970 +SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa +SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321 +SHA1 (patch-am) = 52858b71d4e75d813f134c2d006819108430c766 +SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746 +SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b +SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299 +SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9 +SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0 +SHA1 (patch-dt) = 452fee78b37f8ce0eb30049f9f18b04cff9b6e6e +SHA1 (patch-du) = 89a77e82d881207500fb45c422b66710e44c0eb4 +SHA1 (patch-el) = b85dbef28e14fe29c9fb944508a08e7423a37152 +SHA1 (patch-es) = 7336d905bac315f344f93664e4118332f88fb6ee +SHA1 (patch-fa) = 8fd68fb2107ca6268a149e633ec3b9184daca043 diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa deleted file mode 100644 index 7bcad0daa43..00000000000 --- a/net/net-snmp/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2008/09/08 12:58:09 adam Exp $ - ---- agent/mibgroup/host/hr_filesys.c.orig 2008-07-30 11:58:30.000000000 +0200 -+++ agent/mibgroup/host/hr_filesys.c -@@ -111,6 +111,11 @@ struct mnttab *HRFS_entry = &HRFS_entry - - #elif defined(HAVE_STATVFS) && defined(__NetBSD__) - -+#if !defined(MFSNAMELEN) && defined(_VFS_NAMELEN) -+#define MFSNAMELEN _VFS_NAMELEN -+#endif -+ -+#define getfsstat getvfsstat - static struct statvfs *fsstats = NULL; - struct statvfs *HRFS_entry; - static int fscount; diff --git a/net/net-snmp/patches/patch-ab b/net/net-snmp/patches/patch-ab deleted file mode 100644 index 238e963bccc..00000000000 --- a/net/net-snmp/patches/patch-ab +++ /dev/null @@ -1,160 +0,0 @@ -$NetBSD: patch-ab,v 1.10 2010/07/20 08:33:44 adam Exp $ - ---- agent/mibgroup/ucd-snmp/diskio.c.orig 2009-04-10 20:14:51.000000000 +0000 -+++ agent/mibgroup/ucd-snmp/diskio.c -@@ -446,6 +446,155 @@ var_diskio(struct variable * vp, - } - #endif /* bsdi */ - -+#ifdef __NetBSD__ -+#include -+static int ndisk; -+#ifdef HW_IOSTATNAMES -+static int nmib[2] = {CTL_HW, HW_IOSTATNAMES}; -+#else -+static int nmib[2] = {CTL_HW, HW_DISKNAMES}; -+#endif -+#ifdef HW_DISKSTATS -+#include -+static int dmib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)}; -+static struct disk_sysctl *dk; -+#endif -+#ifdef HW_IOSTATS -+#include -+static int dmib[3] = {CTL_HW, HW_IOSTATS, sizeof(struct io_sysctl)}; -+static struct io_sysctl *dk; -+#endif -+static char **dkname; -+ -+static int -+getstats(void) -+{ -+ time_t now; -+ char *t, *tp; -+ int size, dkn_size, i; -+ -+ now = time(NULL); -+ if (cache_time + CACHE_TIMEOUT > now) { -+ return 1; -+ } -+ size = 0; -+ if (sysctl(dmib, 3, NULL, &size, NULL, 0) < 0) { -+ perror("Can't get size of HW_DISKSTATS/HW_IOSTATS mib"); -+ return 0; -+ } -+ if (ndisk != size / dmib[2]) { -+ if (dk) -+ free(dk); -+ if (dkname) { -+ for (i = 0; i < ndisk; i++) -+ if (dkname[i]) -+ free(dkname[i]); -+ free(dkname); -+ } -+ ndisk = size / dmib[2]; -+ if (ndisk == 0) -+ return 0; -+ dkname = malloc(ndisk * sizeof(char *)); -+ if (sysctl(nmib, 2, NULL, &dkn_size, NULL, 0) < 0) { -+ perror("Can't get size of HW_DISKNAMES mib"); -+ return 0; -+ } -+ t = malloc(dkn_size); -+ if (sysctl(nmib, 2, t, &dkn_size, NULL, 0) < 0) { -+ perror("Can't get size of HW_DISKNAMES mib"); -+ return 0; -+ } -+ for (i = 0, tp = strtok(t, " "); tp && i < ndisk; i++, -+ tp = strtok(NULL, " ")) { -+ dkname[i] = strdup(tp); -+ } -+ free(t); -+ dk = malloc(ndisk * sizeof(*dk)); -+ } -+ if (sysctl(dmib, 3, dk, &size, NULL, 0) < 0) { -+ perror("Can't get HW_DISKSTATS/HW_IOSTATS mib"); -+ return 0; -+ } -+ cache_time = now; -+ return 1; -+} -+ -+u_char * -+var_diskio(struct variable * vp, -+ oid * name, -+ size_t * length, -+ int exact, size_t * var_len, WriteMethod ** write_method) -+{ -+ static long long_ret; -+ unsigned int indx; -+ -+ if (getstats() == 0) -+ return 0; -+ -+ if (header_simple_table -+ (vp, name, length, exact, var_len, write_method, ndisk)) -+ return NULL; -+ -+ indx = (unsigned int) (name[*length - 1] - 1); -+ if (indx >= ndisk) -+ return NULL; -+ -+ switch (vp->magic) { -+ case DISKIO_INDEX: -+ long_ret = (long) indx + 1; -+ return (u_char *) & long_ret; -+ -+ case DISKIO_DEVICE: -+ *var_len = strlen(dkname[indx]); -+ return (u_char *) dkname[indx]; -+ -+ case DISKIO_NREAD: -+#ifdef HW_DISKSTATS -+ long_ret = dk[indx].dk_rbytes; -+#endif -+#ifdef HW_IOSTATS -+ if (dk[indx].type == IOSTAT_DISK) -+ long_ret = dk[indx].rbytes; -+#endif -+ return (u_char *) & long_ret; -+ -+ case DISKIO_NWRITTEN: -+#ifdef HW_DISKSTATS -+ long_ret = dk[indx].dk_wbytes; -+#endif -+#ifdef HW_IOSTATS -+ if (dk[indx].type == IOSTAT_DISK) -+ long_ret = dk[indx].wbytes; -+#endif -+ return (u_char *) & long_ret; -+ -+ case DISKIO_READS: -+#ifdef HW_DISKSTATS -+ long_ret = dk[indx].dk_rxfer; -+#endif -+#ifdef HW_IOSTATS -+ if (dk[indx].type == IOSTAT_DISK) -+ long_ret = dk[indx].rxfer; -+#endif -+ return (u_char *) & long_ret; -+ -+ case DISKIO_WRITES: -+#ifdef HW_DISKSTATS -+ long_ret = dk[indx].dk_wxfer; -+#endif -+#ifdef HW_IOSTATS -+ if (dk[indx].type == IOSTAT_DISK) -+ long_ret = dk[indx].wxfer; -+#endif -+ return (u_char *) & long_ret; -+ -+ default: -+ ERROR_MSG("diskio.c: don't know how to handle this request."); -+ } -+ return NULL; -+} -+#endif /* __NetBSD__ */ -+ - #if defined(freebsd4) || defined(freebsd5) - - /* disk load average patch by Rojer */ diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac dissimilarity index 84% index fc3d6b98ff5..34c24dd1274 100644 --- a/net/net-snmp/patches/patch-ac +++ b/net/net-snmp/patches/patch-ac @@ -1,13 +1,14 @@ -$NetBSD: patch-ac,v 1.10 2011/05/27 10:55:24 adam Exp $ - ---- agent/mibgroup/if-mib/data_access/interface.h.orig 2011-02-04 12:47:44.000000000 +0000 -+++ agent/mibgroup/if-mib/data_access/interface.h -@@ -36,7 +36,7 @@ config_exclude(mibII/interfaces) - config_require(if-mib/data_access/interface_linux) - config_require(if-mib/data_access/interface_ioctl) - --# elif defined( openbsd3 ) || defined( openbsd4 ) || \ -+# elif defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2) || defined(netbsdelf3) || defined( openbsd3 ) || defined( openbsd4 ) || \ - defined( freebsd4 ) || defined( freebsd5 ) || defined( freebsd6 ) || defined (darwin) - - config_require(if-mib/data_access/interface_sysctl) +$NetBSD: patch-ac,v 1.11 2011/05/30 08:58:33 adam Exp $ + +--- agent/mibgroup/if-mib/data_access/interface.h.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/if-mib/data_access/interface.h +@@ -38,7 +38,8 @@ config_exclude(mibII/interfaces) + + # elif defined( openbsd3 ) || \ + defined( freebsd4 ) || defined( freebsd5 ) || defined( freebsd6 ) || \ +- defined( darwin ) || defined( dragonfly ) || defined( netbsd1 ) ++ defined( darwin ) || defined( dragonfly ) || defined( netbsd1 ) || \ ++ defined(netbsd) || defined(netbsdelf) || defined(netbsdelf2) || defined(netbsdelf3) + + config_require(if-mib/data_access/interface_sysctl) + diff --git a/net/net-snmp/patches/patch-ae b/net/net-snmp/patches/patch-ae deleted file mode 100644 index 531dea0ab67..00000000000 --- a/net/net-snmp/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2010/07/20 08:33:44 adam Exp $ - ---- snmplib/transports/snmpUDPIPv6Domain.c.orig 2010-04-28 07:29:33.000000000 +0000 -+++ snmplib/transports/snmpUDPIPv6Domain.c -@@ -54,6 +54,10 @@ const struct in6_addr in6addr_any = IN6A - #define SS_FAMILY __ss_family - #endif - -+#if defined(darwin) -+#include /* for uint8_t */ -+#endif -+ - #include - #include - #include diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af dissimilarity index 82% index 7c24e40e1e6..371b1e91094 100644 --- a/net/net-snmp/patches/patch-af +++ b/net/net-snmp/patches/patch-af @@ -1,493 +1,86 @@ -$NetBSD$ - ---- configure.orig 2011-01-03 23:31:36.000000000 +0000 -+++ configure -@@ -19162,6 +19162,9 @@ cat >>conftest.$ac_ext <<_ACEOF - #if HAVE_SYS_QUEUE_H - #include - #endif -+#if HAVE_NET_ROUTE_H -+#include -+#endif - #if HAVE_NETINET_IN_H - #include - #endif -@@ -19259,6 +19262,9 @@ cat >>conftest.$ac_ext <<_ACEOF - #if HAVE_NET_ROUTE_H - #include - #endif -+#if HAVE_NETINET_IP_H -+#include -+#endif - - - #include <$ac_header> -@@ -28917,6 +28923,81 @@ fi - ## - ######################################### - -+ -+echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 -+echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 -+if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldes $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char des_cbc_encrypt (); -+int -+main () -+{ -+des_cbc_encrypt (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_des_des_cbc_encrypt=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_des_des_cbc_encrypt=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 -+echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 -+if test $ac_cv_lib_des_des_cbc_encrypt = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBDES 1 -+_ACEOF -+ -+ LIBS="-ldes $LIBS" -+ -+fi -+ -+ - ## - # Compilation-related - ## -@@ -37938,6 +38019,12 @@ char $ac_func (); - #if defined __stub_$ac_func || defined __stub___$ac_func - choke me - #endif -+#if HAVE_NET_IF_H -+#include -+#endif -+#if HAVE_NET_ROUTE_H -+#include -+#endif - - int - main () -@@ -47154,6 +47241,219 @@ _ACEOF - - - fi -+{ $as_echo "$as_me:$LINENO: checking for struct ifnet.if_lastchange.tv_nsec" >&5 -+$as_echo_n "checking for struct ifnet.if_lastchange.tv_nsec... " >&6; } -+if test "${ac_cv_member_struct_ifnet_if_lastchange_tv_nsec+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#ifdef NETSNMP_IFNET_NEEDS_KERNEL -+#define _KERNEL 1 -+#endif -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+#ifdef HAVE_SYS_TIME_H -+#include -+#endif -+#ifdef HAVE_NET_IF_H -+#include -+#endif -+#ifdef HAVE_NET_IF_VAR_H -+#include -+#endif -+#ifdef HAVE_SYS_QUEUE_H -+#include -+#endif -+#ifdef linux -+struct ifnet { -+ char *if_name; /* name, e.g. "en" or "lo" */ -+ short if_unit; /* sub-unit for lower level driver */ -+ short if_mtu; /* maximum transmission unit */ -+ short if_flags; /* up/down, broadcast, etc. */ -+ int if_metric; /* routing metric (external only) */ -+ char if_hwaddr [6]; /* ethernet address */ -+ int if_type; /* interface type: 1=generic, -+ 28=slip, ether=6, loopback=24 */ -+ int if_speed; /* interface speed: in bits/sec */ -+ -+ struct sockaddr if_addr; /* interface's address */ -+ struct sockaddr ifu_broadaddr; /* broadcast address */ -+ struct sockaddr ia_subnetmask; /* interface's mask */ -+ -+ struct ifqueue { -+ int ifq_len; -+ int ifq_drops; -+ } if_snd; /* output queue */ -+ int if_ibytes; /* octets received on interface */ -+ int if_ipackets; /* packets received on interface */ -+ int if_ierrors; /* input errors on interface */ -+ int if_iqdrops; /* input queue overruns */ -+ int if_obytes; /* octets sent on interface */ -+ int if_opackets; /* packets sent on interface */ -+ int if_oerrors; /* output errors on interface */ -+ int if_collisions; /* collisions on csma interfaces */ -+/* end statistics */ -+ struct ifnet *if_next; -+}; -+#endif -+ -+ -+int -+main () -+{ -+static struct ifnet ac_aggr; -+if (ac_aggr.if_lastchange.tv_nsec) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_member_struct_ifnet_if_lastchange_tv_nsec=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#ifdef NETSNMP_IFNET_NEEDS_KERNEL -+#define _KERNEL 1 -+#endif -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+#ifdef HAVE_SYS_TIME_H -+#include -+#endif -+#ifdef HAVE_NET_IF_H -+#include -+#endif -+#ifdef HAVE_NET_IF_VAR_H -+#include -+#endif -+#ifdef HAVE_SYS_QUEUE_H -+#include -+#endif -+#ifdef linux -+struct ifnet { -+ char *if_name; /* name, e.g. "en" or "lo" */ -+ short if_unit; /* sub-unit for lower level driver */ -+ short if_mtu; /* maximum transmission unit */ -+ short if_flags; /* up/down, broadcast, etc. */ -+ int if_metric; /* routing metric (external only) */ -+ char if_hwaddr [6]; /* ethernet address */ -+ int if_type; /* interface type: 1=generic, -+ 28=slip, ether=6, loopback=24 */ -+ int if_speed; /* interface speed: in bits/sec */ -+ -+ struct sockaddr if_addr; /* interface's address */ -+ struct sockaddr ifu_broadaddr; /* broadcast address */ -+ struct sockaddr ia_subnetmask; /* interface's mask */ -+ -+ struct ifqueue { -+ int ifq_len; -+ int ifq_drops; -+ } if_snd; /* output queue */ -+ int if_ibytes; /* octets received on interface */ -+ int if_ipackets; /* packets received on interface */ -+ int if_ierrors; /* input errors on interface */ -+ int if_iqdrops; /* input queue overruns */ -+ int if_obytes; /* octets sent on interface */ -+ int if_opackets; /* packets sent on interface */ -+ int if_oerrors; /* output errors on interface */ -+ int if_collisions; /* collisions on csma interfaces */ -+/* end statistics */ -+ struct ifnet *if_next; -+}; -+#endif -+ -+ -+int -+main () -+{ -+static struct ifnet ac_aggr; -+if (sizeof ac_aggr.if_lastchange.tv_nsec) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_member_struct_ifnet_if_lastchange_tv_nsec=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_member_struct_ifnet_if_lastchange_tv_nsec=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifnet_if_lastchange_tv_nsec" >&5 -+$as_echo "$ac_cv_member_struct_ifnet_if_lastchange_tv_nsec" >&6; } -+if test "x$ac_cv_member_struct_ifnet_if_lastchange_tv_nsec" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_IFNET_IF_LASTCHANGE_TV_NSEC 1 -+_ACEOF -+ -+ -+fi - { $as_echo "$as_me:$LINENO: checking for struct ifnet.if_mtu" >&5 - $as_echo_n "checking for struct ifnet.if_mtu... " >&6; } - if test "${ac_cv_member_struct_ifnet_if_mtu+set}" = set; then -@@ -48674,8 +48974,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -48732,8 +49034,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -48813,8 +49117,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -48871,8 +49177,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -48952,8 +49260,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49010,8 +49320,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49091,8 +49403,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49149,8 +49463,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49230,8 +49546,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49288,8 +49606,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49369,8 +49689,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49427,8 +49749,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef HAVE_SYS_SOCKET_H - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49516,8 +49840,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #include - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL -@@ -49585,8 +49911,10 @@ cat >>conftest.$ac_ext <<_ACEOF - #include - #ifdef NETSNMP_IFNET_NEEDS_KERNEL - #define KERNEL -+#if !defined(__DragonFly__) - #define _KERNEL - #endif -+#endif - #include - #undef KERNEL - #undef _KERNEL +$NetBSD: patch-af,v 1.15 2011/05/27 10:55:25 adam Exp $ + +--- configure.orig 2012-10-09 22:35:37.000000000 +0000 ++++ configure +@@ -20981,6 +20981,81 @@ fi + ## + ######################################### + ++ ++echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 ++echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 ++if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldes $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char des_cbc_encrypt (); ++int ++main () ++{ ++des_cbc_encrypt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_des_des_cbc_encrypt=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_des_des_cbc_encrypt=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 ++if test $ac_cv_lib_des_des_cbc_encrypt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDES 1 ++_ACEOF ++ ++ LIBS="-ldes $LIBS" ++ ++fi ++ ++ + ## + # Compilation-related + ## diff --git a/net/net-snmp/patches/patch-ag b/net/net-snmp/patches/patch-ag index 40a8672ed79..899c5842acf 100644 --- a/net/net-snmp/patches/patch-ag +++ b/net/net-snmp/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.10 2007/02/05 12:06:16 adam Exp $ +$NetBSD: patch-ag,v 1.11 2011/05/27 10:55:25 adam Exp $ ---- agent/mibgroup/host/hr_storage.c.orig 2006-10-12 11:54:57.000000000 +0200 +--- agent/mibgroup/host/hr_storage.c.orig 2012-10-09 22:28:58.000000000 +0000 +++ agent/mibgroup/host/hr_storage.c @@ -69,6 +69,13 @@ #endif @@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.10 2007/02/05 12:06:16 adam Exp $ #if defined(HAVE_UVM_UVM_PARAM_H) && defined(HAVE_UVM_UVM_EXTERN_H) #include #include -@@ -82,20 +89,13 @@ +@@ -76,20 +83,13 @@ #include #include #endif diff --git a/net/net-snmp/patches/patch-agent_mibgroup_agent_extend.c b/net/net-snmp/patches/patch-agent_mibgroup_agent_extend.c deleted file mode 100644 index afb99dcfdb0..00000000000 --- a/net/net-snmp/patches/patch-agent_mibgroup_agent_extend.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD$ - -patch by Jan Safranek for CVE-2012-2141 -from https://bugzilla.redhat.com/attachment.cgi?id=580443 : - -Check out-of-index conditions in ExtendOutput2Table. - ---- agent/mibgroup/agent/extend.c.orig 2010-07-08 11:19:15.000000000 +0000 -+++ agent/mibgroup/agent/extend.c -@@ -1309,6 +1309,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_ - * Determine which line we've been asked for.... - */ - line_idx = *table_info->indexes->next_variable->val.integer; -+ if (line_idx < 1 || line_idx > extension->numlines) { -+ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE); -+ continue; -+ } - cp = extension->lines[line_idx-1]; - - /* diff --git a/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c b/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c new file mode 100644 index 00000000000..20601198e91 --- /dev/null +++ b/net/net-snmp/patches/patch-agent_mibgroup_hardware_memory_memory__netbsd.c @@ -0,0 +1,13 @@ +$NetBSD$ + +--- agent/mibgroup/hardware/memory/memory_netbsd.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/hardware/memory/memory_netbsd.c +@@ -174,7 +174,7 @@ int netsnmp_mem_arch_load( netsnmp_cache + mem->descr = strdup("Memory buffers"); + mem->units = 1024; + mem->size = maxbufspace /1024; +- mem->size = (maxbufspace - bufspace)/1024; ++ mem->free = (maxbufspace - bufspace)/1024; + } + #endif + diff --git a/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c b/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c index 97324f357ae..55bccc27970 100644 --- a/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c +++ b/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c @@ -1,6 +1,6 @@ -$NetBSD$ +$NetBSD: patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v 1.1 2013/01/11 13:34:46 joerg Exp $ ---- agent/mibgroup/host/data_access/swrun_kinfo.c.orig 2013-01-11 11:01:25.000000000 +0000 +--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig 2012-10-09 22:28:58.000000000 +0000 +++ agent/mibgroup/host/data_access/swrun_kinfo.c @@ -5,6 +5,10 @@ * diff --git a/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipAddr.c b/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipAddr.c index 58a9b916e16..8c0e8003448 100644 --- a/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipAddr.c +++ b/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipAddr.c @@ -1,8 +1,8 @@ -$NetBSD$ +$NetBSD: patch-agent_mibgroup_mibII_ipAddr.c,v 1.1 2013/03/12 17:14:49 kim Exp $ ---- agent/mibgroup/mibII/ipAddr.c.orig 2010-01-23 17:07:35.000000000 +0200 -+++ agent/mibgroup/mibII/ipAddr.c 2013-03-12 17:48:01.000000000 +0200 -@@ -218,6 +218,10 @@ +--- agent/mibgroup/mibII/ipAddr.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/mibII/ipAddr.c +@@ -221,6 +221,10 @@ var_ipAddrEntry(struct variable *vp, if (Interface_Scan_Next(&interface, NULL, &ifnet, &in_ifaddr) == 0) break; #ifdef HAVE_STRUCT_IFNET_IF_ADDRLIST diff --git a/net/net-snmp/patches/patch-ah b/net/net-snmp/patches/patch-ah deleted file mode 100644 index b3ef365dcd0..00000000000 --- a/net/net-snmp/patches/patch-ah +++ /dev/null @@ -1,142 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/hardware/memory/memory_netbsd.c.orig 2006-03-07 01:23:52.000000000 +0900 -+++ agent/mibgroup/hardware/memory/memory_netbsd.c 2010-12-26 17:50:43.000000000 +0900 -@@ -4,7 +4,9 @@ - #include - - #include -+#include - #include -+#include - #include - - #if defined(HAVE_UVM_UVM_PARAM_H) && defined(HAVE_UVM_UVM_EXTERN_H) -@@ -30,27 +32,47 @@ - long pagesize; - - struct uvmexp uvmexp; -- int uvmexp_size = sizeof(uvmexp); -- int uvmexp_mib[] = { CTL_VM, VM_UVMEXP }; -+ size_t uvmexp_size = sizeof(uvmexp); - - struct vmtotal total; - size_t total_size = sizeof(total); -- int total_mib[] = { CTL_VM, VM_METER }; - -- long phys_mem; -- long user_mem; -+ quad_t phys_mem; -+ quad_t user_mem; -+ unsigned int bufspace; -+ unsigned int maxbufspace; - size_t mem_size = sizeof(phys_mem); -- int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM }; -- int user_mem_mib[] = { CTL_HW, HW_USERMEM }; -+ size_t buf_size = sizeof(bufspace); - - /* - * Retrieve the memory information from the underlying O/S... - */ -- sysctl(uvmexp_mib, 2, &uvmexp, &uvmexp_size, NULL, 0); -- sysctl(total_mib, 2, &total, &total_size, NULL, 0); -- sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0); -- sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); -- pagesize = uvmexp.pagesize; -+ if (sysctlbyname("vm.uvmexp", &uvmexp, &uvmexp_size, NULL, 0) == -1) { -+ snmp_log(LOG_ERR, "sysctl vm.uvmexp failed (errno %d)\n", errno); -+ return -1; -+ } -+ if (sysctlbyname("vm.vmmeter", &total, &total_size, NULL, 0) == -1) { -+ snmp_log(LOG_ERR, "sysctl vm.vmmeter failed (errno %d)\n", errno); -+ return -1; -+ } -+ if (sysctlbyname("hw.physmem64", &phys_mem, &mem_size, NULL, 0) == -1) { -+ snmp_log(LOG_ERR, "sysctl hw.physmem64 failed (errno %d)\n", errno); -+ return -1; -+ } -+ if (sysctlbyname("hw.usermem64", &user_mem, &mem_size, NULL, 0) == -1) { -+ snmp_log(LOG_ERR, "sysctl hw.usermem64 failed (errno %d)\n", errno); -+ return -1; -+ } -+ if (sysctlbyname("vm.bufmem", &bufspace, &buf_size, NULL, 0) == -1) { -+ snmp_log(LOG_ERR, "sysctl vm.bufmem failed (errno %d)\n", errno); -+ return -1; -+ } -+ if (sysctlbyname("vm.bufmem_hiwater", &maxbufspace, &buf_size, NULL, 0) == -1) { -+ snmp_log(LOG_ERR, "sysctl vm.bufmem_hiwater failed (errno %d)\n", errno); -+ return -1; -+ } -+ -+ pagesize = sysconf(_SC_PAGESIZE); - - /* - * ... and save this in a standard form. -@@ -64,7 +86,6 @@ - mem->units = pagesize; - mem->size = phys_mem/pagesize; - mem->free = total.t_free; -- mem->other = -1; - } - - mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_USERMEM, 1 ); -@@ -76,7 +97,39 @@ - mem->units = pagesize; - mem->size = user_mem/pagesize; - mem->free = uvmexp.free; -- mem->other = -1; -+ } -+ -+ mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_VIRTMEM, 1 ); -+ if (!mem) { -+ snmp_log_perror("No Virtual Memory info entry"); -+ } else { -+ if (!mem->descr) -+ mem->descr = strdup("Virtual memory"); -+ mem->units = pagesize; -+ mem->size = total.t_vm; -+ mem->free = total.t_avm; -+ } -+ -+ mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED, 1 ); -+ if (!mem) { -+ snmp_log_perror("No Shared Memory info entry"); -+ } else { -+ if (!mem->descr) -+ mem->descr = strdup("Shared virtual memory"); -+ mem->units = pagesize; -+ mem->size = total.t_vmshr; -+ mem->free = total.t_avmshr; -+ } -+ -+ mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED2, 1 ); -+ if (!mem) { -+ snmp_log_perror("No Shared2 Memory info entry"); -+ } else { -+ if (!mem->descr) -+ mem->descr = strdup("Shared real memory"); -+ mem->units = pagesize; -+ mem->size = total.t_rmshr; -+ mem->free = total.t_armshr; - } - - #ifdef SWAP_NSWAP -@@ -91,7 +144,17 @@ - mem->units = pagesize; - mem->size = uvmexp.swpages; - mem->free = uvmexp.swpages - uvmexp.swpginuse; -- mem->other = -1; -+ } -+ -+ mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 ); -+ if (!mem) { -+ snmp_log_perror("No Buffer, etc info entry"); -+ } else { -+ if (!mem->descr) -+ mem->descr = strdup("Memory buffers"); -+ mem->units = 1024; -+ mem->size = maxbufspace / 1024; -+ mem->free = (maxbufspace - bufspace)/1024; - } - - return 0; diff --git a/net/net-snmp/patches/patch-ai b/net/net-snmp/patches/patch-ai index 8bac57854a3..d587eb2d275 100644 --- a/net/net-snmp/patches/patch-ai +++ b/net/net-snmp/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2008/06/06 16:18:04 tron Exp $ +$NetBSD: patch-ai,v 1.6 2011/05/27 10:55:25 adam Exp $ ---- agent/mibgroup/mibII/ip.c.orig 2008-06-06 15:51:31.000000000 +0100 -+++ agent/mibgroup/mibII/ip.c 2008-06-06 15:55:38.000000000 +0100 -@@ -241,6 +241,18 @@ +--- agent/mibgroup/mibII/ip.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/mibII/ip.c +@@ -255,6 +255,18 @@ long ipTTL, oldipTTL; #define USES_TRADITIONAL_IPSTAT #endif diff --git a/net/net-snmp/patches/patch-aj b/net/net-snmp/patches/patch-aj index 8f5ee052570..dc2235439c2 100644 --- a/net/net-snmp/patches/patch-aj +++ b/net/net-snmp/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.5 2008/06/05 19:09:41 christos Exp $ +$NetBSD: patch-aj,v 1.6 2011/05/27 10:55:25 adam Exp $ ---- agent/mibgroup/mibII/udp.c.orig 2007-07-16 19:59:44.000000000 -0400 -+++ agent/mibgroup/mibII/udp.c 2008-06-04 19:46:27.000000000 -0400 -@@ -162,6 +162,12 @@ +--- agent/mibgroup/mibII/udp.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/mibII/udp.c +@@ -151,6 +151,12 @@ init_udp(void) #define USES_TRADITIONAL_UDPSTAT #endif diff --git a/net/net-snmp/patches/patch-ak b/net/net-snmp/patches/patch-ak index f3943f22e88..7a0f9c40b39 100644 --- a/net/net-snmp/patches/patch-ak +++ b/net/net-snmp/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.4 2008/06/05 19:09:41 christos Exp $ +$NetBSD: patch-ak,v 1.5 2011/05/27 10:55:25 adam Exp $ ---- agent/mibgroup/mibII/icmp.c.orig 2007-07-16 19:59:44.000000000 -0400 -+++ agent/mibgroup/mibII/icmp.c 2008-06-04 19:42:01.000000000 -0400 -@@ -455,6 +455,13 @@ +--- agent/mibgroup/mibII/icmp.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/mibII/icmp.c +@@ -621,6 +621,13 @@ bail: #define USES_TRADITIONAL_ICMPSTAT #endif diff --git a/net/net-snmp/patches/patch-al b/net/net-snmp/patches/patch-al deleted file mode 100644 index d81ed04ec62..00000000000 --- a/net/net-snmp/patches/patch-al +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-al,v 1.4 2006/01/24 22:16:55 adam Exp $ - ---- agent/mibgroup/host/hr_network.c.orig 2005-10-28 20:49:36.000000000 +0200 -+++ agent/mibgroup/host/hr_network.c -@@ -194,6 +194,10 @@ static netsnmp_interface_entry *HRN_ifne - static char HRN_name[MAX_PHYSADDR_LEN]; - static nmapi_phystat HRN_ifnet; - #define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c) -+#elif defined darwin -+static char HRN_name[IFNAMSIZ]; -+static struct if_msghdr HRN_ifnet; -+#define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c, d) - #else /* hpux11 */ - static char HRN_name[16]; - #ifndef WIN32 -@@ -223,7 +227,7 @@ int - Get_Next_HR_Network(void) - { - short HRN_index; --#if !defined( solaris2) && ! defined( WIN32 ) -+#if !defined(solaris2) && !defined(darwin) && !defined(WIN32) - if (M_Interface_Scan_Next(&HRN_index, HRN_name, &HRN_ifnet, NULL) == 0) - HRN_index = -1; - #else -@@ -246,7 +250,11 @@ Save_HR_Network_Info(void) - HRN_savedFlags = HRN_ifnet.if_entry.ifOper; - HRN_savedErrors = HRN_ifnet.if_entry.ifInErrors + - HRN_ifnet.if_entry.ifOutErrors; --#else /* hpux11 */ -+#elif defined(__APPLE__) -+ HRN_savedFlags = HRN_ifnet.ifm_flags; -+ HRN_savedFlags = HRN_ifnet.ifm_data.ifi_ierrors + -+ HRN_ifnet.ifm_data.ifi_oerrors; -+#else - #ifndef WIN32 - HRN_savedFlags = HRN_ifnet.if_flags; - HRN_savedErrors = HRN_ifnet.if_ierrors + HRN_ifnet.if_oerrors; diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am dissimilarity index 94% index fa719c0f449..491ab046f6f 100644 --- a/net/net-snmp/patches/patch-am +++ b/net/net-snmp/patches/patch-am @@ -1,83 +1,16 @@ -$NetBSD$ - ---- agent/mibgroup/host/hr_swrun.c.orig 2010-07-29 14:58:47.000000000 +0000 -+++ agent/mibgroup/host/hr_swrun.c -@@ -614,6 +614,8 @@ var_hrswrun(struct variable * vp, - #elif HAVE_KVM_GETPROCS - #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); -+ #elif defined(dragonfly) && __DragonFly_version >= 190000 -+ strcpy(string, proc_table[LowProcIndex].kp_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); - #endif -@@ -737,6 +739,8 @@ var_hrswrun(struct variable * vp, - #elif HAVE_KVM_GETPROCS - #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); -+ #elif defined(dragonfly) && __DragonFly_version >= 190000 -+ strcpy(string, proc_table[LowProcIndex].kp_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); - #endif -@@ -943,11 +947,17 @@ var_hrswrun(struct variable * vp, - } else - long_return = 4; /* application */ - #else -+ #if defined(dragonfly) && __DragonFly_version >= 190000 -+ if (proc_table[LowProcIndex].kp_flags & P_SYSTEM) -+ #else - if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ #endif - long_return = 2; /* operatingSystem */ - else - long_return = 4; /* application */ - #endif -+#elif defined darwin -+ long_return = -1; - #else - long_return = 4; /* application */ - #endif -@@ -984,6 +994,8 @@ var_hrswrun(struct variable * vp, - #if HAVE_KVM_GETPROCS - #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { -+ #elif defined(dragonfly) && __DragonFly_version >= 190000 -+ switch (proc_table[LowProcIndex].kp_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { - #endif -@@ -1091,6 +1103,14 @@ var_hrswrun(struct variable * vp, - long_return = 0; - #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; -+ #elif defined(dragonfly) && __DragonFly_version >= 190000 -+ long_return = proc_table[LowProcIndex].kp_lwp.kl_uticks + -+ proc_table[LowProcIndex].kp_lwp.kl_sticks + -+ proc_table[LowProcIndex].kp_lwp.kl_iticks; -+ #elif defined(dragonfly) -+ long_return = proc_table[LowProcIndex].kp_eproc.e_uticks + -+ proc_table[LowProcIndex].kp_eproc.e_sticks + -+ proc_table[LowProcIndex].kp_eproc.e_iticks; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + - proc_table[LowProcIndex].kp_proc.p_sticks + -@@ -1208,6 +1228,8 @@ var_hrswrun(struct variable * vp, - long_return = - #if defined(freebsd5) - proc_table[LowProcIndex].ki_size / 1024; -+ #elif defined(dragonfly) && __DragonFly_version >= 190000 -+ proc_table[LowProcIndex].kp_vm_map_size / 1024; - #else - proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; - #endif -@@ -1528,6 +1550,9 @@ Get_Next_HR_SWRun(void) - #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; -+ #elif defined(dragonfly) && __DragonFly_version >= 190000 -+ if (proc_table[current_proc_entry].kp_stat != 0) -+ return proc_table[current_proc_entry++].kp_pid; - #else - if (proc_table[current_proc_entry].kp_proc.p_stat != 0) - return proc_table[current_proc_entry++].kp_proc.p_pid; +$NetBSD: patch-am,v 1.12 2013/03/17 00:15:29 gdt Exp $ + +--- agent/mibgroup/host/hr_swrun.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/mibgroup/host/hr_swrun.c +@@ -1012,8 +1012,10 @@ var_hrswrun(struct variable * vp, + else + long_return = 4; /* application */ + #endif +-#else ++#elif defined darwin ++ long_return = -1; ++#else + long_return = 4; /* application */ + #endif + return (u_char *) & long_return; + case HRSWRUN_STATUS: diff --git a/net/net-snmp/patches/patch-an b/net/net-snmp/patches/patch-an deleted file mode 100644 index 4b393c96155..00000000000 --- a/net/net-snmp/patches/patch-an +++ /dev/null @@ -1,134 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/route_write.c.orig 2010-03-20 19:36:28.000000000 +0000 -+++ agent/mibgroup/mibII/route_write.c -@@ -93,7 +93,7 @@ - int - addRoute(u_long dstip, u_long gwip, u_long iff, u_short flags) - { --#if defined SIOCADDRT && !defined(irix6) -+#if defined SIOCADDRT && !defined(irix6) && !defined(darwin) - struct sockaddr_in dst; - struct sockaddr_in gateway; - int s, rc; -@@ -128,6 +128,54 @@ addRoute(u_long dstip, u_long gwip, u_lo - if (rc < 0) - snmp_log_perror("ioctl"); - return rc; -+#elif defined darwin -+ size_t sa_in_size = sizeof(struct sockaddr_in); -+ int s, rc; -+ struct sockaddr_in dst; -+ struct sockaddr_in gateway; -+ struct { -+ struct rt_msghdr hdr; -+ char space[512]; -+ } rtmsg; -+ -+ s = socket(PF_ROUTE, SOCK_RAW, 0); -+ if (s < 0) { -+ snmp_log_perror("socket"); -+ return -1; -+ } -+ -+ shutdown(s, SHUT_RD); -+ /* possible panic otherwise */ -+ flags |= (RTF_UP | RTF_GATEWAY); -+ -+ bzero((char *)&dst, sa_in_size); -+ dst.sin_len = sa_in_size; -+ dst.sin_family = AF_INET; -+ dst.sin_addr.s_addr = htonl(dstip); -+ -+ bzero((char *)&gateway, sa_in_size); -+ gateway.sin_len = sa_in_size; -+ gateway.sin_family = AF_INET; -+ gateway.sin_addr.s_addr = htonl(gwip); -+ -+ bzero((char *)&rtmsg, sizeof(rtmsg)); -+ rtmsg.hdr.rtm_type = RTM_ADD; -+ rtmsg.hdr.rtm_version = RTM_VERSION; -+ rtmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY; -+ rtmsg.hdr.rtm_flags = RTF_GATEWAY; -+ -+ bcopy((char *)&dst, rtmsg.space, sa_in_size); -+ bcopy((char *)&gateway, (rtmsg.space+sa_in_size), sa_in_size); -+ -+ rc = sizeof(struct rt_msghdr) + sa_in_size + sa_in_size; -+ rtmsg.hdr.rtm_msglen = rc; -+ -+ if ((rc = write(s, (char *)&rtmsg, rc)) < 0) { -+ snmp_log_perror("writing to routing socket"); -+ return -1; -+ } -+ -+ return (rc); - - #else /* SIOCADDRT */ - return -1; -@@ -139,7 +187,7 @@ addRoute(u_long dstip, u_long gwip, u_lo - int - delRoute(u_long dstip, u_long gwip, u_long iff, u_short flags) - { --#if defined SIOCDELRT && !defined(irix6) -+#if defined SIOCDELRT && !defined(irix6) && !defined(darwin) - - struct sockaddr_in dst; - struct sockaddr_in gateway; -@@ -174,6 +222,56 @@ delRoute(u_long dstip, u_long gwip, u_lo - close(s); - return rc; - -+#elif defined darwin -+ size_t sa_in_size = sizeof(struct sockaddr_in); -+ int s, rc; -+ struct sockaddr_in dst; -+ struct sockaddr_in gateway; -+ struct { -+ struct rt_msghdr hdr; -+ char space[512]; -+ } rtmsg; -+ -+ s = socket(PF_ROUTE, SOCK_RAW, 0); -+ -+ if (s < 0) { -+ snmp_log_perror("socket"); -+ return -1; -+ } -+ -+ shutdown(s, SHUT_RD); -+ /* possible panic otherwise */ -+ flags |= (RTF_UP | RTF_GATEWAY); -+ -+ bzero((char *)&dst, sa_in_size); -+ dst.sin_len = sa_in_size; -+ dst.sin_family = AF_INET; -+ dst.sin_addr.s_addr = htonl(dstip); -+ -+ bzero((char *)&gateway, sa_in_size); -+ gateway.sin_len = sa_in_size; -+ gateway.sin_family = AF_INET; -+ gateway.sin_addr.s_addr = htonl(gwip); -+ -+ bzero((char *)&rtmsg, sizeof(rtmsg)); -+ rtmsg.hdr.rtm_type = RTM_DELETE; -+ rtmsg.hdr.rtm_version = RTM_VERSION; -+ rtmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY; -+ rtmsg.hdr.rtm_flags = RTF_GATEWAY; -+ -+ bcopy((char *)&dst, rtmsg.space, sa_in_size); -+ bcopy((char *)&gateway, (rtmsg.space+sa_in_size), sa_in_size); -+ -+ rc = sizeof(struct rt_msghdr) + sa_in_size + sa_in_size; -+ rtmsg.hdr.rtm_msglen = rc; -+ -+ if ((rc = write(s, (char *)&rtmsg, rc)) < 0) { -+ snmp_log_perror("writing to routing socket"); -+ return -1; -+ } -+ -+ return rc; -+ - #else /* SIOCDELRT */ - return 0; - #endif diff --git a/net/net-snmp/patches/patch-ao b/net/net-snmp/patches/patch-ao deleted file mode 100644 index 24317fd7b40..00000000000 --- a/net/net-snmp/patches/patch-ao +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2011/05/27 10:55:25 adam Exp $ - ---- agent/mibgroup/if-mib/data_access/interface_sysctl.c.orig 2010-07-21 19:24:11 +0000 -+++ agent/mibgroup/if-mib/data_access/interface_sysctl.c -@@ -49,7 +49,11 @@ - # define ARCH_PROMISC_FLAG IFF_PROMISC - #endif - -+#if HAVE_STRUCT_IFNET_IF_LASTCHANGE_TV_NSEC -+#define starttime (*(const struct timespec*)netsnmp_get_agent_starttime()) -+#else - #define starttime (*(const struct timeval*)netsnmp_get_agent_starttime()) -+#endif - - /* sa_len roundup macro. */ - #define ROUNDUP(a) \ -@@ -183,6 +187,7 @@ netsnmp_sysctl_ifmedia_to_speed(int medi - #endif - } - break; -+#ifdef IFM_TOKEN - case IFM_TOKEN: - switch (IFM_SUBTYPE(media)) { - case IFM_TOK_STP4: -@@ -204,6 +209,7 @@ netsnmp_sysctl_ifmedia_to_speed(int medi - #endif - } - break; -+#endif - #ifdef IFM_ATM - case IFM_ATM: - switch (IFM_SUBTYPE(media)) { -@@ -472,7 +478,11 @@ netsnmp_arch_interface_container_load(ne - NETSNMP_INTERFACE_FLAGS_HAS_DROPS | - NETSNMP_INTERFACE_FLAGS_HAS_MCAST_PKTS; - -+#if HAVE_STRUCT_IFNET_IF_LASTCHANGE_TV_NSEC -+ if (timespeccmp(&ifp->ifm_data.ifi_lastchange, &starttime, >)) { -+#else - if (timercmp(&ifp->ifm_data.ifi_lastchange, &starttime, >)) { -+#endif - entry->lastchange = (ifp->ifm_data.ifi_lastchange.tv_sec - - starttime.tv_sec) * 100; - entry->ns_flags |= NETSNMP_INTERFACE_FLAGS_HAS_LASTCHANGE; diff --git a/net/net-snmp/patches/patch-ap b/net/net-snmp/patches/patch-ap index f485dc96e7f..b7db52bd866 100644 --- a/net/net-snmp/patches/patch-ap +++ b/net/net-snmp/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.1 2009/03/10 18:30:44 apb Exp $ +$NetBSD: patch-ap,v 1.2 2011/05/27 10:55:25 adam Exp $ Some systems define ifnet.if_lastchange as struct timespec (with a tv_nsec field measured in nanoseconds), while other systems define it as struct timeval (with a tv_usec field measured in microseconds). Both variants have a tv_sec field for integer seconds. ---- agent/mibgroup/mibII/interfaces.c.orig 2008-06-05 23:11:53.000000000 +0200 +--- agent/mibgroup/mibII/interfaces.c.orig 2012-10-09 22:28:58.000000000 +0000 +++ agent/mibgroup/mibII/interfaces.c -@@ -847,15 +847,25 @@ var_ifEntry(struct variable *vp, +@@ -871,15 +871,25 @@ var_ifEntry(struct variable *vp, * * this is fixed, thus the 199607 comparison. */ if (ifnet.if_lastchange.tv_sec == 0 && diff --git a/net/net-snmp/patches/patch-aq b/net/net-snmp/patches/patch-aq dissimilarity index 94% index 85fa1845743..10e56423815 100644 --- a/net/net-snmp/patches/patch-aq +++ b/net/net-snmp/patches/patch-aq @@ -1,12 +1,13 @@ -$NetBSD: patch-aq,v 1.1 2011/05/27 10:55:25 adam Exp $ - ---- agent/auto_nlist.c.orig 2011-04-27 11:31:53.000000000 +0000 -+++ agent/auto_nlist.c -@@ -73,7 +73,6 @@ auto_nlist_value(const char *string) - #if !(defined(aix4) || defined(aix5) || defined(aix6) || defined(aix7)) - if (it->nl[0].n_type == 0) { - strcpy(it->nl[0].n_name, string); -- it->nl[0].n_name[strlen(string)+1] = '\0'; - init_nlist(it->nl); - } - #endif +$NetBSD: patch-aq,v 1.2 2011/05/31 10:52:31 adam Exp $ + +--- agent/auto_nlist.c.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/auto_nlist.c +@@ -67,7 +67,7 @@ auto_nlist_value(const char *string) + it->nl[0].n_name = (char *) malloc(strlen(string) + 2); + #if defined(aix4) || defined(aix5) || defined(aix6) || defined(aix7) + strcpy(it->nl[0].n_name, string); +- it->nl[0].n_name[strlen(string)+1] = '\0'; ++ /* it->nl[0].n_name[strlen(string)+1] = '\0'; */ + #elif defined(freebsd9) + sprintf(__DECONST(char*, it->nl[0].n_name), "_%s", string); + #else diff --git a/net/net-snmp/patches/patch-da b/net/net-snmp/patches/patch-da index 507409e0899..f171cc950fd 100644 --- a/net/net-snmp/patches/patch-da +++ b/net/net-snmp/patches/patch-da @@ -1,6 +1,6 @@ -$NetBSD$ +$NetBSD: patch-da,v 1.1 2006/03/19 22:03:29 joerg Exp $ ---- ov/UCD-fields.orig 2006-03-19 18:20:29.000000000 +0000 +--- ov/UCD-fields.orig 2012-10-09 22:28:58.000000000 +0000 +++ ov/UCD-fields @@ -11,6 +11,7 @@ Field "SNMPAgent" { "UCD Ultrix", diff --git a/net/net-snmp/patches/patch-db b/net/net-snmp/patches/patch-db index 790e46cd371..c668f744c37 100644 --- a/net/net-snmp/patches/patch-db +++ b/net/net-snmp/patches/patch-db @@ -1,6 +1,6 @@ -$NetBSD$ +$NetBSD: patch-db,v 1.1 2006/03/19 22:03:29 joerg Exp $ ---- ov/oid_to_type.in.orig 2006-03-19 18:20:47.000000000 +0000 +--- ov/oid_to_type.in.orig 2012-10-09 22:28:58.000000000 +0000 +++ ov/oid_to_type.in @@ -6,6 +6,7 @@ EXTENSIBLEDOTMIB.AGENTID.OSFID:DEC:UCD O EXTENSIBLEDOTMIB.AGENTID.ULTRIXID:DEC:UCD Ultrix diff --git a/net/net-snmp/patches/patch-dc b/net/net-snmp/patches/patch-dc deleted file mode 100644 index 98f0acd276f..00000000000 --- a/net/net-snmp/patches/patch-dc +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD$ - ---- include/net-snmp/net-snmp-config.h.in.orig 2010-11-30 05:56:25.000000000 +0000 -+++ include/net-snmp/net-snmp-config.h.in -@@ -767,6 +767,9 @@ - /* Define to 1 if `if_lastchange.tv_sec' is member of `struct ifnet'. */ - #undef HAVE_STRUCT_IFNET_IF_LASTCHANGE_TV_SEC - -+/* Define to 1 if `if_lastchange.tv_nsec' is member of `struct ifnet'. */ -+#undef HAVE_STRUCT_IFNET_IF_LASTCHANGE_TV_NSEC -+ - /* Define to 1 if `if_mtu' is member of `struct ifnet'. */ - #undef HAVE_STRUCT_IFNET_IF_MTU - -@@ -1715,6 +1718,7 @@ - #define NETSNMP_HPUX11ID 14 - #define NETSNMP_AIXID 15 - #define NETSNMP_MACOSXID 16 -+#define NETSNMP_DRAGONFLYID 17 - #define NETSNMP_UNKNOWNID 255 - - #ifdef hpux9 -@@ -1744,6 +1748,9 @@ - #if defined(__FreeBSD__) - #define NETSNMP_OSTYPE NETSNMP_FREEBSDID - #endif -+#if defined(__DragonFly__) -+#define OSTYPE DRAGONFLYID -+#endif - #if defined(irix6) || defined(irix5) - #define NETSNMP_OSTYPE NETSNMP_IRIXID - #endif diff --git a/net/net-snmp/patches/patch-dd b/net/net-snmp/patches/patch-dd deleted file mode 100644 index eae45fbbc34..00000000000 --- a/net/net-snmp/patches/patch-dd +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- sedscript.in.orig 2006-11-24 18:53:18.000000000 +0100 -+++ sedscript.in -@@ -96,6 +96,7 @@ s/FREMOVEMEREEBSDID/FREEBSDID/g - s/IREMOVEMERIXID/IRIXID/g - s/LREMOVEMEINUXID/LINUXID/g - s/BREMOVEMESDIID/BSDIID/g -+s/DREMOVEMERAGONFLYID/DRAGONFLYID/g - s/UREMOVEMENKNOWNID/UNKNOWNID/g - - s#PREMOVEMESCMD#PSCMD#g diff --git a/net/net-snmp/patches/patch-de b/net/net-snmp/patches/patch-de deleted file mode 100644 index a53e234ee53..00000000000 --- a/net/net-snmp/patches/patch-de +++ /dev/null @@ -1,369 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/ipv6.c.orig 2010-12-08 13:17:10.000000000 +0000 -+++ agent/mibgroup/mibII/ipv6.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) - # if HAVE_SYS_SOCKETVAR_H - # include - # endif -@@ -51,7 +51,13 @@ - #endif - #include - #if HAVE_NET_IF_VAR_H -+# ifdef __DragonFly__ -+# define _KERNEL_STRUCTURES -+# endif - #include -+# ifdef __DragonFly__ -+# undef _KERNEL_STRUCTURES -+# endif - #endif - #if HAVE_NET_IF_DL_H - #include -@@ -80,7 +86,7 @@ - # include - #endif - #include --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) - # if HAVE_NETINET_IN_PCB_H - # include - # endif -@@ -616,7 +622,7 @@ if_getifnet(int idx, struct ifnet *resul - memcpy(result, &tmp, sizeof(tmp)); - return 0; - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) - q = (caddr_t) TAILQ_NEXT(&tmp, if_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -846,13 +852,36 @@ var_ifv6Entry(register struct variable * - { - struct ifnet ifnet; - struct ifaddr ifaddr; -+#if defined(__DragonFly__) && __DragonFly_version >= 197700 -+ struct ifaddr_container ifac; -+ struct ifaddrhead head; -+#endif - static struct sockaddr_dl sdl; - caddr_t ifa; - - if (if_getifnet(interface, &ifnet) < 0) - break; --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) -+# if defined(__DragonFly__) && __DragonFly_version >= 197700 -+ /* -+ * Locate ifaddr head on CPU0 -+ */ -+ if (!NETSNMP_KLOOKUP(ifnet.if_addrheads, (char *)&head, sizeof(head))) { -+ DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup head failed\n")); -+ break; -+ } -+ if (TAILQ_FIRST(&head) != NULL) { -+ if (!NETSNMP_KLOOKUP(TAILQ_FIRST(&head), (char *) &ifac, sizeof(ifac))) { -+ DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup ifac failed\n")); -+ break; -+ } -+ ifa = (caddr_t)ifac.ifa; -+ } else { -+ ifa = NULL; -+ } -+# else - ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead); -+# endif - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) - ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrlist); -@@ -878,8 +907,20 @@ var_ifv6Entry(register struct variable * - *var_len = sdl.sdl_alen; - return (u_char *) (sdl.sdl_data + sdl.sdl_nlen); - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) -+# if defined(__DragonFly__) && __DragonFly_version >= 197700 -+ if (TAILQ_NEXT(&ifac, ifa_link) == NULL) { -+ ifa = NULL; -+ } else { -+ if (!NETSNMP_KLOOKUP(TAILQ_NEXT(&ifac, ifa_link), (char *)&ifac, sizeof(ifac))) { -+ DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup ifac next failed\n")); -+ break; -+ } -+ ifa = (caddr_t)ifac.ifa; -+ } -+# else - ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link); -+# endif - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) - ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_list); -@@ -1285,7 +1326,11 @@ var_udp6(register struct variable * vp, - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - struct inpcbtable udbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif defined(dragonfly) -+ char *sysctl_buf; -+ struct xinpcb *xig; -+ size_t sysctl_len; -+#elif defined(freebsd3) || defined(darwin) - char *sysctl_buf; - struct xinpgen *xig, *oxig; - #else -@@ -1300,10 +1345,31 @@ var_udp6(register struct variable * vp, - if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable))) - return NULL; - first = p = (caddr_t)udbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - if (!auto_nlist("udb6", (char *) &udb6, sizeof(udb6))) - return NULL; - p = (caddr_t) udb6.in6p_next; -+#elif defined(dragonfly) -+ { -+ const char *udblist = "net.inet.udp.pcblist"; -+ const char *pp = udblist; -+ -+ if (sysctlbyname(udblist, 0, &sysctl_len, 0, 0) < 0) -+ return NULL; -+ if ((sysctl_buf = malloc(sysctl_len)) == NULL) -+ return NULL; -+ udblist = pp; -+ if (sysctlbyname(udblist, sysctl_buf, &sysctl_len, 0, 0) < 0) { -+ free(sysctl_buf); -+ return NULL; -+ } -+ xig = (struct xinpcb *) sysctl_buf; -+ if (xig->xi_len != sizeof(*xig)) { -+ free(sysctl_buf); -+ return NULL; -+ } -+ p = (caddr_t) ((char *) xig); /* silence compiler warning */ -+ } - #else - { - const char *udblist = "net.inet.udp.pcblist"; -@@ -1331,15 +1397,17 @@ var_udp6(register struct variable * vp, - while ( - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - p && (u_long) p != auto_nlist_value("udb6") -+#elif defined(dragonfly) -+ (char *)xig + xig->xi_len <= sysctl_buf + sysctl_len - #else - xig->xig_len > sizeof(struct xinpgen) - #endif - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#if !defined(freebsd3) && !defined(darwin) - if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n", - p)); -@@ -1352,7 +1420,7 @@ var_udp6(register struct variable * vp, - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - if (in6pcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif defined(freebsd3) || defined(darwin) - if (0 == (in6pcb.inp_vflag & INP_IPV6)) - goto skip; - #endif -@@ -1395,13 +1463,15 @@ var_udp6(register struct variable * vp, - skip: - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - p = (caddr_t) in6pcb.in6p_next; -+#elif defined(__DragonFly__) -+ xig = (struct xinpcb *) ((char *) xig + xig->xi_len); - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1460,7 +1530,7 @@ var_tcp6(register struct variable * vp, - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif defined(freebsd3) || defined(darwin) - char *sysctl_buf; - struct xinpgen *xig, *oxig; - #else -@@ -1490,7 +1560,7 @@ var_tcp6(register struct variable * vp, - if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) - return NULL; - first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6))) - return NULL; - p = (caddr_t) tcb6.in6p_next; -@@ -1521,7 +1591,7 @@ var_tcp6(register struct variable * vp, - while ( - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1529,7 +1599,7 @@ var_tcp6(register struct variable * vp, - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#if !defined(freebsd3) && !defined(darwin) - if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); -@@ -1542,7 +1612,7 @@ var_tcp6(register struct variable * vp, - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - if (in6pcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif defined(freebsd3) || defined(darwin) - if (0 == (in6pcb.inp_vflag & INP_IPV6)) - goto skip; - #endif -@@ -1599,13 +1669,13 @@ var_tcp6(register struct variable * vp, - skip: - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - p = (caddr_t) in6pcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1697,7 +1767,11 @@ var_tcp6(register struct variable * vp, - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif defined(dragonfly) -+ char *sysctl_buf; -+ size_t sysctl_len; -+ struct xtcpcb *xtp; -+#elif defined(freebsd3) || defined(darwin) - char *sysctl_buf; - struct xinpgen *xig, *oxig; - #else -@@ -1712,10 +1786,31 @@ var_tcp6(register struct variable * vp, - if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) - return NULL; - first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6))) - return NULL; - p = (caddr_t) tcb6.in6p_next; -+#elif defined(dragonfly) -+ { -+ const char *tcblist = "net.inet.tcp.pcblist"; -+ const char *pp = tcblist; -+ -+ if (sysctlbyname(tcblist, 0, &sysctl_len, 0, 0) < 0) -+ return NULL; -+ if ((sysctl_buf = malloc(sysctl_len)) == NULL) -+ return NULL; -+ tcblist = pp; -+ if (sysctlbyname(tcblist, sysctl_buf, &sysctl_len, 0, 0) < 0) { -+ free(sysctl_buf); -+ return NULL; -+ } -+ xtp = (struct xtcpcb *) sysctl_buf; -+ if (xtp->xt_len != sizeof(*xtp)) { -+ free(sysctl_buf); -+ return NULL; -+ } -+ p = (caddr_t) ((char *) xtp); /* silence compiler warning */ -+ } - #else - { - const char *tcblist = "net.inet.tcp.pcblist"; -@@ -1732,7 +1827,8 @@ var_tcp6(register struct variable * vp, - return NULL; - } - oxig = (struct xinpgen *) sysctl_buf; -- xig = (struct xinpgen *) ((char *) oxig + oxig->xig_len); -+ xig = (struct xinpgen *) ((char *) oxtp + oxtp->xt_len); -+ if (oxig - p = (caddr_t) ((char *) xig); /* silence compiler warning */ - } - #endif -@@ -1743,28 +1839,32 @@ var_tcp6(register struct variable * vp, - while ( - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - p && (u_long) p != auto_nlist_value("tcb6") -+#elif defined(dragonfly) -+ (char *)xtp + xtp->xt_len < sysctl_buf + sysctl_len - #else - xig->xig_len > sizeof(struct xinpgen) - #endif - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#if !defined(freebsd3) && !defined(darwin) - if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } -+#elif defined(dragonfly) -+ in6pcb = xtp->xt_inp; - #else - in6pcb = ((struct xinpcb *) xig)->xi_inp; - #endif - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - if (in6pcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif defined(freebsd3) || defined(darwin) - if (0 == (in6pcb.inp_vflag & INP_IPV6)) - goto skip; - #endif -@@ -1820,13 +1920,15 @@ var_tcp6(register struct variable * vp, - skip: - #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ - p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif !defined(freebsd3) && !defined(darwin) - p = (caddr_t) in6pcb.in6p_next; -+#elif defined(dragonfly) -+ xtp = (struct xtcpcb *) ((char *)xtp + xtp->xt_len); - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if defined(freebsd3) || defined(darwin) - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); diff --git a/net/net-snmp/patches/patch-df b/net/net-snmp/patches/patch-df deleted file mode 100644 index e2e4940f681..00000000000 --- a/net/net-snmp/patches/patch-df +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/hardware/cpu.h.orig 2010-07-29 14:58:47.000000000 +0000 -+++ agent/mibgroup/hardware/cpu.h -@@ -12,12 +12,12 @@ config_require(hardware/cpu/cpu_pcp) - #elif defined(irix6) - config_require(hardware/cpu/cpu_sysinfo) - -+#elif (defined(freebsd2) || defined(freebsd3) || defined(dragonfly)) -+config_require(hardware/cpu/cpu_nlist) -+ - #elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2) || defined(openbsd3) || defined(openbsd4) || defined(freebsd4) || defined(freebsd5) || defined(freebsd6)) - config_require(hardware/cpu/cpu_sysctl) - --#elif (defined(freebsd2) || defined(freebsd3)) --config_require(hardware/cpu/cpu_nlist) -- - #elif (defined(aix4) || defined(aix5) || defined(aix6) || defined(aix7)) - config_require(hardware/cpu/cpu_perfstat) - diff --git a/net/net-snmp/patches/patch-dg b/net/net-snmp/patches/patch-dg deleted file mode 100644 index 225b14f2b34..00000000000 --- a/net/net-snmp/patches/patch-dg +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- mibs/NET-SNMP-TC.txt.orig 2006-03-19 19:01:33.000000000 +0000 -+++ mibs/NET-SNMP-TC.txt -@@ -93,6 +93,7 @@ win32 OBJECT IDENTIFIER ::= { netSnmp - hpux11 OBJECT IDENTIFIER ::= { netSnmpAgentOIDs 14 } - aix OBJECT IDENTIFIER ::= { netSnmpAgentOIDs 15 } - macosx OBJECT IDENTIFIER ::= { netSnmpAgentOIDs 16 } -+dragonfly OBJECT IDENTIFIER ::= { netSnmpAgentOIDs 17 } - unknown OBJECT IDENTIFIER ::= { netSnmpAgentOIDs 255 } - - diff --git a/net/net-snmp/patches/patch-dh b/net/net-snmp/patches/patch-dh deleted file mode 100644 index d7aec10a0e6..00000000000 --- a/net/net-snmp/patches/patch-dh +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dh,v 1.3 2010/07/20 08:33:44 adam Exp $ - ---- mibs/UCD-SNMP-MIB.txt.orig 2010-04-06 08:56:20.000000000 +0000 -+++ mibs/UCD-SNMP-MIB.txt -@@ -140,6 +140,9 @@ bsdi OBJECT IDENTIFIER ::= - openbsd OBJECT IDENTIFIER ::= { ucdSnmpAgent 12 } - win32 OBJECT IDENTIFIER ::= { ucdSnmpAgent 13 } -- unlucky - hpux11 OBJECT IDENTIFIER ::= { ucdSnmpAgent 14 } -+aix OBJECT IDENTIFIER ::= { ucdSnmpAgent 15 } -+macosx OBJECT IDENTIFIER ::= { ucdSnmpAgent 16 } -+dragonfly OBJECT IDENTIFIER ::= { ucdSnmpAgent 17 } - unknown OBJECT IDENTIFIER ::= { ucdSnmpAgent 255 } - - diff --git a/net/net-snmp/patches/patch-di b/net/net-snmp/patches/patch-di deleted file mode 100644 index 6dbef23d612..00000000000 --- a/net/net-snmp/patches/patch-di +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD$ - ---- ov/oid_to_sym.in.orig 2006-03-19 19:03:39.000000000 +0000 -+++ ov/oid_to_sym.in -@@ -14,4 +14,5 @@ EXTENSIBLEDOTMIB.AGENTID.WIN32ID:Compute - EXTENSIBLEDOTMIB.AGENTID.HPUX11ID:Computer:UCD # UCD HP-UX 11 - EXTENSIBLEDOTMIB.AGENTID.AIXID:Computer:UCD # UCD AIX - EXTENSIBLEDOTMIB.AGENTID.MACOSXID:Computer:UCD # UCD Mac OS X -+EXTENSIBLEDOTMIB.AGENTID.DRAGONFLYID:Computer:UCD # UCD DragonFly - EXTENSIBLEDOTMIB.AGENTID.UNKNOWNID:Computer:UCD # UCD Unknown diff --git a/net/net-snmp/patches/patch-dl b/net/net-snmp/patches/patch-dl index 249174de3d5..c0c67bf5326 100644 --- a/net/net-snmp/patches/patch-dl +++ b/net/net-snmp/patches/patch-dl @@ -1,8 +1,8 @@ -$NetBSD$ +$NetBSD: patch-dl,v 1.5 2011/05/27 10:55:25 adam Exp $ ---- agent/mibgroup/mibII/tcp.c.orig 2010-11-30 04:04:26.000000000 +0000 +--- agent/mibgroup/mibII/tcp.c.orig 2012-10-09 22:28:58.000000000 +0000 +++ agent/mibgroup/mibII/tcp.c -@@ -180,6 +180,16 @@ init_tcp(void) +@@ -197,6 +197,16 @@ init_tcp(void) #define USES_TRADITIONAL_TCPSTAT #endif @@ -19,7 +19,7 @@ $NetBSD$ #if !defined(TCP_STAT_STRUCTURE) #define TCP_STAT_STRUCTURE struct tcpstat #define USES_TRADITIONAL_TCPSTAT -@@ -307,6 +317,75 @@ tcp_handler(netsnmp_mib_handler +@@ -324,6 +334,75 @@ tcp_handler(netsnmp_mib_handler #endif /* linux */ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT); continue; diff --git a/net/net-snmp/patches/patch-dm b/net/net-snmp/patches/patch-dm deleted file mode 100644 index e729ce71c31..00000000000 --- a/net/net-snmp/patches/patch-dm +++ /dev/null @@ -1,167 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c.orig 2008-10-21 21:10:43.000000000 +0000 -+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c -@@ -9,9 +9,15 @@ - */ - #include - #include -+#if defined(dragonfly) -+#include -+#else - #include -+#endif - #if defined(freebsd5) && __FreeBSD_version >= 500101 - #include -+#elif defined(dragonfly) -+#include - #else - #include - #endif -@@ -175,11 +181,18 @@ var_extensible_vmstat(struct variable *v - static time_t time_old; - static time_t time_diff; - -+#if defined(dragonfly) -+ static struct kinfo_cputime cpu_old, cpu_new, cpu_diff; -+ static uint64_t cpu_total; -+ uint64_t cpu_sum; -+ static int pagesize; -+#else - static long cpu_old[CPUSTATES]; - static long cpu_new[CPUSTATES]; - static long cpu_diff[CPUSTATES]; - static long cpu_total; - long cpu_sum; -+#endif - double cpu_prc; - - static struct vmmeter mem_old, mem_new; -@@ -187,6 +200,11 @@ var_extensible_vmstat(struct variable *v - static long long_ret; - static char errmsg[300]; - -+#if defined(dragonfly) -+ if (pagesize == 0) -+ pagesize = getpagesize() >> 10; -+#endif -+ - long_ret = 0; /* set to 0 as default */ - - if (header_generic(vp, name, length, exact, var_len, write_method)) -@@ -202,15 +220,27 @@ var_extensible_vmstat(struct variable *v - /* - * CPU usage - */ -- auto_nlist(CPTIME_SYMBOL, (char *) cpu_new, sizeof(cpu_new)); -+ cpu_total = 0; - -- cpu_total = 0; -+#if defined(dragonfly) -+ kinfo_get_sched_cputime(&cpu_new); -+#define CP_UPDATE(field) cpu_diff.field = cpu_new.field - cpu_old.field; cpu_total += cpu_diff.field; -+ CP_UPDATE(cp_user); -+ CP_UPDATE(cp_nice); -+ CP_UPDATE(cp_sys); -+ CP_UPDATE(cp_intr); -+ CP_UPDATE(cp_idle); -+ cpu_old = cpu_new; -+#undef CP_UPDATE -+#else -+ auto_nlist(CPTIME_SYMBOL, (char *) cpu_new, sizeof(cpu_new)); - - for (loop = 0; loop < CPUSTATES; loop++) { - cpu_diff[loop] = cpu_new[loop] - cpu_old[loop]; - cpu_old[loop] = cpu_new[loop]; - cpu_total += cpu_diff[loop]; - } -+#endif - - if (cpu_total == 0) - cpu_total = 1; -@@ -230,7 +260,11 @@ var_extensible_vmstat(struct variable *v - /* - * Page-to-kb macro - */ -+#if defined(dragonfly) -+#define ptok(p) ((p) * pagesize) -+#else - #define ptok(p) ((p) * (mem_new.v_page_size >> 10)) -+#endif - - switch (vp->magic) { - case MIBINDEX: -@@ -277,37 +311,73 @@ var_extensible_vmstat(struct variable *v - long_ret = rate(mem_new.v_swtch - mem_old.v_swtch); - return ((u_char *) (&long_ret)); - case CPUUSER: -+#if defined(dragonfly) -+ cpu_sum = cpu_diff.cp_user + cpu_diff.cp_nice; -+#else - cpu_sum = cpu_diff[CP_USER] + cpu_diff[CP_NICE]; -+#endif - cpu_prc = (float) cpu_sum / (float) cpu_total; - long_ret = cpu_prc * CPU_PRC; - return ((u_char *) (&long_ret)); - case CPUSYSTEM: -+#if defined(dragonfly) -+ cpu_sum = cpu_diff.cp_sys + cpu_diff.cp_intr; -+#else - cpu_sum = cpu_diff[CP_SYS] + cpu_diff[CP_INTR]; -+#endif - cpu_prc = (float) cpu_sum / (float) cpu_total; - long_ret = cpu_prc * CPU_PRC; - return ((u_char *) (&long_ret)); - case CPUIDLE: -+#if defined(dragonfly) -+ cpu_sum = cpu_diff.cp_idle; -+#else - cpu_sum = cpu_diff[CP_IDLE]; -+#endif - cpu_prc = (float) cpu_sum / (float) cpu_total; - long_ret = cpu_prc * CPU_PRC; - return ((u_char *) (&long_ret)); - case CPURAWUSER: -+#if defined(dragonfly) -+ cpu_sum = cpu_new.cp_user; -+#else - long_ret = cpu_new[CP_USER]; -+#endif - return ((u_char *) (&long_ret)); - case CPURAWNICE: -+#if defined(dragonfly) -+ cpu_sum = cpu_new.cp_nice; -+#else - long_ret = cpu_new[CP_NICE]; -+#endif - return ((u_char *) (&long_ret)); - case CPURAWSYSTEM: -+#if defined(dragonfly) -+ cpu_sum = cpu_new.cp_sys + cpu_new.cp_intr; -+#else - long_ret = cpu_new[CP_SYS] + cpu_new[CP_INTR]; -+#endif - return ((u_char *) (&long_ret)); - case CPURAWIDLE: -+#if defined(dragonfly) -+ cpu_sum = cpu_new.cp_idle; -+#else - long_ret = cpu_new[CP_IDLE]; -+#endif - return ((u_char *) (&long_ret)); - case CPURAWKERNEL: -+#if defined(dragonfly) -+ cpu_sum = cpu_new.cp_sys; -+#else - long_ret = cpu_new[CP_SYS]; -+#endif - return ((u_char *) (&long_ret)); - case CPURAWINTR: -+#if defined(dragonfly) -+ cpu_sum = cpu_new.cp_intr; -+#else - long_ret = cpu_new[CP_INTR]; -+#endif - return ((u_char *) (&long_ret)); - case SYSRAWINTERRUPTS: - long_ret = mem_new.v_intr; diff --git a/net/net-snmp/patches/patch-dn b/net/net-snmp/patches/patch-dn deleted file mode 100644 index 873eece8ff2..00000000000 --- a/net/net-snmp/patches/patch-dn +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig 2008-10-21 21:10:43.000000000 +0000 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c -@@ -10,8 +10,12 @@ - */ - #include - #include -+#ifdef dragonfly -+#include -+#else - #include - #include -+#endif - #ifdef freebsd5 - #include - #endif -@@ -253,6 +257,10 @@ var_extensible_mem(struct variable *vp, - - static struct vmmeter mem; - static struct vmtotal total; -+#ifdef dragonfly -+ static struct vmstats vmstats; -+ size_t vmstats_size = sizeof(vmstats); -+#endif - size_t total_size = sizeof(total); - int total_mib[] = { CTL_VM, VM_METER }; - -@@ -286,6 +294,8 @@ var_extensible_mem(struct variable *vp, - */ - sysctl(phys_mem_mib, 2, &phys_mem, &phys_mem_size, NULL, 0); - -+ sysctlbyname("vm.vmstats", &vmstats, &vmstats_size, NULL, 0); -+ - #ifdef BUFSPACE_SYMBOL - /* - * Buffer space -@@ -298,7 +308,11 @@ var_extensible_mem(struct variable *vp, - /* - * Page-to-kb macro - */ -+#ifdef dragonfly -+#define ptok(p) ((p) * (vmstats.v_page_size >> 10)) -+#else - #define ptok(p) ((p) * (mem.v_page_size >> 10)) -+#endif - - switch (vp->magic) { - case MIBINDEX: -@@ -318,7 +332,11 @@ var_extensible_mem(struct variable *vp, - long_ret = phys_mem >> 10; - return ((u_char *) (&long_ret)); - case MEMAVAILREAL: /* FREE real memory */ -+#ifdef dragonfly -+ long_ret = ptok(vmstats.v_free_count); -+#else - long_ret = ptok(mem.v_free_count); -+#endif - return ((u_char *) (&long_ret)); - - /* -@@ -353,6 +371,8 @@ var_extensible_mem(struct variable *vp, - case MEMCACHED: - #ifdef darwin - long_ret = ptok(mem.v_lookups); -+#elif defined(dragonfly) -+ long_ret = ptok(vmstats.v_cache_count); - #else - long_ret = ptok(mem.v_cache_count) + ptok(mem.v_inactive_count); - #endif diff --git a/net/net-snmp/patches/patch-do b/net/net-snmp/patches/patch-do deleted file mode 100644 index f0cb55bff8a..00000000000 --- a/net/net-snmp/patches/patch-do +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/ucd-snmp/disk.c.orig 2010-06-16 21:34:42.000000000 +0000 -+++ agent/mibgroup/ucd-snmp/disk.c -@@ -51,9 +51,11 @@ - #ifdef HAVE_SYS_STAT_H - #include - #endif -+#if !defined(dragonfly) - #ifdef HAVE_SYS_VNODE_H - #include - #endif -+#endif - #ifdef HAVE_UFS_UFS_QUOTA_H - #include - #endif diff --git a/net/net-snmp/patches/patch-dp b/net/net-snmp/patches/patch-dp deleted file mode 100644 index e0ac1727e82..00000000000 --- a/net/net-snmp/patches/patch-dp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/ucd-snmp/loadave.c.orig 2006-03-19 20:40:02.000000000 +0000 -+++ agent/mibgroup/ucd-snmp/loadave.c -@@ -39,9 +39,11 @@ - #ifdef HAVE_SYS_STAT_H - #include - #endif -+#if !defined(dragonfly) - #ifdef HAVE_SYS_VNODE_H - #include - #endif -+#endif - #ifdef HAVE_UFS_UFS_QUOTA_H - #include - #endif diff --git a/net/net-snmp/patches/patch-dq b/net/net-snmp/patches/patch-dq deleted file mode 100644 index d33c85e8e1f..00000000000 --- a/net/net-snmp/patches/patch-dq +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dq,v 1.1 2006/03/19 22:03:29 joerg Exp $ - ---- agent/mibgroup/ucd-snmp/errormib.c.orig 2006-03-19 20:41:58.000000000 +0000 -+++ agent/mibgroup/ucd-snmp/errormib.c -@@ -49,9 +49,11 @@ - #ifdef HAVE_SYS_STAT_H - #include - #endif -+#if !defined(dragonfly) - #ifdef HAVE_SYS_VNODE_H - #include - #endif -+#endif - #ifdef HAVE_UFS_UFS_QUOTA_H - #include - #endif diff --git a/net/net-snmp/patches/patch-dr b/net/net-snmp/patches/patch-dr deleted file mode 100644 index cfdfed45aff..00000000000 --- a/net/net-snmp/patches/patch-dr +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/tcpTable.c.orig 2010-10-20 13:12:08.000000000 +0000 -+++ agent/mibgroup/mibII/tcpTable.c -@@ -838,7 +838,11 @@ tcpTable_load(netsnmp_cache *cache, void - size_t len; - int sname[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_PCBLIST }; - char *tcpcb_buf = NULL; -+#if defined(dragonfly) -+ struct xtcpcb *xig = NULL; -+#else - struct xinpgen *xig = NULL; -+#endif - netsnmp_inpcb *nnew; - int StateMap[] = { 1, 2, 3, 4, 5, 8, 6, 10, 9, 7, 11 }; - -@@ -860,10 +864,18 @@ tcpTable_load(netsnmp_cache *cache, void - * Unpick this into the constituent 'xinpgen' structures, and extract - * the 'inpcb' elements into a linked list (built in reverse) - */ -+#if defined(dragonfly) -+ xig = (struct xtcpcb *) tcpcb_buf; -+#else - xig = (struct xinpgen *) tcpcb_buf; - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); -+#endif - -+#if defined(dragonfly) -+ while (xig && ((char *)xig + xig->xt_len < tcpcb_buf + len)) { -+#else - while (xig && (xig->xig_len > sizeof(struct xinpgen))) { -+#endif - nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb); - if (!nnew) - break; -@@ -876,7 +888,11 @@ tcpTable_load(netsnmp_cache *cache, void - - nnew->inp_next = tcp_head; - tcp_head = nnew; -+#if defined(dragonfly) -+ xig = (struct xtcpcb *) ((char *) xig + xig->xt_len); -+#else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); -+#endif - } - - free(tcpcb_buf); diff --git a/net/net-snmp/patches/patch-ds b/net/net-snmp/patches/patch-ds deleted file mode 100644 index acfc99fe5e7..00000000000 --- a/net/net-snmp/patches/patch-ds +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/udpTable.c.orig 2010-03-08 23:07:20.000000000 +0000 -+++ agent/mibgroup/mibII/udpTable.c -@@ -618,7 +618,11 @@ udpTable_load(netsnmp_cache *cache, void - size_t len; - int sname[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_PCBLIST }; - char *udpcb_buf = NULL; -+#if defined(dragonfly) -+ struct xinpcb *xig = NULL; -+#else - struct xinpgen *xig = NULL; -+#endif - UDPTABLE_ENTRY_TYPE *nnew; - - udpTable_free(NULL, NULL); -@@ -639,10 +643,18 @@ udpTable_load(netsnmp_cache *cache, void - * Unpick this into the constituent 'xinpgen' structures, and extract - * the 'inpcb' elements into a linked list (built in reverse) - */ -+#if defined(dragonfly) -+ xig = (struct xinpcb *) udpcb_buf; -+#else - xig = (struct xinpgen *) udpcb_buf; - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); -+#endif - -+#if defined(dragonfly) -+ while (xig && ((char *)xig + xig->xi_len < udpcb_buf + len)) { -+#else - while (xig && (xig->xig_len > sizeof(struct xinpgen))) { -+#endif - nnew = SNMP_MALLOC_TYPEDEF(UDPTABLE_ENTRY_TYPE); - if (!nnew) - break; -@@ -655,7 +667,11 @@ udpTable_load(netsnmp_cache *cache, void - #endif - - udp_head = nnew; -+#if defined(dragonfly) -+ xig = (struct xinpcb *) ((char *) xig + xig->xi_len); -+#else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); -+#endif - } - - free(udpcb_buf); diff --git a/net/net-snmp/patches/patch-dt b/net/net-snmp/patches/patch-dt index 32a18ccf2b9..ab52d32ca9d 100644 --- a/net/net-snmp/patches/patch-dt +++ b/net/net-snmp/patches/patch-dt @@ -1,12 +1,12 @@ -$NetBSD: patch-dt,v 1.8 2011/05/27 10:55:25 adam Exp $ +$NetBSD: patch-dt,v 1.9 2013/03/12 03:00:38 garbled Exp $ ---- agent/Makefile.in.orig 2010-06-08 14:05:11.000000000 -0700 -+++ agent/Makefile.in 2013-03-11 13:16:27.000000000 -0700 -@@ -253,7 +253,7 @@ +--- agent/Makefile.in.orig 2012-10-09 22:28:58.000000000 +0000 ++++ agent/Makefile.in +@@ -301,7 +301,7 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE $(RANLIB) $(AGENTLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS) -- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@ +- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@ + $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) ${MIB_SYSTEM_LIBS} @AGENTLIBS@ $(RANLIB) $(MIBLIB) diff --git a/net/net-snmp/patches/patch-du b/net/net-snmp/patches/patch-du index 280ea2d6825..7701794769b 100644 --- a/net/net-snmp/patches/patch-du +++ b/net/net-snmp/patches/patch-du @@ -1,6 +1,6 @@ -$NetBSD$ +$NetBSD: patch-du,v 1.2 2008/09/08 12:58:09 adam Exp $ ---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2008-05-28 13:48:46.000000000 +0200 +--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2012-10-09 22:28:58.000000000 +0000 +++ agent/mibgroup/hardware/memory/memory_freebsd.c @@ -36,6 +36,12 @@ int netsnmp_mem_arch_load( netsnmp_cache long pagesize; @@ -12,11 +12,11 @@ $NetBSD$ + size_t vmem_size = sizeof(struct vmmeter); +#endif + - struct vmmeter vmem; struct vmtotal total; size_t total_size = sizeof(total); -@@ -58,12 +64,18 @@ int netsnmp_mem_arch_load( netsnmp_cache - sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); + int total_mib[] = { CTL_VM, VM_METER }; +@@ -65,11 +71,17 @@ int netsnmp_mem_arch_load( netsnmp_cache + sysctlbyname("vm.stats.vm.v_inactive_count", &inact_count, &inact_size, NULL, 0); sysctlbyname("vfs.bufspace", &bufspace, &buf_size, NULL, 0); sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0); +#ifdef dragonfly @@ -24,7 +24,6 @@ $NetBSD$ + sysctlbyname("vm.vmstats", &vms, &vms_size, NULL, 0); + sysctlbyname("vm.vmmeter", &vmem, &vmem_size, NULL, 0); +#else - auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem)); #ifndef freebsd4 pagesize = 1024; #else @@ -34,19 +33,19 @@ $NetBSD$ /* * ... and save this in a standard form. -@@ -129,9 +141,15 @@ int netsnmp_mem_arch_load( netsnmp_cache +@@ -80,9 +92,15 @@ int netsnmp_mem_arch_load( netsnmp_cache } else { if (!mem->descr) - mem->descr = strdup("Cached memory"); + mem->descr = strdup("Physical memory"); +#ifdef dragonfly + mem->units = vms.v_page_size; + mem->size = vms.v_cache_max; + mem->free = vms.v_cache_max - vms.v_cache_count; +#else - mem->units = vmem.v_page_size; - mem->size = vmem.v_cache_max; - mem->free = vmem.v_cache_max - vmem.v_cache_count; + mem->units = pagesize; + mem->size = phys_mem/pagesize; + mem->free = total.t_free; +#endif } - nswap = swapmode(pagesize); + mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_USERMEM, 1 ); diff --git a/net/net-snmp/patches/patch-el b/net/net-snmp/patches/patch-el index 2b98e992e81..2841266f0e4 100644 --- a/net/net-snmp/patches/patch-el +++ b/net/net-snmp/patches/patch-el @@ -1,8 +1,8 @@ -$NetBSD$ +$NetBSD: patch-el,v 1.3 2011/05/27 10:55:26 adam Exp $ ---- perl/OID/OID.xs.orig 2011-02-01 14:34:03.000000000 +0000 +--- perl/OID/OID.xs.orig 2012-10-09 22:28:58.000000000 +0000 +++ perl/OID/OID.xs -@@ -156,17 +156,22 @@ MODULE = NetSNMP::OID PACKAGE = NetSNMP +@@ -157,17 +157,22 @@ MODULE = NetSNMP::OID PACKAGE = NetSNMP netsnmp_oid * nso_newptr(initstring) char *initstring diff --git a/net/net-snmp/patches/patch-es b/net/net-snmp/patches/patch-es index c3937ce6dda..df9f5c5111d 100644 --- a/net/net-snmp/patches/patch-es +++ b/net/net-snmp/patches/patch-es @@ -1,6 +1,6 @@ -$NetBSD$ +$NetBSD: patch-es,v 1.2 2011/05/27 10:55:26 adam Exp $ ---- agent/mibgroup/ucd-snmp/memory_netbsd1.c.orig 2008-10-21 21:10:43.000000000 +0000 +--- agent/mibgroup/ucd-snmp/memory_netbsd1.c.orig 2012-10-09 22:28:58.000000000 +0000 +++ agent/mibgroup/ucd-snmp/memory_netbsd1.c @@ -165,7 +165,7 @@ var_extensible_mem(struct variable *vp, static char errmsg[1024]; diff --git a/net/net-snmp/patches/patch-et b/net/net-snmp/patches/patch-et deleted file mode 100644 index 15d40d5162e..00000000000 --- a/net/net-snmp/patches/patch-et +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/icmp.c.orig 2011-02-01 14:16:23.000000000 +0000 -+++ agent/mibgroup/mibII/icmp.c -@@ -567,6 +567,12 @@ init_icmp(void) - * - *********************/ - -+#ifdef NETBSD_STATS_VIA_SYSCTL -+#define ICMP_STAT_STRUCTURE struct icmp_mib -+#define USES_SNMP_DESIGNED_ICMPSTAT -+#undef ICMP_NSTATS -+#endif -+ - #ifdef hpux11 - #define ICMP_STAT_STRUCTURE int - #endif -@@ -1289,6 +1295,21 @@ icmp_load(netsnmp_cache *cache, void *vm - } - return ret_value; - } -+#elif defined(NETBSD_STATS_VIA_SYSCTL) -+int -+icmp_load(netsnmp_cache *cache, void *vmagic) -+{ -+ long ret_value =- -1; -+ -+ ret_value = netbsd_read_icmp_stat(&icmpstat); -+ -+ if ( ret_value < 0 ) { -+ DEBUGMSGTL(("mibII/icmp", "Failed to load ICMP Group (netbsd)\n")); -+ } else { -+ DEBUGMSGTL(("mibII/icmp", "Loaded ICMP Group (netbsd)\n")); -+ } -+ return ret_value; -+} - #elif defined (WIN32) || defined (cygwin) - int - icmp_load(netsnmp_cache *cache, void *vmagic) diff --git a/net/net-snmp/patches/patch-eu b/net/net-snmp/patches/patch-eu deleted file mode 100644 index cc7e39a2295..00000000000 --- a/net/net-snmp/patches/patch-eu +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/ip.c.orig 2011-02-01 14:15:54.000000000 +0000 -+++ agent/mibgroup/mibII/ip.c -@@ -214,6 +214,12 @@ init_ip(void) - * - *********************/ - -+#ifdef NETBSD_STATS_VIA_SYSCTL -+#define IP_STAT_STRUCTURE struct ip_mib -+#define USES_SNMP_DESIGNED_IPSTAT -+#undef IP_NSTATS -+#endif -+ - #ifdef hpux11 - #define IP_STAT_STRUCTURE int - #endif -@@ -827,6 +833,21 @@ ip_load(netsnmp_cache *cache, void *vmag - } - return ret_value; - } -+#elif defined (NETBSD_STATS_VIA_SYSCTL) -+int -+ip_load(netsnmp_cache *cache, void *vmagic) -+{ -+ long ret_value = -1; -+ -+ ret_value = netbsd_read_ip_stat(&ipstat); -+ -+ if ( ret_value < 0) { -+ DEBUGMSGTL(("mibII/ip", "Failed to load IP Group (netbsd)\n")); -+ } else { -+ DEBUGMSGTL(("mibII/ip", "Loaded IP Group (netbsd)\n")); -+ } -+ return ret_value; -+} - #elif defined (WIN32) || defined (cygwin) - int - ip_load(netsnmp_cache *cache, void *vmagic) diff --git a/net/net-snmp/patches/patch-ev b/net/net-snmp/patches/patch-ev deleted file mode 100644 index f94db5ecd8c..00000000000 --- a/net/net-snmp/patches/patch-ev +++ /dev/null @@ -1,203 +0,0 @@ -$NetBSD: patch-ev,v 1.1 2010/05/11 04:39:54 adam Exp $ - ---- agent/mibgroup/mibII/kernel_netbsd.c.orig 2010-10-19 03:54:58.000000000 +0000 -+++ agent/mibgroup/mibII/kernel_netbsd.c -@@ -0,0 +1,198 @@ -+/* -+ * NetBSD implementation for mapping the IP stat arrays into struct's -+ * Required for NetBSD versions produced after April 7th 2008 (4+) -+ * -+ * Based on: http://mail-index.netbsd.org/pkgsrc-users/2008/04/27/msg007095.html -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include "kernel_netbsd.h" -+ -+#if defined(NETBSD_STATS_VIA_SYSCTL) -+ -+int -+netbsd_read_icmp_stat(struct icmp_mib *mib) -+{ -+ size_t size; -+ uint64_t icmpstat[ICMP_NSTATS]; -+ int i; -+ -+ (void)memset(mib, 0, sizeof(*mib)); -+ -+ if (-1 == sysctlbyname("net.inet.icmp.stats", icmpstat, &size, NULL, 0)) -+ return -1; -+ -+ mib->icmpInMsgs = icmpstat[ICMP_STAT_BADCODE] -+ + icmpstat[ICMP_STAT_TOOSHORT] -+ + icmpstat[ICMP_STAT_CHECKSUM] -+ + icmpstat[ICMP_STAT_BADLEN]; -+ for (i = 0; i <= ICMP_MAXTYPE; i++) -+ mib->icmpInMsgs += icmpstat[ICMP_STAT_INHIST + i]; -+ mib->icmpInErrors = icmpstat[ICMP_STAT_BADCODE] -+ + icmpstat[ICMP_STAT_TOOSHORT] -+ + icmpstat[ICMP_STAT_CHECKSUM] -+ + icmpstat[ICMP_STAT_BADLEN]; -+ mib->icmpInDestUnreachs = icmpstat[ICMP_STAT_INHIST + ICMP_UNREACH]; -+ mib->icmpInTimeExcds = icmpstat[ICMP_STAT_INHIST + ICMP_TIMXCEED]; -+ mib->icmpInParmProbs = icmpstat[ICMP_STAT_INHIST + ICMP_PARAMPROB]; -+ mib->icmpInSrcQuenchs = icmpstat[ICMP_STAT_INHIST + ICMP_SOURCEQUENCH]; -+ mib->icmpInRedirects = icmpstat[ICMP_STAT_INHIST + ICMP_REDIRECT]; -+ mib->icmpInEchos = icmpstat[ICMP_STAT_INHIST + ICMP_ECHO]; -+ mib->icmpInEchoReps = icmpstat[ICMP_STAT_INHIST + ICMP_ECHOREPLY]; -+ mib->icmpInTimestamps = icmpstat[ICMP_STAT_INHIST + ICMP_TSTAMP]; -+ mib->icmpInTimestampReps -+ = icmpstat[ICMP_STAT_INHIST + ICMP_TSTAMPREPLY]; -+ mib->icmpInAddrMasks = icmpstat[ICMP_STAT_INHIST + ICMP_MASKREQ]; -+ mib->icmpInAddrMaskReps = icmpstat[ICMP_STAT_INHIST + ICMP_MASKREPLY]; -+ mib->icmpOutMsgs = icmpstat[ICMP_STAT_OLDSHORT] -+ + icmpstat[ICMP_STAT_OLDICMP]; -+ for (i = 0; i <= ICMP_MAXTYPE; i++) -+ mib->icmpOutMsgs += icmpstat[ICMP_STAT_OUTHIST + i]; -+ mib->icmpOutErrors = icmpstat[ICMP_STAT_OLDSHORT] -+ + icmpstat[ICMP_STAT_OLDICMP]; -+ mib->icmpOutDestUnreachs = icmpstat[ICMP_STAT_OUTHIST + ICMP_UNREACH]; -+ mib->icmpOutTimeExcds = icmpstat[ICMP_STAT_OUTHIST + ICMP_TIMXCEED]; -+ mib->icmpOutParmProbs = icmpstat[ICMP_STAT_OUTHIST + ICMP_PARAMPROB]; -+ mib->icmpOutSrcQuenchs -+ = icmpstat[ICMP_STAT_OUTHIST + ICMP_SOURCEQUENCH]; -+ mib->icmpOutRedirects = icmpstat[ICMP_STAT_OUTHIST + ICMP_REDIRECT]; -+ mib->icmpOutEchos = icmpstat[ICMP_STAT_OUTHIST + ICMP_ECHO]; -+ mib->icmpOutEchoReps = icmpstat[ICMP_STAT_OUTHIST + ICMP_ECHOREPLY]; -+ mib->icmpOutTimestamps = icmpstat[ICMP_STAT_OUTHIST + ICMP_TSTAMP]; -+ mib->icmpOutTimestampReps -+ = icmpstat[ICMP_STAT_OUTHIST + ICMP_TSTAMPREPLY]; -+ mib->icmpOutAddrMasks = icmpstat[ICMP_STAT_OUTHIST + ICMP_MASKREQ]; -+ mib->icmpOutAddrMaskReps = icmpstat[ICMP_STAT_OUTHIST + ICMP_MASKREPLY]; -+ -+ return 0; -+} -+ -+int -+netbsd_read_ip_stat(struct ip_mib *mib) -+{ -+ size_t size; -+ uint64_t ipstat[IP_NSTATS]; -+ int i; -+ static int sname[4] = { 4, 2, 0, 0 }; // CTL_NET, PF_INET, IPPROTO_IP, 0 -+ size_t len; -+ -+ (void)memset(mib, 0, sizeof(*mib)); -+ -+ if (-1 == sysctlbyname("net.inet.ip.stats", ipstat, &size, NULL, 0)) -+ return -1; -+ -+ mib->ipForwarding = 0; -+ len = sizeof i; -+ sname[3] = IPCTL_FORWARDING; -+ if (0 == sysctl(sname, 4, &i, &len, 0, 0)) { -+ mib->ipForwarding = (long)i; -+ } -+ -+ mib->ipDefaultTTL = 0; -+ sname[3] = IPCTL_DEFTTL; -+ if (0 == sysctl(sname, 4, &i, &len, 0, 0)) { -+ mib->ipDefaultTTL = (long)i; -+ } -+ -+ mib->ipInReceives = ipstat[IP_STAT_TOTAL]; -+ mib->ipInHdrErrors = ipstat[IP_STAT_BADSUM] -+ + ipstat[IP_STAT_TOOSHORT] + ipstat[IP_STAT_TOOSMALL] -+ + ipstat[IP_STAT_BADHLEN] + ipstat[IP_STAT_BADLEN]; -+ mib->ipInAddrErrors = ipstat[IP_STAT_CANTFORWARD]; -+ mib->ipForwDatagrams = ipstat[IP_STAT_FORWARD]; -+ mib->ipInUnknownProtos = ipstat[IP_STAT_NOPROTO]; -+ mib->ipInDiscards = ipstat[IP_STAT_FRAGDROPPED]; /* FIXME */ -+ mib->ipInDelivers = ipstat[IP_STAT_DELIVERED]; -+ mib->ipOutRequests = ipstat[IP_STAT_LOCALOUT]; -+ mib->ipOutDiscards = ipstat[IP_STAT_ODROPPED]; -+ mib->ipOutNoRoutes = 0; /* FIXME */ -+ mib->ipReasmTimeout = 0; /* IPFRAGTTL; */ -+ mib->ipReasmReqds = ipstat[IP_STAT_FRAGMENTS]; -+ mib->ipReasmOKs = ipstat[IP_STAT_REASSEMBLED]; -+ mib->ipReasmFails = ipstat[IP_STAT_FRAGDROPPED] -+ + ipstat[IP_STAT_FRAGTIMEOUT]; -+ mib->ipFragOKs = ipstat[IP_STAT_FRAGMENTS]; -+ mib->ipFragFails = ipstat[IP_STAT_CANTFRAG]; -+ mib->ipFragCreates = ipstat[IP_STAT_OFRAGMENTS]; -+ mib->ipRoutingDiscards = ipstat[IP_STAT_NOROUTE]; -+ -+ return 0; -+} -+ -+int -+netbsd_read_tcp_stat(struct tcp_mib *mib) -+{ -+ size_t size; -+ uint64_t tcpstat[TCP_NSTATS]; -+ -+ (void)memset(mib, 0, sizeof(*mib)); -+ -+ if (-1 == sysctlbyname("net.inet.tcp.stats", tcpstat, &size, NULL, 0)) -+ return -1; -+ -+ mib->tcpRtoAlgorithm = 4; /* Assume Van Jacobsen's algorithm */ -+ mib->tcpRtoMin = TCPTV_MIN; -+ mib->tcpRtoMax = TCPTV_REXMTMAX; -+ mib->tcpMaxConn = -1; /* Dynamic Maximum */ -+ mib->tcpActiveOpens = tcpstat[TCP_STAT_CONNATTEMPT]; -+ mib->tcpPassiveOpens = tcpstat[TCP_STAT_ACCEPTS]; -+ mib->tcpAttemptFails = tcpstat[TCP_STAT_CONNDROPS]; -+ mib->tcpEstabResets = tcpstat[TCP_STAT_DROPS]; -+ mib->tcpCurrEstab = 0; /* FIXME */ -+ mib->tcpInSegs = tcpstat[TCP_STAT_RCVTOTAL]; -+ mib->tcpOutSegs = tcpstat[TCP_STAT_SNDTOTAL] -+ - tcpstat[TCP_STAT_SNDREXMITPACK]; -+ mib->tcpRetransSegs = tcpstat[TCP_STAT_SNDREXMITPACK]; -+ mib->tcpInErrs = tcpstat[TCP_STAT_RCVBADSUM] -+ + tcpstat[TCP_STAT_RCVBADOFF] -+ + tcpstat[TCP_STAT_RCVMEMDROP] -+ + tcpstat[TCP_STAT_RCVSHORT]; -+ mib->tcpOutRsts = tcpstat[TCP_STAT_SNDCTRL] -+ - tcpstat[TCP_STAT_CLOSED]; -+ mib->tcpInErrsValid = mib->tcpInErrs; /* FIXME */ -+ mib->tcpOutRstsValid = mib->tcpOutRsts; /* FIXME */ -+ -+ return 0; -+} -+ -+int -+netbsd_read_udp_stat(struct udp_mib *mib) -+{ -+ size_t size; -+ uint64_t udpstat[UDP_NSTATS]; -+ -+ (void)memset(mib, 0, sizeof(*mib)); -+ -+ if (-1 == sysctlbyname("net.inet.udp.stats", udpstat, &size, NULL, 0)) -+ return -1; -+ -+ mib->udpInDatagrams = udpstat[UDP_STAT_IPACKETS]; -+ mib->udpNoPorts = udpstat[UDP_STAT_NOPORT]; -+ mib->udpOutDatagrams = udpstat[UDP_STAT_OPACKETS]; -+ mib->udpInErrors = udpstat[UDP_STAT_HDROPS] -+ + udpstat[UDP_STAT_BADSUM] //+ udpstat[UDP_STAT_DISCARD] /* FIXME */ -+ + udpstat[UDP_STAT_FULLSOCK] + udpstat[UDP_STAT_BADLEN]; -+ -+ return 0; -+} -+ -+#endif diff --git a/net/net-snmp/patches/patch-ew b/net/net-snmp/patches/patch-ew deleted file mode 100644 index f01a432616a..00000000000 --- a/net/net-snmp/patches/patch-ew +++ /dev/null @@ -1,96 +0,0 @@ -$NetBSD: patch-ew,v 1.1 2010/05/11 04:39:54 adam Exp $ - ---- agent/mibgroup/mibII/kernel_netbsd.h.orig 2010-03-12 00:31:50.000000000 +0000 -+++ agent/mibgroup/mibII/kernel_netbsd.h 2010-03-12 00:31:50.000000000 +0000 -@@ -0,0 +1,91 @@ -+#ifndef _MIBGROUP_KERNEL_NETBSD_H -+#define _MIBGROUP_KERNEL_NETBSD_H -+ -+#if defined(NETBSD_STATS_VIA_SYSCTL) -+ -+struct icmp_mib { -+ unsigned long icmpInMsgs; -+ unsigned long icmpInErrors; -+ unsigned long icmpInDestUnreachs; -+ unsigned long icmpInTimeExcds; -+ unsigned long icmpInParmProbs; -+ unsigned long icmpInSrcQuenchs; -+ unsigned long icmpInRedirects; -+ unsigned long icmpInEchos; -+ unsigned long icmpInEchoReps; -+ unsigned long icmpInTimestamps; -+ unsigned long icmpInTimestampReps; -+ unsigned long icmpInAddrMasks; -+ unsigned long icmpInAddrMaskReps; -+ unsigned long icmpOutMsgs; -+ unsigned long icmpOutErrors; -+ unsigned long icmpOutDestUnreachs; -+ unsigned long icmpOutTimeExcds; -+ unsigned long icmpOutParmProbs; -+ unsigned long icmpOutSrcQuenchs; -+ unsigned long icmpOutRedirects; -+ unsigned long icmpOutEchos; -+ unsigned long icmpOutEchoReps; -+ unsigned long icmpOutTimestamps; -+ unsigned long icmpOutTimestampReps; -+ unsigned long icmpOutAddrMasks; -+ unsigned long icmpOutAddrMaskReps; -+}; -+ -+struct ip_mib { -+ unsigned long ipForwarding; -+ unsigned long ipDefaultTTL; -+ unsigned long ipInReceives; -+ unsigned long ipInHdrErrors; -+ unsigned long ipInAddrErrors; -+ unsigned long ipForwDatagrams; -+ unsigned long ipInUnknownProtos; -+ unsigned long ipInDiscards; -+ unsigned long ipInDelivers; -+ unsigned long ipOutRequests; -+ unsigned long ipOutDiscards; -+ unsigned long ipOutNoRoutes; -+ unsigned long ipReasmTimeout; -+ unsigned long ipReasmReqds; -+ unsigned long ipReasmOKs; -+ unsigned long ipReasmFails; -+ unsigned long ipFragOKs; -+ unsigned long ipFragFails; -+ unsigned long ipFragCreates; -+ unsigned long ipRoutingDiscards; -+}; -+ -+struct tcp_mib { -+ unsigned long tcpRtoAlgorithm; -+ unsigned long tcpRtoMin; -+ unsigned long tcpRtoMax; -+ unsigned long tcpMaxConn; -+ unsigned long tcpActiveOpens; -+ unsigned long tcpPassiveOpens; -+ unsigned long tcpAttemptFails; -+ unsigned long tcpEstabResets; -+ unsigned long tcpCurrEstab; -+ unsigned long tcpInSegs; -+ unsigned long tcpOutSegs; -+ unsigned long tcpRetransSegs; -+ unsigned long tcpInErrs; -+ unsigned long tcpOutRsts; -+ short tcpInErrsValid; -+ short tcpOutRstsValid; -+}; -+ -+struct udp_mib { -+ unsigned long udpInDatagrams; -+ unsigned long udpNoPorts; -+ unsigned long udpInErrors; -+ unsigned long udpOutDatagrams; -+}; -+ -+int netbsd_read_icmp_stat(struct icmp_mib *); -+int netbsd_read_ip_stat(struct ip_mib *); -+int netbsd_read_tcp_stat(struct tcp_mib *); -+int netbsd_read_udp_stat(struct udp_mib *); -+ -+#endif /* NETBSD_STATS_VIA_SYSCTL */ -+ -+#endif /* _MIBGROUP_KERNEL_NETBSD_H */ diff --git a/net/net-snmp/patches/patch-ex b/net/net-snmp/patches/patch-ex deleted file mode 100644 index e692e135dce..00000000000 --- a/net/net-snmp/patches/patch-ex +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ex,v 1.2 2010/11/17 00:59:06 taca Exp $ - ---- agent/mibgroup/mibII/mibII_common.h.orig 2006-09-15 00:48:50.000000000 +0000 -+++ agent/mibgroup/mibII/mibII_common.h -@@ -97,6 +97,9 @@ - #ifdef linux - #include "kernel_linux.h" - #endif -+#ifdef NETBSD_STATS_VIA_SYSCTL -+#include "kernel_netbsd.h" -+#endif - /* or MIB_xxxCOUNTER_SYMBOL || hpux11 */ - #ifdef hpux - #include diff --git a/net/net-snmp/patches/patch-ey b/net/net-snmp/patches/patch-ey deleted file mode 100644 index d2371a522fc..00000000000 --- a/net/net-snmp/patches/patch-ey +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/tcp.c.orig 2011-02-01 14:23:55.000000000 +0000 -+++ agent/mibgroup/mibII/tcp.c -@@ -155,6 +155,12 @@ init_tcp(void) - * - *********************/ - -+#ifdef NETBSD_STATS_VIA_SYSCTL -+#define TCP_STAT_STRUCTURE struct tcp_mib -+#define USES_SNMP_DESIGNED_TCPSTAT -+#undef TCP_NSTATS -+#endif -+ - #ifdef hpux11 - #define TCP_STAT_STRUCTURE int - #endif -@@ -766,6 +772,21 @@ tcp_load(netsnmp_cache *cache, void *vma - } - return ret_value; - } -+#elif defined(NETBSD_STATS_VIA_SYSCTL) -+int -+tcp_load(netsnmp_cache *cache, void *vmagic) -+{ -+ long ret_value = -1; -+ -+ ret_value = netbsd_read_tcp_stat(&tcpstat); -+ -+ if ( ret_value < 0 ) { -+ DEBUGMSGTL(("mibII/tcpScalar", "Failed to load TCP scalar Group (netbsd)\n")); -+ } else { -+ DEBUGMSGTL(("mibII/tcpScalar", "Loaded TCP scalar Group (netbsd)\n")); -+ } -+ return ret_value; -+} - #elif defined (WIN32) || defined (cygwin) - int - tcp_load(netsnmp_cache *cache, void *vmagic) diff --git a/net/net-snmp/patches/patch-ez b/net/net-snmp/patches/patch-ez deleted file mode 100644 index bf04bb7bad1..00000000000 --- a/net/net-snmp/patches/patch-ez +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/udp.c.orig 2011-02-01 14:16:09.000000000 +0000 -+++ agent/mibgroup/mibII/udp.c -@@ -30,6 +30,10 @@ - #include "kernel_linux.h" - #endif - -+#ifdef NETBSD_STATS_VIA_SYSCTL -+#include "kernel_netbsd.h" -+#endif -+ - #ifdef cygwin - #define WIN32 - #include -@@ -137,6 +141,12 @@ init_udp(void) - * - *********************/ - -+#ifdef NETBSD_STATS_VIA_SYSCTL -+#define UDP_STAT_STRUCTURE struct udp_mib -+#define USES_SNMP_DESIGNED_UDPSTAT -+#undef UDP_NSTATS -+#endif -+ - #ifdef hpux11 - #define UDP_STAT_STRUCTURE int - #endif -@@ -467,6 +477,21 @@ udp_load(netsnmp_cache *cache, void *vma - } - return ret_value; - } -+#elif defined(NETBSD_STATS_VIA_SYSCTL) -+int -+udp_load(netsnmp_cache *cache, void *vmagic) -+{ -+ long ret_value = -1; -+ -+ ret_value = netbsd_read_udp_stat(&udpstat); -+ -+ if ( ret_value < 0 ) { -+ DEBUGMSGTL(("mibII/udpScalar", "Failed to load UDP scalar Group (netbsd)\n")); -+ } else { -+ DEBUGMSGTL(("mibII/udpScalar", "Loaded UDP scalar Group (netbsd)\n")); -+ } -+ return ret_value; -+} - #elif defined(WIN32) - int - udp_load(netsnmp_cache *cache, void *vmagic) diff --git a/net/net-snmp/patches/patch-fa b/net/net-snmp/patches/patch-fa dissimilarity index 64% index 8f308833cde..f7c19c026c7 100644 --- a/net/net-snmp/patches/patch-fa +++ b/net/net-snmp/patches/patch-fa @@ -1,19 +1,18 @@ -$NetBSD: patch-fa,v 1.3 2011/05/27 10:55:26 adam Exp $ - ---- include/net-snmp/system/netbsd.h.orig 2009-04-09 08:48:32.000000000 +0000 -+++ include/net-snmp/system/netbsd.h -@@ -38,6 +38,14 @@ - # define netbsd1 netbsd1 - #endif - -+#if __NetBSD_Version__ >= 499005800 -+#define NETBSD_STATS_VIA_SYSCTL -+#undef IPSTAT_SYMBOL -+#undef ICMPSTAT_SYMBOL -+#undef TCPSTAT_SYMBOL -+#undef UDPSTAT_SYMBOL -+#endif /* __NetBSD_Version__ >= 499005800 */ -+ - /* define the extra mib modules that are supported */ - #define NETSNMP_INCLUDE_HOST_RESOURCES - #define NETSNMP_INCLUDE_IFTABLE_REWRITES +$NetBSD: patch-fa,v 1.4 2011/10/17 19:40:26 shattered Exp $ + +--- include/net-snmp/system/netbsd.h.orig 2012-10-09 22:28:58.000000000 +0000 ++++ include/net-snmp/system/netbsd.h +@@ -68,6 +68,13 @@ + + #if __NetBSD_Version__ >= 499005800 + #define NETBSD_STATS_VIA_SYSCTL ++ ++/* Why these undefs? */ ++#undef IPSTAT_SYMBOL ++#undef ICMPSTAT_SYMBOL ++#undef TCPSTAT_SYMBOL ++#undef UDPSTAT_SYMBOL ++ + #endif /* __NetBSD_Version__ >= 499005800 */ + + /* define the extra mib modules that are supported */ diff --git a/net/net-snmp/patches/patch-fb b/net/net-snmp/patches/patch-fb deleted file mode 100644 index 486a07158ae..00000000000 --- a/net/net-snmp/patches/patch-fb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/mibII/ip.h 2010-03-12 00:54:04.000000000 +0000 -+++ agent/mibgroup/mibII/ip.h.orig 2010-03-12 00:53:16.000000000 +0000 -@@ -14,6 +14,8 @@ - - config_arch_require(solaris2, kernel_sunos5) - config_arch_require(linux, mibII/kernel_linux) -+config_arch_require(netbsd, mibII/kernel_netbsd) -+config_arch_require(netbsdelf, mibII/kernel_netbsd) - - #include "var_route.h" - #include "route_write.h" diff --git a/net/net-snmp/patches/patch-fc b/net/net-snmp/patches/patch-fc deleted file mode 100644 index 618540d3c9c..00000000000 --- a/net/net-snmp/patches/patch-fc +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD$ - ---- agent/mibgroup/ucd-snmp/vmstat.c.orig 2010-12-22 15:46:31.000000000 +0900 -+++ agent/mibgroup/ucd-snmp/vmstat.c 2010-12-22 15:48:47.000000000 +0900 -@@ -129,7 +129,10 @@ - case CPUUSER: - if ( info->history && info->history[0].total_hist ) { - value = (info->user_ticks - info->history[0].user_hist)*100; -- value /= (info->total_ticks - info->history[0].total_hist); -+ if (info->total_ticks > info->history[0].total_hist) -+ value /= (info->total_ticks - info->history[0].total_hist); -+ else -+ value = 0; - snmp_set_var_typed_integer(requests->requestvb, - ASN_INTEGER, value); - } -@@ -138,7 +141,10 @@ - if ( info->history && info->history[0].total_hist ) { - /* or sys2_ticks ??? */ - value = (info->sys_ticks - info->history[0].sys_hist)*100; -- value /= (info->total_ticks - info->history[0].total_hist); -+ if (info->total_ticks > info->history[0].total_hist) -+ value /= (info->total_ticks - info->history[0].total_hist); -+ else -+ value = 0; - snmp_set_var_typed_integer(requests->requestvb, - ASN_INTEGER, value); - } -@@ -146,7 +152,10 @@ - case CPUIDLE: - if ( info->history && info->history[0].total_hist ) { - value = (info->idle_ticks - info->history[0].idle_hist)*100; -- value /= (info->total_ticks - info->history[0].total_hist); -+ if (info->total_ticks > info->history[0].total_hist) -+ value /= (info->total_ticks - info->history[0].total_hist); -+ else -+ value = 0; - snmp_set_var_typed_integer(requests->requestvb, - ASN_INTEGER, value); - } diff --git a/net/net-snmp/patches/patch-fd b/net/net-snmp/patches/patch-fd deleted file mode 100644 index 0b292fb5d9d..00000000000 --- a/net/net-snmp/patches/patch-fd +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-fd,v 1.1 2010/12/26 09:23:49 sekiya Exp $ - ---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2010-06-12 21:33:30.000000000 +0000 -+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c -@@ -19,6 +19,9 @@ - #else - #include - #endif -+#if defined(__NetBSD__) -+#include -+#endif - - #include - #include -@@ -49,7 +52,11 @@ void init_cpu_sysctl( void ) { - if ( n <= 0 ) - n = 1; /* Single CPU system */ - i = sizeof(descr); -+#if defined(__NetBSD__) && ( defined(__i386__) || defined(__x86_64__) ) -+ sysctlbyname("machdep.cpu_brand", descr, (void *)&i, NULL, 0); -+#else - sysctl(model_mib, 2, descr, (void *)&i, NULL, 0); -+#endif - for ( i = 0; i < n; i++ ) { - cpu = netsnmp_cpu_get_byIdx( i, 1 ); - cpu->status = 2; /* running */ -@@ -59,26 +66,22 @@ void init_cpu_sysctl( void ) { - cpu_num = n; - } - -- -+#if defined(__NetBSD__) -+#define NETSNMP_CPU_STATS uint64_t -+#define NETSNMP_KERN_CPU KERN_CP_TIME -+#else - #define NETSNMP_CPU_STATS long - #if defined(KERN_CPUSTATS) /* BSDi */ - #define NETSNMP_KERN_CPU KERN_CPUSTATS - #elif defined(KERN_CPTIME) /* OpenBSD */ - #define NETSNMP_KERN_CPU KERN_CPTIME --#elif defined(KERN_CP_TIME) /* NetBSD */ --#define NETSNMP_KERN_CPU KERN_CP_TIME -- --#if defined(netbsdelf3) --#undef NETSNMP_CPU_STATS --#define NETSNMP_CPU_STATS uint64_t --#endif -- - #elif defined(__FreeBSD__) - #define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */ - - #else - #error "No CPU statistics sysctl token" - #endif -+#endif - - /* - Need to check details before enabling this! -@@ -159,7 +162,7 @@ int netsnmp_cpu_arch_load( netsnmp_cache - size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE); - netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 ); - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined (__NetBSD__) - sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0); - #else - sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0); diff --git a/print/Makefile b/print/Makefile index c7bde2ebac2..aa4d6c4fde3 100644 --- a/print/Makefile +++ b/print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.554 2013/01/14 00:26:18 minskim Exp $ +# $NetBSD: Makefile,v 1.556 2013/03/16 21:32:23 dholland Exp $ # COMMENT= Desktop publishing @@ -49,6 +49,8 @@ SUBDIR+= foomatic4-db SUBDIR+= foomatic4-db-engine SUBDIR+= foomatic4-filters SUBDIR+= ghostscript +SUBDIR+= ghostscript-agpl +SUBDIR+= ghostscript-gpl SUBDIR+= glabels SUBDIR+= gtklp SUBDIR+= gutenprint-lib diff --git a/print/cups-drivers-Magicolor5440DL/Makefile b/print/cups-drivers-Magicolor5440DL/Makefile index cd876f02cf0..22a361b46d9 100644 --- a/print/cups-drivers-Magicolor5440DL/Makefile +++ b/print/cups-drivers-Magicolor5440DL/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2013/02/06 23:23:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2013/02/16 11:24:06 wiz Exp $ # DISTNAME= 5440DL_lin64bit_1_2_1 PKGNAME= cups-drivers-Magicolor5440DL-1.2.1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= print MASTER_SITES= http://printer.konicaminolta.net/drivers/linux/ EXTRACT_SUFX= .zip @@ -14,7 +14,6 @@ COMMENT= CUPS drivers for printer Konica Minolta Magicolor 5440DL BUILD_DEPENDS+= jbigkit>=1.6:../../graphics/jbigkit DEPENDS+= cups>=1.1.14:../../print/cups -DEPENDS+= ghostscript>=8.0:../../print/ghostscript WRKSRC= ${WRKDIR}/5440DL_64_v1.2.1/magicolor5440DL-1.2.1/ @@ -29,6 +28,13 @@ post-extract: cd ${WRKDIR}/5440DL_64_v1.2.1/; \ extract_file=src/magicolor5440DL-1.2.1.tar.gz; ${EXTRACT_CMD} +# This >=8.0 should be restored if we ever go back to a single package +# called just "ghostscript". (The current family of packages were +# created in the days of 9.x and therefore always satisfy this +# requirement.) +#DEPENDS+= ghostscript>=8.0:../../print/ghostscript +.include "../../print/ghostscript/ghostscript.mk" + .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/jbigkit/buildlink3.mk" .include "../../print/cups/buildlink3.mk" diff --git a/print/ghostscript/DESCR b/print/ghostscript-agpl/DESCR similarity index 100% copy from print/ghostscript/DESCR copy to print/ghostscript-agpl/DESCR diff --git a/print/ghostscript/Makefile b/print/ghostscript-agpl/Makefile similarity index 96% copy from print/ghostscript/Makefile copy to print/ghostscript-agpl/Makefile index b2adb6b94b0..b7351cad26d 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript-agpl/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.96 2013/03/13 09:37:11 adam Exp $ +# $NetBSD: Makefile,v 1.97 2013/03/14 05:34:35 dholland Exp $ DISTNAME= ghostscript-${GS_VERSION} +PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/} PKGREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} diff --git a/print/ghostscript/Makefile.common b/print/ghostscript-agpl/Makefile.common similarity index 52% rename from print/ghostscript/Makefile.common rename to print/ghostscript-agpl/Makefile.common index 58d66112d03..f7248883dd8 100644 --- a/print/ghostscript/Makefile.common +++ b/print/ghostscript-agpl/Makefile.common @@ -1,5 +1,5 @@ -# $NetBSD: Makefile.common,v 1.2 2012/10/11 03:09:24 mef Exp $ -# used by print/ghostscript/Makefile +# $NetBSD: Makefile.common,v 1.3 2013/03/08 20:45:25 adam Exp $ +# used by print/ghostscript-agpl/Makefile # used by fonts/ghostscript-cidfonts/Makefile # used by fonts/ghostscript-cidfonts-ryumin/Makefile diff --git a/print/ghostscript/PLIST b/print/ghostscript-agpl/PLIST similarity index 99% copy from print/ghostscript/PLIST copy to print/ghostscript-agpl/PLIST index 7fec03a9ca5..18ee75a80c7 100644 --- a/print/ghostscript/PLIST +++ b/print/ghostscript-agpl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2012/10/07 14:19:18 mef Exp $ +@comment $NetBSD: PLIST,v 1.18 2013/03/08 20:45:25 adam Exp $ bin/dvipdf bin/eps2eps bin/font2c diff --git a/print/ghostscript/buildlink3.mk b/print/ghostscript-agpl/buildlink3.mk similarity index 52% rename from print/ghostscript/buildlink3.mk rename to print/ghostscript-agpl/buildlink3.mk index 2034344f3bb..10479104990 100644 --- a/print/ghostscript/buildlink3.mk +++ b/print/ghostscript-agpl/buildlink3.mk @@ -1,18 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/02/06 23:21:20 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2013/02/16 11:17:57 wiz Exp $ -BUILDLINK_TREE+= ghostscript +BUILDLINK_TREE+= ghostscript-agpl -.if !defined(GHOSTSCRIPT_BUILDLINK3_MK) -GHOSTSCRIPT_BUILDLINK3_MK:= +.if !defined(GHOSTSCRIPT_AGPL_BUILDLINK3_MK) +GHOSTSCRIPT_AGPL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ghostscript+= ghostscript>=8.63nb1 -BUILDLINK_ABI_DEPENDS.ghostscript+= ghostscript>=9.05nb3 -BUILDLINK_PKGSRCDIR.ghostscript?= ../../print/ghostscript +BUILDLINK_API_DEPENDS.ghostscript-agpl+= ghostscript-agpl>=8.63nb1 +BUILDLINK_ABI_DEPENDS.ghostscript-agpl+= ghostscript-agpl>=9.05nb3 +BUILDLINK_PKGSRCDIR.ghostscript-agpl?= ../../print/ghostscript-agpl .include "../../graphics/png/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -pkgbase := ghostscript +pkgbase := ghostscript-agpl .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.ghostscript:Mcups) @@ -28,6 +28,6 @@ pkgbase := ghostscript .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .endif -.endif # GHOSTSCRIPT_BUILDLINK3_MK +.endif # GHOSTSCRIPT_AGPL_BUILDLINK3_MK -BUILDLINK_TREE+= -ghostscript +BUILDLINK_TREE+= -ghostscript-agpl diff --git a/print/ghostscript/distinfo b/print/ghostscript-agpl/distinfo similarity index 93% rename from print/ghostscript/distinfo rename to print/ghostscript-agpl/distinfo index 878a2ae9dc3..247b5f040f7 100644 --- a/print/ghostscript/distinfo +++ b/print/ghostscript-agpl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2012/12/12 16:37:08 bsiegert Exp $ +$NetBSD: distinfo,v 1.42 2013/03/08 20:45:25 adam Exp $ SHA1 (ghostscript-9.07.tar.bz2) = 550a85e73b7213d8ae41ea06523661638b4bc1a2 RMD160 (ghostscript-9.07.tar.bz2) = 704750aa367650b74135dc4f8a3caeccb8d1b0d6 diff --git a/print/ghostscript/hacks.mk b/print/ghostscript-agpl/hacks.mk similarity index 92% copy from print/ghostscript/hacks.mk copy to print/ghostscript-agpl/hacks.mk index 623fb5e12a1..15224f7f4e6 100644 --- a/print/ghostscript/hacks.mk +++ b/print/ghostscript-agpl/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2008/11/13 17:36:54 chuck Exp $ +# $NetBSD: hacks.mk,v 1.3 2009/02/16 12:23:14 drochner Exp $ ### [Tue Jan 9 15:57:05 EST 2007 : tv] ### Interix has u_int64_t, but not uint64_t diff --git a/print/ghostscript/options.mk b/print/ghostscript-agpl/options.mk similarity index 96% copy from print/ghostscript/options.mk copy to print/ghostscript-agpl/options.mk index 70846a111c4..47d61786e74 100644 --- a/print/ghostscript/options.mk +++ b/print/ghostscript-agpl/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2012/10/07 14:19:18 mef Exp $ +# $NetBSD: options.mk,v 1.13 2013/03/08 20:45:25 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits diff --git a/print/ghostscript/patches/patch-af b/print/ghostscript-agpl/patches/patch-af similarity index 97% copy from print/ghostscript/patches/patch-af copy to print/ghostscript-agpl/patches/patch-af index dc590c193c6..00a59f21a4b 100644 --- a/print/ghostscript/patches/patch-af +++ b/print/ghostscript-agpl/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-af,v 1.8 2012/10/10 02:18:25 mef Exp $ (From the log for revision 1.4 of print/ghostscript/patches/patch-af) date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4 diff --git a/print/ghostscript/patches/patch-ah b/print/ghostscript-agpl/patches/patch-ah similarity index 94% copy from print/ghostscript/patches/patch-ah copy to print/ghostscript-agpl/patches/patch-ah index ff96547ce23..279228ea0e8 100644 --- a/print/ghostscript/patches/patch-ah +++ b/print/ghostscript-agpl/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-ah,v 1.7 2012/10/10 02:18:25 mef Exp $ (1) First chunk to fix the X11_TYPE=native problem, which freetype2 in /usr/X11R7/ is way old, and work around to diff --git a/print/ghostscript/patches/patch-ai b/print/ghostscript-agpl/patches/patch-ai similarity index 91% copy from print/ghostscript/patches/patch-ai copy to print/ghostscript-agpl/patches/patch-ai index bfe4aa9df36..d8e77837977 100644 --- a/print/ghostscript/patches/patch-ai +++ b/print/ghostscript-agpl/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.4 2009/02/16 16:31:30 drochner Exp $ +$NetBSD: patch-ai,v 1.5 2012/10/07 14:19:18 mef Exp $ replace BSD/Linux specific "qd" printf format specifier by "lld", should fix build problem on Solaris reported by Joern Clausen diff --git a/print/ghostscript/patches/patch-aj b/print/ghostscript-agpl/patches/patch-aj similarity index 86% copy from print/ghostscript/patches/patch-aj copy to print/ghostscript-agpl/patches/patch-aj index 6306638ee29..1845c3aa4c4 100644 --- a/print/ghostscript/patches/patch-aj +++ b/print/ghostscript-agpl/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-aj,v 1.7 2009/11/03 00:06:00 wiz Exp $ http://bugs.ghostscript.com/show_bug.cgi?id=690883 diff --git a/print/ghostscript/patches/patch-al b/print/ghostscript-agpl/patches/patch-al similarity index 91% copy from print/ghostscript/patches/patch-al copy to print/ghostscript-agpl/patches/patch-al index 7aa0bf91d24..99ee9106062 100644 --- a/print/ghostscript/patches/patch-al +++ b/print/ghostscript-agpl/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-al,v 1.3 2010/02/23 20:31:26 drochner Exp $ --- base/unixlink.mak.orig 2010-02-18 12:08:31.000000000 +0000 +++ base/unixlink.mak diff --git a/print/ghostscript/patches/patch-base_gdevpng.c b/print/ghostscript-agpl/patches/patch-base_gdevpng.c similarity index 93% copy from print/ghostscript/patches/patch-base_gdevpng.c copy to print/ghostscript-agpl/patches/patch-base_gdevpng.c index 24420ba3076..3d1adcc77aa 100644 --- a/print/ghostscript/patches/patch-base_gdevpng.c +++ b/print/ghostscript-agpl/patches/patch-base_gdevpng.c @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-base_gdevpng.c,v 1.1 2012/10/07 14:19:18 mef Exp $ The patch was included in patches/patch-ak: revision 1.5 diff --git a/print/ghostscript/patches/patch-base_gserrors_h b/print/ghostscript-agpl/patches/patch-base_gserrors_h similarity index 86% copy from print/ghostscript/patches/patch-base_gserrors_h copy to print/ghostscript-agpl/patches/patch-base_gserrors_h index 9e5ffdd1df3..b6bd1d3343e 100644 --- a/print/ghostscript/patches/patch-base_gserrors_h +++ b/print/ghostscript-agpl/patches/patch-base_gserrors_h @@ -1,4 +1,4 @@ -$NetBSD: patch-base_gserrors_h,v 1.1 2012/10/07 14:19:18 mef Exp $ +$NetBSD: patch-base_gserrors_h,v 1.2 2013/03/08 20:45:25 adam Exp $ This suppresses the noisy warning that __func__ redefined. diff --git a/print/ghostscript/patches/patch-configure.ac b/print/ghostscript-agpl/patches/patch-configure.ac similarity index 85% copy from print/ghostscript/patches/patch-configure.ac copy to print/ghostscript-agpl/patches/patch-configure.ac index 05823a86515..dff06463828 100644 --- a/print/ghostscript/patches/patch-configure.ac +++ b/print/ghostscript-agpl/patches/patch-configure.ac @@ -1,4 +1,4 @@ -$NetBSD: patch-configure.ac,v 1.1 2012/10/07 14:19:18 mef Exp $ +$NetBSD: patch-configure.ac,v 1.2 2013/03/08 20:45:25 adam Exp $ See patch-ah (configure) diff --git a/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h similarity index 90% copy from print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h copy to print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h index edd6f521f2d..a688ba5820b 100644 --- a/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h +++ b/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h @@ -1,4 +1,4 @@ -$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2012/12/12 16:37:09 bsiegert Exp $ +$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.3 2013/03/08 20:45:25 adam Exp $ To avoid following problem: | gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \ diff --git a/print/ghostscript/DESCR b/print/ghostscript-gpl/DESCR similarity index 100% rename from print/ghostscript/DESCR rename to print/ghostscript-gpl/DESCR diff --git a/print/ghostscript/Makefile b/print/ghostscript-gpl/Makefile similarity index 90% rename from print/ghostscript/Makefile rename to print/ghostscript-gpl/Makefile index b2adb6b94b0..b3ba282f562 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.96 2013/03/13 09:37:11 adam Exp $ +# $NetBSD: Makefile,v 1.94 2013/02/16 11:17:57 wiz Exp $ DISTNAME= ghostscript-${GS_VERSION} -PKGREVISION= 1 +PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/} +PKGREVISION= 3 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} MASTER_SITES+= http://ghostscript.com/releases/ @@ -12,7 +13,7 @@ HOMEPAGE= http://ghostscript.sourceforge.net/ COMMENT= Postscript interpreter # Plus adobe verbatim for Resources/CMap. -LICENSE= gnu-agpl-v3 +LICENSE= gnu-gpl-v3 .include "Makefile.common" @@ -22,10 +23,9 @@ CONFLICTS+= ghostscript-afpl-[0-9]* CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]* CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* -USE_LANGUAGES+= c c++ USE_TOOLS+= gmake perl:run lex pkg-config +USE_LANGUAGES+= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-system-libtiff UNLIMIT_RESOURCES+= datasize # gsromfs1.c BUILD_TARGET= so @@ -87,12 +87,12 @@ CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib post-extract: ${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/obj - ${RM} -rf ${WRKSRC}/freetype - ${RM} -rf ${WRKSRC}/jpeg -# ${RM} -rf ${WRKSRC}/lcms2 +# ${RM} -rf ${WRKSRC}/jasper ${RM} -rf ${WRKSRC}/libpng - ${RM} -rf ${WRKSRC}/zlib - +# ${RM} -rf ${WRKSRC}/tiff +# ${RM} -rf ${WRKSRC}/zlib + ${RM} -rf ${WRKSRC}/freetype +# # To allow outside customization, rename cidfmap # (if you look at inside of the file, it is logically empty) .if !empty(PKG_OPTIONS:Mdisable-compile-inits) @@ -102,10 +102,11 @@ post-extract: post-install: ${LN} -sf gsc ${DESTDIR}${PREFIX}/bin/gs -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -#.include "../../graphics/lcms2/buildlink3.mk" +.include "../../print/libpaper/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../print/libpaper/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +# pkgsrc jasper is too new +#.include "../../graphics/jasper/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript-gpl/Makefile.common b/print/ghostscript-gpl/Makefile.common new file mode 100644 index 00000000000..c5863a5daed --- /dev/null +++ b/print/ghostscript-gpl/Makefile.common @@ -0,0 +1,6 @@ +# $NetBSD: Makefile.common,v 1.2 2012/10/11 03:09:24 mef Exp $ +# used by print/ghostscript-gpl/Makefile +# used (potentially) by fonts/ghostscript-cidfonts/Makefile +# used (potentially) by fonts/ghostscript-cidfonts-ryumin/Makefile + +GS_VERSION= 9.05 diff --git a/print/ghostscript/PLIST b/print/ghostscript-gpl/PLIST similarity index 98% rename from print/ghostscript/PLIST rename to print/ghostscript-gpl/PLIST index 7fec03a9ca5..991a81d73c2 100644 --- a/print/ghostscript/PLIST +++ b/print/ghostscript-gpl/PLIST @@ -1,4 +1,5 @@ @comment $NetBSD: PLIST,v 1.17 2012/10/07 14:19:18 mef Exp $ +bin/dumphint bin/dvipdf bin/eps2eps bin/font2c @@ -14,6 +15,7 @@ bin/gsx bin/lprsetup.sh bin/pdf2dsc bin/pdf2ps +bin/pdfopt bin/pf2afm bin/pfbtopfa bin/pphs @@ -369,9 +371,7 @@ ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/GB1-WMode ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Japan1-WMode ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Korea1-WMode share/ghostscript/${PKGVERSION}/doc/API.htm -share/ghostscript/${PKGVERSION}/doc/AUTHORS share/ghostscript/${PKGVERSION}/doc/C-style.htm -share/ghostscript/${PKGVERSION}/doc/COPYING share/ghostscript/${PKGVERSION}/doc/Changes.htm share/ghostscript/${PKGVERSION}/doc/Commprod.htm share/ghostscript/${PKGVERSION}/doc/DLL.htm @@ -383,8 +383,6 @@ share/ghostscript/${PKGVERSION}/doc/Develop.htm share/ghostscript/${PKGVERSION}/doc/Devices.htm share/ghostscript/${PKGVERSION}/doc/Drivers.htm share/ghostscript/${PKGVERSION}/doc/Fonts.htm -share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.pdf -share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.tex share/ghostscript/${PKGVERSION}/doc/Helpers.htm share/ghostscript/${PKGVERSION}/doc/Hershey.htm share/ghostscript/${PKGVERSION}/doc/History1.htm @@ -406,21 +404,15 @@ share/ghostscript/${PKGVERSION}/doc/Projects.htm share/ghostscript/${PKGVERSION}/doc/Ps-style.htm share/ghostscript/${PKGVERSION}/doc/Ps2epsi.htm share/ghostscript/${PKGVERSION}/doc/Ps2pdf.htm -share/ghostscript/${PKGVERSION}/doc/Ps2ps2.htm share/ghostscript/${PKGVERSION}/doc/Psfiles.htm share/ghostscript/${PKGVERSION}/doc/Readme.htm share/ghostscript/${PKGVERSION}/doc/Release.htm share/ghostscript/${PKGVERSION}/doc/Source.htm share/ghostscript/${PKGVERSION}/doc/Unix-lpr.htm share/ghostscript/${PKGVERSION}/doc/Use.htm -share/ghostscript/${PKGVERSION}/doc/WhatIsGS.htm share/ghostscript/${PKGVERSION}/doc/Xfonts.htm -share/ghostscript/${PKGVERSION}/doc/gs-vms.hlp share/ghostscript/${PKGVERSION}/doc/gs.css -share/ghostscript/${PKGVERSION}/doc/gsdoc.el share/ghostscript/${PKGVERSION}/doc/index.html -share/ghostscript/${PKGVERSION}/doc/pscet_status.txt -share/ghostscript/${PKGVERSION}/doc/thirdparty.htm share/ghostscript/${PKGVERSION}/examples/alphabet.ps share/ghostscript/${PKGVERSION}/examples/annots.pdf share/ghostscript/${PKGVERSION}/examples/chess.ps @@ -443,10 +435,7 @@ share/ghostscript/${PKGVERSION}/examples/golfer.eps share/ghostscript/${PKGVERSION}/examples/grayalph.ps share/ghostscript/${PKGVERSION}/examples/ridt91.eps share/ghostscript/${PKGVERSION}/examples/snowflak.ps -share/ghostscript/${PKGVERSION}/examples/text_graph_image_cmyk_rgb.pdf -share/ghostscript/${PKGVERSION}/examples/text_graphic_image.pdf share/ghostscript/${PKGVERSION}/examples/tiger.eps -share/ghostscript/${PKGVERSION}/examples/transparency_example.ps share/ghostscript/${PKGVERSION}/examples/vasarely.ps share/ghostscript/${PKGVERSION}/examples/waterfal.ps ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_cmyk.icc @@ -520,6 +509,7 @@ share/ghostscript/${PKGVERSION}/lib/dmp_site.ps share/ghostscript/${PKGVERSION}/lib/dnj750c.upp share/ghostscript/${PKGVERSION}/lib/dnj750m.upp share/ghostscript/${PKGVERSION}/lib/docie.ps +share/ghostscript/${PKGVERSION}/lib/dumphint.ps share/ghostscript/${PKGVERSION}/lib/escp_24.src share/ghostscript/${PKGVERSION}/lib/font2c.ps share/ghostscript/${PKGVERSION}/lib/font2pcl.ps @@ -566,6 +556,7 @@ share/ghostscript/${PKGVERSION}/lib/necp2x6.upp share/ghostscript/${PKGVERSION}/lib/packfile.ps share/ghostscript/${PKGVERSION}/lib/pcharstr.ps share/ghostscript/${PKGVERSION}/lib/pdf2dsc.ps +share/ghostscript/${PKGVERSION}/lib/pdfopt.ps share/ghostscript/${PKGVERSION}/lib/pdfwrite.ps share/ghostscript/${PKGVERSION}/lib/pf2afm.ps share/ghostscript/${PKGVERSION}/lib/pfbtopfa.ps diff --git a/print/ghostscript-gpl/buildlink3.mk b/print/ghostscript-gpl/buildlink3.mk new file mode 100644 index 00000000000..daf19a6dbce --- /dev/null +++ b/print/ghostscript-gpl/buildlink3.mk @@ -0,0 +1,33 @@ +# $NetBSD: buildlink3.mk,v 1.13 2013/02/16 11:17:57 wiz Exp $ + +BUILDLINK_TREE+= ghostscript-gpl + +.if !defined(GHOSTSCRIPT_GPL_BUILDLINK3_MK) +GHOSTSCRIPT_GPL_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.ghostscript-gpl+= ghostscript-gpl>=8.63nb1 +BUILDLINK_ABI_DEPENDS.ghostscript-gpl+= ghostscript-gpl>=9.05nb3 +BUILDLINK_PKGSRCDIR.ghostscript-gpl?= ../../print/ghostscript-gpl + +.include "../../graphics/png/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" + +pkgbase := ghostscript-gpl +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mcups) +.include "../../print/cups/buildlink3.mk" +.endif + +.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mfontconfig) +.include "../../fonts/fontconfig/buildlink3.mk" +.endif + +.if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mx11) +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.endif +.endif # GHOSTSCRIPT_GPL_BUILDLINK3_MK + +BUILDLINK_TREE+= -ghostscript-gpl diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo new file mode 100644 index 00000000000..bd5c3ea15ad --- /dev/null +++ b/print/ghostscript-gpl/distinfo @@ -0,0 +1,16 @@ +$NetBSD: distinfo,v 1.41 2012/12/12 16:37:08 bsiegert Exp $ + +SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf +RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084 +Size (ghostscript-9.05.tar.bz2) = 28279634 bytes +SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca +SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de +SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429 +SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65 +SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c +SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc +SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 +SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f +SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae +SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600 +SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 4be081d6c4c9bc632ef8d9685fe4167ea3c51484 diff --git a/print/ghostscript/hacks.mk b/print/ghostscript-gpl/hacks.mk similarity index 92% rename from print/ghostscript/hacks.mk rename to print/ghostscript-gpl/hacks.mk index 623fb5e12a1..15224f7f4e6 100644 --- a/print/ghostscript/hacks.mk +++ b/print/ghostscript-gpl/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2008/11/13 17:36:54 chuck Exp $ +# $NetBSD: hacks.mk,v 1.3 2009/02/16 12:23:14 drochner Exp $ ### [Tue Jan 9 15:57:05 EST 2007 : tv] ### Interix has u_int64_t, but not uint64_t diff --git a/print/ghostscript/options.mk b/print/ghostscript-gpl/options.mk similarity index 95% rename from print/ghostscript/options.mk rename to print/ghostscript-gpl/options.mk index 70846a111c4..9dc1d2658b2 100644 --- a/print/ghostscript/options.mk +++ b/print/ghostscript-gpl/options.mk @@ -17,6 +17,7 @@ CONFIGURE_ARGS+= --with-x .include "../../x11/libXext/buildlink3.mk" .else CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --disable-freetype .endif PLIST_VARS+= cups @@ -49,6 +50,7 @@ CONFIGURE_ARGS+= --enable-debug .include "../../fonts/fontconfig/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-fontconfig +CONFIGURE_ARGS+= --disable-freetype .endif # Please note the same if condition is in post-extract: target in Makefile diff --git a/print/ghostscript-gpl/patches/patch-CVE-2012-4405 b/print/ghostscript-gpl/patches/patch-CVE-2012-4405 new file mode 100644 index 00000000000..356d69f1b6f --- /dev/null +++ b/print/ghostscript-gpl/patches/patch-CVE-2012-4405 @@ -0,0 +1,18 @@ +$NetBSD: patch-CVE-2012-4405,v 1.2 2012/10/07 14:19:18 mef Exp $ + +from RedHat bug #854227 + +--- icclib/icc.c.orig 2009-07-28 07:48:19.000000000 +0000 ++++ icclib/icc.c +@@ -4996,6 +4996,11 @@ + p->clutPoints = read_UInt8Number(bp+10); + + /* Sanity check */ ++ if (p->inputChan < 1) { ++ sprintf(icp->err,"icmLut_read: No input channels!"); ++ return icp->errc = 1; ++ } ++ + if (p->inputChan > MAX_CHAN) { + sprintf(icp->err,"icmLut_read: Can't handle > %d input channels\n",MAX_CHAN); + return icp->errc = 1; diff --git a/print/ghostscript/patches/patch-af b/print/ghostscript-gpl/patches/patch-af similarity index 97% rename from print/ghostscript/patches/patch-af rename to print/ghostscript-gpl/patches/patch-af index dc590c193c6..00a59f21a4b 100644 --- a/print/ghostscript/patches/patch-af +++ b/print/ghostscript-gpl/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-af,v 1.8 2012/10/10 02:18:25 mef Exp $ (From the log for revision 1.4 of print/ghostscript/patches/patch-af) date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4 diff --git a/print/ghostscript/patches/patch-ah b/print/ghostscript-gpl/patches/patch-ah similarity index 94% rename from print/ghostscript/patches/patch-ah rename to print/ghostscript-gpl/patches/patch-ah index ff96547ce23..279228ea0e8 100644 --- a/print/ghostscript/patches/patch-ah +++ b/print/ghostscript-gpl/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-ah,v 1.7 2012/10/10 02:18:25 mef Exp $ (1) First chunk to fix the X11_TYPE=native problem, which freetype2 in /usr/X11R7/ is way old, and work around to diff --git a/print/ghostscript/patches/patch-ai b/print/ghostscript-gpl/patches/patch-ai similarity index 91% rename from print/ghostscript/patches/patch-ai rename to print/ghostscript-gpl/patches/patch-ai index bfe4aa9df36..d8e77837977 100644 --- a/print/ghostscript/patches/patch-ai +++ b/print/ghostscript-gpl/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.4 2009/02/16 16:31:30 drochner Exp $ +$NetBSD: patch-ai,v 1.5 2012/10/07 14:19:18 mef Exp $ replace BSD/Linux specific "qd" printf format specifier by "lld", should fix build problem on Solaris reported by Joern Clausen diff --git a/print/ghostscript/patches/patch-aj b/print/ghostscript-gpl/patches/patch-aj similarity index 86% rename from print/ghostscript/patches/patch-aj rename to print/ghostscript-gpl/patches/patch-aj index 6306638ee29..1845c3aa4c4 100644 --- a/print/ghostscript/patches/patch-aj +++ b/print/ghostscript-gpl/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-aj,v 1.7 2009/11/03 00:06:00 wiz Exp $ http://bugs.ghostscript.com/show_bug.cgi?id=690883 diff --git a/print/ghostscript/patches/patch-al b/print/ghostscript-gpl/patches/patch-al similarity index 91% rename from print/ghostscript/patches/patch-al rename to print/ghostscript-gpl/patches/patch-al index 7aa0bf91d24..99ee9106062 100644 --- a/print/ghostscript/patches/patch-al +++ b/print/ghostscript-gpl/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-al,v 1.3 2010/02/23 20:31:26 drochner Exp $ --- base/unixlink.mak.orig 2010-02-18 12:08:31.000000000 +0000 +++ base/unixlink.mak diff --git a/print/ghostscript-gpl/patches/patch-an b/print/ghostscript-gpl/patches/patch-an new file mode 100644 index 00000000000..bdd19fcf5f4 --- /dev/null +++ b/print/ghostscript-gpl/patches/patch-an @@ -0,0 +1,22 @@ +$NetBSD: patch-an,v 1.4 2012/10/07 14:19:18 mef Exp $ + +Do some initialization of global stuff earlier, in particular before +"@file" args get processed, fixes PR pkg/42984 from T. M. Pederson. +I'm not 100% sure that this has no side effects (the initialization +order in gs is messy and undocumented) but I haven't found any within +some weeks of testing. + +--- psi/imainarg.c.orig 2011-01-13 23:37:33.000000000 +0900 ++++ psi/imainarg.c 2011-03-30 16:22:08.000000000 +0900 +@@ -194,6 +194,11 @@ + return e_Fatal; + } + } ++ ++ code = gs_main_init1(minst); ++ if (code < 0) ++ return code; ++ + while ((arg = arg_next(&args, &code)) != 0) { + switch (*arg) { + case '-': diff --git a/print/ghostscript/patches/patch-base_gdevpng.c b/print/ghostscript-gpl/patches/patch-base_gdevpng.c similarity index 93% rename from print/ghostscript/patches/patch-base_gdevpng.c rename to print/ghostscript-gpl/patches/patch-base_gdevpng.c index 24420ba3076..3d1adcc77aa 100644 --- a/print/ghostscript/patches/patch-base_gdevpng.c +++ b/print/ghostscript-gpl/patches/patch-base_gdevpng.c @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-base_gdevpng.c,v 1.1 2012/10/07 14:19:18 mef Exp $ The patch was included in patches/patch-ak: revision 1.5 diff --git a/print/ghostscript/patches/patch-base_gserrors_h b/print/ghostscript-gpl/patches/patch-base_gserrors_h similarity index 54% rename from print/ghostscript/patches/patch-base_gserrors_h rename to print/ghostscript-gpl/patches/patch-base_gserrors_h index 9e5ffdd1df3..0e5449c3341 100644 --- a/print/ghostscript/patches/patch-base_gserrors_h +++ b/print/ghostscript-gpl/patches/patch-base_gserrors_h @@ -1,11 +1,10 @@ $NetBSD: patch-base_gserrors_h,v 1.1 2012/10/07 14:19:18 mef Exp $ +# This suppresses the noisy warning that __func__ redefined -This suppresses the noisy warning that __func__ redefined. - ---- base/gserrors.h.orig 2013-02-14 07:58:13.000000000 +0000 -+++ base/gserrors.h -@@ -60,6 +60,9 @@ int gs_log_error(int, const char *, int) - #endif +--- base/gserrors.h.orig 2012-02-08 17:48:48.000000000 +0900 ++++ base/gserrors.h 2012-03-24 07:26:35.000000000 +0900 +@@ -53,6 +53,9 @@ + #define return_error(err) return gs_note_error(err) #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L +# if (defined(__func__)) diff --git a/print/ghostscript/patches/patch-configure.ac b/print/ghostscript-gpl/patches/patch-configure.ac similarity index 95% rename from print/ghostscript/patches/patch-configure.ac rename to print/ghostscript-gpl/patches/patch-configure.ac index 05823a86515..b28325d70f3 100644 --- a/print/ghostscript/patches/patch-configure.ac +++ b/print/ghostscript-gpl/patches/patch-configure.ac @@ -4,7 +4,7 @@ See patch-ah (configure) --- base/configure.ac.orig 2011-08-05 20:12:20.000000000 +0900 +++ base/configure.ac 2011-08-22 19:10:30.000000000 +0900 -@@ -514,7 +514,7 @@ +@@ -404,7 +404,7 @@ fi if test x$with_libpaper != xno; then diff --git a/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h similarity index 58% rename from print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h rename to print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h index edd6f521f2d..573b853483a 100644 --- a/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h +++ b/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h @@ -6,14 +6,14 @@ To avoid following problem: | ./sobin/libgs.so: undefined reference to `memalign' | gmake[2]: *** [sobin/gsc] Error 1 ---- openjpeg/libopenjpeg/opj_malloc.h.orig 2013-02-14 07:58:13.000000000 +0000 -+++ openjpeg/libopenjpeg/opj_malloc.h -@@ -84,7 +84,7 @@ Allocate memory aligned to a 16 byte bou +--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-04-18 22:36:57.000000000 +0900 ++++ openjpeg/libopenjpeg/opj_malloc.h 2012-04-18 22:54:13.000000000 +0900 +@@ -84,7 +84,7 @@ #if defined(__sun) #define HAVE_MEMALIGN /* Linux x86_64 and OSX always align allocations to 16 bytes */ -- #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__) -+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) +- #elif !defined(__amd64__) && !defined(__APPLE__) ++ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) #define HAVE_MEMALIGN #include #endif diff --git a/print/ghostscript/ghostscript.buildlink3.mk b/print/ghostscript/ghostscript.buildlink3.mk new file mode 100644 index 00000000000..b1452496c6b --- /dev/null +++ b/print/ghostscript/ghostscript.buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD$ +# +# This file selects the proper buildlink3 file for ghostscript. +# + + +.include "../../mk/bsd.prefs.mk" + +# +# Use ACCEPTABLE_LICENSES to pick the ghostscript package, on the +# theory that the agpl version is newer and therefore preferable if +# it's acceptable. +# +# This should probably support an explicit GS_TYPE or similar setting, +# and we might need GS_ACCEPTED, etc. too. +# + +.if !empty(ACCEPTABLE_LICENSES:Mgnu-agpl-*) +.include "../../print/ghostscript-agpl/buildlink3.mk" +.else +.include "../../print/ghostscript-gpl/buildlink3.mk" +.endif diff --git a/print/ghostscript/ghostscript.mk b/print/ghostscript/ghostscript.mk new file mode 100644 index 00000000000..337fa679789 --- /dev/null +++ b/print/ghostscript/ghostscript.mk @@ -0,0 +1,30 @@ +# $NetBSD$ +# +# This file is for packages that wish to depend on ghostscript, but do +# not compile against it and therefore do not need it buildlinked. +# +# XXX: It is probable that some or all of these should be instead +# setting USE_TOOLS+=gs or USE_TOOLS+=gs:run, but they currently +# aren't and I don't currently have time to tidy them up. Someone +# please see to this... +# +# Packages that compile against ghostscript should use ghostscript.bl3.mk +# instead. +# + +.include "../../mk/bsd.prefs.mk" + +# +# Use ACCEPTABLE_LICENSES to pick the ghostscript package, on the +# theory that the agpl version is newer and therefore preferable if +# it's acceptable. +# +# This should probably support an explicit GS_TYPE or similar setting, +# and we might need GS_ACCEPTED, etc. too. +# + +.if !empty(ACCEPTABLE_LICENSES:Mgnu-agpl-*) +DEPENDS+= ghostscript-agpl-[0-9]*:../../print/ghostscript-agpl +.else +DEPENDS+= ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl +.endif diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 2e2dd92b5e8..9813ef31d0a 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2013/02/06 23:23:31 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2013/02/16 11:24:10 wiz Exp $ # DISTNAME= hplip-3.12.11 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} @@ -176,7 +176,7 @@ post-install: .include "../../mk/jpeg.buildlink3.mk" .include "../../net/net-snmp/buildlink3.mk" .include "../../print/cups/buildlink3.mk" -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .include "../../devel/libusb1/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/py-xml/buildlink3.mk" diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile index d632891c02a..bedd5c7d83c 100644 --- a/print/libspectre/Makefile +++ b/print/libspectre/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2013/02/06 23:21:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2013/02/16 11:19:59 wiz Exp $ DISTNAME= libspectre-0.2.7 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= print MASTER_SITES= http://libspectre.freedesktop.org/releases/ @@ -15,5 +15,5 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libspectre.pc.in -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/libspectre/buildlink3.mk b/print/libspectre/buildlink3.mk index f192be1e0eb..6cebc85a921 100644 --- a/print/libspectre/buildlink3.mk +++ b/print/libspectre/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/02/06 23:21:21 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2013/02/16 11:19:59 wiz Exp $ BUILDLINK_TREE+= libspectre @@ -6,10 +6,10 @@ BUILDLINK_TREE+= libspectre LIBSPECTRE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libspectre+= libspectre>=0.2.1 -BUILDLINK_ABI_DEPENDS.libspectre+= libspectre>=0.2.7nb3 +BUILDLINK_ABI_DEPENDS.libspectre+= libspectre>=0.2.7nb4 BUILDLINK_PKGSRCDIR.libspectre?= ../../print/libspectre -.include "../../print/ghostscript/buildlink3.mk" +.include "../../print/ghostscript/ghostscript.buildlink3.mk" .endif # LIBSPECTRE_BUILDLINK3_MK BUILDLINK_TREE+= -libspectre diff --git a/print/p5-LaTeX-Driver/Makefile b/print/p5-LaTeX-Driver/Makefile index 560f374ad39..4f225828582 100644 --- a/print/p5-LaTeX-Driver/Makefile +++ b/print/p5-LaTeX-Driver/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2012/10/03 21:57:19 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2012/10/08 13:45:42 asau Exp $ # DISTNAME= LaTeX-Driver-0.10 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=LaTeX/} @@ -19,7 +19,8 @@ DEPENDS+= p5-File-Slurp-[0-9]*:../../devel/p5-File-Slurp DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin DEPENDS+= web2c-[0-9]*:../../print/web2c DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript + +.include "../../print/ghostscript/ghostscript.mk" PERL5_PACKLIST= auto/LaTeX/Driver/.packlist diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile index 28c6f1ba23f..055d92a7f5c 100644 --- a/print/tex-musixtex/Makefile +++ b/print/tex-musixtex/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2011/05/26 23:50:43 minskim Exp $ +# $NetBSD: Makefile,v 1.27 2011/11/06 08:43:32 minskim Exp $ DISTNAME= musixtex PKGNAME= tex-${DISTNAME}-1.15 -PKGREVISION= 1 +PKGREVISION= 2 TEXLIVE_REV= 22568 MAINTAINER= dgriffi@cs.csubak.edu @@ -10,7 +10,6 @@ COMMENT= TeX macros for sophisticated music typesetting LICENSE= gnu-gpl-v2 DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex SUBST_CLASSES+= paths @@ -31,4 +30,5 @@ post-extract: ${MV} ${WRKSRC}/texmf-dist/scripts/musixtex/${f}.lua ${WRKSRC}/bin/${f} .endfor +.include "../../print/ghostscript/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile index d3d3c768565..030c4409f8c 100644 --- a/print/xdvik/Makefile +++ b/print/xdvik/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2011/11/29 17:55:07 drochner Exp $ +# $NetBSD: Makefile,v 1.11 2012/10/08 13:45:48 asau Exp $ DISTNAME= texlive-20110705-source PKGNAME= xdvik-22.84.16 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/} EXTRACT_SUFX= .tar.xz @@ -15,7 +15,6 @@ CONFLICTS+= teTeX-bin<3.0nb25 BUILD_DEPENDS+= texlive-tetex-[0-9]*:../../print/texlive-tetex BUILD_DEPENDS+= tex-xdvi-[0-9]*:../../print/tex-xdvi DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript DEPENDS+= kpathsea>=6.0.1:../../print/kpathsea EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ @@ -84,4 +83,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/texmf/xdvi/XDvi \ ${DESTDIR}${PREFIX}/share/texmf-dist/xdvi +.include "../../print/ghostscript/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/Makefile b/security/Makefile index 276ee121788..c9fd6d2d996 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.458 2013/03/15 02:05:03 dsainty Exp $ +# $NetBSD: Makefile,v 1.459 2013/03/15 07:34:27 wiz Exp $ # COMMENT= Security tools @@ -386,6 +386,7 @@ SUBDIR+= ssss SUBDIR+= starttls SUBDIR+= steghide SUBDIR+= stegtunnel +SUBDIR+= stud SUBDIR+= stunnel SUBDIR+= sudo SUBDIR+= systrace-policies diff --git a/security/libyubikey/Makefile b/security/libyubikey/Makefile index 18292b80291..9389961b956 100644 --- a/security/libyubikey/Makefile +++ b/security/libyubikey/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2012/06/16 20:26:12 pettai Exp $ +# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:35 asau Exp $ -DISTNAME= libyubikey-1.9 +DISTNAME= libyubikey-1.10 CATEGORIES= security MASTER_SITES= http://yubico-c.googlecode.com/files/ diff --git a/security/libyubikey/distinfo b/security/libyubikey/distinfo index 39734ff657e..00286ecbe94 100644 --- a/security/libyubikey/distinfo +++ b/security/libyubikey/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2012/03/19 02:12:28 dholland Exp $ +$NetBSD: distinfo,v 1.4 2012/06/16 20:26:12 pettai Exp $ -SHA1 (libyubikey-1.9.tar.gz) = 340789bee32d8c0f2f8b2dfdc1b0be428e3140c8 -RMD160 (libyubikey-1.9.tar.gz) = 73973d67d4ba74d03d07bff58b2e2fee5d0004fd -Size (libyubikey-1.9.tar.gz) = 321889 bytes +SHA1 (libyubikey-1.10.tar.gz) = 796c24f6dd642d25bab782947b134ed1c79aecde +RMD160 (libyubikey-1.10.tar.gz) = 2201be3d0059a3c648e5c11994b1cf594ea2f6a5 +Size (libyubikey-1.10.tar.gz) = 330630 bytes SHA1 (patch-Makefile_in) = c9f4975597c6c81de6902262a65d54a8d9d74898 diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile index ca1429e32da..72858ef8563 100644 --- a/security/oath-toolkit/Makefile +++ b/security/oath-toolkit/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2012/11/10 18:07:44 pettai Exp $ +# $NetBSD: Makefile,v 1.7 2012/11/18 02:25:38 asau Exp $ # -DISTNAME= oath-toolkit-1.12.6 +DISTNAME= oath-toolkit-2.0.2 CATEGORIES= security MASTER_SITES= http://download.savannah.gnu.org/releases/oath-toolkit/ @@ -16,5 +16,7 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= liboath/liboath.pc.in +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../security/xmlsec1/buildlink3.mk" .include "../../mk/pam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/oath-toolkit/PLIST b/security/oath-toolkit/PLIST index 0b7319f7764..da586cdeda1 100644 --- a/security/oath-toolkit/PLIST +++ b/security/oath-toolkit/PLIST @@ -1,23 +1,147 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/05 09:51:20 pettai Exp $ +@comment $NetBSD$ bin/oathtool +bin/pskctool include/liboath/oath.h +include/pskc/container.h +include/pskc/enums.h +include/pskc/errors.h +include/pskc/exports.h +include/pskc/global.h +include/pskc/keypackage.h +include/pskc/pskc.h +include/pskc/version.h lib/liboath.la +lib/libpskc.la lib/pkgconfig/liboath.pc +lib/pkgconfig/libpskc.pc lib/security/pam_oath.la man/man1/oathtool.1 +man/man1/pskctool.1 +man/man3/oath_authenticate_usersfile.3 +man/man3/oath_base32_decode.3 +man/man3/oath_base32_encode.3 +man/man3/oath_bin2hex.3 +man/man3/oath_check_version.3 +man/man3/oath_done.3 +man/man3/oath_hex2bin.3 +man/man3/oath_hotp_generate.3 +man/man3/oath_hotp_validate.3 +man/man3/oath_hotp_validate_callback.3 +man/man3/oath_init.3 +man/man3/oath_strerror.3 +man/man3/oath_strerror_name.3 +man/man3/oath_totp_generate.3 +man/man3/oath_totp_validate.3 +man/man3/oath_totp_validate2.3 +man/man3/oath_totp_validate2_callback.3 +man/man3/oath_totp_validate_callback.3 +man/man3/pskc_build_xml.3 +man/man3/pskc_check_version.3 +man/man3/pskc_done.3 +man/man3/pskc_free.3 +man/man3/pskc_get_cryptomodule_id.3 +man/man3/pskc_get_device_devicebinding.3 +man/man3/pskc_get_device_expirydate.3 +man/man3/pskc_get_device_issueno.3 +man/man3/pskc_get_device_manufacturer.3 +man/man3/pskc_get_device_model.3 +man/man3/pskc_get_device_serialno.3 +man/man3/pskc_get_device_startdate.3 +man/man3/pskc_get_device_userid.3 +man/man3/pskc_get_id.3 +man/man3/pskc_get_key_algorithm.3 +man/man3/pskc_get_key_algparm_chall_checkdigits.3 +man/man3/pskc_get_key_algparm_chall_encoding.3 +man/man3/pskc_get_key_algparm_chall_max.3 +man/man3/pskc_get_key_algparm_chall_min.3 +man/man3/pskc_get_key_algparm_resp_checkdigits.3 +man/man3/pskc_get_key_algparm_resp_encoding.3 +man/man3/pskc_get_key_algparm_resp_length.3 +man/man3/pskc_get_key_algparm_suite.3 +man/man3/pskc_get_key_data_b64secret.3 +man/man3/pskc_get_key_data_counter.3 +man/man3/pskc_get_key_data_secret.3 +man/man3/pskc_get_key_data_time.3 +man/man3/pskc_get_key_data_timedrift.3 +man/man3/pskc_get_key_data_timeinterval.3 +man/man3/pskc_get_key_friendlyname.3 +man/man3/pskc_get_key_id.3 +man/man3/pskc_get_key_issuer.3 +man/man3/pskc_get_key_policy_expirydate.3 +man/man3/pskc_get_key_policy_keyusages.3 +man/man3/pskc_get_key_policy_numberoftransactions.3 +man/man3/pskc_get_key_policy_pinencoding.3 +man/man3/pskc_get_key_policy_pinkeyid.3 +man/man3/pskc_get_key_policy_pinmaxfailedattempts.3 +man/man3/pskc_get_key_policy_pinmaxlength.3 +man/man3/pskc_get_key_policy_pinminlength.3 +man/man3/pskc_get_key_policy_pinusagemode.3 +man/man3/pskc_get_key_policy_startdate.3 +man/man3/pskc_get_key_profileid.3 +man/man3/pskc_get_key_reference.3 +man/man3/pskc_get_key_userid.3 +man/man3/pskc_get_keypackage.3 +man/man3/pskc_get_signed_p.3 +man/man3/pskc_get_version.3 +man/man3/pskc_global_done.3 +man/man3/pskc_global_init.3 +man/man3/pskc_global_log.3 +man/man3/pskc_init.3 +man/man3/pskc_keyusage2str.3 +man/man3/pskc_output.3 +man/man3/pskc_parse_from_memory.3 +man/man3/pskc_pinusagemode2str.3 +man/man3/pskc_sign_x509.3 +man/man3/pskc_str2keyusage.3 +man/man3/pskc_str2pinusagemode.3 +man/man3/pskc_str2valueformat.3 +man/man3/pskc_strerror.3 +man/man3/pskc_strerror_name.3 +man/man3/pskc_validate.3 +man/man3/pskc_valueformat2str.3 +man/man3/pskc_verify_x509crt.3 share/gtk-doc/html/liboath/api-index-1-10-0.html share/gtk-doc/html/liboath/api-index-1-12-0.html share/gtk-doc/html/liboath/api-index-1-4-0.html share/gtk-doc/html/liboath/api-index-1-6-0.html share/gtk-doc/html/liboath/api-index-1-8-0.html share/gtk-doc/html/liboath/api-index-full.html -share/gtk-doc/html/liboath/ch01.html share/gtk-doc/html/liboath/home.png share/gtk-doc/html/liboath/index.html share/gtk-doc/html/liboath/index.sgml +share/gtk-doc/html/liboath/intro.html share/gtk-doc/html/liboath/left.png share/gtk-doc/html/liboath/liboath-oath.html share/gtk-doc/html/liboath/liboath.devhelp2 share/gtk-doc/html/liboath/right.png share/gtk-doc/html/liboath/style.css share/gtk-doc/html/liboath/up.png +share/gtk-doc/html/libpskc/api-index-full.html +share/gtk-doc/html/libpskc/ch02s02.html +share/gtk-doc/html/libpskc/ch02s03.html +share/gtk-doc/html/libpskc/ch02s04.html +share/gtk-doc/html/libpskc/home.png +share/gtk-doc/html/libpskc/index.html +share/gtk-doc/html/libpskc/index.sgml +share/gtk-doc/html/libpskc/left.png +share/gtk-doc/html/libpskc/libpskc-container.html +share/gtk-doc/html/libpskc/libpskc-enums.html +share/gtk-doc/html/libpskc/libpskc-errors.html +share/gtk-doc/html/libpskc/libpskc-global.html +share/gtk-doc/html/libpskc/libpskc-keypackage.html +share/gtk-doc/html/libpskc/libpskc-pskc.html +share/gtk-doc/html/libpskc/libpskc-version.html +share/gtk-doc/html/libpskc/libpskc.devhelp2 +share/gtk-doc/html/libpskc/pskc-reference.html +share/gtk-doc/html/libpskc/pskc-tutorial-libpskc-sign.html +share/gtk-doc/html/libpskc/pskc-tutorial-libpskc-verify.html +share/gtk-doc/html/libpskc/pskc-tutorial-pskctool.html +share/gtk-doc/html/libpskc/pskc-tutorial-quickstart.html +share/gtk-doc/html/libpskc/pskc-tutorial.html +share/gtk-doc/html/libpskc/right.png +share/gtk-doc/html/libpskc/style.css +share/gtk-doc/html/libpskc/up.png +share/xml/pskc/catalog-pskc.xml +share/xml/pskc/pskc-schema.xsd +share/xml/pskc/xenc-schema.xsd +share/xml/pskc/xmldsig-core-schema.xsd diff --git a/security/oath-toolkit/distinfo b/security/oath-toolkit/distinfo dissimilarity index 81% index 096730dd7ff..afcd00e433f 100644 --- a/security/oath-toolkit/distinfo +++ b/security/oath-toolkit/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2012/04/07 19:38:43 joerg Exp $ - -SHA1 (oath-toolkit-1.12.6.tar.gz) = e1d116d7a60aca902b880cd99d542f7896f21e39 -RMD160 (oath-toolkit-1.12.6.tar.gz) = dd6613531f770042b113230f7d42c49a302f6e89 -Size (oath-toolkit-1.12.6.tar.gz) = 2275393 bytes -SHA1 (patch-liboath_gl_fflush.c) = 5a1ff1a9ae740e55816fbd5d33f01145e52368a4 -SHA1 (patch-liboath_gl_fseeko.c) = bd67a1af8c01a2dbf849f8612cbb18470cb3b248 +$NetBSD: distinfo,v 1.7 2012/11/10 18:07:44 pettai Exp $ + +SHA1 (oath-toolkit-2.0.2.tar.gz) = 3672924a9d9c3373ec62a6b79e9aa1e846c4d178 +RMD160 (oath-toolkit-2.0.2.tar.gz) = 751beac5e9b34c0905cfbb4bd58ee7c6b379fd65 +Size (oath-toolkit-2.0.2.tar.gz) = 3946021 bytes +SHA1 (patch-liboath_gl_fflush.c) = d957eed6c3e653ee53bbcf0b95b0c032f092b07d +SHA1 (patch-liboath_gl_fseeko.c) = bd67a1af8c01a2dbf849f8612cbb18470cb3b248 diff --git a/security/oath-toolkit/patches/patch-liboath_gl_fflush.c b/security/oath-toolkit/patches/patch-liboath_gl_fflush.c dissimilarity index 71% index 9677b3b8569..6ae14c6ab74 100644 --- a/security/oath-toolkit/patches/patch-liboath_gl_fflush.c +++ b/security/oath-toolkit/patches/patch-liboath_gl_fflush.c @@ -1,13 +1,13 @@ -$NetBSD: patch-liboath_gl_fflush.c,v 1.1 2012/04/07 19:34:15 joerg Exp $ - ---- liboath/gl/fflush.c.orig 2012-08-07 07:13:22.000000000 +0000 -+++ liboath/gl/fflush.c -@@ -94,7 +94,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P - off_t pos _GL_UNUSED_PARAMETER) - { - #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ --# if defined __CYGWIN__ -+# if defined(__CYGWIN__) || defined(__NetBSD__) - /* fp_->_offset is typed as an integer. */ - fp_->_offset = pos; - # else +$NetBSD$ + +--- liboath/gl/fflush.c.orig 2013-01-03 22:33:04.000000000 +0000 ++++ liboath/gl/fflush.c +@@ -96,7 +96,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P + off_t pos _GL_UNUSED_PARAMETER) + { + # if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +-# if defined __CYGWIN__ ++# if defined(__CYGWIN__) || defined(__NetBSD__) + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else diff --git a/security/pam-yubico/Makefile b/security/pam-yubico/Makefile index 6d714a59c43..d8eda81c869 100644 --- a/security/pam-yubico/Makefile +++ b/security/pam-yubico/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2012/12/16 01:52:33 obache Exp $ +# $NetBSD: Makefile,v 1.6 2013/02/06 23:23:43 jperkin Exp $ -DISTNAME= pam_yubico-2.12 +DISTNAME= pam_yubico-2.13 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 CATEGORIES= security MASTER_SITES= http://yubico-pam.googlecode.com/files/ diff --git a/security/pam-yubico/distinfo b/security/pam-yubico/distinfo index 2e05f4590fa..c65799b86f2 100644 --- a/security/pam-yubico/distinfo +++ b/security/pam-yubico/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2012/06/16 20:45:33 pettai Exp $ +$NetBSD: distinfo,v 1.3 2012/06/16 23:21:14 dholland Exp $ -SHA1 (pam_yubico-2.12.tar.gz) = 37bc2c19b3aaa43f2394eb33241ce95fe37c24c6 -RMD160 (pam_yubico-2.12.tar.gz) = 81aac096d20dd992edf06d8135a6fdb878c77e81 -Size (pam_yubico-2.12.tar.gz) = 367164 bytes +SHA1 (pam_yubico-2.13.tar.gz) = 63de5cc19aa89122709eede7f4f272a00945535d +RMD160 (pam_yubico-2.13.tar.gz) = 9f9280a5c4aea20e6c8b0a66c8fba2ba8fc6365b +Size (pam_yubico-2.13.tar.gz) = 375151 bytes SHA1 (patch-Makefile_in) = 7981018066034283ae7fb67c5d502b0ac89191b6 diff --git a/security/stud/DESCR b/security/stud/DESCR new file mode 100644 index 00000000000..c5d3361e94a --- /dev/null +++ b/security/stud/DESCR @@ -0,0 +1,5 @@ +stud is a network proxy that terminates TLS/SSL connections and forwards +the unencrypted traffic to some backend. It's designed to handle 10s +of thousands of connections efficiently on multicore machines. +stud has very few features. It is designed to be paired with an +intelligent backend like haproxy or nginx. diff --git a/security/stud/Makefile b/security/stud/Makefile new file mode 100644 index 00000000000..e24c4671557 --- /dev/null +++ b/security/stud/Makefile @@ -0,0 +1,62 @@ +# $NetBSD$ +# + +PKGNAME= stud-0.3p53 +CATEGORIES= security +MAINTAINER= jym@NetBSD.org +HOMEPAGE= http://github.com/bumptech/stud +COMMENT= Scalable TLS Unwrapping Daemon +LICENSE= 2-clause-bsd + +MASTER_SITES= http://rohara.fedorapeople.org/stud/ +DISTNAME= bumptech-stud-0.3-51-g0b88039 +WRKSRC= ${WRKDIR}/bumptech-stud-0b88039 + +USE_TOOLS+= gmake pax:run + +BUILD_DEFS+= STUD_USER STUD_GROUP VARBASE + +STUD_USER?= stud +STUD_GROUP?= stud +# Default file that should contain the X509 certificates PEM file +STUD_CERTS?= ${PKG_SYSCONFDIR}/certs.pem +STUD_HOME?= ${VARBASE}/chroot/stud + +PKG_GROUPS?= ${STUD_GROUP} +PKG_USERS?= ${STUD_USER}:${STUD_GROUP} +PKG_GECOS.${STUD_USER}= stud daemon user +PKG_HOME.${STUD_USER}= ${STUD_HOME} + +RCD_SCRIPTS= stud + +EGDIR= ${PREFIX}/share/examples/stud +OWN_DIRS= ${STUD_HOME} +INSTALLATION_DIRS+= bin ${EGDIR} + +FILES_SUBST+= STUD_HOME=${STUD_HOME:Q} + +SUBST_CLASSES+= studconf +SUBST_STAGE.studconf= pre-configure +SUBST_FILES.studconf= stud.conf +SUBST_VARS.studconf= STUD_USER STUD_GROUP STUD_HOME STUD_CERTS +SUBST_MESSAGE.studconf= Set default configuration values. + +SUBST_CLASSES+= makefile +SUBST_STAGE.makefile= pre-configure +SUBST_FILES.makefile= Makefile +SUBST_VARS.makefile= PREFIX +SUBST_MESSAGE.makefile= Set prefix path. + +PKG_SYSCONFSUBDIR= stud +PKG_SYSCONFDIR_PERMS= ${ROOT_USER} ${STUD_GROUP} 0750 +CONF_FILES+= ${EGDIR}/stud.conf ${PKG_SYSCONFDIR}/stud.conf + +post-extract: + ${CP} ${FILESDIR}/stud.conf ${WRKSRC}/stud.conf + +post-install: + ${INSTALL_DATA} ${WRKSRC}/stud.conf ${DESTDIR}${EGDIR}/stud.conf + +.include "../../devel/libev/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/security/stud/PLIST b/security/stud/PLIST new file mode 100644 index 00000000000..5b81e30bb51 --- /dev/null +++ b/security/stud/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD$ +bin/stud +man/man8/stud.8 +share/examples/stud/stud.conf +share/examples/rc.d/stud diff --git a/security/stud/distinfo b/security/stud/distinfo new file mode 100644 index 00000000000..66fe42635ad --- /dev/null +++ b/security/stud/distinfo @@ -0,0 +1,9 @@ +$NetBSD$ + +SHA1 (bumptech-stud-0.3-51-g0b88039.tar.gz) = fad22d9cf008b7db8f30d8d7ca0a6fcc177714de +RMD160 (bumptech-stud-0.3-51-g0b88039.tar.gz) = 66a186e1095fd127945802ab681f5948ee1d4011 +Size (bumptech-stud-0.3-51-g0b88039.tar.gz) = 41000 bytes +SHA1 (patch-Makefile) = c0794c6ebb3bdc3d55b473acec674a9f98b03ffb +SHA1 (patch-configuration.c) = 886226a104f84bac6902bb8a8593d37a25653563 +SHA1 (patch-stud.8) = a6b36ab6ac8c65cbc70172a9c230b22965cbdc3d +SHA1 (patch-stud.c) = 9b11693619291925376f35f1443bbec83a1d798b diff --git a/security/stud/files/stud.conf b/security/stud/files/stud.conf new file mode 100644 index 00000000000..6909c9ed786 --- /dev/null +++ b/security/stud/files/stud.conf @@ -0,0 +1,121 @@ +# +# stud(8), The Scalable TLS Unwrapping Daemon's configuration +# + +# NOTE: all config file parameters can be overriden +# from command line! + +# Listening address. REQUIRED. +# +# type: string +# syntax: [HOST]:PORT +frontend = "[*]:8443" + +# Upstream server address. REQUIRED. +# +# type: string +# syntax: [HOST]:PORT. +backend = "[127.0.0.1]:8000" + +# SSL x509 certificate file. REQUIRED. +# List multiple certs to use SNI. Certs are used in the order they +# are listed; the last cert listed will be used if none of the others match +# +# type: string +pem-file = "@STUD_CERTS@" + +# SSL protocol. +# +# tls = on +# ssl = off + +# List of allowed SSL ciphers. +# +# Run openssl ciphers for list of available ciphers. +# type: string +ciphers = "" + +# Enforce server cipher list order +# +# type: boolean +prefer-server-ciphers = off + +# Use specified SSL engine +# +# type: string +ssl-engine = "" + +# Number of worker processes +# +# type: integer +workers = 1 + +# Listen backlog size +# +# type: integer +backlog = 100 + +# TCP socket keepalive interval in seconds +# +# type: integer +keepalive = 3600 + +# Chroot directory +# +# type: string +chroot = "@STUD_HOME@" + +# Set uid after binding a socket +# +# type: string +user = "@STUD_USER@" + +# Set gid after binding a socket +# +# type: string +group = "@STUD_GROUP@" + +# Quiet execution, report only error messages +# +# type: boolean +quiet = off + +# Use syslog for logging +# +# type: boolean +syslog = off + +# Syslog facility to use +# +# type: string +syslog-facility = "daemon" + +# Run as daemon +# +# type: boolean +daemon = on + +# Report client address by writing IP before sending data +# +# NOTE: This option is mutually exclusive with option write-proxy and proxy-proxy. +# +# type: boolean +write-ip = off + +# Report client address using SENDPROXY protocol, see +# http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt +# for details. +# +# NOTE: This option is mutually exclusive with option write-ip and proxy-proxy. +# +# type: boolean +write-proxy = off + +# Proxy an existing SENDPROXY protocol header through this request. +# +# NOTE: This option is mutually exclusive with option write-ip and write-proxy. +# +# type: boolean +proxy-proxy = off + +# EOF diff --git a/security/stud/files/stud.sh b/security/stud/files/stud.sh new file mode 100644 index 00000000000..99a71b061f2 --- /dev/null +++ b/security/stud/files/stud.sh @@ -0,0 +1,33 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD$ +# + +# PROVIDE: stud +# REQUIRE: LOGIN + +. /etc/rc.subr + +name="stud" +rcvar=$name +command="@PREFIX@/bin/stud" +command_args="--config=@PKG_SYSCONFDIR@/stud.conf" +required_files="@PKG_SYSCONFDIR@/stud.conf" +required_dirs="$stud_chrootdir" + +stud_chrootdir="@STUD_HOME@" +start_precmd="stud_precmd" + +stud_precmd() +{ + for i in null random urandom; do + if [ ! -c "${stud_chrootdir}/dev/$i" ]; then + rm -f "${stud_chrootdir}/dev/$i" + (cd /dev && + /bin/pax -rw -pe "$i" "${stud_chrootdir}/dev") + fi + done +} + +load_rc_config $name +run_rc_command "$1" diff --git a/security/stud/patches/patch-Makefile b/security/stud/patches/patch-Makefile new file mode 100644 index 00000000000..1d34e72868e --- /dev/null +++ b/security/stud/patches/patch-Makefile @@ -0,0 +1,51 @@ +$NetBSD$ + +pkgsrc standards. SunOS fixes as per https://github.com/bumptech/stud/pull/71 +--- Makefile.orig 2012-08-15 10:33:39.000000000 +0000 ++++ Makefile +@@ -2,15 +2,25 @@ + # + # USE_SHARED_CACHE : enable/disable a shared session cache (disabled by default) + +-DESTDIR = +-PREFIX = /usr/local ++DESTDIR?= ++PREFIX ?= @PREFIX@ + BINDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/share/man ++MANDIR = $(PREFIX)/$(PKGMANDIR) + +-CFLAGS = -O2 -g -std=c99 -fno-strict-aliasing -Wall -W -D_GNU_SOURCE -I/usr/local/include +-LDFLAGS = -lssl -lcrypto -lev -L/usr/local/lib ++CFLAGS += -O2 -g -std=c99 -fno-strict-aliasing -Wall -W -D_GNU_SOURCE -I$(PREFIX)/include ++LDFLAGS+= -lssl -lcrypto -lev -L$(PREFIX)/lib + OBJS = stud.o ringbuffer.o configuration.o + ++UNAME := $(shell uname) ++ ++ifeq ($(UNAME),SunOS) ++ # need __EXTENSIONS__ to get signal handling and getopt ++ CFLAGS += -D__EXTENSIONS__ ++ LDFLAGS += -lnsl -lsocket ++else ++ CFLAGS += -DUSE_KEEPIDLE ++endif ++ + all: realall + + # Shared cache feature +@@ -40,10 +50,10 @@ stud: $(OBJS) + $(CC) -o $@ $^ $(LDFLAGS) + + install: $(ALL) +- install -d $(DESTDIR)$(BINDIR) +- install stud $(DESTDIR)$(BINDIR) +- install -d $(DESTDIR)$(MANDIR)/man8 +- install -m 644 stud.8 $(DESTDIR)$(MANDIR)/man8 ++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_PROGRAM) stud $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man8 ++ $(BSD_INSTALL_MAN) stud.8 $(DESTDIR)$(MANDIR)/man8 + + clean: + rm -f stud $(OBJS) diff --git a/security/stud/patches/patch-configuration.c b/security/stud/patches/patch-configuration.c new file mode 100644 index 00000000000..5e6d246a828 --- /dev/null +++ b/security/stud/patches/patch-configuration.c @@ -0,0 +1,48 @@ +$NetBSD$ + +Workaround missing facilities (SunOS). + +--- configuration.c.orig 2013-02-12 08:36:11.000000000 +0000 ++++ configuration.c +@@ -637,13 +637,19 @@ void config_param_validate (char *k, cha + else if (strcmp(k, CFG_SYSLOG_FACILITY) == 0) { + r = 1; + if (!strcmp(v, "auth") || !strcmp(v, "authpriv")) ++#ifdef LOG_AUTHPRIV + cfg->SYSLOG_FACILITY = LOG_AUTHPRIV; ++#else ++ cfg->SYSLOG_FACILITY = LOG_AUTH; ++#endif + else if (!strcmp(v, "cron")) + cfg->SYSLOG_FACILITY = LOG_CRON; + else if (!strcmp(v, "daemon")) + cfg->SYSLOG_FACILITY = LOG_DAEMON; ++#ifdef LOG_FTP + else if (!strcmp(v, "ftp")) + cfg->SYSLOG_FACILITY = LOG_FTP; ++#endif + else if (!strcmp(v, "local0")) + cfg->SYSLOG_FACILITY = LOG_LOCAL0; + else if (!strcmp(v, "local1")) +@@ -813,14 +819,21 @@ char * config_disp_hostport (char *host, + const char * config_disp_log_facility (int facility) { + switch (facility) + { ++#ifdef LOG_AUTHPRIV + case LOG_AUTHPRIV: + return "authpriv"; ++#else ++ case LOG_AUTH: ++ return "auth"; ++#endif + case LOG_CRON: + return "cron"; + case LOG_DAEMON: + return "daemon"; ++#ifdef LOG_FTP + case LOG_FTP: + return "ftp"; ++#endif + case LOG_LOCAL0: + return "local0"; + case LOG_LOCAL1: diff --git a/security/stud/patches/patch-stud.8 b/security/stud/patches/patch-stud.8 new file mode 100644 index 00000000000..2f61bfb295c --- /dev/null +++ b/security/stud/patches/patch-stud.8 @@ -0,0 +1,15 @@ +$NetBSD$ +Give correct man page name for ciphers(1) and dhparam(1). +--- stud.8.orig 2012-08-10 23:40:19.000000000 +0000 ++++ stud.8 +@@ -119,8 +119,8 @@ Write HaProxy's PROXY (IPv4 or IPv6) pro + before actual data. + .El + .Sh SEE ALSO +-.Xr ciphers 1SSL , +-.Xr dhparam 1SSL , ++.Xr openssl_ciphers 1 , ++.Xr openssl_dhparam 1 , + .Xr haproxy 1 + .Sh AUTHORS + .Nm diff --git a/security/stud/patches/patch-stud.c b/security/stud/patches/patch-stud.c new file mode 100644 index 00000000000..69dea938367 --- /dev/null +++ b/security/stud/patches/patch-stud.c @@ -0,0 +1,65 @@ +$NetBSD$ + +SunOS fixes as per https://github.com/bumptech/stud/pull/71. +--- stud.c.orig 2012-08-15 10:33:39.000000000 +0000 ++++ stud.c +@@ -189,9 +189,17 @@ typedef struct proxystate { + + /* Set a file descriptor (socket) to non-blocking mode */ + static void setnonblocking(int fd) { +- int flag = 1; +- +- assert(ioctl(fd, FIONBIO, &flag) == 0); ++ int flag; ++#if defined(O_NONBLOCK) ++ /* O_NONBLOCK is more portable and POSIX-standard */ ++ flag = O_NONBLOCK; ++ assert (fcntl(fd, F_SETFL, flag) == 0); ++#elif defined(FIONBIO) ++ flag = 1; ++ assert (ioctl(fd, FIONBIO, &flag) == 0); ++#else ++# error O_NONBLOCK and FIONBIO are both undefined for this platform ++#endif + } + + /* set a tcp socket to use TCP Keepalive */ +@@ -203,9 +211,9 @@ static void settcpkeepalive(int fd) { + ERR("Error activating SO_KEEPALIVE on client socket: %s", strerror(errno)); + } + ++#ifdef TCP_KEEPIDLE + optval = CONFIG->TCP_KEEPALIVE_TIME; + optlen = sizeof(optval); +-#ifdef TCP_KEEPIDLE + if(setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) { + ERR("Error setting TCP_KEEPIDLE on client socket: %s", strerror(errno)); + } +@@ -1751,24 +1759,16 @@ void daemonize () { + exit(0); + } + +- /* close standard streams */ +- fclose(stdin); +- fclose(stdout); +- fclose(stderr); +- + /* reopen standard streams to null device */ +- stdin = fopen(NULL_DEV, "r"); +- if (stdin == NULL) { ++ if (freopen(NULL_DEV, "r", stdin) == NULL) { + ERR("Unable to reopen stdin to %s: %s\n", NULL_DEV, strerror(errno)); + exit(1); + } +- stdout = fopen(NULL_DEV, "w"); +- if (stdout == NULL) { ++ if (freopen(NULL_DEV, "w", stdout) == NULL) { + ERR("Unable to reopen stdout to %s: %s\n", NULL_DEV, strerror(errno)); + exit(1); + } +- stderr = fopen(NULL_DEV, "w"); +- if (stderr == NULL) { ++ if (freopen(NULL_DEV, "w", stderr) == NULL) { + ERR("Unable to reopen stderr to %s: %s\n", NULL_DEV, strerror(errno)); + exit(1); + } diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile index 06bc2cca605..43d3418e410 100644 --- a/security/ykpers/Makefile +++ b/security/ykpers/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2012/11/10 20:53:43 pettai Exp $ +# $NetBSD: Makefile,v 1.5 2012/11/19 11:40:27 pettai Exp $ # -DISTNAME= ykpers-1.9.0 +DISTNAME= ykpers-1.11.3 CATEGORIES= security MASTER_SITES= http://yubikey-personalization.googlecode.com/files/ diff --git a/security/ykpers/PLIST b/security/ykpers/PLIST index cdc103a9539..f6379597c9e 100644 --- a/security/ykpers/PLIST +++ b/security/ykpers/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2012/11/10 20:53:43 pettai Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/11/19 11:40:27 pettai Exp $ bin/ykchalresp bin/ykinfo bin/ykpersonalize include/ykpers-1/ykcore.h include/ykpers-1/ykdef.h include/ykpers-1/ykpbkdf2.h +include/ykpers-1/ykpers-version.h include/ykpers-1/ykpers.h include/ykpers-1/ykstatus.h lib/libykpers-1.la diff --git a/security/ykpers/distinfo b/security/ykpers/distinfo index ef0b62d47a6..c6b70d39782 100644 --- a/security/ykpers/distinfo +++ b/security/ykpers/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2012/11/10 20:53:43 pettai Exp $ +$NetBSD: distinfo,v 1.5 2012/11/19 11:40:27 pettai Exp $ -SHA1 (ykpers-1.9.0.tar.gz) = 25b44ef793ddd00917447b00b71dc3b683cb56ad -RMD160 (ykpers-1.9.0.tar.gz) = 3ab0ee4ca8ba30f2a538831be0081ed5dab6d38b -Size (ykpers-1.9.0.tar.gz) = 454253 bytes +SHA1 (ykpers-1.11.3.tar.gz) = 252c2748e862c3b44fbe4a1d8e04729d40a8accf +RMD160 (ykpers-1.11.3.tar.gz) = 7587fb00e22f3535b23a72f2e09e2bde0edb4d6b +Size (ykpers-1.11.3.tar.gz) = 463589 bytes SHA1 (patch-Makefile_in) = 78b1667f52367d3ccc9ee637fb2cb40ebd5b2f02 diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile index d82fa13c338..38463611007 100644 --- a/www/SOGo/Makefile +++ b/www/SOGo/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2013/01/26 21:39:00 adam Exp $ +# $NetBSD: Makefile,v 1.11 2013/02/06 23:23:56 jperkin Exp $ # -DISTNAME= SOGo-2.0.2a -PKGREVISION= 3 +DISTNAME= SOGo-2.0.4b CATEGORIES= www MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ @@ -19,12 +18,14 @@ CONFIGURE_ARGS= --enable-debug --disable-strip SOGOUSER?= sogo SOGOGROUP?= sogo -SOGOETCDIR?= ${PKG_SYSCONFDIR}/sogo +SOGOETCDIR?= ${PKG_SYSCONFDIR} SOGORUNDIR?= ${VARBASE}/sogo + INSTALLATION_DIRS+= share/examples/SOGo -CONF_FILES+= ${DESTDIR}${PREFIX}/share/examples/SOGo/sogo-conf.sh \ + +CONF_FILES+= share/examples/SOGo/sogo-conf.sh \ ${PKG_SYSCONFDIR}/sogo-conf.sh -CONF_FILES+= ${DESTDIR}${PREFIX}/share/examples/SOGo/SOGo.conf \ +CONF_FILES+= share/examples/SOGo/SOGo.conf \ ${PKG_SYSCONFDIR}/SOGo.conf OWN_DIRS+= ${SOGOETCDIR} OWN_DIRS+= ${SOGORUNDIR} @@ -38,6 +39,8 @@ PKG_HOME.${SOGOUSER}= ${SOGOETCDIR} PKG_SHELL.${SOGOUSER}= ${SH} PKG_GECOS.${SOGOUSER}= SOGo daemon user +PKG_SYSCONFSUBDIR= sogo + FILES_SUBST+= SOGORUNDIR=${SOGORUNDIR} FILES_SUBST+= SOGOETCDIR=${SOGOETCDIR} FILES_SUBST+= SOGOUSER=${SOGOUSER} diff --git a/www/SOGo/PLIST b/www/SOGo/PLIST index c6c9ad59724..93759fe615c 100644 --- a/www/SOGo/PLIST +++ b/www/SOGo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2011/12/14 15:02:24 manu Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/11/24 14:06:43 manu Exp $ include/GDLContentStore/EOAdaptorChannel+GCS.h include/GDLContentStore/GCSAlarmsFolder.h include/GDLContentStore/GCSChannelManager.h @@ -109,7 +109,7 @@ lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/Info-gnustep.plist lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/SOGoDefaults.plist lib/GNUstep/Frameworks/SOGo.framework/Versions/2/SOGo lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so -lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.2.0.2 +lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.${PKGVERSION} lib/GNUstep/Frameworks/SOGo.framework/Versions/Current lib/GNUstep/Frameworks/SOGo.framework/libSOGo.so lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Abidjan.ics @@ -543,6 +543,7 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -552,6 +553,7 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/Localizab lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -567,6 +569,7 @@ lib/GNUstep/SOGo/Appointments.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/Appointments.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -579,6 +582,7 @@ lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/Localizable.s lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/Appointments.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -593,6 +597,7 @@ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -603,6 +608,7 @@ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strin lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -618,6 +624,7 @@ lib/GNUstep/SOGo/Contacts.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/Contacts.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -628,6 +635,7 @@ lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strin lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/Contacts.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -642,6 +650,7 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -653,6 +662,7 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.st lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SOGoContactFolder.toolbar +lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -668,6 +678,7 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -678,6 +689,7 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianBokmal.lproj/Localizabl lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -776,6 +788,7 @@ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -789,6 +802,7 @@ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoDraftObject.toolbar lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailFolder.toolbar lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailObject.toolbar +lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -810,6 +824,8 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Dutch.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/English.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Finnish.lproj/Locale +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/French.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/German.lproj/Locale @@ -833,6 +849,8 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile-oracle.sql lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile.sql +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Locale +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishSpain.lproj/Locale @@ -852,6 +870,7 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -862,6 +881,7 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable. lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -876,6 +896,7 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Czech.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Danish.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Dutch.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/English.lproj/Localizable.strings +lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Finnish.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/French.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/German.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings @@ -894,6 +915,7 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentObjectDecline.toolbar lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoComponentClose.toolbar lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoEmpty.toolbar lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoTaskObject.toolbar +lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -915,7 +937,6 @@ lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactEditor.wox lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactFoldersView.wox lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactView.wox lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsFilterPanel.wox -lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsListView.wox lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsMailerSelection.wox lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsUserFolders.wox lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsUserRightsEditor.wox @@ -968,6 +989,9 @@ lib/GNUstep/SOGo/Templates/SOGoACLDutchRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLEnglishAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLEnglishModificationAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLEnglishRemovalAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLFinnishAdditionAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLFinnishModificationAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLFinnishRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLFrenchAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLFrenchModificationAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLFrenchRemovalAdvisory.wox @@ -995,6 +1019,9 @@ lib/GNUstep/SOGo/Templates/SOGoACLPolishRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLRussianAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLRussianModificationAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLRussianRemovalAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLSlovakAdditionAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLSlovakModificationAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLSlovakRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaModificationAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaRemovalAdvisory.wox @@ -1019,6 +1046,8 @@ lib/GNUstep/SOGo/Templates/SOGoFolderDutchAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderDutchRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderEnglishAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderEnglishRemovalAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoFolderFinnishAdditionAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoFolderFinnishRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderFrenchAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderFrenchRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderGermanAdditionAdvisory.wox @@ -1037,6 +1066,8 @@ lib/GNUstep/SOGo/Templates/SOGoFolderPolishAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderPolishRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderRussianAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderRussianRemovalAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoFolderSlovakAdditionAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoFolderSlovakRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderSpanishSpainAdditionAdvisory.wox @@ -1186,315 +1217,67 @@ lib/GNUstep/SOGo/WebServerResources/busy.gif lib/GNUstep/SOGo/WebServerResources/calendar-folder-16x16.png lib/GNUstep/SOGo/WebServerResources/calendar-reload.png lib/GNUstep/SOGo/WebServerResources/choose-date.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/LICENSE.html -lib/GNUstep/SOGo/WebServerResources/ckeditor/adapters/jquery.js +lib/GNUstep/SOGo/WebServerResources/ckeditor/LICENSE.md +lib/GNUstep/SOGo/WebServerResources/ckeditor/build-config.js lib/GNUstep/SOGo/WebServerResources/ckeditor/ckeditor.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/ckeditor_basic.js lib/GNUstep/SOGo/WebServerResources/ckeditor/config.js lib/GNUstep/SOGo/WebServerResources/ckeditor/contents.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/images/spacer.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/_languages.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/_translationstatus.txt -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/af.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ar.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/bg.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/bn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/bs.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ca.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/cs.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/cy.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/da.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/de.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/el.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en-au.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en-ca.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en-gb.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/eo.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/es.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/et.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/eu.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fa.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fo.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fr-ca.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/gl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/gu.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/he.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hr.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hu.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/id.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/is.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/it.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ja.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ka.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/km.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ko.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/lt.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/lv.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ms.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nb.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nl.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/no.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pt-br.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pt.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ro.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ru.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sr-latn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sr.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sv.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/th.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/tr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ug.js lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/uk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/vi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/zh-cn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/zh.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/cs.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/cy.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/da.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/de.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/el.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/en.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/eo.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fa.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/gu.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/he.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/it.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/mk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/nb.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/nl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/no.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/pt-br.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/ro.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/tr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/ug.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/vi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/zh-cn.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/about.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/logo_ckeditor.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/ajax/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/autogrow/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/bbcode/plugin.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/clipboard/dialogs/paste.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/colordialog/dialogs/colordialog.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/dialog/dialogDefinition.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/dialogs/div.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/docprops/dialogs/docprops.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/docprops/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/find/dialogs/find.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/flash/dialogs/flash.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/flash/images/placeholder.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/button.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/checkbox.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/form.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/hiddenfield.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/radio.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/select.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/textarea.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/textfield.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/images/hiddenfield.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/iframe/dialogs/iframe.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/iframe/images/placeholder.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/iframedialog/plugin.js +lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/images/spacer.gif +lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/icons.png lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/dialogs/image.js +lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/images/noimage.png lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/dialogs/anchor.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/dialogs/link.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/anchor.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/liststyle/dialogs/liststyle.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pagebreak/images/pagebreak.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pastefromword/filter/default.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pastetext/dialogs/pastetext.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/dialogs/placeholder.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/_translationstatus.txt -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/bg.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/cs.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/cy.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/da.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/de.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/el.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/en.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/eo.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/et.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fa.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/he.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/hr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/it.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/nb.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/nl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/no.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/pl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/pt-br.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/tr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/ug.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/uk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/vi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/zh-cn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/placeholder.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/plugin.js +lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/anchor.png lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/options.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/toolbar.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_address.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_blockquote.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_div.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h1.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h2.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h3.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h4.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h5.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h6.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_p.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_pre.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/dialogs/smiley.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/angel_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/angry_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/broken_heart.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/confused_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/cry_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/devil_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/embaressed_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/envelope.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/heart.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/kiss.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/lightbulb.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/omg_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/regular_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/sad_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/shades_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/teeth_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/thumbs_down.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/thumbs_up.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/tounge_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/wink_smile.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/dialogs/specialchar.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/_translationstatus.txt -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/cs.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/cy.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/de.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/el.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/en.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/eo.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/et.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fa.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/he.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/hr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/it.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/nb.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/nl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/no.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/pt-br.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/tr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/ug.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/zh-cn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/styles/styles/default.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/stylesheetparser/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/table/dialogs/table.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tableresize/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/dialogs/tableCell.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/dialogs/templates.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/default.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template1.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template2.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template3.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/dialogs/uicolor.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/_translationstatus.txt -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/bg.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/cs.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/cy.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/da.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/de.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/el.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/en.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/eo.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/et.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fa.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/he.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/hr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/it.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/mk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/nb.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/nl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/no.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/pl.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/pt-br.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/tr.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/ug.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/uk.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/vi.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/zh-cn.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/uicolor.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/hue_bg.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/picker_mask.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/yui.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/yui.js lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/ciframe.html lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/tmpFrameset.html lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.css lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/xml/plugin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/dialog.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/editor.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/icons.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/icons_rtl.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/dialog_sides.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/dialog_sides.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/dialog_sides_rtl.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/mini.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/noimage.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/sprites.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/sprites_ie6.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/toolbar_start.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/skin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/templates.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/dialog.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/editor.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/icons.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/icons_rtl.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/dialog_sides.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/dialog_sides.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/dialog_sides_rtl.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/mini.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/noimage.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/sprites.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/sprites_ie6.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/skin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/templates.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/dialog.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/editor.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/icons.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/icons_rtl.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/dialog_sides.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/dialog_sides.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/dialog_sides_rtl.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/mini.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/noimage.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/sprites.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/sprites_ie6.png -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/toolbar_start.gif -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/skin.js -lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/templates.css -lib/GNUstep/SOGo/WebServerResources/ckeditor/themes/default/theme.js +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie7.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie8.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_iequirks.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_opera.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_gecko.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie7.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie8.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_iequirks.css +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/icons.png +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/arrow.png +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/close.png +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/mini.png +lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/readme.md +lib/GNUstep/SOGo/WebServerResources/ckeditor/styles.js lib/GNUstep/SOGo/WebServerResources/confidential.png lib/GNUstep/SOGo/WebServerResources/create-account.png lib/GNUstep/SOGo/WebServerResources/datepicker.css @@ -1802,7 +1585,7 @@ lib/libNGCards.so.4.9.0 lib/libOGoContentStore.so lib/libOGoContentStore.so.0.9.0 lib/libSOGo.so -lib/libSOGo.so.2.0.2 +lib/libSOGo.so.${PKGVERSION} lib/libSOGoUI.so lib/libSOGoUI.so.2.0.0 sbin/sogo-ealarms-notify diff --git a/www/SOGo/distinfo b/www/SOGo/distinfo dissimilarity index 99% index dd473f0a181..b7530117b5a 100644 --- a/www/SOGo/distinfo +++ b/www/SOGo/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.5 2011/12/15 12:55:16 dholland Exp $ - -SHA1 (SOGo-2.0.2a.tar.gz) = 0e722b8530465463560c2c9a2c45f748979d8674 -RMD160 (SOGo-2.0.2a.tar.gz) = dd1fc7764e9aa151ed8a64307d75d8130f05a810 -Size (SOGo-2.0.2a.tar.gz) = 6700117 bytes -SHA1 (patch-SoObjects_SOGo_GNUmakefile.preamble) = ae129e2a04ab2e43d58c29c2db0a950881305fb1 -SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 259be0979fbbc61194a0fbccd34d81dee3659186 +$NetBSD: distinfo,v 1.6 2012/11/24 14:06:44 manu Exp $ + +SHA1 (SOGo-2.0.4b.tar.gz) = 37c03286d713c45db12ecfd3e765123350625f96 +RMD160 (SOGo-2.0.4b.tar.gz) = 7728f65b62532b460a00b4608780cf7680b6c305 +Size (SOGo-2.0.4b.tar.gz) = 6276765 bytes +SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 1ea9270c9f17af383d1306d726c0e6c6733ad45a diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble b/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble deleted file mode 100644 index 52ebc21cb2a..00000000000 --- a/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ ---- ./SoObjects/SOGo/GNUmakefile.preamble.orig 2012-11-23 16:15:38.000000000 +0100 -+++ ./SoObjects/SOGo/GNUmakefile.preamble 2012-11-23 16:15:43.000000000 +0100 -@@ -23,9 +23,9 @@ - -lNGMime \ - -lNGStreams -lNGExtensions -lEOControl \ - -lDOM -lSaxObjC \ - -lNGLdap -lSBJson \ -- -lGDLContentStore -lgnustep-base -lobjc -ldl -+ -lGDLContentStore -lgnustep-base -lobjc - - ifeq ($(HAS_LIBRARY_gnutls),yes) - ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1 - SOGo_LIBRARIES_DEPEND_UPON += -lgnutls diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m b/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m index 663ceb8c6d7..be1f96de405 100644 --- a/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m +++ b/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m @@ -1,9 +1,8 @@ -$NetBSD$ +$NetBSD: patch-SoObjects_SOGo_NSData+Crypto.m,v 1.1 2012/11/24 14:06:44 manu Exp $ ---- SoObjects/SOGo/NSData+Crypto.m.orig 2012-11-22 18:43:09.000000000 +0100 -+++ SoObjects/SOGo/NSData+Crypto.m 2012-11-22 18:43:47.000000000 +0100 -@@ -22,9 +22,9 @@ - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +--- SoObjects/SOGo/NSData+Crypto.m.orig 2013-02-04 20:13:13.000000000 +0000 ++++ SoObjects/SOGo/NSData+Crypto.m +@@ -23,7 +23,7 @@ * Boston, MA 02111-1307, USA. */ @@ -12,4 +11,3 @@ $NetBSD$ #include #endif - #include diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile index 62e23083c6d..9b80a4dbffb 100644 --- a/www/calamaris/Makefile +++ b/www/calamaris/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2012/10/03 21:58:28 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2012/10/28 06:30:12 asau Exp $ # -DISTNAME= calamaris-2.58 -PKGREVISION= 1 +DISTNAME= calamaris-2.59 CATEGORIES= www MASTER_SITES= http://cord.de/tools/squid/calamaris/ diff --git a/www/calamaris/distinfo b/www/calamaris/distinfo index d69e3d703ed..ccaf6809890 100644 --- a/www/calamaris/distinfo +++ b/www/calamaris/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2003/06/10 07:13:54 wiz Exp $ +$NetBSD: distinfo,v 1.4 2005/02/24 14:08:29 wiz Exp $ -SHA1 (calamaris-2.58.tar.gz) = e35eac86c498983b85e176e5879fcfce7a4a25c1 -RMD160 (calamaris-2.58.tar.gz) = d42d92ffdf5ff492e6707a93e377d63e6b4f20fe -Size (calamaris-2.58.tar.gz) = 53673 bytes +SHA1 (calamaris-2.59.tar.gz) = 5dc703e247b707482ce28d4612598aa51b101c31 +RMD160 (calamaris-2.59.tar.gz) = f1050e0b896eb851412e754b8137484113ddb19b +Size (calamaris-2.59.tar.gz) = 56168 bytes diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile index 0d269fcb716..3dbf56d75aa 100644 --- a/www/php-owncloud/Makefile +++ b/www/php-owncloud/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.27 2013/03/03 23:53:45 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2013/03/04 21:57:22 wiz Exp $ # DISTNAME= owncloud-4.5.7 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://owncloud.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -19,6 +20,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.3.0:../../archivers/php-zlib +DEPENDS+= ${PHP_PKG_PREFIX}-pdo>=5.3.0:../../databases/php-pdo .include "options.mk" diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo index 1531b9b729d..80b0e4ffe3b 100644 --- a/www/php-owncloud/distinfo +++ b/www/php-owncloud/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2013/01/25 20:02:24 ryoon Exp $ +$NetBSD: distinfo,v 1.13 2013/02/25 21:30:18 ryoon Exp $ SHA1 (owncloud-4.5.7.tar.bz2) = 12c5140e3e6c68ae2e9d19da038c1097892a5310 RMD160 (owncloud-4.5.7.tar.bz2) = 395c7cc5f3a4dee415dec9801f9a0d581907ebeb Size (owncloud-4.5.7.tar.bz2) = 9126728 bytes +SHA1 (patch-apps_user_ldap_lib_access.php) = b4560578e913c27485aa8c4dc27c3192be8704b0 diff --git a/www/php-owncloud/patches/patch-apps_user_ldap_lib_access.php b/www/php-owncloud/patches/patch-apps_user_ldap_lib_access.php new file mode 100644 index 00000000000..179784a41bb --- /dev/null +++ b/www/php-owncloud/patches/patch-apps_user_ldap_lib_access.php @@ -0,0 +1,11 @@ +--- apps/user_ldap/lib/access.php.orig 2013-03-16 18:19:18.000000000 +0100 ++++ apps/user_ldap/lib/access.php 2013-03-16 18:19:35.000000000 +0100 +@@ -602,7 +602,7 @@ + + // Translitaration + //latin characters to ASCII +- $name = iconv('UTF-8', 'ASCII//TRANSLIT', $name); ++ $name = iconv('UTF-8', 'ASCII', $name); + + //REPLACEMENTS + $name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8'); -- 2.11.4.GIT