From patchwork Tue Jun 18 11:40:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 252242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 499C92C0174 for ; Tue, 18 Jun 2013 21:40:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 436ED20875; Tue, 18 Jun 2013 11:40:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KibIyOktnXS3; Tue, 18 Jun 2013 11:40:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D5B242087A; Tue, 18 Jun 2013 11:40:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B69C68F75E for ; Tue, 18 Jun 2013 11:40:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B4ED984E94 for ; Tue, 18 Jun 2013 11:40:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sj-Szxhbo4Mh for ; Tue, 18 Jun 2013 11:40:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by whitealder.osuosl.org (Postfix) with ESMTPS id 34E7085B86 for ; Tue, 18 Jun 2013 11:40:10 +0000 (UTC) Received: by mail-we0-f170.google.com with SMTP id w57so3329667wes.1 for ; Tue, 18 Jun 2013 04:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=qV8Ra8UkHsSD2/+dwAUP75uzshksH1cjsvzzIoEqmIo=; b=OroLatVyJEO/sipyKfofxzfu2orPB6goUxiLHM3hwCkxSuIg1Opqr5sTHwjYlJl0fy lwMuNsm0QWStd3bBaLw9wWSMsx+CbX+J0z0Q9Y86b9rvsgg/UM9SgHpBNSCgEzaqzFLl eyKTCHSGF29L0P+XARiWDY23Lzlkm2AZfsYigO84F8QhWXY7l/TGWhZMOzwOBdAbFukI evZ8NDIlPsGOFM0WwupzphXDm2RuTYcPR9Z0XCQigG54kBrphlI3jcZzcsRmls7UI7n7 Ou9KCnjurT7aZKWNK+rwPvvHC9rKrOopi/CLB6G4bCOmUpIQ3aC2UMtCYRE8oQdY9zPf 95lA== X-Received: by 10.180.101.170 with SMTP id fh10mr7429343wib.22.1371555608275; Tue, 18 Jun 2013 04:40:08 -0700 (PDT) Received: from localhost.localdomain (host86-134-29-5.range86-134.btcentralplus.com. [86.134.29.5]) by mx.google.com with ESMTPSA id x13sm1481617wib.3.2013.06.18.04.40.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 04:40:07 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Tue, 18 Jun 2013 12:40:05 +0100 Message-Id: <1371555605-3757-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH] sconeserver: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson A patch from Thomas Petazzoni has been upstreamed in sconeserver; bump version and remove the patch from Buildroot. Signed-off-by: Simon Dawson --- .../sconeserver-fix-configure-operators.patch | 93 ---------------------- package/sconeserver/sconeserver.mk | 2 +- 2 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 package/sconeserver/sconeserver-fix-configure-operators.patch diff --git a/package/sconeserver/sconeserver-fix-configure-operators.patch b/package/sconeserver/sconeserver-fix-configure-operators.patch deleted file mode 100644 index 504be45..0000000 --- a/package/sconeserver/sconeserver-fix-configure-operators.patch +++ /dev/null @@ -1,93 +0,0 @@ -configure: use the proper '=' POSIX shell operator - -The '==' shell operator doesn't work in POSIX shells, so when sh is -symlinked to a POSIX shell such as dash and not a bash shell, the -configure tests that use this operator fail to work. - -Signed-off-by: Thomas Petazzoni - -Index: sconeserver-211/configure.in -=================================================================== ---- sconeserver-211.orig/configure.in 2013-05-14 12:00:19.000000000 +0200 -+++ sconeserver-211/configure.in 2013-06-16 18:47:31.000000000 +0200 -@@ -121,7 +121,7 @@ - [SSL="$withval"], - [AC_CHECK_HEADER([openssl/ssl.h],[SSL="yes"],[SSL="no"])] - ) --if test "x$SSL" == "xyes"; then -+if test "x$SSL" = "xyes"; then - AC_CHECK_HEADER([openssl/ssl.h],, - [AC_MSG_ERROR([header file is required for OpenSSL, use --with-openssl-path=PATH])] - ) -@@ -179,7 +179,7 @@ - ) - - # Check we have libxml2 if Sconesite is enabled --if test "x$SCONESITE" == "xyes"; then -+if test "x$SCONESITE" = "xyes"; then - if test "x$ac_cv_lib_xml2_xmlNewDoc" != "xyes"; then - AC_MSG_ERROR([library 'libxml2' is required for Sconesite]) - fi -@@ -195,7 +195,7 @@ - [MAGICK_CONFIG="Magick++-config"] - ) - AC_CHECK_PROG([MAGICK], ["$MAGICK_CONFIG"], [yes], [no]) --if test "x$MAGICK" == "xyes"; then -+if test "x$MAGICK" = "xyes"; then - MAGICK_CFLAGS=`$MAGICK_CONFIG --cppflags` - MAGICK_LDFLAGS=`$MAGICK_CONFIG --ldflags` - MAGICK_LIBS=`$MAGICK_CONFIG --libs` -@@ -209,7 +209,7 @@ - ) - - # Need ImageMagick for image --if test "x$IMAGE" == "xyes"; then -+if test "x$IMAGE" = "xyes"; then - if test "x$MAGICK" != "xyes"; then - AC_MSG_ERROR([library 'Magick++' is required for image]) - fi -@@ -227,7 +227,7 @@ - [RSS="yes"] - ) - # Need libxml2 library for rss --if test "x$RSS" == "xyes"; then -+if test "x$RSS" = "xyes"; then - if test "x$ac_cv_lib_xml2_xmlNewDoc" != "xyes"; then - AC_MSG_ERROR([library 'libxml2' is required for the rss module]) - fi -@@ -249,7 +249,7 @@ - [AC_CHECK_HEADER([mysql/mysql.h],[MYSQL="yes"],[MYSQL="no"])] - ) - # Need mysqlclient library for mysql --if test "x$MYSQL" == "xyes"; then -+if test "x$MYSQL" = "xyes"; then - AC_CHECK_LIB([mysqlclient],[mysql_init], - [CXXFLAGS="$CXXFLAGS `$MYSQL_CONFIG --cflags`" - MYSQL_LIBADD=`$MYSQL_CONFIG --libs` -@@ -266,7 +266,7 @@ - [AC_CHECK_HEADER([sqlite3.h],[SQLITE="yes"],[SQLITE="no"])] - ) - # Need sqlite3 library for sqlite --if test "x$SQLITE" == "xyes"; then -+if test "x$SQLITE" = "xyes"; then - AC_CHECK_LIB([sqlite3],[sqlite3_open_v2], - [SQLITE_LIBADD="-lsqlite3" - AC_SUBST(SQLITE_LIBADD)], -@@ -283,7 +283,7 @@ - [AC_CHECK_HEADER([mpfr.h],[MATHS="yes"],[MATHS="no"])] - ) - # Need libgmp and libmpfr library for maths --if test "x$MATHS" == "xyes"; then -+if test "x$MATHS" = "xyes"; then - AC_CHECK_LIB([mpfr],[mpfr_init], - [MATHS_LIBADD="-lgmp -lmpfr" - AC_SUBST(MATHS_LIBADD)], -@@ -300,7 +300,7 @@ - [AC_CHECK_HEADER([X11/Xlib.h],[UI="yes"],[UI="no"])] - ) - # Need libX11 library for ui --if test "x$UI" == "xyes"; then -+if test "x$UI" = "xyes"; then - AC_CHECK_LIB([X11],[XOpenDisplay], - [UI_LIBADD="-lX11" - AC_SUBST(UI_LIBADD)], diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index ff6eada..62cc0ee 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -6,7 +6,7 @@ # Release 0.6.0 doesn't build cleanly, so use a recent # Subversion trunk snapshot. -SCONESERVER_VERSION = 211 +SCONESERVER_VERSION = 212 SCONESERVER_SITE = svn://svn.code.sf.net/p/sconeserver/code/trunk SCONESERVER_SITE_METHOD = svn SCONESERVER_LICENSE = GPLv2+