Merge commit 'f48a0a9515911d082d1bb5706799060f136ab84f'

* commit 'f48a0a9515911d082d1bb5706799060f136ab84f': tor: 0.2.7.3-rc -> 0.3.2.9 Per Optware#284 py-pip: 9.0.1 -> 10.0.0 collectd: add libtool dependency Closes Optware#281 rsunc: 3.1.2 -> 3.1.3 Closes Optware#279 putmail: remove broken dependency on py-putmail-common Fixes Optware#278 msmtp: bump ipk version to follow gnutls soname change Updates Optware#278 sendmail: fix uclibc-ng build: use librpc-uclibc for rresvport(). Updates Optware#278 dovecot: fix postinst script dovecot: add libcap dependency, remove automatic rpath Fixes Optware#277 transmissiondcfp: update to revision 14734-12 golang: bump to 1.10
tofuliang · Apr 26, 2018 · f4d9441 · f4d9441
2 parents f07455c + f48a0a9
commit f4d9441
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 42 deletions.
diff --git a/checksums/go1.10.src.tar.gz.sha512 b/checksums/go1.10.src.tar.gz.sha512
@@ -0,0 +1 @@
+59f089e1ffb2d3aba5ada329d4f0d1181c3c4f01fa64f19d0b753f8a989cb59cf290ad88d215cadc18ef99aba8518e44c9bc258c07eaffc834c55e4a37bd4651
diff --git a/checksums/pip-10.0.0.tar.gz.sha512 b/checksums/pip-10.0.0.tar.gz.sha512
@@ -0,0 +1 @@
+d27a100939022e45c35cde11e5be989472ac7e36680f28d8e2fa81a393fe662a1cd4e6005606bfe8c914e4403554f67831aada885fbb77bbe9cf1ea5fee8e06a
diff --git a/checksums/rsync-3.1.3.tar.gz.sha512 b/checksums/rsync-3.1.3.tar.gz.sha512
@@ -0,0 +1 @@
+8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
diff --git a/checksums/tor-0.3.2.9.tar.gz.sha512 b/checksums/tor-0.3.2.9.tar.gz.sha512
@@ -0,0 +1 @@
+60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
diff --git a/checksums/transmissiondcfp-2.77+14734-11.tar.bz2.sha512 b/checksums/transmissiondcfp-2.77+14734-11.tar.bz2.sha512
diff --git a/checksums/transmissiondcfp-2.77+14734-12.tar.bz2.sha512 b/checksums/transmissiondcfp-2.77+14734-12.tar.bz2.sha512
@@ -0,0 +1 @@
+aff1c704c3dffe544eb478c112ff4b2fdcf756939884c27694657f0a40ee70703c4d6560a81d7b75499f52d84c1ce19a929d413d064d1b8265914b5db27a49fb
diff --git a/make/collectd.mk b/make/collectd.mk
@@ -29,7 +29,7 @@ COLLECTD_MAINTAINER=NSLU2 Linux <nslu2-linux@yahoogroups.com>
 COLLECTD_DESCRIPTION=statistics collection and monitoring daemon
 COLLECTD_SECTION=utils
 COLLECTD_PRIORITY=optional
-COLLECTD_DEPENDS=libgcrypt, libgpg-error
+COLLECTD_DEPENDS=libgcrypt, libgpg-error, libtool
 COLLECTD_SUGGESTS=libcurl, libesmtp, libpcap, libxml2, mysql, net-snmp, perl, postgresql, python27, rrdtool, bash
 ifeq (lm-sensors, $(filter lm-sensors, $(PACKAGES)))
 COLLECTD_SUGGESTS+=, lm-sensors
@@ -39,7 +39,7 @@ COLLECTD_CONFLICTS=
 #
 # COLLECTD_IPK_VERSION should be incremented when the ipk changes.
 #
-COLLECTD_IPK_VERSION=4
+COLLECTD_IPK_VERSION=5
 
 #
 # COLLECTD_CONFFILES should be a list of user-editable files
