bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

umurmur: update to 0.2.2, from #6829

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@20192 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
thepeople 2010-03-14 03:26:58 +00:00
parent 0d573bc0fd
commit 445b6adb40
2 changed files with 29 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
net/umurmur/Makefile
View File

@ -7,13 +7,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=umurmur
PKG_VERSION:=0.2.1
PKG_RELEASE:=2
PKG_VERSION:=0.2.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://umurmur.googlecode.com/files/
PKG_MD5SUM:=e3471fb925dadc60e3b307efe2a1cc80
PKG_MD5SUM:=a841cf38de7fbc8bdacafbd481561da7
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
@ -34,6 +35,7 @@ define Package/umurmur-openssl
$(call Package/umurmur/Default)
TITLE+= (with OpenSSL support)
DEPENDS+= +libopenssl
VARIANT:=openssl
endef
define Package/umurmur-openssl/description
@ -45,6 +47,7 @@ define Package/umurmur-polarssl
$(call Package/umurmur/Default)
TITLE+= (with PolarSSL support)
DEPENDS+= +libpolarssl
VARIANT:=polarssl
endef
define Package/umurmur-polarssl/description
@ -53,50 +56,39 @@ define Package/umurmur-polarssl/description
endef
define Build/Compile
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
$(MAKE) -C $(PKG_BUILD_DIR)/src all
endef
define Build/Template
$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
-$(MAKE) -C $(PKG_BUILD_DIR)/src clean
CC="$(TARGET_CC)" \
CFLAGS="$(3) -DWRT_TARGET -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
LDFLAGS="$(4) $(TARGET_LDFLAGS)" \
$(MAKE) -C $(PKG_BUILD_DIR)/src all
( cd $(PKG_BUILD_DIR)/src; mv -f umurmurd umurmurd-$(2))
touch $$@
$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
define Package/$(1)/conffiles
define Package/umurmur-openssl/conffiles
/etc/umurmur.conf
endef
define Package/$(1)/install
$(INSTALL_DIR) $$(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd-$(2) $$(1)/usr/bin/umurmurd
$(INSTALL_DIR) $$(1)/etc
$(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $$(1)/etc/
$(INSTALL_DIR) $$(1)/etc/init.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $$(1)/etc/init.d/umurmur
$(INSTALL_DIR) $$(1)/etc/umurmur
endef
Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles)
define Package/umurmur-openssl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc
$(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
$(INSTALL_DIR) $(1)/etc/umurmur
endef
ifneq ($(SDK)$(CONFIG_PACKAGE_umurmur-openssl),)
define Build/with-openssl
$(call Build/Template,umurmur-openssl,openssl,,-lcrypto -lssl)
endef
endif
$(eval $(Build/with-openssl))
Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
ifneq ($(SDK)$(CONFIG_PACKAGE_umurmur-polarssl),)
define Build/with-polarssl
$(call Build/Template,umurmur-polarssl,polarssl,-DUSE_POLARSSL,-lpolarssl)
endef
ifeq ($(BUILD_VARIANT),openssl)
TARGET_CFLAGS += -DWRT_TARGET -I$(STAGING_DIR)/usr/include
TARGET_LDFLAGS += -lcrypto -lssl
endif
$(eval $(Build/with-polarssl))
ifeq ($(BUILD_VARIANT),polarssl)
TARGET_CFLAGS += -DUSE_POLARSSL -DWRT_TARGET -I$(STAGING_DIR)/usr/include
TARGET_LDFLAGS += -lpolarssl
endif
$(eval $(call BuildPackage,umurmur-openssl))
$(eval $(call BuildPackage,umurmur-polarssl))

17
net/umurmur/patches/001-join-channel.patch
View File

@ -1,17 +0,0 @@
diff -ruN umurmur-0.2.1/src/channel.c umurmur-0.2.1.new/src/channel.c
--- umurmur-0.2.1/src/channel.c 2010-02-13 23:36:54.000000000 +0100
+++ umurmur-0.2.1.new/src/channel.c 2010-02-28 00:00:43.661542508 +0100
@@ -276,9 +276,12 @@
int Chan_userJoin(channel_t *ch, client_t *client)
{
int leaving_id;
+
+ /* Do nothing if user already is in this channel */
+ if ((channel_t *)client->channel == ch)
+ return 0;
Log_debug("Add user %s to channel %s", client->username, ch->name);
-
/* Only allowed in one channel at a time */
leaving_id = Chan_userLeave(client);
list_add_tail(&client->chan_node, &ch->clients);