From 9f512b8cf7708a4a6de17b5183adfdf5d92a931d Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 18 Jan 2019 00:29:12 -0800 Subject: [PATCH] mongodb: remove --- srcpkgs/mongodb/files/mongodb.conf | 8 -- srcpkgs/mongodb/files/mongodb/run | 3 - srcpkgs/mongodb/patches/fix-musl.diff | 11 --- .../patches/fix-options_parser-segfault.patch | 25 ------ .../patches/musl-elf_native_class.patch | 21 ----- srcpkgs/mongodb/patches/musl-fix-asio.patch | 15 ---- .../mongodb/patches/musl-libc_version_h.patch | 39 --------- .../patches/no-boost-min-version-check.patch | 11 --- srcpkgs/mongodb/template | 80 ------------------- srcpkgs/mongodb/update | 3 - 10 files changed, 216 deletions(-) delete mode 100644 srcpkgs/mongodb/files/mongodb.conf delete mode 100755 srcpkgs/mongodb/files/mongodb/run delete mode 100644 srcpkgs/mongodb/patches/fix-musl.diff delete mode 100644 srcpkgs/mongodb/patches/fix-options_parser-segfault.patch delete mode 100644 srcpkgs/mongodb/patches/musl-elf_native_class.patch delete mode 100644 srcpkgs/mongodb/patches/musl-fix-asio.patch delete mode 100644 srcpkgs/mongodb/patches/musl-libc_version_h.patch delete mode 100644 srcpkgs/mongodb/patches/no-boost-min-version-check.patch delete mode 100644 srcpkgs/mongodb/template delete mode 100644 srcpkgs/mongodb/update diff --git a/srcpkgs/mongodb/files/mongodb.conf b/srcpkgs/mongodb/files/mongodb.conf deleted file mode 100644 index c5272b7f2df..00000000000 --- a/srcpkgs/mongodb/files/mongodb.conf +++ /dev/null @@ -1,8 +0,0 @@ -# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details -# Run mongod --help to see a list of options - -bind_ip = 127.0.0.1 -quiet = true -dbpath = /var/lib/mongodb -logpath = /var/log/mongodb/mongod.log -logappend = true diff --git a/srcpkgs/mongodb/files/mongodb/run b/srcpkgs/mongodb/files/mongodb/run deleted file mode 100755 index 849fdfcbf74..00000000000 --- a/srcpkgs/mongodb/files/mongodb/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -[ -r conf ] && . ./conf -exec chpst -u mongodb mongod ${OPTS:=--quiet --config /etc/mongodb/mongodb.conf} diff --git a/srcpkgs/mongodb/patches/fix-musl.diff b/srcpkgs/mongodb/patches/fix-musl.diff deleted file mode 100644 index ac2a87eab99..00000000000 --- a/srcpkgs/mongodb/patches/fix-musl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mongo/util/log.cpp.orig 2016-12-09 15:51:39.493596899 +0100 -+++ src/mongo/util/log.cpp 2016-12-09 15:51:52.286765108 +0100 -@@ -101,7 +101,7 @@ string errnoWithDescription(int errNumbe - char buf[kBuflen]; - char* msg{nullptr}; - --#if defined(__GNUC__) && defined(_GNU_SOURCE) -+#if defined(__GNUC__) && defined(_GNU_SOURCE) && defined(__GLIBC__) - msg = strerror_r(errNumber, buf, kBuflen); - #elif defined(_WIN32) - diff --git a/srcpkgs/mongodb/patches/fix-options_parser-segfault.patch b/srcpkgs/mongodb/patches/fix-options_parser-segfault.patch deleted file mode 100644 index 15d6da6d56c..00000000000 --- a/srcpkgs/mongodb/patches/fix-options_parser-segfault.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b552e3b3fa87e3f374d603e065785734c5b36e55 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Mon, 28 Dec 2015 13:39:06 -0700 -Subject: [PATCH 5/5] fix options_parser segfault - ---- - src/mongo/util/options_parser/option_section.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/mongo/util/options_parser/option_section.cpp src/mongo/util/options_parser/option_section.cpp -index b499025..d9f5046 100644 ---- src/mongo/util/options_parser/option_section.cpp -+++ src/mongo/util/options_parser/option_section.cpp -@@ -484,7 +484,7 @@ Status OptionSection::getDefaults(std::map* values) const { - std::list::const_iterator oditerator; - for (oditerator = _options.begin(); oditerator != _options.end(); oditerator++) { - if (!oditerator->_default.isEmpty()) { -- (*values)[oditerator->_dottedName] = oditerator->_default; -+ (*((values->insert(make_pair(oditerator->_dottedName, std::map::mapped_type()))).first)).second = oditerator->_default; - } - } - --- -2.6.4 - diff --git a/srcpkgs/mongodb/patches/musl-elf_native_class.patch b/srcpkgs/mongodb/patches/musl-elf_native_class.patch deleted file mode 100644 index cf5a34667bf..00000000000 --- a/srcpkgs/mongodb/patches/musl-elf_native_class.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add a definition for the macro __ELF_NATIVE_CLASS which depends -on the native arch's word size. - ---- src/mongo/util/stacktrace_posix.cpp 2015-08-24 02:39:52.000000000 +0200 -+++ src/mongo/util/stacktrace_posix.cpp 2015-08-26 18:59:52.290831910 +0200 -@@ -37,6 +37,15 @@ - #include - #include - -+#if !defined(__GLIBC__) -+#if defined __x86_64__ && !defined __ILP32__ -+# define __WORDSIZE 64 -+#else -+# define __WORDSIZE 32 -+#endif -+#define __ELF_NATIVE_CLASS __WORDSIZE -+#endif -+ - #include "mongo/base/init.h" - #include "mongo/config.h" - #include "mongo/db/jsobj.h" diff --git a/srcpkgs/mongodb/patches/musl-fix-asio.patch b/srcpkgs/mongodb/patches/musl-fix-asio.patch deleted file mode 100644 index aec101112c5..00000000000 --- a/srcpkgs/mongodb/patches/musl-fix-asio.patch +++ /dev/null @@ -1,15 +0,0 @@ -src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp ---- src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp.orig 2016-01-12 14:04:28.770860071 +0100 -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/impl/error_code.ipp 2016-01-12 14:05:21.615858764 +0100 -@@ -97,10 +97,7 @@ public: - #if defined(__sun) || defined(__QNX__) || defined(__SYMBIAN32__) - using namespace std; - return strerror(value); --#elif defined(__MACH__) && defined(__APPLE__) \ -- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ -- || defined(_AIX) || defined(__hpux) || defined(__osf__) \ -- || defined(__ANDROID__) -+#elif ! defined(__GLIBC__) - char buf[256] = ""; - using namespace std; - strerror_r(value, buf, sizeof(buf)); diff --git a/srcpkgs/mongodb/patches/musl-libc_version_h.patch b/srcpkgs/mongodb/patches/musl-libc_version_h.patch deleted file mode 100644 index a63dd12ba6d..00000000000 --- a/srcpkgs/mongodb/patches/musl-libc_version_h.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/mongo/util/processinfo_linux.cpp.orig 2016-12-09 16:19:48.215968681 +0100 -+++ src/mongo/util/processinfo_linux.cpp 2016-12-09 16:20:52.402812620 +0100 -@@ -40,7 +40,7 @@ - #include - #include - #include --#ifdef __UCLIBC__ -+#ifndef __GLIBC__ - #include - #else - #include -@@ -451,11 +451,13 @@ double ProcessInfo::getSystemMemoryPress - } - - void ProcessInfo::getExtraInfo(BSONObjBuilder& info) { -+ #if defined(__GLIBC__) - LinuxProc p(_pid); - if (p._maj_flt <= std::numeric_limits::max()) - info.appendNumber("page_faults", static_cast(p._maj_flt)); - else - info.appendNumber("page_faults", static_cast(p._maj_flt)); -+ #endif - } - - /** -@@ -487,11 +489,11 @@ void ProcessInfo::SystemInfo::collectSys - - BSONObjBuilder bExtra; - bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version")); --#ifdef __UCLIBC__ -+#if defined(__UCLIBC__) - stringstream ss; - ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; - bExtra.append("libcVersion", ss.str()); --#else -+#elif defined(__GLIBC__) - bExtra.append("libcVersion", gnu_get_libc_version()); - #endif - if (!verSig.empty()) diff --git a/srcpkgs/mongodb/patches/no-boost-min-version-check.patch b/srcpkgs/mongodb/patches/no-boost-min-version-check.patch deleted file mode 100644 index f1af44e5430..00000000000 --- a/srcpkgs/mongodb/patches/no-boost-min-version-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct.orig 2017-07-05 17:34:21.000000000 +0000 -+++ SConstruct 2017-07-05 17:35:17.126642925 +0000 -@@ -2799,8 +2799,6 @@ - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): - myenv.ConfError("can't find boost headers") -- if not conf.CheckBoostMinVersion(): -- myenv.ConfError("system's version of boost is too old. version 1.49 or better required") - - # Note that on Windows with using-system-boost builds, the following - # FindSysLibDep calls do nothing useful (but nothing problematic either) diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template deleted file mode 100644 index 3c453a48248..00000000000 --- a/srcpkgs/mongodb/template +++ /dev/null @@ -1,80 +0,0 @@ -# Template file for 'mongodb' -pkgname=mongodb -version=3.4.17 -revision=3 -wrksrc="mongodb-src-r${version}" -only_for_archs="aarch64 x86_64 aarch64-musl x86_64-musl ppc64le ppc64le-musl ppc64-musl" -conf_files="/etc/mongodb/mongodb.conf" -hostmakedepends="scons" -makedepends="pcre-devel snappy-devel libressl-devel libpcap-devel - gperftools libsasl-devel yaml-cpp-devel" -depends="cyrus-sasl-modules" -short_desc="High-performance, schema-free document-oriented database" -maintainer="Enno Boland " -license="AGPL-3.0-only" -homepage="http://www.mongodb.org" -distfiles="https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz" -checksum=6044e4c811a87bffd512a96fd2a4e4af9513af12f407bf7cd7c6281ccfb46484 -system_accounts="mongodb" -mongodb_homedir="/var/lib/mongodb" - -make_dirs=" - /var/lib/mongodb 0700 mongodb mongodb - /var/log/mongodb 0750 mongodb mongodb" - -# ETOOHUGE -nodebug=1 - -case "${XBPS_TARGET_MACHINE}" in - aarch64-musl) - # error: conflicting types for 'wchar_t' - broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/2739/steps/shell_3/logs/stdio" - ;; - x86_64*|aarch64*|ppc64*) makedepends+=" wiredtiger-devel";; -esac - -do_configure() { - find . -name SConstruct -print0 | xargs -0 sed -i "s/-Werror/-Wno-error/g" - case "$XBPS_TARGET_MACHINE" in - *-musl) # Disable strtouq(3) - sed -i src/third_party/wiredtiger/build_linux/wiredtiger_config.h \ - -e "s;#define HAVE_STRTOUQ 1;#undef HAVE_STRTOUQ;" - esac -} -do_build() { - # Choose storage engine - case "$XBPS_TARGET_MACHINE" in - x86_64*|aarch64*|ppc64*) _scons_args="--wiredtiger=on --use-system-wiredtiger";; - i686*|arm*) _scons_args="--wiredtiger=off --mmapv1=on";; - *) _scons_args="--wiredtiger=off";; - esac - scons core tools ${makejobs} \ - CC=$CC \ - CFLAGS="$CFLAGS" \ - CXX=$CXX \ - CXXFLAGS="$CXXFLAGS" \ - LIBPATH="${XBPS_CROSS_BASE}/usr/lib" \ - CPPPATH="${XBPS_CROSS_BASE}/usr/include" \ - --prefix="/usr" \ - --use-system-pcre \ - --use-system-snappy \ - --use-system-zlib \ - --use-system-yaml \ - --use-sasl-client \ - --ssl \ - --nostrip \ - --disable-warnings-as-errors \ - --allocator=system \ - ${_scons_args} - # --use-system-intel_decimal128 \ -} -do_install() { - for b in mongos mongod mongo mongoperf; do - vbin $b - done - - vinstall ${FILESDIR}/mongodb.conf 644 etc/mongodb - - vsv mongodb - vlicense GNU-AGPL-3.0.txt -} diff --git a/srcpkgs/mongodb/update b/srcpkgs/mongodb/update deleted file mode 100644 index f00ed9ce09e..00000000000 --- a/srcpkgs/mongodb/update +++ /dev/null @@ -1,3 +0,0 @@ -site=$homepage/downloads -pattern="mongodb-src-r\K[\d.]+(?=.tar)" -ignore="*.[13579].*"