@@ -113,7 +113,8 @@ $(COLLECTD_BUILD_DIR)/.configured: $(DL_DIR)/$(COLLECTD_SOURCE) $(COLLECTD_PATCH
 	$(MAKE) libcurl-stage libgcrypt-stage libxml2-stage \
 		net-snmp-stage mysql-stage postgresql-stage \
 		libesmtp-stage libpcap-stage libgpg-error \
-		perl-hostperl python27-host-stage rrdtool-stage
+		perl-hostperl python27-host-stage rrdtool-stage \
+		libtool-stage
 ifeq (lm-sensors, $(filter lm-sensors, $(PACKAGES)))
 	$(MAKE) lm-sensors-stage
 endif

diff --git a/make/dovecot.mk b/make/dovecot.mk
@@ -29,7 +29,7 @@ DOVECOT_MAINTAINER=Marcel Nijenhof <nslu2@pion.xs4all.nl>
 DOVECOT_DESCRIPTION=Dovecot secure IMAP server
 DOVECOT_SECTION=net
 DOVECOT_PRIORITY=optional
-DOVECOT_DEPENDS=openssl
+DOVECOT_DEPENDS=openssl, libcap
 DOVECOT_SUGGESTS=
 DOVECOT_CONFLICTS=cyrus-imapd, imap
 
@@ -43,7 +43,7 @@ DOVECOT_DOC_CONFLICTS=
 #
 # DOVECOT_IPK_VERSION should be incremented when the ipk changes.
 #
-DOVECOT_IPK_VERSION=4
+DOVECOT_IPK_VERSION=6
 
 #
 # DOVECOT_CONFFILES should be a list of user-editable files
@@ -126,7 +126,7 @@ dovecot-source: $(DL_DIR)/$(DOVECOT_SOURCE) $(DOVECOT_PATCHES)
 # shown below to make various patches to it.
 #
 $(DOVECOT_BUILD_DIR)/.configured: $(DL_DIR)/$(DOVECOT_SOURCE) $(DOVECOT_PATCHES) make/dovecot.mk
-	$(MAKE) openssl-stage
+	$(MAKE) openssl-stage libcap-stage
 	rm -rf $(BUILD_DIR)/$(DOVECOT_DIR) $(@D)
 	$(DOVECOT_UNZIP) $(DL_DIR)/$(DOVECOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	if test -n "$(DOVECOT_PATCHES)" ; \
@@ -151,6 +151,7 @@ $(DOVECOT_BUILD_DIR)/.configured: $(DL_DIR)/$(DOVECOT_SOURCE) $(DOVECOT_PATCHES)
 		--target=$(GNU_TARGET_NAME) \
 		--prefix=$(TARGET_PREFIX) \
 		--disable-static \
+		--disable-rpath \
 		--without-gssapi \
 		--without-pam \
 		--with-notify=dnotify \

diff --git a/make/golang.mk b/make/golang.mk
@@ -22,12 +22,12 @@
 #
 
 GOLANG_SITE=https://redirector.gvt1.com/edgedl/go
-GOLANG_VERSION:=1.9.2
+GOLANG_VERSION:=1.10
 GOLANG_SOURCE=go$(GOLANG_VERSION).src.tar.gz
 GOLANG_DIR=go
 
 GOLANG_GIT=https://github.com/golang/go.git
-GOLANG_GIT_TAG=go1.10beta2
+#GOLANG_GIT_TAG=go1.10beta2
 #GOLANG_GIT_DATE=20171207
 
 ifdef GOLANG_GIT_TAG
@@ -50,7 +50,7 @@ GOLANG_DEPENDS=
 GOLANG_SUGGESTS=git, gcc, pkgconfig
 GOLANG_CONFLICTS=
 
-GOLANG_IPK_VERSION=3
+GOLANG_IPK_VERSION=1
 
 GOLANG_CONFFILES=
 
@@ -71,8 +71,6 @@ $(if $(filter buildroot-mipsel-ng, $(OPTWARE_TARGET)), softfloat, \
 
 GOLANG_PATCHES=\
 $(GOLANG_SOURCE_DIR)/default-target-cc-cxx-pkgconfig.patch \
-$(GOLANG_SOURCE_DIR)/mips_no_pipe2.patch \
-$(GOLANG_SOURCE_DIR)/mips_no_accept4.patch \
 $(GOLANG_SOURCE_DIR)/fix-errno-sign-for-epollctl-on-mips-mips64-and-ppc64.patch \
 $(GOLANG_SOURCE_DIR)/optware_crypto_x509_root.patch \
 

diff --git a/make/msmtp.mk b/make/msmtp.mk
@@ -39,7 +39,7 @@ MSMTP_CONFLICTS=
 #
 # MSMTP_IPK_VERSION should be incremented when the ipk changes.
 #
-MSMTP_IPK_VERSION=1
+MSMTP_IPK_VERSION=2
 
 #
 # MSMTP_CONFFILES should be a list of user-editable files

diff --git a/make/putmail.mk b/make/putmail.mk
@@ -37,7 +37,7 @@ PUTMAIL_CONFLICTS=
 #
 # PUTMAIL_IPK_VERSION should be incremented when the ipk changes.
 #
-PUTMAIL_IPK_VERSION=1
+PUTMAIL_IPK_VERSION=2
 
 #
 # PUTMAIL_CONFFILES should be a list of user-editable files
@@ -153,7 +153,7 @@ $(PUTMAIL_IPK_DIR)/CONTROL/control:
 	@echo "Maintainer: $(PUTMAIL_MAINTAINER)" >>$@
 	@echo "Source: $(PUTMAIL_SITE)/$(PUTMAIL_SOURCE)" >>$@
 	@echo "Description: $(PUTMAIL_DESCRIPTION)" >>$@
-	@echo "Depends: py-putmail-common $(PUTMAIL_DEPENDS)" >>$@
+	@echo "Depends: $(PUTMAIL_DEPENDS)" >>$@
 	@echo "Suggests: $(PUTMAIL_SUGGESTS)" >>$@
 	@echo "Conflicts: $(PUTMAIL_CONFLICTS)" >>$@
 

diff --git a/make/py-pip.mk b/make/py-pip.mk
@@ -21,8 +21,8 @@
 # from your name or email address.  If you leave MAINTAINER set to
 # "NSLU2 Linux" other developers will feel free to edit.
 #
-PY-PIP_VERSION=9.0.1
-PY-PIP_SITE=https://pypi.python.org/packages/11/b6/abcb525026a4be042b486df43905d6893fb04f05aac21c32c638e939e447
+PY-PIP_VERSION=10.0.0
+PY-PIP_SITE=https://files.pythonhosted.org/packages/e0/69/983a8e47d3dfb51e1463c1e962b2ccd1d74ec4e236e232625e353d830ed2
 PY-PIP_SOURCE=pip-$(PY-PIP_VERSION).tar.gz
 PY-PIP_DIR=pip-$(PY-PIP_VERSION)
 PY-PIP_UNZIP=zcat

diff --git a/make/rsync.mk b/make/rsync.mk
@@ -5,7 +5,7 @@
 ###########################################################
 
 RSYNC_SITE=http://www.samba.org/ftp/rsync/src/
-RSYNC_VERSION=3.1.2
+RSYNC_VERSION=3.1.3
 RSYNC_SOURCE=rsync-$(RSYNC_VERSION).tar.gz
 RSYNC_DIR=rsync-$(RSYNC_VERSION)
 RSYNC_UNZIP=zcat
@@ -136,6 +136,7 @@ $(RSYNC_IPK): $(RSYNC_BUILD_DIR)/.built
 	$(INSTALL) -m 755 $(RSYNC_SOURCE_DIR)/prerm $(RSYNC_IPK_DIR)/CONTROL/prerm
 	echo $(RSYNC_CONFFILES) | sed -e 's/ /\n/g' > $(RSYNC_IPK_DIR)/CONTROL/conffiles
 	cd $(BUILD_DIR); $(IPKG_BUILD) $(RSYNC_IPK_DIR)
+	$(WHAT_TO_DO_WITH_IPK_DIR) $(RSYNC_IPK_DIR)
 
 rsync-ipk: $(RSYNC_IPK)
 

diff --git a/make/sendmail.mk b/make/sendmail.mk
@@ -14,13 +14,16 @@ SENDMAIL_DESCRIPTION=The most classic SMTP server.
 SENDMAIL_SECTION=network
 SENDMAIL_PRIORITY=optional
 SENDMAIL_DEPENDS=procmail, openssl, libdb
+ifeq (uclibc, $(LIBC_STYLE))
+SENDMAIL_DEPENDS +=, librpc-uclibc
+endif
 SENDMAIL_SUGGESTS=
 SENDMAIL_CONFLICTS=postfix
 
 #
 # SENDMAIL_IPK_VERSION should be incremented when the ipk changes.
 #
-SENDMAIL_IPK_VERSION=9
+SENDMAIL_IPK_VERSION=10
 
 #
 # SENDMAIL_CONFFILES should be a list of user-editable files
@@ -48,6 +51,9 @@ SENDMAIL_PATCHES += $(SENDMAIL_SOURCE_DIR)/config.patch
 endif
 SENDMAIL_CPPFLAGS=-I$(STAGING_INCLUDE_DIR)/openssl
 SENDMAIL_LDFLAGS=-lresolv
+ifeq (uclibc, $(LIBC_STYLE))
+SENDMAIL_LDFLAGS += -lrpc-uclibc
+endif
 
 #
 # SENDMAIL_BUILD_DIR is the directory in which the build is done.
@@ -97,31 +103,34 @@ sendmail-source: $(DL_DIR)/$(SENDMAIL_SOURCE) $(SENDMAIL_PATCHES)
 #
 $(SENDMAIL_BUILD_DIR)/.configured: $(DL_DIR)/$(SENDMAIL_SOURCE) $(SENDMAIL_PATCHES) make/sendmail.mk
 	$(MAKE) openssl-stage libdb-stage
-	rm -rf $(BUILD_DIR)/$(SENDMAIL_DIR) $(SENDMAIL_BUILD_DIR)
+ifeq (uclibc, $(LIBC_STYLE))
+	$(MAKE) librpc-uclibc-stage
+endif
+	rm -rf $(BUILD_DIR)/$(SENDMAIL_DIR) $(@D)
 	$(SENDMAIL_UNZIP) $(DL_DIR)/$(SENDMAIL_SOURCE) | tar -C $(BUILD_DIR) -xf -
 	if test -n "$(SENDMAIL_PATCHES)" ; then  \
 		cat $(SENDMAIL_PATCHES) |\
-		$(PATCH) -d "$(BUILD_DIR)/$(SENDMAIL_DIR)"  -p0 ; \
+		$(PATCH) -d "$(BUILD_DIR)/$(SENDMAIL_DIR)" -p0 ; \
 	fi
-	if test "$(BUILD_DIR)/$(SENDMAIL_DIR)" != "$(SENDMAIL_BUILD_DIR)" ; \
-		then mv $(BUILD_DIR)/$(SENDMAIL_DIR) $(SENDMAIL_BUILD_DIR) ; \
+	if test "$(BUILD_DIR)/$(SENDMAIL_DIR)" != "$(@D)" ; \
+		then mv $(BUILD_DIR)/$(SENDMAIL_DIR) $(@D) ; \
 	fi
 	sed -i -e '/APPENDDEF/s/-ldb/&-$(LIBDB_LIB_VERSION)/' $(@D)/devtools/Site/site.config.m4
 	sed -i -e 's|".*/spool/mail"|"$(TARGET_PREFIX)/var/spool/mail"|' $(@D)/include/*/*.h
-	touch $(SENDMAIL_BUILD_DIR)/.configured
+	touch $@
 
 sendmail-unpack: $(SENDMAIL_BUILD_DIR)/.configured
 
 #
 # This builds the actual binary.
 #
 $(SENDMAIL_BUILD_DIR)/.built: $(SENDMAIL_BUILD_DIR)/.configured
-	rm -f $(SENDMAIL_BUILD_DIR)/.built
-	$(MAKE) -C $(SENDMAIL_BUILD_DIR) \
+	rm -f $@
+	$(MAKE) -C $(@D) \
 		CC=$(TARGET_CC)	CCLINK=$(TARGET_CC) \
 	CCOPTS="-D_PATH_SENDMAILCF=\\\"$(TARGET_PREFIX)/etc/mail/sendmail.cf\\\" $(STAGING_CPPFLAGS) $(SENDMAIL_CPPFLAGS)" \
 		LIBDIRS="$(STAGING_LDFLAGS) $(SENDMAIL_LDFLAGS)"
-	touch $(SENDMAIL_BUILD_DIR)/.built
+	touch $@
 
 #
 # This is the build convenience target.
@@ -132,9 +141,9 @@ sendmail: $(SENDMAIL_BUILD_DIR)/.built
 # If you are building a library, then you need to stage it too.
 #
 $(SENDMAIL_BUILD_DIR)/.staged: $(SENDMAIL_BUILD_DIR)/.built
-	rm -f $(SENDMAIL_BUILD_DIR)/.staged
-	$(MAKE) -C $(SENDMAIL_BUILD_DIR) DESTDIR=$(STAGING_DIR) install
-	touch $(SENDMAIL_BUILD_DIR)/.staged
+	rm -f $@
+	$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+	touch $@
 
 sendmail-stage: $(SENDMAIL_BUILD_DIR)/.staged
 
@@ -143,7 +152,7 @@ sendmail-stage: $(SENDMAIL_BUILD_DIR)/.staged
 # necessary to create a seperate control file under sources/sendmail
 #
 $(SENDMAIL_IPK_DIR)/CONTROL/control:
-	@$(INSTALL) -d $(SENDMAIL_IPK_DIR)/CONTROL
+	@$(INSTALL) -d $(@D)
 	@rm -f $@
 	@echo "Package: sendmail" >>$@
 	@echo "Architecture: $(TARGET_ARCH)" >>$@
@@ -211,7 +220,7 @@ $(SENDMAIL_IPK): $(SENDMAIL_BUILD_DIR)/.built
 	$(INSTALL) -m 755 $(SENDMAIL_SOURCE_DIR)/postinst $(SENDMAIL_IPK_DIR)/CONTROL/postinst
 	echo $(SENDMAIL_CONFFILES) | sed -e 's/ /\n/g' > $(SENDMAIL_IPK_DIR)/CONTROL/conffiles
 	cd $(BUILD_DIR); $(IPKG_BUILD) $(SENDMAIL_IPK_DIR)
-#	$(WHAT_TO_DO_WITH_IPK_DIR) $(SENDMAIL_IPK_DIR)
+	$(WHAT_TO_DO_WITH_IPK_DIR) $(SENDMAIL_IPK_DIR)
 
 #
 # This is called from the top level makefile to create the IPK file.
@@ -236,4 +245,4 @@ sendmail-dirclean:
 # Some sanity check for the package.
 #
 sendmail-check: $(SENDMAIL_IPK)
-	perl scripts/optware-check-package.pl --target=$(OPTWARE_TARGET) $(SENDMAIL_IPK)
+	perl scripts/optware-check-package.pl --target=$(OPTWARE_TARGET) $^
diff --git a/make/tor.mk b/make/tor.mk
@@ -21,7 +21,7 @@
 # "NSLU2 Linux" other developers will feel free to edit.
 #
 TOR_SITE=https://archive.torproject.org/tor-package-archive
-TOR_VERSION=0.2.7.3-rc
+TOR_VERSION=0.3.2.9
 TOR_SOURCE=tor-$(TOR_VERSION).tar.gz
 TOR_DIR=tor-$(TOR_VERSION)
 TOR_UNZIP=zcat
@@ -36,7 +36,7 @@ TOR_CONFLICTS=
 #
 # TOR_IPK_VERSION should be incremented when the ipk changes.
 #
-TOR_IPK_VERSION=3
+TOR_IPK_VERSION=1
 
 #
 # TOR_CONFFILES should be a list of user-editable files

diff --git a/make/transmissiondcfp.mk b/make/transmissiondcfp.mk
@@ -25,9 +25,9 @@
 # SVN releases also include transmissiond-dbg while official releases does not.
 #
 TRANSMISSIONDCFP_SITE=http://$(SOURCEFORGE_MIRROR)/project/transmissiondaemon/optware-ng-source
-TRANSMISSIONDCFP_VERSION=2.77+14734-11
-TRANSMISSIONDCFP_ALT_VERSION=2.77plus14734-11
-TRANSMISSIONDCFP_ALT2_VERSION=2.77plus14734-11
+TRANSMISSIONDCFP_VERSION=2.77+14734-12
+TRANSMISSIONDCFP_ALT_VERSION=2.77plus14734-12
+TRANSMISSIONDCFP_ALT2_VERSION=2.77plus14734-12
 TRANSMISSIONDCFP_ALT_SITE=https://github.com/cfpp2p/transmission/releases/download/$(TRANSMISSIONDCFP_ALT_VERSION)
 TRANSMISSIONDCFP_ALT2_SITE=http://transmissionbt.net
 

diff --git a/sources/dovecot/postinst b/sources/dovecot/postinst
@@ -18,10 +18,6 @@ if grep -v nobody /etc/passwd > /dev/null ; then
     sed -i -e 's/login_user = nobody/login_user = guest/' %OPTWARE_TARGET_PREFIX%/etc/dovecot/dovecot.conf
 fi
 
-if [ -f /etc/shadow ] ; then
-    sed -i -e 's/passdb passwd/passdb shadow/' %OPTWARE_TARGET_PREFIX%/etc/dovecot/dovecot.conf
-fi
-
 mkdir -p %OPTWARE_TARGET_PREFIX%/var/run/dovecot/login
 chown $root_user:$root_group %OPTWARE_TARGET_PREFIX%/var/run/dovecot
 chmod 700 %OPTWARE_TARGET_PREFIX%/var/run/dovecot