diff options
| -rw-r--r-- | net-im/jabber-server/ChangeLog | 10 | ||||
| -rw-r--r-- | net-im/jabber-server/files/ServSetup | 41 | ||||
| -rw-r--r-- | net-im/jabber-server/files/SetupEngine.py | 249 | ||||
| -rw-r--r-- | net-im/jabber-server/files/WriteEngine.py | 351 | ||||
| -rw-r--r-- | net-im/jabber-server/files/config-1.4.2.tar.bz2 | bin | 0 -> 3359 bytes | |||
| -rw-r--r-- | net-im/jabber-server/files/digest-jabber-server-1.4.2 | 7 | ||||
| -rw-r--r-- | net-im/jabber-server/files/digest-jabber-server-1.4.2-r1 | 7 | ||||
| -rw-r--r-- | net-im/jabber-server/files/jabber-server | 5 | ||||
| -rw-r--r-- | net-im/jabber-server/files/jabber.rc6 | 26 | ||||
| -rw-r--r-- | net-im/jabber-server/jabber-server-1.4.2-r1.ebuild | 105 | ||||
| -rw-r--r-- | net-im/jabber-server/jabber-server-1.4.2.ebuild | 87 |
11 files changed, 135 insertions, 753 deletions
diff --git a/net-im/jabber-server/ChangeLog b/net-im/jabber-server/ChangeLog index 4cadbbcaa020..f23895242349 100644 --- a/net-im/jabber-server/ChangeLog +++ b/net-im/jabber-server/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/jabber-server # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/ChangeLog,v 1.2 2002/05/11 08:13:42 verwilst Exp $ + +*jabber-server-1.4.2-r1 (11 May 2002) + + 11 May 2002; B.Verwilst <verwilst@gentoo.org> ChangeLog : + + Totally reworked ebuild, with the latest snapshots of the transports, + this should work virtually out of the box now. Included ssl script as + well. *jabber-server-1.4.1 (1 Feb 2002) diff --git a/net-im/jabber-server/files/ServSetup b/net-im/jabber-server/files/ServSetup deleted file mode 100644 index 06395f64b2b8..000000000000 --- a/net-im/jabber-server/files/ServSetup +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python - -################################################################## -## ## -## Written By Bart Verwilst <verwilst@gentoo.org> ## -## For additions and bugfixes, Please consult the author! ## -## ## -################################################################## - -from SetupEngine import * -from WriteEngine import * - -print " " -print "Gentoo Jabber Server 1.4.1 Configuration Utility (version 0.4)" -print " " -ShowIntro() - -Init = 1 -while Init == 1: - CmdInput = raw_input("Enter your choice: ") - if CmdInput == "1": - SetupGeneral() - elif CmdInput == "2": - JUDConfig() - elif CmdInput == "3": - CONConfig() - elif CmdInput == "4": - AIMConfig() - elif CmdInput == "5": - ICQConfig() - elif CmdInput == "6": - MSNConfig() - elif CmdInput == "7": - YahooConfig() - elif CmdInput == "8": - SecurityConfig() - elif CmdInput == "9": - WriteConfig() - Init = 0 - elif CmdInput == "0": - Init = 0 diff --git a/net-im/jabber-server/files/SetupEngine.py b/net-im/jabber-server/files/SetupEngine.py deleted file mode 100644 index e2877d9e8ee2..000000000000 --- a/net-im/jabber-server/files/SetupEngine.py +++ /dev/null @@ -1,249 +0,0 @@ -#!/usr/bin/env python - -################################################################## -## ## -## Written By Bart Verwilst <verwilst@gentoo.org> ## -## For additions and bugfixes, Please consult the author! ## -## ## -################################################################## - -global GeneralData -GeneralData = {} - -## List all Attribs for GeneralData ## -GeneralData['domainname'] = '' -GeneralData['vcard_subject'] = '' -GeneralData['vcard_desc'] = '' -GeneralData['vcard_url'] = '' -GeneralData['admin_notif'] = '' -GeneralData['new_welcome'] = 0 ## 0 for no messages, 1 for messages ## -GeneralData['new_welcome_subject'] = '' -GeneralData['new_welcome_body'] = '' -GeneralData['vcard2jud'] = 0 ## 0 for no messages, 1 for messages ## - -global JUDData -JUDData = {} - -## List all Attribs for JUDData ## -JUDData['extra_jud'] = 0 -JUDData['jid'] = '' -JUDData['name'] = '' - -global CONData -CONData = {} - -## List all Attribs for CONData ## -CONData['enable_con'] = 0 -CONData['jid'] = '' -CONData['name'] = '' - -global AIMData -AIMData = {} - -## List all Attribs for AIMData ## -AIMData['enable_aim'] = 0 -AIMData['jid'] = '' -AIMData['name'] = '' - -global ICQData -ICQData = {} - -## List all Attribs for ICQData ## -ICQData['enable_icq'] = 0 -ICQData['jid'] = '' -ICQData['name'] = '' - -global MSNData -MSNData = {} - -## List all Attribs for MSNData ## -MSNData['enable_msn'] = 0 -MSNData['jid'] = '' -MSNData['name'] = '' - -global YahooData -YahooData = {} - -## List all Attribs for MSNData ## -YahooData['enable_yahoo'] = 0 -YahooData['jid'] = '' -YahooData['name'] = '' - - -def ShowIntro(): - print " " - print " Choose one of the following options: " - print " [\x1b[32;01m1\x1b[0m] General Server Configuration " - print " [\x1b[32;01m2\x1b[0m] JUD Configuration " - print " [\x1b[32;01m3\x1b[0m] Conference Configuration " - print " [\x1b[32;01m4\x1b[0m] AIM Transport Configuration " - print " [\x1b[32;01m5\x1b[0m] ICQ Transport Configuration " - print " [\x1b[32;01m6\x1b[0m] MSN Transport Configuration " - print " [\x1b[32;01m7\x1b[0m] Yahoo! Transport Configuration " - print " [\x1b[32;01m8\x1b[0m] Server Security Configuration " - print " [\x1b[32;01m9\x1b[0m] Write Configuration File " - print " [\x1b[32;01m0\x1b[0m] Quit " - print " " - -def SetupGeneral(): - print " " - print "<---\x1b[33;02m| General Server Configuration |\x1b[0m--------------------------------->" - GeneralData['domainname'] = raw_input(" Server DomainName (eg. myjabberserver.com):\n # ") - GeneralData['vcard_subject'] = raw_input(" Server vCard: Subject (eg. Jabber Server):\n # ") - GeneralData['vcard_desc'] = raw_input(" Server vCard: Description (eg. My Jabber Server!):\n # ") - GeneralData['vcard_url'] = raw_input(" Server vCard: WebSite URL (eg. http://foo.bar):\n # ") - a = raw_input(" Admin gets notified of new registration? ([yes]|no):\n # ") - if a == "no" or a == "n": - GeneralData['admin_notif'] = 0 - elif a == "yes" or a == "ye" or a == "y": - GeneralData['admin_notif'] = 1 - else: - print " * Incorrect Input, Assuming \"Yes\" *" - GeneralData['admin_notif'] = 1 - - b = raw_input(" Send welcome Message to new users? (yes|[no]):\n # ") - if b == "yes" or b == "ye" or b == "y": - GeneralData['new_welcome'] = 1 - GeneralData['new_welcome_subject'] = raw_input(" * Message Subject (eg. Welcome!):\n # ") - GeneralData['new_welcome_body'] = raw_input(" * Message Body (eg. Welcome to our Jabber server...):\n # ") - else: - GeneralData['new_welcome'] = 0 - print " * Welcome Messages will NOT be sent *" - - c = raw_input(" Auto-Update JUD when vCard is edited? ([yes]|no):\n # ") - if c == "no" or c == "n": - GeneralData['vcard2jud'] = 0 - elif c == "yes" or c == "ye" or c == "y": - GeneralData['vcard2jud'] = 1 - else: - print " * Incorrect Input, Assuming \"Yes\" *" - GeneralData['vcard2jud'] = 1 - - - print " " - print " *** \x1b[32;02mGeneral Server Configuration Finished SuccessFully!\x1b[0m ***" - print " " - ShowIntro() - - -def JUDConfig(): - print " " - print "<---\x1b[33;02m| Jabber User Directory Configuration |\x1b[0m--------------------------------->" - - a = raw_input(" Do you want to add a second JUD (eg. Intranet JUD?) ([yes]|no):\n # ") - if a == "yes" or a == "ye" or a == "y" or a == "": - JUDData['extra_jud'] = 1 - JUDData['jid'] = raw_input(" Enter JabberID for server (eg. users.foo.bar):\n # ") - JUDData['name'] = raw_input(" Enter Name for server (eg. My Intranet JUD):\n # ") - else: - print " * No extra JUD will be configured *" - JUDData['extra_jud'] = 0 - - print " " - print " *** JUD Configuration Finished SuccessFully! ***" - print " " - ShowIntro() - -def CONConfig(): - print " " - print "<---\x1b[33;02m| Conference Configuration |\x1b[0m--------------------------------->" - a = raw_input(" Do you want to enable Conferencing on your server? ([yes]|no):\n # ") - if a == "yes" or a == "ye" or a == "y" or a == "": - CONData['enable_con'] = 1 - CONData['jid'] = raw_input(" Enter Prefix for the Conference Host (default: conference):\n # ") - if CONData['jid'] == "": - CONData['jid'] = "conference" - CONData['name'] = raw_input(" Enter Name for Conference Transport (eg. My Own Conf. Transport):\n # ") - else: - print " * No extra JUD will be configured *" - CONData['extra_jud'] = 0 - - print " " - print " *** Conference Configuration Finished SuccessFully! ***" - print " " - ShowIntro() - -def AIMConfig(): - print " " - print "<---\x1b[33;02m| AIM Transport Configuration |\x1b[0m--------------------------------->" - a = raw_input(" Do you want to enable the AIM Transport on your server? ([yes]|no):\n # ") - if a == "yes" or a == "ye" or a == "y" or a == "": - AIMData['enable_aim'] = 1 - AIMData['jid'] = raw_input(" Enter Prefix for the AIM Host (default: aim):\n # ") - if AIMData['jid'] == "": - AIMData['jid'] = "aim" - AIMData['name'] = raw_input(" Enter Name for AIM Transport (eg. My Own AIM Transport):\n # ") - else: - print " * AIM Transport will NOT be installed *" - AIMData['enable_aim'] = 0 - - print " " - print " *** AIM Transport Configuration Finished SuccessFully! ***" - print " " - ShowIntro() - -def ICQConfig(): - print " " - print "<---\x1b[33;02m| ICQ Transport Configuration |\x1b[0m--------------------------------->" - a = raw_input(" Do you want to enable the ICQ Transport on your server? ([yes]|no):\n # ") - if a == "yes" or a == "ye" or a == "y" or a == "": - ICQData['enable_icq'] = 1 - ICQData['jid'] = raw_input(" Enter Prefix for the ICQ Host (default: icq):\n # ") - if ICQData['jid'] == "": - ICQData['jid'] = "icq" - ICQData['name'] = raw_input(" Enter Name for ICQ Transport (eg. My Own ICQ Transport):\n # ") - else: - print " * ICQ Transport will NOT be installed *" - ICQData['enable_icq'] = 0 - - print " " - print " *** ICQ Transport Configuration Finished SuccessFully! ***" - print " " - ShowIntro() - -def MSNConfig(): - print " " - print "<---\x1b[33;02m| MSN Transport Configuration |\x1b[0m--------------------------------->" - a = raw_input(" Do you want to enable the MSN Transport on your server? ([yes]|no):\n # ") - if a == "yes" or a == "ye" or a == "y" or a == "": - MSNData['enable_msn'] = 1 - MSNData['jid'] = raw_input(" Enter Prefix for the MSN Host (default: msn):\n # ") - if MSNData['jid'] == "": - MSNData['jid'] = "msn" - MSNData['name'] = raw_input(" Enter Name for MSN Transport (eg. My Own MSN Transport):\n # ") - else: - print " * MSN Transport will NOT be installed *" - MSNData['enable_msn'] = 0 - - print " " - print " *** MSN Transport Configuration Finished SuccessFully! ***" - print " " - ShowIntro() - -def YahooConfig(): - print " " - print "<---\x1b[33;02m| Yahoo! Transport Configuration |\x1b[0m--------------------------------->" - a = raw_input(" Do you want to enable the Yahoo! Transport on your server? ([yes]|no):\n # ") - if a == "yes" or a == "ye" or a == "y" or a == "": - YahooData['enable_yahoo'] = 1 - YahooData['jid'] = raw_input(" Enter Prefix for the Yahoo! Host (default: msn):\n # ") - if YahooData['jid'] == "": - YahooData['jid'] = "yahoo" - YahooData['name'] = raw_input(" Enter Name for Yahoo! Transport (eg. My Own Yahoo! Transport):\n # ") - else: - print " * Yahoo! Transport will NOT be installed *" - MSNData['enable_yahoo'] = 0 - - print " " - print " *** Yahoo! Transport Configuration Finished SuccessFully! ***" - print " " - ShowIntro() - -def SecurityConfig(): - print " " - print "<---\x1b[33;02m| Server Security Configuration |\x1b[0m--------------------------------->" - - print " " - print " *** Server Security Configuration Finished SuccessFully! ***" - print " " - ShowIntro()
\ No newline at end of file diff --git a/net-im/jabber-server/files/WriteEngine.py b/net-im/jabber-server/files/WriteEngine.py deleted file mode 100644 index b820df582c55..000000000000 --- a/net-im/jabber-server/files/WriteEngine.py +++ /dev/null @@ -1,351 +0,0 @@ -#!/usr/bin/env python - -################################################################## -## ## -## Written By Bart Verwilst <verwilst@gentoo.org> ## -## For additions and bugfixes, Please consult the author! ## -## ## -################################################################## -from SetupEngine import * - -def WriteConfig(): - if GeneralData['admin_notif'] == 0: - admin_notif = "<register notify=\"no\">" - else: - admin_notif = "<register notify=\"yes\">" - - if GeneralData['new_welcome'] == 0: - new_welcome = " " - else: - new_welcome = """ - <welcome> - <subject>""" + GeneralData['new_welcome_subject'] + """</subject> - <body>""" + GeneralData['new_welcome_body'] + """</body> - </welcome> - """ - - if GeneralData['vcard2jud'] == 0: - vcard2jud = " " - else: - vcard2jud = """ - <vcard2jud/>""" - - if JUDData['extra_jud'] == 1: - extra_jud_1 = """ - <service """ + "type=\"jud\" jid=\"" + JUDData['jid'] + "\" name=\"" + JUDData['name'] + """\"> - <ns>jabber:iq:search</ns> - <ns>jabber:iq:register</ns> - </service>""" - extra_jud_2 = """<service id="jud"> <host>jud.""" + GeneralData['domainname'] + """</host> - <load><jud>./jud-0.4/jud.so</jud></load> - <jud xmlns="jabber:config:jud"> - <vCard> - <FN>User Directory on """ + GeneralData['domainname'] + """</FN> - <DESC>This service provides a simple user directory service.</DESC> - <URL>""" + GeneralData['vcard_url'] + """</URL> - </vCard> - </jud> - </service> - """ - else: - extra_jud_1 = " " - extra_jud_2 = " " - - if CONData['enable_con'] == 1: - enable_con_1 = "\n<conference type=\"private\" jid=\"" + CONData['jid'] + "\" name=\"" + CONData['name'] + """\"/>""" - enable_con_2 = "\n<service id=\"" + CONData['jid'] + "." + GeneralData['domainname'] + "\">" + """ - <load><conference>./conference-0.4.1/conference.so</conference></load> - <conference xmlns="jabber:config:conference"> - <vCard> - <FN>Conferencing Service</FN> - <DESC>This service is for private chatrooms.</DESC> - <URL>""" + GeneralData['vcard_url'] + """</URL> - </vCard> - <history>20</history> - <notice> - <join> has joined</join> - <leave> has left</leave> - <rename> is now known as </rename> - </notice> - </conference> - </service> - """ - - else: - enable_con_1 = " " - enable_con_2 = " " - - - if AIMData['enable_aim'] == 1: - enable_aim_1 = """ - <service """ + "type=\"aim\" jid=\"" + AIMData['jid'] + "\" name=\"" + AIMData['name'] + """\"> - <ns>jabber:iq:gateway</ns> - <ns>jabber:iq:search</ns> - <ns>jabber:iq:register</ns> - </service>""" - enable_aim_2 = "<service id=" + AIMData['jid'] + "." + GeneralData['domainname'] + """> - <aimtrans xmlns='jabber:config:aimtrans'> - <vCard> - <FN>AIM Transport</FN> - <DESC>The AIM Transport</DESC> - <URL>""" + GeneralData['vcard_url'] + """</URL> - </vCard> - </aimtrans> - <load> - <aim_transport>./aim-transport-0.9.24c/src/aimtrans.so</aim_transport> - </load> - </service> - """ - else: - enable_aim_1 = " " - enable_aim_2 = " " - - - if ICQData['enable_icq'] == 1: - enable_icq_1 = """ - <service """ + "type=\"icq\" jid=\"" + ICQData['jid'] + "\" name=\"" + ICQData['name'] + """\"> - <ns>jabber:iq:gateway</ns> - <ns>jabber:iq:search</ns> - <ns>jabber:iq:register</ns> - </service>""" - enable_icq_2 = "<service id=" + ICQData['jid'] + "." + GeneralData['domainname'] + """> - <!-- ?? <aimtrans xmlns='jabber:config:aimtrans'> ?? --> - <icqtrans xmlns="jabber:config:icqtrans"> - <instructions>Please enter your ICQ number (in the "username" field), - nickname, and password. Leave the "username" field blank - to create a new ICQ number.</instructions> - <search>Search for ICQ users</search> - <vCard> - <FN>ICQ Transport</FN> - <DESC>The ICQ Transport</DESC> - <URL>""" + GeneralData['vcard_url'] + """</URL> - </vCard> - <prime>37</prime> - <ports> - <min>2000</min> - <max>3000</max> - </ports> - </icqtrans> - <load> - <icqtrans>./aim-transport-0.9.24c/src/aimtrans.so</icqtrans> - </load> - </service> - """ - else: - enable_icq_1 = " " - enable_icq_2 = " " - - - if MSNData['enable_msn'] == 1: - enable_msn_1 = """ - <service """ + "type=\"msn\" jid=\"" + MSNData['jid'] + "\" name=\"" + MSNData['name'] + """\"> - <ns>jabber:iq:gateway</ns> - <ns>jabber:iq:register</ns> - </service>""" - enable_msn_2 = "<service id=" + MSNData['jid'] + "." + GeneralData['domainname'] + """> - <msntrans xmlns="jabber:config:msntrans"> - <instructions>Enter your MSN Messenger account and password. Example: user1@hotmail.com. Nickname is optional.</instructions> - <search>Search for ICQ users</search> - <vCard> - <FN>MSN Transport</FN> - <DESC>The MSN Transport</DESC> - <URL>""" + GeneralData['vcard_url'] + """</URL> - </vCard> - </msntrans> - <load> - <msntrans>./msn-transport-1.1/msntrans.so</msntrans> - </load> - </service> - """ - else: - enable_msn_1 = " " - enable_msn_2 = " " - - - - f = open('jabber.xml', 'w') - f.write(""" -<jabber> - <!-- This Jabber Server Configuration File is built with Dr. JabServ, - the Jabber Config Tool... --> - - <service id="sessions"> - - <host><jabberd:cmdline flag="h">""" + GeneralData['domainname'] + """</jabberd:cmdline></host> - - <jsm xmlns="jabber:config:jsm"> - - <filter> - <default/> - <max_size>100</max_size> - <allow> - <conditions> - <ns/> - <unavailable/> - <from/> - <resource/> - <subject/> - <body/> - <show/> - <type/> - <roster/> - <group/> - </conditions> - <actions> - <error/> - <offline/> - <forward/> - <reply/> - <continue/> - <settype/> - </actions> - </allow> - </filter> - - <vCard> - <FN>""" + GeneralData['vcard_subject'] + """</FN> - <DESC>""" + GeneralData['vcard_desc'] + """</DESC> - <URL>""" + GeneralData['vcard_url'] + """</URL> - </vCard> - - """ + admin_notif + """ - <instructions>Choose a username and password to register with this server.</instructions> - <name/> - <email/> - </register> - - """ + new_welcome + vcard2jud + """ - - - <browse> - - <service type="jud" jid="users.jabber.org" name="Jabber User Directory"> - <ns>jabber:iq:search</ns> - <ns>jabber:iq:register</ns> - </service> - """ + extra_jud_1 + enable_con_1 + enable_aim_1 + enable_icq_1 + """ - - </browse> - - - </jsm> - - <load main="jsm"> - <jsm>./jsm/jsm.so</jsm> - <mod_echo>./jsm/jsm.so</mod_echo> - <mod_roster>./jsm/jsm.so</mod_roster> - <mod_time>./jsm/jsm.so</mod_time> - <mod_vcard>./jsm/jsm.so</mod_vcard> - <mod_last>./jsm/jsm.so</mod_last> - <mod_version>./jsm/jsm.so</mod_version> - <mod_announce>./jsm/jsm.so</mod_announce> - <mod_agents>./jsm/jsm.so</mod_agents> - <mod_browse>./jsm/jsm.so</mod_browse> - <mod_admin>./jsm/jsm.so</mod_admin> - <mod_filter>./jsm/jsm.so</mod_filter> - <mod_offline>./jsm/jsm.so</mod_offline> - <mod_presence>./jsm/jsm.so</mod_presence> - <mod_auth_plain>./jsm/jsm.so</mod_auth_plain> - <mod_auth_digest>./jsm/jsm.so</mod_auth_digest> - <mod_auth_0k>./jsm/jsm.so</mod_auth_0k> - <mod_log>./jsm/jsm.so</mod_log> - <mod_register>./jsm/jsm.so</mod_register> - <mod_xml>./jsm/jsm.so</mod_xml> - </load> - - </service> - - <xdb id="xdb"> - <host/> - <load> - <xdb_file>./xdb_file/xdb_file.so</xdb_file> - </load> - <xdb_file xmlns="jabber:config:xdb_file"> - <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool> - </xdb_file> - </xdb> - - <service id="c2s"> - <load> - <pthsock_client>./pthsock/pthsock_client.so</pthsock_client> - </load> - <pthcsock xmlns='jabber:config:pth-csock'> - <authtime/> - <karma> - <init>10</init> - <max>10</max> - <inc>1</inc> - <dec>1</dec> - <penalty>-6</penalty> - <restore>10</restore> - </karma> - - <ip port="5222"/> - - </pthcsock> - </service> - - <log id='elogger'> - <host/> - <logtype/> - <format>%d: [%t] (%h): %s</format> - <file>error.log</file> - <stderr/> - </log> - - <log id='rlogger'> - <host/> - <logtype>record</logtype> - <format>%d %h %s</format> - <file>record.log</file> - </log> - - <service id="dnsrv"> - <host/> - <load> - <dnsrv>./dnsrv/dnsrv.so</dnsrv> - </load> - <dnsrv xmlns="jabber:config:dnsrv"> - <resend service="_jabber._tcp">s2s</resend> <!-- for supporting SRV records --> - <resend>s2s</resend> - </dnsrv> - </service> - - <service id="s2s"> - <load> - <dialback>./dialback/dialback.so</dialback> - </load> - <dialback xmlns='jabber:config:dialback'> - <legacy/> - <ip port="5269"/> - <karma> - <init>50</init> - <max>50</max> - <inc>4</inc> - <dec>1</dec> - <penalty>-5</penalty> - <restore>50</restore> - </karma> - </dialback> - </service> - - """ + extra_jud_2 + enable_con_2 + enable_aim_2 + enable_icq_2 + """ - - <io> - - <rate points="5" time="25"/> - - </io> - - <pidfile>./jabber.pid</pidfile> - - -</jabber>""") - - f.close() - - - - print " " - print "Jabber Server Configuration File Written.... Exiting...." - print " " diff --git a/net-im/jabber-server/files/config-1.4.2.tar.bz2 b/net-im/jabber-server/files/config-1.4.2.tar.bz2 Binary files differnew file mode 100644 index 000000000000..7cae8d56ec7d --- /dev/null +++ b/net-im/jabber-server/files/config-1.4.2.tar.bz2 diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.2 b/net-im/jabber-server/files/digest-jabber-server-1.4.2 deleted file mode 100644 index 983eae5f1be6..000000000000 --- a/net-im/jabber-server/files/digest-jabber-server-1.4.2 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 e5a0f96ba804a1626e37806d17114e1e jabber-1.4.2.tar.gz 691919 -MD5 a3c18654d41ebfaa3c74117004bf7d93 aim-transport-0.9.24c.tar.gz 298241 -MD5 01b825d9f917674f25fdba29255d081b conference-0.4.1.tar.gz 9645 -MD5 a08ef678fa8d768d7696af5bb85d1e34 irc-transport-0.1.1-1.4.linux.tar.gz 126244 -MD5 a057e8dd5966fa0d26ded03697ba395a jud-0.4.tar.gz 3950 -MD5 251cd4b6cfc6c52a0f15c3ff2bfbfff9 msn-transport-1.1.tar.gz 24399 -MD5 0850f8d36d7b1e8df656fa84d03c82ba yahoo-transport-0.8-1.4.linux.tar.gz 143828 diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r1 b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r1 new file mode 100644 index 000000000000..2a23d203c69e --- /dev/null +++ b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r1 @@ -0,0 +1,7 @@ +MD5 e5a0f96ba804a1626e37806d17114e1e jabber-1.4.2.tar.gz 691919 +MD5 b17f55aa42a3e6e6ca484fa2e9688b87 conference-0.4.tar.gz 9533 +MD5 a057e8dd5966fa0d26ded03697ba395a jud-0.4.tar.gz 3950 +MD5 802fbf87f950147afe47841af234d40d aim-transport-stable-20020503.tar.gz 149342 +MD5 7cff38bc6f2b0adae9e942cffa1b5b70 msn-transport-stable-20011217.tar.gz 33781 +MD5 910073bf65c00b08aa2edd95ca122ece yahoo-transport-0.8.4.6.tar.gz 89610 +MD5 3946cf625278fb5899cad78d49f469d4 Install_AIM_3.5.1670.exe 2452872 diff --git a/net-im/jabber-server/files/jabber-server b/net-im/jabber-server/files/jabber-server deleted file mode 100644 index c05d0d6165a6..000000000000 --- a/net-im/jabber-server/files/jabber-server +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cd /usr/jabber-1.4.2 -chown -R jabber.jabber /usr/jabber -su - jabber -c "./jabberd/jabberd &" diff --git a/net-im/jabber-server/files/jabber.rc6 b/net-im/jabber-server/files/jabber.rc6 index 3101de7d2db7..7a12d2687087 100644 --- a/net-im/jabber-server/files/jabber.rc6 +++ b/net-im/jabber-server/files/jabber.rc6 @@ -1,28 +1,30 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/files/jabber.rc6,v 1.2 2002/02/13 16:04:42 verwilst Exp $ - +# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/files/jabber.rc6,v 1.3 2002/05/11 08:13:42 verwilst Exp $ depend() { need net } -checkconfig() { - if [ ! -e /usr/jabber-1.4.2/jabber.xml ] ; then - eerror "You need an /usr/jabber/jabber.xml file first" - return 1 - fi -} - start() { - checkconfig || return 1 ebegin "Starting Jabber Server" - start-stop-daemon --start --quiet --exec /usr/sbin/jabber-server + + cd /usr/jabber-1.4.2 + + ./jabberd/jabberd -c multiple.xml & + ./jabberd/jabberd -c aimtrans.xml & + ./jabberd/jabberd -c msntrans.xml & + ./jabberd/jabberd -c yahootrans.xml & + ./jabberd/jabberd -c confserv.xml & + ./jabberd/jabberd -c icqtrans.xml & + ./jabberd/jabberd -c judserv.xml & + eend $? } stop() { ebegin "Stopping Jabber Server" - start-stop-daemon --stop --quiet --pidfile /usr/jabber-1.4.2/jabber.pid + killall jabberd + sleep 2 eend $? } diff --git a/net-im/jabber-server/jabber-server-1.4.2-r1.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r1.ebuild new file mode 100644 index 000000000000..bcb72f3beaf5 --- /dev/null +++ b/net-im/jabber-server/jabber-server-1.4.2-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# Author Bart Verwilst <verwilst@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r1.ebuild,v 1.1 2002/05/11 08:13:42 verwilst Exp $ + +S="${WORKDIR}/jabber-${PV}" +DESCRIPTION="Open Source Jabber Server & JUD,AIM,MSN,ICQ,Yahoo and Conference transports" +HOMEPAGE="http://www.jabber.org" +SRC_URI="http://jabberd.jabberstudio.org/downloads/jabber-${PV}.tar.gz + http://jabberd.jabberstudio.org/downloads/conference-0.4.tar.gz + http://jabberd.jabberstudio.org/downloads/jud-0.4.tar.gz + http://www.ibiblio.org/gentoo/distfiles/aim-transport-stable-20020503.tar.gz + http://www.ibiblio.org/gentoo/distfiles/msn-transport-stable-20011217.tar.gz + http://www.ibiblio.org/gentoo/distfiles/yahoo-transport-0.8.4.6.tar.gz + http://www.ibiblio.org/gentoo/distfiles/Install_AIM_3.5.1670.exe" + +DEPEND="virtual/glibc + >=dev-libs/pth-1.4.0 + ssl? ( >=dev-libs/openssl-0.9.6c )" + +src_unpack() { + + unpack jabber-${PV}.tar.gz + cd ${S} + tar -xjf ${FILESDIR}/config-1.4.2.tar.bz2 + unpack msn-transport-stable-20011217.tar.gz + unpack aim-transport-stable-20020503.tar.gz + unpack conference-0.4.tar.gz + unpack jud-0.4.tar.gz + unpack yahoo-transport-0.8.4.6.tar.gz + cd ${S}/aim-transport + cp ${DISTDIR}/Install_AIM_3.5.1670.exe . + +} + +src_compile() { + + local myconf + cd ${S} + use ssl && myconf="--enable-ssl" + + mv jabberd/jabberd.c jabberd/jabberd.c.orig + sed 's:pstrdup(jabberd__runtime,HOME):"/usr/jabber-1.4.2":' jabberd/jabberd.c.orig > jabberd/jabberd.c + rm -f jabberd/jabberd.c.orig + ./configure ${myconf} || die + make || die + + cd ${S}/conference-0.4 + make || die + + cd ${S}/jud-0.4 + make || die + + cd ${S}/aim-transport + ./autogen.sh || die + make || die + + cd ${S}/msn-transport + ./bootstrap || die + ./configure || die + make || die + + cd ${S}/yahoo-transport + CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./autogen.sh || die + make || die + +} + + +src_install() { + + cd ${S} + touch error.log + touch record.log + exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6 jabber + mkdir -p ${D}/usr/jabber-${PV} + cp -rf * ${D}/usr/jabber-${PV}/ + cd ${D}/usr/jabber-${PV}/jabberd + +} + +pkg_postinst() { + + cd /usr/jabber-${PV} + groupadd jabber + useradd jabber -s /bin/false -d /usr/jabber-${PV} -g jabber -m + chown jabber.jabber * -R + chmod o-rwx * -R + chmod g-x * -R + chmod g+rw * -R + chmod u+xs jabberd/jabberd + + einfo "Change 'localhost' to your server's domainname in the *.xml configs first" + einfo "To enable SSL connections, execute ./self-cert.sh in the server's dir" + einfo "(Only if compiled with SSL support (ssl in USE)" + einfo "Server admins should be added to the "jabber" group" + +} + +pkg_postrm() { + + userdel jabber + groupdel jabber + +} diff --git a/net-im/jabber-server/jabber-server-1.4.2.ebuild b/net-im/jabber-server/jabber-server-1.4.2.ebuild deleted file mode 100644 index 3dc7ecc773d0..000000000000 --- a/net-im/jabber-server/jabber-server-1.4.2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# Author Bart Verwilst <verwilst@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2.ebuild,v 1.4 2002/02/17 15:13:44 verwilst Exp $ - -S="${WORKDIR}/jabber-${PV}" -DESCRIPTION="Open Source Jabber Server & AIM,MSN,ICQ,Yahoo en conference transports" -HOMEPAGE="http://www.jabber.org" -SRC_URI="http://download.jabber.org/stable/jabber-${PV}.tar.gz - http://download.jabber.org/dists/transports/aim-transport/aim-transport-0.9.24c.tar.gz - http://download.jabber.org/dists/1.4/final/conference-0.4.1.tar.gz - http://download.jabber.org/dists/transports/irc-transport/irc-transport-0.1.1-1.4.linux.tar.gz - http://download.jabber.org/dists/1.4/final/jud-0.4.tar.gz - http://download.jabber.org/dists/1.4/final/msn-transport-1.1.tar.gz - http://download.jabber.org/dists/1.4/final/yahoo-transport-0.8-1.4.linux.tar.gz" - -DEPEND="virtual/glibc - >=dev-libs/pth-1.4.0 - ssl? ( >=dev-libs/openssl-0.9.6c )" - -src_unpack() { - - unpack jabber-${PV}.tar.gz - cd ${S} - unpack msn-transport-1.1.tar.gz - unpack aim-transport-0.9.24c.tar.gz - unpack conference-0.4.1.tar.gz - unpack irc-transport-0.1.1-1.4.linux.tar.gz - unpack jud-0.4.tar.gz - unpack yahoo-transport-0.8-1.4.linux.tar.gz - -} - -src_compile() { - - cd ${S} - if [ "`use ssl`" ] ; then - mv configure configure.orig - sed 's:WANT_SSL=0:WANT_SSL=1:' configure.orig > configure - rm -f configure.orig - chmod 750 configure - fi - mv jabberd/jabberd.c jabberd/jabberd.c.orig - sed 's:pstrdup(jabberd__runtime,HOME):"/usr/jabber-1.4.2":' jabberd/jabberd.c.orig > jabberd/jabberd.c - rm -f jabberd/jabberd.c.orig - ./configure || die - make || die - - cd ${S}/conference-0.4.1 - make || die - - cd ${S}/jud-0.4 - make || die - - cd ${S}/aim-transport-0.9.24c - CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./configure || die - make || die - - cd ${S}/msn-transport-1.1 - make || die - - cd ${S}/yahoo-transport-0.8-1.4 - CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./configure || die - make || die - -} - - -src_install() { - - cd ${S} - - exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6 jabber - exeinto /usr/sbin ; doexe ${FILESDIR}/jabber-server - mkdir -p ${D}/usr/jabber-${PV} - cp -rf * ${D}/usr/jabber-${PV}/ - -} - -src_postinst() { - - echo " # " - echo " # Please chmod and use the jabber server as a different" - echo " # user as root.. Running as root is a security hazard.." - echo " # " - -} |