Changeset 30134


Ignore:
Timestamp:
2012-02-04T21:45:54+01:00 (4 years ago)
Author:
jow
Message:

[packages_10.03.2] znc: merge r28774, r28775, r29724, r29875

Location:
branches/packages_10.03.2/net/znc
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/znc/Makefile

    r27836 r30134  
    99 
    1010PKG_NAME:=znc 
    11 PKG_VERSION:=0.098 
    12 PKG_RELEASE:=4 
     11PKG_VERSION:=0.204 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=http://znc.in/releases 
    16 PKG_MD5SUM:=5667b4acb1f01309d6eded77abac700c 
     15PKG_SOURCE_URL:=http://znc.in/releases \ 
     16                http://znc.in/releases/archive 
     17PKG_MD5SUM:=7c7247423fc08b0c5c62759a50a9bca3 
    1718 
    1819PKG_BUILD_PARALLEL:=1 
     
    7576        $(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/$(strip $(3))$(subst -,_,$(strip $(1))).so $$(1)/usr/lib/znc/ 
    7677        # include webadmin page templates if existing 
    77         if [ -d $$(PKG_BUILD_DIR)/modules/$(strip $(3))$(subst -,_,$(strip $(1))) ]; then \ 
    78                 $(INSTALL_DIR) $$(1)/usr/share/znc/ ;\ 
    79                 $(CP) -r $$(PKG_BUILD_DIR)/modules/$(strip $(3))$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/ ;\ 
     78        if [ -d $$(PKG_BUILD_DIR)/modules/$(strip $(3))data/$(subst -,_,$(strip $(1))) ]; then \ 
     79                $(INSTALL_DIR) $$(1)/usr/share/znc/modules ;\ 
     80                $(CP) -r $$(PKG_BUILD_DIR)/modules/$(strip $(3))data/$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/modules ;\ 
    8081        fi 
    8182  endef 
     
    99100        $(INSTALL_DIR) $$(1)/usr/lib/znc/ 
    100101        $(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/ 
    101         $(INSTALL_DIR) $$(1)/usr/share/znc/ 
    102         $(CP) -r $$(PKG_BUILD_DIR)/modules/webadmin $$(1)/usr/share/znc/ 
     102        $(INSTALL_DIR) $$(1)/usr/share/znc/modules 
     103        $(CP) -r $$(PKG_BUILD_DIR)/modules/data/webadmin $$(1)/usr/share/znc/modules 
    103104        $(INSTALL_DIR) $$(1)/usr/share/znc/webskins/ 
    104105        $(CP) -r $$(PKG_BUILD_DIR)/webskins/_default_ $$(1)/usr/share/znc/webskins/ 
     
    137138$(eval $(call module,autoattach,Reattaches you to channels on activity.)) 
    138139 
    139 $(eval $(call module,autocycle,Cycles a channel when you are the only one in \ 
    140         there and you don't have op.)) 
    141  
    142140$(eval $(call module,autoop,Auto op the good guys.)) 
    143141 
     
    145143        if you are away.)) 
    146144 
    147 $(eval $(call module,away,Stores messages while away$(,) also auto away.)) 
    148  
    149145$(eval $(call module,awaynick,Change your nick while you are away.)) 
    150146 
     
    152148        their account was disabled.)) 
    153149 
     150$(eval $(call module,bouncedcc,Bounces dcc transfers through the znc server \ 
     151        instead of sending them directly to the user.)) 
     152 
    154153$(eval $(call module,buffextras,Add nick changes$(,) joins$(,) parts$(,) topic \ 
    155154        changes etc. to your playback buffer.)) 
    156155 
    157 $(eval $(call module,certauth,This module allows users to log in via SSL \ 
    158         client keys.)) 
     156$(eval $(call module,cert,Use a SSL certificate for connecting to a server.)) 
     157 
     158$(eval $(call module,certauth,This module allows users to log in to ZNC via \ 
     159        SSL client keys.)) 
    159160 
    160161$(eval $(call module,chansaver,Keeping config up to date when user joins and \ 
     
    171172$(eval $(call module,fail2ban,Block IPs for some time after a failed login.)) 
    172173 
     174$(eval $(call module,identfile,Places the ident of a user to a file when they \ 
     175         are trying to connect.)) 
     176 
    173177$(eval $(call module,keepnick,Tries to get you your primary nick.)) 
    174178 
     
    209213$(eval $(call module,antiidle,Hides your idle time.,extra/)) 
    210214 
     215$(eval $(call module,autocycle,Cycles a channel when you are the only one in \ 
     216        there and you don't have op.,extra/)) 
     217 
    211218$(eval $(call module,autovoice,Autovoices everyone who joins some channel., \ 
    212219        extra/)) 
    213220 
     221$(eval $(call module,away,Stores messages while away$(,) also auto away.,extra/)) 
     222 
    214223$(eval $(call module,block-motd,This module blocks the server's Message of the \ 
    215224        Day.,extra/)) 
     
    219228 
    220229$(eval $(call module,ctcpflood,This module tries to block ctcp floods.,extra/)) 
     230 
     231$(eval $(call module,dcc,Allows you to transfer files to and from ZNC.,extra/)) 
     232 
     233$(eval $(call module,email,Watches a local mailbox for new mails.,extra/)) 
    221234 
    222235$(eval $(call module,fakeonline,This module fakes the online status of \ 
  • branches/packages_10.03.2/net/znc/files/znc.init

    r26722 r30134  
    5353                config_get znc_pem_file "$znc" znc_ssl_cert 
    5454 
    55                 [ -z $znc_pem_file -o -f $ZNC_CONFIG_PATH/znc.pem ] || ln -s "$znc_pem_file" $ZNC_CONFIG_PATH/znc.pem 
     55                [ -z "$znc_pem_file" ] || ln -sf "$znc_pem_file" $ZNC_CONFIG_PATH/znc.pem 
    5656 
    5757                [ -z $anoniplimit ] || echo "AnonIPLimit = $anoniplimit" >> $ZNC_CONFIG 
     
    128128                config_foreach add_user user 
    129129 
    130                 chown -R ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} /tmp/etc/znc 
     130                chown -hR ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} /tmp/etc/znc 
    131131        fi 
    132132 
  • branches/packages_10.03.2/net/znc/patches/001-move_rootcheck_after_config.patch

    r26651 r30134  
    1010--- a/main.cpp 
    1111+++ b/main.cpp 
    12 @@ -194,19 +194,6 @@ int main(int argc, char** argv) { 
     12@@ -211,19 +211,6 @@ int main(int argc, char** argv) { 
    1313        } 
    1414 #endif 
     
    3030                if (!pZNC->WriteNewConfig(sConfig)) { 
    3131                        delete pZNC; 
    32 @@ -227,6 +214,20 @@ int main(int argc, char** argv) { 
     32@@ -244,6 +231,20 @@ int main(int argc, char** argv) { 
    3333                return 1; 
    3434        } 
  • branches/packages_10.03.2/net/znc/patches/002-Uclibcpp_build_fix.patch

    r26651 r30134  
    2424 /* Stuff to be able to write this: 
    2525    // i will be name of local variable, see below 
    26 @@ -58,7 +60,7 @@ class CWebAdminMod : public CGlobalModul 
     26@@ -55,7 +57,7 @@ class CWebAdminMod : public CGlobalModul 
    2727 public: 
    2828        GLOBALMODCONSTRUCTOR(CWebAdminMod) { 
  • branches/packages_10.03.2/net/znc/patches/003-Reduce_rebuild_time.patch

    r26722 r30134  
    2222--- a/modules/Makefile.in 
    2323+++ b/modules/Makefile.in 
    24 @@ -114,7 +114,7 @@ install_metadirs: create_install_dir 
     24@@ -114,7 +114,7 @@ install_datadir: 
    2525 clean: 
    2626        rm -rf $(CLEAN) 
Note: See TracChangeset for help on using the changeset viewer.