# HG changeset patch # User Rich Burridge # Date 1361918778 28800 # Node ID 865ee3a7a5e09cbe18d79a97fa929c1288b3b7a5 # Parent d62659e7da8aee2d0a56c4f0abacbba111f38b69 16329677 Update ircii to the latest version. diff -r d62659e7da8a -r 865ee3a7a5e0 components/ircii/Makefile --- a/components/ircii/Makefile Tue Feb 26 13:41:15 2013 -0800 +++ b/components/ircii/Makefile Tue Feb 26 14:46:18 2013 -0800 @@ -20,20 +20,20 @@ # # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= ircii -COMPONENT_VERSION= 20060725 -IPS_COMPONENT_VERSION= 0.2006.7.25 +COMPONENT_VERSION= 20111115 +IPS_COMPONENT_VERSION= 0.2011.11.15 COMPONENT_PROJECT_URL= http://www.eterna.com.au/ircii/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:09c5840cbf9a060acd4f57a24eb4bbacd7c3fba52986a356ffebad736b961dfe -COMPONENT_ARCHIVE_URL= ftp://ircii.warped.com/pub/ircII/old/$(COMPONENT_ARCHIVE) + sha256:629a0a335c790aa5fa9f327532d1d45fd37d2fcd1902e8b0ee28b51994dcf604 +COMPONENT_ARCHIVE_URL= ftp://ircii.warped.com/pub/ircII/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/ircii include ../../make-rules/prep.mk @@ -49,6 +49,18 @@ CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(BITS)) +# The ircio and wserv are now installed in the libexecdir, which by +# default is /usr/libexec. We want to install them under /usr/bin. +# One would think that you could just set --libexecdir=/usr/bin but no. +# The configure script has some logic that just blindly resets it back +# to /usr/libexec. This problem has been reported to the ircii maintainer. +# +# This action modifies the libexecdir setting in the Makefile to /usr/bin +COMPONENT_POST_CONFIGURE_ACTION = \ + $(GSED) -i -e 's|/usr/libexec|/usr/bin|' $(BUILD_DIR_32)/Makefile + +# Enable ASLR for this component +ASLR_MODE = $(ASLR_ENABLE) # common targets build: $(BUILD_32) diff -r d62659e7da8a -r 865ee3a7a5e0 components/ircii/ircii.license --- a/components/ircii/ircii.license Tue Feb 26 13:41:15 2013 -0800 +++ b/components/ircii/ircii.license Tue Feb 26 14:46:18 2013 -0800 @@ -1,8 +1,8 @@ ------------------ -- ircii 20060725 - +- ircii 20111115 - ------------------ -Oracle Internal Tracking Number 5578 +Oracle Internal Tracking Number 12675 /* $eterna: Copyright,v 1.13 2005/04/03 02:35:06 mrg Exp $ */ diff -r d62659e7da8a -r 865ee3a7a5e0 components/ircii/ircii.p5m --- a/components/ircii/ircii.p5m Tue Feb 26 13:41:15 2013 -0800 +++ b/components/ircii/ircii.p5m Tue Feb 26 14:46:18 2013 -0800 @@ -18,51 +18,38 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> set name=pkg.fmri \ value=pkg:/network/chat/ircii@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Internet Relay Chat Client" +set name=pkg.description \ + value="A terminal-based IRC client that runs under most unix platforms." set name=pkg.human-version value=$(COMPONENT_VERSION) -set name=pkg.description value="A terminal-based IRC client that runs under most unix platforms." -set name=pkg.summary value="Internet Relay Chat Client" set name=info.classification \ value=org.opensolaris.category.2008:Applications/Internet set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) -set name=org.opensolaris.arc-caseid \ - value=LSARC/2008/373 +set name=org.opensolaris.arc-caseid value=LSARC/2008/373 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - -dir path=usr -dir path=usr/bin -dir path=usr/share -dir path=usr/share/irc -dir path=usr/share/irc/help -dir path=usr/share/irc/help/alias -dir path=usr/share/irc/help/bind -dir path=usr/share/irc/help/ctcp -dir path=usr/share/irc/help/dcc -dir path=usr/share/irc/help/ircii -dir path=usr/share/irc/help/load -dir path=usr/share/irc/help/note -dir path=usr/share/irc/help/on -dir path=usr/share/irc/help/set -dir path=usr/share/irc/help/window -dir path=usr/share/irc/script -dir path=usr/share/man -dir path=usr/share/man/man1 -file path=usr/bin/irc +dir path=usr +dir path=usr/bin +file usr/bin/irc-$(COMPONENT_VERSION) path=usr/bin/irc file path=usr/bin/ircflush file path=usr/bin/ircio file path=usr/bin/wserv +dir path=usr/share +dir path=usr/share/irc +dir path=usr/share/irc/help file path=usr/share/irc/help/! file path=usr/share/irc/help/.date file path=usr/share/irc/help/: file path=usr/share/irc/help/@ file path=usr/share/irc/help/abort file path=usr/share/irc/help/admin +dir path=usr/share/irc/help/alias file path=usr/share/irc/help/alias/alias file path=usr/share/irc/help/alias/functions file path=usr/share/irc/help/alias/quote @@ -72,6 +59,7 @@ file path=usr/share/irc/help/away file path=usr/share/irc/help/basics file path=usr/share/irc/help/beep +dir path=usr/share/irc/help/bind file path=usr/share/irc/help/bind/backspace file path=usr/share/irc/help/bind/backward_character file path=usr/share/irc/help/bind/backward_history @@ -134,6 +122,7 @@ file path=usr/share/irc/help/commands file path=usr/share/irc/help/comment file path=usr/share/irc/help/connect +dir path=usr/share/irc/help/ctcp file path=usr/share/irc/help/ctcp/action file path=usr/share/irc/help/ctcp/clientinfo file path=usr/share/irc/help/ctcp/ctcp @@ -145,6 +134,7 @@ file path=usr/share/irc/help/ctcp/utc file path=usr/share/irc/help/ctcp/version file path=usr/share/irc/help/date +dir path=usr/share/irc/help/dcc file path=usr/share/irc/help/dcc/chat file path=usr/share/irc/help/dcc/close file path=usr/share/irc/help/dcc/dcc @@ -179,6 +169,7 @@ file path=usr/share/irc/help/input file path=usr/share/irc/help/intro file path=usr/share/irc/help/invite +dir path=usr/share/irc/help/ircii file path=usr/share/irc/help/ircii/copyright file path=usr/share/irc/help/ison file path=usr/share/irc/help/join @@ -188,6 +179,7 @@ file path=usr/share/irc/help/leave file path=usr/share/irc/help/links file path=usr/share/irc/help/list +dir path=usr/share/irc/help/load file path=usr/share/irc/help/load/2.9script file path=usr/share/irc/help/load/action file path=usr/share/irc/help/load/alias @@ -264,6 +256,7 @@ file path=usr/share/irc/help/news file path=usr/share/irc/help/newuser file path=usr/share/irc/help/nick +dir path=usr/share/irc/help/note file path=usr/share/irc/help/note/antiwall file path=usr/share/irc/help/note/count file path=usr/share/irc/help/note/deny @@ -287,6 +280,8 @@ file path=usr/share/irc/help/note/wallops file path=usr/share/irc/help/notice file path=usr/share/irc/help/notify +file path=usr/share/irc/help/nuser +dir path=usr/share/irc/help/on file path=usr/share/irc/help/on/action file path=usr/share/irc/help/on/channel_nick file path=usr/share/irc/help/on/channel_signoff @@ -370,6 +365,7 @@ file path=usr/share/irc/help/sendline file path=usr/share/irc/help/server file path=usr/share/irc/help/servlist +dir path=usr/share/irc/help/set file path=usr/share/irc/help/set/always_split_biggest file path=usr/share/irc/help/set/auto_unmark_away file path=usr/share/irc/help/set/auto_whowas @@ -398,7 +394,6 @@ file path=usr/share/irc/help/set/debug file path=usr/share/irc/help/set/decrypt_program file path=usr/share/irc/help/set/display -file path=usr/share/irc/help/set/display_encoding file path=usr/share/irc/help/set/eight_bit_characters file path=usr/share/irc/help/set/encrypt_program file path=usr/share/irc/help/set/exec_protection @@ -421,12 +416,10 @@ file path=usr/share/irc/help/set/hold_mode_max file path=usr/share/irc/help/set/indent file path=usr/share/irc/help/set/input_aliases -file path=usr/share/irc/help/set/input_encoding file path=usr/share/irc/help/set/input_prompt file path=usr/share/irc/help/set/input_protection file path=usr/share/irc/help/set/insert_mode file path=usr/share/irc/help/set/inverse_video -file path=usr/share/irc/help/set/irc_encoding file path=usr/share/irc/help/set/irchost file path=usr/share/irc/help/set/lastlog file path=usr/share/irc/help/set/lastlog_level @@ -487,6 +480,7 @@ file path=usr/share/irc/help/set/suppress_server_motd file path=usr/share/irc/help/set/tab file path=usr/share/irc/help/set/tab_max +file path=usr/share/irc/help/set/translation file path=usr/share/irc/help/set/underline_video file path=usr/share/irc/help/set/user_information file path=usr/share/irc/help/set/user_wallops @@ -516,6 +510,7 @@ file path=usr/share/irc/help/who file path=usr/share/irc/help/whois file path=usr/share/irc/help/whowas +dir path=usr/share/irc/help/window file path=usr/share/irc/help/window/add file path=usr/share/irc/help/window/addgroup file path=usr/share/irc/help/window/back @@ -565,6 +560,7 @@ file path=usr/share/irc/help/window/window file path=usr/share/irc/help/xecho file path=usr/share/irc/help/xtype +dir path=usr/share/irc/script file path=usr/share/irc/script/2.8script file path=usr/share/irc/script/2.9script file path=usr/share/irc/script/action @@ -646,6 +642,42 @@ file path=usr/share/irc/script/wallopstat file path=usr/share/irc/script/whowas file path=usr/share/irc/script/window +dir path=usr/share/irc/translation +file path=usr/share/irc/translation/ASCII +file path=usr/share/irc/translation/CP437 +file path=usr/share/irc/translation/CP850 +file path=usr/share/irc/translation/DANISH +file path=usr/share/irc/translation/DEC_MCS +file path=usr/share/irc/translation/DG_MCS +file path=usr/share/irc/translation/DUTCH +file path=usr/share/irc/translation/FINNISH +file path=usr/share/irc/translation/FRENCH +file path=usr/share/irc/translation/FRENCH_CANADIAN +file path=usr/share/irc/translation/GERMAN +file path=usr/share/irc/translation/HP_MCS +file path=usr/share/irc/translation/IRV +file path=usr/share/irc/translation/ITALIAN +file path=usr/share/irc/translation/JIS +file path=usr/share/irc/translation/MACINTOSH +file path=usr/share/irc/translation/NEXT +file path=usr/share/irc/translation/NORWEGIAN_1 +file path=usr/share/irc/translation/NORWEGIAN_2 +file path=usr/share/irc/translation/POLISH +file path=usr/share/irc/translation/POLISH_NOPL +file path=usr/share/irc/translation/PORTUGUESE +file path=usr/share/irc/translation/PORTUGUESE_COM +file path=usr/share/irc/translation/RUSSIAN +file path=usr/share/irc/translation/RUSSIAN_ALT +file path=usr/share/irc/translation/RUSSIAN_WIN +file path=usr/share/irc/translation/SPANISH +file path=usr/share/irc/translation/SWEDISH +file path=usr/share/irc/translation/SWEDISH_NAMES +file path=usr/share/irc/translation/SWEDISH_NAMES_COM +file path=usr/share/irc/translation/SWISS +file path=usr/share/irc/translation/UNITED_KINGDOM +file path=usr/share/irc/translation/UNITED_KINGDOM_COM +dir path=usr/share/man +dir path=usr/share/man/man1 +link path=usr/share/man/man1/irc.1 target=ircII.1 file path=usr/share/man/man1/ircII.1 license ircii.license license=BSD -link path=usr/share/man/man1/irc.1 target=ircII.1 diff -r d62659e7da8a -r 865ee3a7a5e0 components/ircii/patches/cast_sbox_h.patch --- a/components/ircii/patches/cast_sbox_h.patch Tue Feb 26 13:41:15 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- ircii-20060725/include/cast_sbox.h.orig 2011-06-27 16:30:51.920110566 -0700 -+++ ircii-20060725/include/cast_sbox.h 2011-06-27 16:31:14.238117457 -0700 -@@ -9,7 +9,7 @@ - */ - - /* sigh */ --#if __STDC__ /* || (__STDC__ == 0 && defined(__sun)) */ -+#if __STDC__ || (__STDC__ == 0 && defined(__sun)) - #define U(x) x##U - #define UL(x) x##UL - #else