From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Mon, 13 Jun 2016 01:46:46 +0000 (+0800)
Subject: Merge pull request #2844 from MikePetullo/libsoup
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=416252f675e5c3e0392a90742d2d098c275b7487;hp=996704eac8d989bc0c0d61421aa669ecf3dd71f5;p=feed%2Fpackages.git

Merge pull request #2844 from MikePetullo/libsoup

libsoup: update to 2.54.1
---

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index d31dfa8c1c..a335559474 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bogofilter
 PKG_VERSION:=1.2.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING
diff --git a/mail/bogofilter/files/postfix-bogofilter b/mail/bogofilter/files/postfix-bogofilter
index 952d8cda31..284530912d 100755
--- a/mail/bogofilter/files/postfix-bogofilter
+++ b/mail/bogofilter/files/postfix-bogofilter
@@ -1,7 +1,10 @@
 #!/bin/sh
 
 FILTER=/usr/bin/bogofilter
-FILTER_DIR=/mnt/sda1/var/spool/bogofilter
+
+# Attempt to read from bogofilter configuration.
+FILTER_DIR=$(cat /etc/bogofilter.cf | sed 's/#.*//g' | grep ^bogofilter_dir | awk -F = '{ print $2 }')
+
 # WARNING! The -i is crucial, else you may see
 # messages truncated at the first period that is alone on a line
 # (which can happen with several kinds of messages, particularly
@@ -12,7 +15,13 @@ FILTER_DIR=/mnt/sda1/var/spool/bogofilter
 # misleading traces in headers, such as local address
 # canonicalizations.
 POSTFIX="/usr/sbin/sendmail -G -i"
-export BOGOFILTER_DIR=/etc/bogofilter
+
+# No bogofilter_dir set in /etc/bogofilter.cf; fall back on directory
+# which persists across reboots.
+if [ -z "$FILTER_DIR" ]; then
+	FILTER_DIR=/etc/bogofilter
+	export BOGOFILTER_DIR=$FILTER_DIR
+fi
 
 # Exit codes from <sysexits.h>
 EX_TEMPFAIL=75
diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile
index 153cd1a9f9..8f6f7dcdab 100644
--- a/multimedia/grilo-plugins/Makefile
+++ b/multimedia/grilo-plugins/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=grilo-plugins
-PKG_VERSION:=0.3.0
+PKG_VERSION:=0.3.1
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/
-PKG_MD5SUM:=670f0302a4b91c043a7c9f9222545fbe
+PKG_MD5SUM:=8e4ef3a6a8f66629d4f2c9fe7a05d8c9
 
 PKG_BUILD_DEPENDS:=glib2 grilo
 
@@ -71,7 +71,6 @@ define BuildPlugin
 	$(INSTALL_DIR) $$(1)/usr/lib/grilo-0.3
 	for p in $(3); do \
 		$(CP) $(PKG_INSTALL_DIR)/usr/lib/grilo-0.3/libgrl$$$$$$$${p}.so $$(1)/usr/lib/grilo-0.3; \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/grilo-0.3/grl-$$$$$$$${p}.xml $$(1)/usr/lib/grilo-0.3; \
 	done
   endef
 
@@ -84,9 +83,7 @@ $(eval $(call BuildPlugin,dleyna,DLNA sharing,dleyna,,30))
 $(eval $(call BuildPlugin,dmap,DAAP and DPAP sharing,daap dpap,libdmapsharing,30))
 $(eval $(call BuildPlugin,gravatar,Gravatar provider,gravatar,,30))
 $(eval $(call BuildPlugin,jamendo,Jamendo sharing,jamendo,,30))
-$(eval $(call BuildPlugin,lastfm-albumart,Last.FM album art provider,lastfm-albumart,,30))
 $(eval $(call BuildPlugin,magnatune,Magnatune sharing,magnatune,,30))
-$(eval $(call BuildPlugin,metadata-store,Extra metadata store,metadata-store,,30))
 $(eval $(call BuildPlugin,opensubtitles,Openi subtitles provider,opensubtitles,,30))
 $(eval $(call BuildPlugin,raitv,Rai.tv sharing,raitv,,30))
 $(eval $(call BuildPlugin,shoutcast,SHOUTcast sharing,shoutcast,,30))