diff --git a/databases/Makefile b/databases/Makefile index 925ac3615445..6ec124117f74 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,1049 +1,1050 @@ COMMENT = Databases and related software SUBDIR += R-cran-DBI SUBDIR += R-cran-RMySQL SUBDIR += R-cran-RPostgreSQL SUBDIR += R-cran-RSQLite SUBDIR += R-cran-RSQLite.extfuns SUBDIR += R-cran-cachem SUBDIR += R-cran-fastmap SUBDIR += R-cran-sqldf SUBDIR += WWWdb SUBDIR += adminer SUBDIR += adodb5 SUBDIR += akonadi SUBDIR += apache-commons-dbutils SUBDIR += arrow SUBDIR += ateam_mysql57_ldap_auth SUBDIR += ateam_mysql_ldap_auth SUBDIR += autobackupmysql SUBDIR += automysqlbackup SUBDIR += bbdb SUBDIR += beansdb SUBDIR += buzhug SUBDIR += c3p0 SUBDIR += cassandra-cpp-driver SUBDIR += cassandra3 SUBDIR += cassandra4 SUBDIR += casstcl SUBDIR += caterva SUBDIR += cayley SUBDIR += cdb SUBDIR += cego SUBDIR += cegobridge SUBDIR += clickhouse SUBDIR += closql SUBDIR += cockroach SUBDIR += couchdb3 SUBDIR += courier-authlib-mysql SUBDIR += courier-authlib-pgsql SUBDIR += courier-authlib-sqlite SUBDIR += courier-authlib-userdb SUBDIR += courier-authlib-usergdbm SUBDIR += cppdb SUBDIR += credis SUBDIR += cutelyst-asql SUBDIR += dalmp SUBDIR += db SUBDIR += db18 SUBDIR += db5 SUBDIR += dbf SUBDIR += dbh SUBDIR += dbixx SUBDIR += dbow SUBDIR += dbtool SUBDIR += dbview SUBDIR += elixir-calecto SUBDIR += elixir-db_connection SUBDIR += elixir-ecto SUBDIR += elixir-geo SUBDIR += elixir-mariaex SUBDIR += elixir-postgrex SUBDIR += elixir-timex_ecto SUBDIR += emacsql SUBDIR += erlang-couchbeam SUBDIR += erlang-epgsql SUBDIR += erlang-eredis SUBDIR += erlfdb SUBDIR += evolution-data-server SUBDIR += fastdb SUBDIR += firebird25-client SUBDIR += firebird25-server SUBDIR += firebird30-client SUBDIR += firebird30-server SUBDIR += firebird40-client SUBDIR += firebird40-server SUBDIR += fortytwo-bdb SUBDIR += foundationdb SUBDIR += foundationdb-devel SUBDIR += fpc-dblib SUBDIR += fpc-fpindexer SUBDIR += fpc-gdbm SUBDIR += fpc-ibase SUBDIR += fpc-mysql SUBDIR += fpc-odbc SUBDIR += fpc-oracle SUBDIR += fpc-postgres SUBDIR += fpc-pxlib SUBDIR += fpc-sqlite SUBDIR += freetds SUBDIR += freetds-devel SUBDIR += frontbase-jdbc SUBDIR += galera SUBDIR += galera26 SUBDIR += gdbm SUBDIR += geoserver-mysql-plugin SUBDIR += gigabase SUBDIR += gmdb2 SUBDIR += gnats4 SUBDIR += gnatsweb4 SUBDIR += go-carbon SUBDIR += go-pgweb SUBDIR += gom SUBDIR += gqlplus SUBDIR += grass7 SUBDIR += grass8 SUBDIR += hashtypes SUBDIR += hiredis SUBDIR += hsqldb SUBDIR += influxdb SUBDIR += influxdb2-cli SUBDIR += innotop SUBDIR += iowow SUBDIR += ip4r SUBDIR += ipa_sdb SUBDIR += iplike SUBDIR += isql-viewer SUBDIR += jdb SUBDIR += jdbc-oracle11g SUBDIR += jetbrains-datagrip SUBDIR += jlog SUBDIR += jrobin SUBDIR += jrrd SUBDIR += kbibtex SUBDIR += kdb SUBDIR += kexi SUBDIR += kyotocabinet SUBDIR += kyototycoon SUBDIR += ldb15 SUBDIR += ldb20 SUBDIR += ldb21 SUBDIR += ldb22 SUBDIR += leo_center SUBDIR += leofs SUBDIR += leveldb SUBDIR += libcouchbase SUBDIR += libdbi SUBDIR += libdbi-drivers SUBDIR += libdrizzle SUBDIR += libdrizzle-redux SUBDIR += libgda5 SUBDIR += libgda5-bdb SUBDIR += libgda5-jdbc SUBDIR += libgda5-ldap SUBDIR += libgda5-mdb SUBDIR += libgda5-mysql SUBDIR += libgda5-postgresql SUBDIR += libgda5-ui SUBDIR += libgdamm5 SUBDIR += libhsclient SUBDIR += libiodbc SUBDIR += libmemcache SUBDIR += libmemcached SUBDIR += libmongo-client SUBDIR += libmswstr SUBDIR += libnvpair SUBDIR += libodbc++ SUBDIR += libpbl SUBDIR += libpg_query SUBDIR += libpqtypes SUBDIR += libsdb SUBDIR += libzdb SUBDIR += linux-c7-sqlite3 SUBDIR += linux-c7-unixODBC SUBDIR += linux-oracle-instantclient-basic SUBDIR += linux-oracle-instantclient-sdk SUBDIR += liquibase SUBDIR += litestream SUBDIR += lmdb SUBDIR += lua-lsqlite3 SUBDIR += lua-pgsql SUBDIR += lua-resty-redis SUBDIR += lua-xapian SUBDIR += luadbi SUBDIR += luasql-firebird SUBDIR += luasql-mysql SUBDIR += luasql-odbc SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis SUBDIR += mariadb-connector-c SUBDIR += mariadb-connector-odbc SUBDIR += mariadb103-client SUBDIR += mariadb103-server SUBDIR += mariadb104-client SUBDIR += mariadb104-server SUBDIR += mariadb105-client SUBDIR += mariadb105-server SUBDIR += mariadb106-client SUBDIR += mariadb106-server SUBDIR += mdbtools SUBDIR += mdbx SUBDIR += mdcached SUBDIR += memcached SUBDIR += metabase SUBDIR += mongodb-tools SUBDIR += mongodb36 SUBDIR += mongodb36-tools SUBDIR += mongodb40 SUBDIR += mongodb40-tools SUBDIR += mongodb42 SUBDIR += mongodb42-tools SUBDIR += mongodb44 SUBDIR += mongodb50 SUBDIR += mroonga SUBDIR += mtop SUBDIR += mydumper SUBDIR += mysac SUBDIR += mysql-connector-c SUBDIR += mysql-connector-c++ SUBDIR += mysql-connector-java SUBDIR += mysql-connector-java51 SUBDIR += mysql-connector-odbc SUBDIR += mysql-q4m SUBDIR += mysql-udf SUBDIR += mysql2pgsql SUBDIR += mysql55-client SUBDIR += mysql55-server SUBDIR += mysql56-client SUBDIR += mysql56-server SUBDIR += mysql57-client SUBDIR += mysql57-server SUBDIR += mysql80-client SUBDIR += mysql80-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram SUBDIR += mysqldump-secure SUBDIR += mysqlreport SUBDIR += mysqlsla SUBDIR += mysqltcl SUBDIR += mysqltuner SUBDIR += mysqlwsrep56-server SUBDIR += mysqlwsrep57-server SUBDIR += mytop SUBDIR += nagios-check_mongodb SUBDIR += nagios-check_postgres_replication SUBDIR += nagios-check_redis SUBDIR += namazu2 SUBDIR += neo4j SUBDIR += ocaml-dbm SUBDIR += ocaml-mysql SUBDIR += ocaml-sqlite3 SUBDIR += ods2sql SUBDIR += opendbviewer SUBDIR += opendbx SUBDIR += ora2pg SUBDIR += oracle8-client SUBDIR += p5-Amazon-SimpleDB SUBDIR += p5-Amon2-DBI SUBDIR += p5-AnyEvent-BDB SUBDIR += p5-AnyEvent-CouchDB SUBDIR += p5-AnyEvent-DBD-Pg SUBDIR += p5-AnyEvent-Memcached SUBDIR += p5-AnyEvent-Redis SUBDIR += p5-App-Sqitch SUBDIR += p5-AsciiDB-TagFile SUBDIR += p5-BDB SUBDIR += p5-BSON SUBDIR += p5-BSON-XS SUBDIR += p5-BerkeleyDB SUBDIR += p5-Bucardo SUBDIR += p5-CDB_File SUBDIR += p5-CDB_File-Generator SUBDIR += p5-CGI-Session-Driver-memcached SUBDIR += p5-CHI-Driver-Memcached SUBDIR += p5-CHI-Driver-Redis SUBDIR += p5-CHI-Driver-TokyoTyrant SUBDIR += p5-Cache-BDB SUBDIR += p5-Cache-Memcached SUBDIR += p5-Cache-Memcached-Fast SUBDIR += p5-Cache-Memcached-Managed SUBDIR += p5-Cache-Memcached-XS SUBDIR += p5-Cache-Memcached-libmemcached SUBDIR += p5-Class-DBI SUBDIR += p5-Class-DBI-AbstractSearch SUBDIR += p5-Class-DBI-AsForm SUBDIR += p5-Class-DBI-AutoLoader SUBDIR += p5-Class-DBI-BaseDSN SUBDIR += p5-Class-DBI-DATA-Schema SUBDIR += p5-Class-DBI-DDL SUBDIR += p5-Class-DBI-FromCGI SUBDIR += p5-Class-DBI-LazyInflate SUBDIR += p5-Class-DBI-Loader SUBDIR += p5-Class-DBI-Loader-Relationship SUBDIR += p5-Class-DBI-Oracle SUBDIR += p5-Class-DBI-Pager SUBDIR += p5-Class-DBI-Pg SUBDIR += p5-Class-DBI-Plugin SUBDIR += p5-Class-DBI-Plugin-AbstractCount SUBDIR += p5-Class-DBI-Plugin-DeepAbstractSearch SUBDIR += p5-Class-DBI-Plugin-Iterator SUBDIR += p5-Class-DBI-Plugin-Pager SUBDIR += p5-Class-DBI-Plugin-RetrieveAll SUBDIR += p5-Class-DBI-Plugin-Senna SUBDIR += p5-Class-DBI-Plugin-Type SUBDIR += p5-Class-DBI-Replication SUBDIR += p5-Class-DBI-SAK SUBDIR += p5-Class-DBI-SQLite SUBDIR += p5-Class-DBI-Sweet SUBDIR += p5-Class-DBI-ToSax SUBDIR += p5-Class-DBI-Untaint SUBDIR += p5-Class-DBI-mysql SUBDIR += p5-Class-Inflate SUBDIR += p5-CouchDB-View SUBDIR += p5-DBD-AnyData SUBDIR += p5-DBD-CSV SUBDIR += p5-DBD-Excel SUBDIR += p5-DBD-Google SUBDIR += p5-DBD-InterBase SUBDIR += p5-DBD-LDAP SUBDIR += p5-DBD-MariaDB SUBDIR += p5-DBD-Mock SUBDIR += p5-DBD-Multi SUBDIR += p5-DBD-ODBC SUBDIR += p5-DBD-Oracle SUBDIR += p5-DBD-Pg SUBDIR += p5-DBD-PgLite SUBDIR += p5-DBD-PgPP SUBDIR += p5-DBD-SQLite SUBDIR += p5-DBD-SQLite2 SUBDIR += p5-DBD-Sybase SUBDIR += p5-DBD-XBase SUBDIR += p5-DBD-cego SUBDIR += p5-DBD-mysql SUBDIR += p5-DBI SUBDIR += p5-DBI-Shell SUBDIR += p5-DBICx-Deploy SUBDIR += p5-DBICx-MapMaker SUBDIR += p5-DBICx-Sugar SUBDIR += p5-DBICx-TestDatabase SUBDIR += p5-DBICx-TxnInsert SUBDIR += p5-DBIWrapper SUBDIR += p5-DBIx-Abstract SUBDIR += p5-DBIx-Admin-CreateTable SUBDIR += p5-DBIx-Admin-DSNManager SUBDIR += p5-DBIx-Admin-TableInfo SUBDIR += p5-DBIx-AnyDBD SUBDIR += p5-DBIx-Browse SUBDIR += p5-DBIx-Class SUBDIR += p5-DBIx-Class-AsFdat SUBDIR += p5-DBIx-Class-AuditLog SUBDIR += p5-DBIx-Class-BitField SUBDIR += p5-DBIx-Class-Candy SUBDIR += p5-DBIx-Class-Cursor-Cached SUBDIR += p5-DBIx-Class-CustomPrefetch SUBDIR += p5-DBIx-Class-DateTime-Epoch SUBDIR += p5-DBIx-Class-DeploymentHandler SUBDIR += p5-DBIx-Class-DigestColumns SUBDIR += p5-DBIx-Class-DynamicDefault SUBDIR += p5-DBIx-Class-DynamicSubclass SUBDIR += p5-DBIx-Class-EncodeColumns SUBDIR += p5-DBIx-Class-EncodedColumn SUBDIR += p5-DBIx-Class-Fixtures SUBDIR += p5-DBIx-Class-FrozenColumns SUBDIR += p5-DBIx-Class-Helpers SUBDIR += p5-DBIx-Class-InflateColumn-Authen-Passphrase SUBDIR += p5-DBIx-Class-InflateColumn-FS SUBDIR += p5-DBIx-Class-InflateColumn-IP SUBDIR += p5-DBIx-Class-InflateColumn-Serializer SUBDIR += p5-DBIx-Class-IntrospectableM2M SUBDIR += p5-DBIx-Class-Loader SUBDIR += p5-DBIx-Class-Migration SUBDIR += p5-DBIx-Class-MooseColumns SUBDIR += p5-DBIx-Class-PassphraseColumn SUBDIR += p5-DBIx-Class-QueryLog SUBDIR += p5-DBIx-Class-QueryProfiler SUBDIR += p5-DBIx-Class-ResultSet-HashRef SUBDIR += p5-DBIx-Class-ResultSet-RecursiveUpdate SUBDIR += p5-DBIx-Class-Schema-Config SUBDIR += p5-DBIx-Class-Schema-Loader SUBDIR += p5-DBIx-Class-Schema-PopulateMore SUBDIR += p5-DBIx-Class-Storage-TxnEndHook SUBDIR += p5-DBIx-Class-TimeStamp SUBDIR += p5-DBIx-Class-Tree SUBDIR += p5-DBIx-Class-Tree-NestedSet SUBDIR += p5-DBIx-Class-UUIDColumns SUBDIR += p5-DBIx-Class-VirtualColumns SUBDIR += p5-DBIx-Class-WebForm SUBDIR += p5-DBIx-Connector SUBDIR += p5-DBIx-ContextualFetch SUBDIR += p5-DBIx-Custom SUBDIR += p5-DBIx-DBHResolver SUBDIR += p5-DBIx-DBSchema SUBDIR += p5-DBIx-DataSource SUBDIR += p5-DBIx-DisconnectAll SUBDIR += p5-DBIx-Dump SUBDIR += p5-DBIx-HA SUBDIR += p5-DBIx-Handler SUBDIR += p5-DBIx-Inspector SUBDIR += p5-DBIx-Introspector SUBDIR += p5-DBIx-Lite SUBDIR += p5-DBIx-Log4perl SUBDIR += p5-DBIx-MySQLSequence SUBDIR += p5-DBIx-NoSQL SUBDIR += p5-DBIx-Password SUBDIR += p5-DBIx-Perlish SUBDIR += p5-DBIx-QueryLog SUBDIR += p5-DBIx-QuickDB SUBDIR += p5-DBIx-Recordset SUBDIR += p5-DBIx-RetryOverDisconnects SUBDIR += p5-DBIx-SQLEngine SUBDIR += p5-DBIx-SQLite-Simple SUBDIR += p5-DBIx-Safe SUBDIR += p5-DBIx-SearchBuilder SUBDIR += p5-DBIx-Sequence SUBDIR += p5-DBIx-Simple SUBDIR += p5-DBIx-Skinny SUBDIR += p5-DBIx-Skinny-InflateColumn-DateTime SUBDIR += p5-DBIx-Skinny-Mixin-DBHResolver SUBDIR += p5-DBIx-Skinny-Pager SUBDIR += p5-DBIx-Skinny-Schema-Loader SUBDIR += p5-DBIx-Sunny SUBDIR += p5-DBIx-TableHash SUBDIR += p5-DBIx-Tracer SUBDIR += p5-DBIx-TransactionManager SUBDIR += p5-DBIx-Tree SUBDIR += p5-DBIx-VersionedDDL SUBDIR += p5-DBIx-Wrapper SUBDIR += p5-DBIx-XHTML_Table SUBDIR += p5-DBIx-XML_RDB SUBDIR += p5-DBM-Deep SUBDIR += p5-DR-Tarantool SUBDIR += p5-DWH_File SUBDIR += p5-Dancer-Plugin-DBIC SUBDIR += p5-Dancer-Plugin-Database SUBDIR += p5-Dancer-Plugin-Database-Core SUBDIR += p5-Dancer-Plugin-Redis SUBDIR += p5-Dancer-Session-Memcached SUBDIR += p5-Dancer2-Plugin-DBIC SUBDIR += p5-Dancer2-Plugin-Database SUBDIR += p5-Dancer2-Session-DBIC SUBDIR += p5-Data-Page SUBDIR += p5-Data-Pageset SUBDIR += p5-Exception-Class-DBI SUBDIR += p5-File-Locate SUBDIR += p5-GDBM SUBDIR += p5-Genezzo SUBDIR += p5-GitDDL SUBDIR += p5-GitDDL-Migrator SUBDIR += p5-GraphViz-DBI SUBDIR += p5-HTML-FormHandler-Model-DBIC SUBDIR += p5-Ima-DBI SUBDIR += p5-Interchange6-Schema SUBDIR += p5-Iterator-DBI SUBDIR += p5-Jifty-DBI SUBDIR += p5-KyotoCabinet SUBDIR += p5-LMDB_File SUBDIR += p5-MLDBM SUBDIR += p5-MLDBM-Sync SUBDIR += p5-MR-Tarantool SUBDIR += p5-Mango SUBDIR += p5-Memcached-libmemcached SUBDIR += p5-Metadata SUBDIR += p5-Mojo-Pg SUBDIR += p5-MongoDB SUBDIR += p5-Mongoose SUBDIR += p5-MySQL-Diff SUBDIR += p5-Net-Async-CassandraCQL SUBDIR += p5-ORLite SUBDIR += p5-ORLite-Migrate SUBDIR += p5-Oryx SUBDIR += p5-POE-Component-DBIAgent SUBDIR += p5-POE-Component-EasyDBI SUBDIR += p5-POE-Component-LaDBI SUBDIR += p5-POE-Component-RRDTool SUBDIR += p5-Pg SUBDIR += p5-PostgreSQL-PLPerl-Call SUBDIR += p5-PostgreSQL-PLPerl-Trace SUBDIR += p5-Prophet SUBDIR += p5-Protocol-CassandraCQL SUBDIR += p5-RRD-Simple SUBDIR += p5-Redis SUBDIR += p5-Redis-Fast SUBDIR += p5-Redis-JobQueue SUBDIR += p5-Redis-RateLimit SUBDIR += p5-Redis-hiredis SUBDIR += p5-RedisDB SUBDIR += p5-RedisDB-Parser SUBDIR += p5-Relations SUBDIR += p5-Relations-Query SUBDIR += p5-ResourcePool-Resource-DBI SUBDIR += p5-Rose-DB SUBDIR += p5-Rose-DB-Object SUBDIR += p5-Rose-DBx-Object-MoreHelpers SUBDIR += p5-Rose-DBx-Object-Renderer SUBDIR += p5-SQL-Abstract SUBDIR += p5-SQL-Abstract-Classic SUBDIR += p5-SQL-Abstract-Limit SUBDIR += p5-SQL-Abstract-More SUBDIR += p5-SQL-Abstract-Pg SUBDIR += p5-SQL-Abstract-Plugin-InsertMulti SUBDIR += p5-SQL-Interp SUBDIR += p5-SQL-Maker SUBDIR += p5-SQL-NamedPlaceholder SUBDIR += p5-SQL-ReservedWords SUBDIR += p5-SQL-Statement SUBDIR += p5-SQL-Translator SUBDIR += p5-SQLite-Work SUBDIR += p5-Scope-Container-DBI SUBDIR += p5-Search-InvertedIndex SUBDIR += p5-Search-Namazu SUBDIR += p5-Search-Xapian SUBDIR += p5-Search-Xapian12 SUBDIR += p5-Store-CouchDB SUBDIR += p5-T2 SUBDIR += p5-Tangram SUBDIR += p5-Template-DBI SUBDIR += p5-Teng SUBDIR += p5-Test-Cukes SUBDIR += p5-Test-Database SUBDIR += p5-Test-DatabaseRow SUBDIR += p5-Test-Fixture-DBI SUBDIR += p5-Test-mysqld SUBDIR += p5-Test-postgresql SUBDIR += p5-Text-Query-SQL SUBDIR += p5-Text-xSV SUBDIR += p5-Tie-DBI SUBDIR += p5-Tie-LevelDB SUBDIR += p5-Time-Piece-MySQL SUBDIR += p5-TokyoCabinet SUBDIR += p5-Xapian SUBDIR += p5-mysql-genocide SUBDIR += p5-tokyotyrant SUBDIR += pear-DB SUBDIR += pear-DBA SUBDIR += pear-DBA_Relational SUBDIR += pear-DB_DataObject SUBDIR += pear-DB_DataObject_FormBuilder SUBDIR += pear-DB_Pager SUBDIR += pear-DB_QueryTool SUBDIR += pear-DB_Sqlite_Tools SUBDIR += pear-DB_Table SUBDIR += pear-DB_ldap SUBDIR += pear-DB_ldap2 SUBDIR += pear-DoctrineCommon SUBDIR += pear-DoctrineDBAL SUBDIR += pear-Horde_Db SUBDIR += pear-Horde_HashTable SUBDIR += pear-Horde_Imsp SUBDIR += pear-Horde_Memcache SUBDIR += pear-Horde_Mongo SUBDIR += pear-MDB SUBDIR += pear-MDB2 SUBDIR += pear-MDB2_Driver_mysqli SUBDIR += pear-MDB2_Driver_pgsql SUBDIR += pear-MDB2_Schema SUBDIR += pear-MDB_QueryTool SUBDIR += pear-Structures_DataGrid_DataSource_Array SUBDIR += pear-Structures_DataGrid_DataSource_CSV SUBDIR += pear-Structures_DataGrid_DataSource_DB SUBDIR += pear-Structures_DataGrid_DataSource_PDO SUBDIR += pear-XML_Query2XML SUBDIR += pecl-cassandra SUBDIR += pecl-couchbase SUBDIR += pecl-leveldb SUBDIR += pecl-memcache SUBDIR += pecl-memcached SUBDIR += pecl-mongodb SUBDIR += pecl-redis SUBDIR += pecl-rrd SUBDIR += percona-pam-for-mysql SUBDIR += percona-toolkit SUBDIR += percona56-client SUBDIR += percona56-server SUBDIR += percona57-client SUBDIR += percona57-pam-for-mysql SUBDIR += percona57-server SUBDIR += pg.el SUBDIR += pgFormatter SUBDIR += pg_activity SUBDIR += pg_citus SUBDIR += pg_dirtyread SUBDIR += pg_ed25519 SUBDIR += pg_filedump SUBDIR += pg_hashids SUBDIR += pg_partman SUBDIR += pg_qualstats SUBDIR += pg_repack SUBDIR += pg_similarity SUBDIR += pg_stat_kcache SUBDIR += pg_tileserv SUBDIR += pgaccess SUBDIR += pgadmin3 SUBDIR += pgbackrest SUBDIR += pgbadger SUBDIR += pgbarman SUBDIR += pgbouncer SUBDIR += pgdbf SUBDIR += pgfouine SUBDIR += pgloader3 SUBDIR += pglogical SUBDIR += pgmetrics SUBDIR += pgmodeler SUBDIR += pgpool-II-36 SUBDIR += pgpool-II-37 SUBDIR += pgpool-II-40 SUBDIR += pgpool-II-41 SUBDIR += pgpool-II-42 SUBDIR += pgpool-II-43 SUBDIR += pgreplay SUBDIR += pgroonga SUBDIR += pgrouting SUBDIR += pgsanity SUBDIR += pgsphere SUBDIR += pgtcl SUBDIR += pgtop SUBDIR += pguri SUBDIR += php-tarantool SUBDIR += php-xapian SUBDIR += php74-dba SUBDIR += php74-mysqli SUBDIR += php74-odbc SUBDIR += php74-pdo SUBDIR += php74-pdo_dblib SUBDIR += php74-pdo_firebird SUBDIR += php74-pdo_mysql SUBDIR += php74-pdo_odbc SUBDIR += php74-pdo_pgsql SUBDIR += php74-pdo_sqlite SUBDIR += php74-pgsql SUBDIR += php74-sqlite3 SUBDIR += php80-dba SUBDIR += php80-mysqli SUBDIR += php80-odbc SUBDIR += php80-pdo SUBDIR += php80-pdo_dblib SUBDIR += php80-pdo_firebird SUBDIR += php80-pdo_mysql SUBDIR += php80-pdo_odbc SUBDIR += php80-pdo_pgsql SUBDIR += php80-pdo_sqlite SUBDIR += php80-pgsql SUBDIR += php80-sqlite3 SUBDIR += php81-dba SUBDIR += php81-mysqli SUBDIR += php81-odbc SUBDIR += php81-pdo SUBDIR += php81-pdo_dblib SUBDIR += php81-pdo_firebird SUBDIR += php81-pdo_mysql SUBDIR += php81-pdo_odbc SUBDIR += php81-pdo_pgsql SUBDIR += php81-pdo_sqlite SUBDIR += php81-pgsql SUBDIR += php81-sqlite3 SUBDIR += phpliteadmin SUBDIR += phpminiadmin SUBDIR += phpmyadmin SUBDIR += phpmyadmin5 SUBDIR += phppgadmin SUBDIR += pldebugger SUBDIR += plpgsql_check SUBDIR += pointcloud SUBDIR += postgis-jdbc SUBDIR += postgis30 SUBDIR += postgis31 SUBDIR += postgis32 SUBDIR += postgresql-cstore_fdw SUBDIR += postgresql-jdbc SUBDIR += postgresql-libpgeasy SUBDIR += postgresql-libpqxx SUBDIR += postgresql-mysql_fdw SUBDIR += postgresql-odbc SUBDIR += postgresql-ogr_fdw SUBDIR += postgresql-orafce SUBDIR += postgresql-plproxy SUBDIR += postgresql-plv8js SUBDIR += postgresql-prefix SUBDIR += postgresql-relay SUBDIR += postgresql-repmgr SUBDIR += postgresql-rum SUBDIR += postgresql-semver SUBDIR += postgresql-tds_fdw SUBDIR += postgresql-zhparser SUBDIR += postgresql10-client SUBDIR += postgresql10-contrib SUBDIR += postgresql10-docs SUBDIR += postgresql10-pgtcl SUBDIR += postgresql10-plperl SUBDIR += postgresql10-plpython SUBDIR += postgresql10-pltcl SUBDIR += postgresql10-server SUBDIR += postgresql11-client SUBDIR += postgresql11-contrib SUBDIR += postgresql11-docs SUBDIR += postgresql11-pgtcl SUBDIR += postgresql11-plperl SUBDIR += postgresql11-plpython SUBDIR += postgresql11-pltcl SUBDIR += postgresql11-server SUBDIR += postgresql12-client SUBDIR += postgresql12-contrib SUBDIR += postgresql12-docs SUBDIR += postgresql12-pgtcl SUBDIR += postgresql12-plperl SUBDIR += postgresql12-plpython SUBDIR += postgresql12-pltcl SUBDIR += postgresql12-server SUBDIR += postgresql13-client SUBDIR += postgresql13-contrib SUBDIR += postgresql13-docs SUBDIR += postgresql13-pgtcl SUBDIR += postgresql13-plperl SUBDIR += postgresql13-plpython SUBDIR += postgresql13-pltcl SUBDIR += postgresql13-server SUBDIR += postgresql14-client SUBDIR += postgresql14-contrib SUBDIR += postgresql14-docs SUBDIR += postgresql14-pgtcl SUBDIR += postgresql14-plperl SUBDIR += postgresql14-plpython SUBDIR += postgresql14-pltcl SUBDIR += postgresql14-server SUBDIR += powa-archivist SUBDIR += powa-web SUBDIR += powerarchitect SUBDIR += proftpd-mod_sql_mysql SUBDIR += proftpd-mod_sql_odbc SUBDIR += proftpd-mod_sql_postgres SUBDIR += proftpd-mod_sql_sqlite SUBDIR += proftpd-mod_sql_tds SUBDIR += prometheus-postgresql-adapter SUBDIR += pspg SUBDIR += puppetdb-terminus6 SUBDIR += puppetdb-terminus7 SUBDIR += puppetdb6 SUBDIR += puppetdb7 SUBDIR += puredb SUBDIR += pxlib SUBDIR += pxtools SUBDIR += py-Elixir SUBDIR += py-PyGreSQL SUBDIR += py-Pyrseas SUBDIR += py-aesqlapius SUBDIR += py-agate-sql SUBDIR += py-aiomysql SUBDIR += py-aiopg SUBDIR += py-aioredis SUBDIR += py-aiosqlite SUBDIR += py-alembic SUBDIR += py-alembic14 SUBDIR += py-alembic16 SUBDIR += py-apsw SUBDIR += py-asyncmy SUBDIR += py-asyncpg SUBDIR += py-berkeleydb SUBDIR += py-bsddb3 SUBDIR += py-carbon SUBDIR += py-cassandra-driver SUBDIR += py-caterva SUBDIR += py-couchdb SUBDIR += py-databases SUBDIR += py-dbf SUBDIR += py-dbutils SUBDIR += py-fakeredis SUBDIR += py-fastapi-users-db-ormar SUBDIR += py-fdb SUBDIR += py-firebirdsql SUBDIR += py-flask-sqlalchemy SUBDIR += py-gdbm SUBDIR += py-geoalchemy2 SUBDIR += py-hiredis SUBDIR += py-influxdb SUBDIR += py-kyotocabinet SUBDIR += py-leveldb SUBDIR += py-litecli SUBDIR += py-lmdb SUBDIR += py-marshmallow-sqlalchemy SUBDIR += py-minidb SUBDIR += py-mongoengine SUBDIR += py-motor SUBDIR += py-mycli SUBDIR += py-mysql-connector-python SUBDIR += py-mysqlclient SUBDIR += py-ormar SUBDIR += py-partd SUBDIR += py-peewee SUBDIR += py-peewee_migrate SUBDIR += py-pg8000 SUBDIR += py-pg8000-112 SUBDIR += py-pgcli SUBDIR += py-pgdbconn SUBDIR += py-pglast SUBDIR += py-pglite SUBDIR += py-pgmigrate SUBDIR += py-pgspecial SUBDIR += py-pgxnclient SUBDIR += py-pickledb SUBDIR += py-pickleshare SUBDIR += py-pony SUBDIR += py-postgresql SUBDIR += py-psycogreen SUBDIR += py-psycopg SUBDIR += py-psycopg-c SUBDIR += py-psycopg-pool SUBDIR += py-psycopg2 SUBDIR += py-psycopg2cffi SUBDIR += py-pum SUBDIR += py-pycql SUBDIR += py-pylibmc SUBDIR += py-pymemcache SUBDIR += py-pymssql SUBDIR += py-pymysql SUBDIR += py-pyodbc SUBDIR += py-pypuppetdb SUBDIR += py-python-arango SUBDIR += py-python-binary-memcached SUBDIR += py-python-memcached SUBDIR += py-python-sql SUBDIR += py-python-swiftclient SUBDIR += py-queries SUBDIR += py-rb SUBDIR += py-redis SUBDIR += py-redis2 SUBDIR += py-rrdtool SUBDIR += py-sispy SUBDIR += py-south SUBDIR += py-sqlalchemy-json SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy-utils SUBDIR += py-sqlalchemy10 SUBDIR += py-sqlalchemy11 SUBDIR += py-sqlalchemy12 SUBDIR += py-sqlalchemy13 SUBDIR += py-sqlalchemy14 SUBDIR += py-sqlite3 SUBDIR += py-sqlobject SUBDIR += py-sqlparse SUBDIR += py-sqlrelay SUBDIR += py-tableschema SUBDIR += py-tarantool SUBDIR += py-tiledb SUBDIR += py-txredisapi SUBDIR += py-unqlite SUBDIR += py-varstack SUBDIR += py-whisper SUBDIR += py-xapian SUBDIR += py-zodbpickle SUBDIR += pymongo SUBDIR += qdbm SUBDIR += qdbm-plus SUBDIR += qof SUBDIR += qt5-sql SUBDIR += qt5-sqldrivers-ibase SUBDIR += qt5-sqldrivers-mysql SUBDIR += qt5-sqldrivers-odbc SUBDIR += qt5-sqldrivers-pgsql SUBDIR += qt5-sqldrivers-sqlite2 SUBDIR += qt5-sqldrivers-sqlite3 SUBDIR += qt5-sqldrivers-tds SUBDIR += recutils SUBDIR += redis SUBDIR += redis-devel SUBDIR += redis6 + SUBDIR += redis62 SUBDIR += redis_exporter SUBDIR += redisdesktopmanager SUBDIR += redisjson SUBDIR += retcl SUBDIR += rocksdb SUBDIR += rocksdb-lite SUBDIR += rrdman SUBDIR += rrdmerge SUBDIR += rrdtool SUBDIR += rrdtool12 SUBDIR += ruby-bdb SUBDIR += ruby-qdbm SUBDIR += ruby-tokyocabinet SUBDIR += ruby-xapian SUBDIR += rubygem-active_model_serializers SUBDIR += rubygem-active_record_query_trace SUBDIR += rubygem-activemodel-serializers-xml SUBDIR += rubygem-activemodel4 SUBDIR += rubygem-activemodel5 SUBDIR += rubygem-activemodel50 SUBDIR += rubygem-activemodel52 SUBDIR += rubygem-activemodel60 SUBDIR += rubygem-activemodel61 SUBDIR += rubygem-activemodel70 SUBDIR += rubygem-activerecord-explain-analyze SUBDIR += rubygem-activerecord-import SUBDIR += rubygem-activerecord-jdbc-adapter SUBDIR += rubygem-activerecord-jdbcmysql-adapter SUBDIR += rubygem-activerecord-session_store SUBDIR += rubygem-activerecord4 SUBDIR += rubygem-activerecord5 SUBDIR += rubygem-activerecord50 SUBDIR += rubygem-activerecord52 SUBDIR += rubygem-activerecord60 SUBDIR += rubygem-activerecord61 SUBDIR += rubygem-activerecord70 SUBDIR += rubygem-after_commit_queue SUBDIR += rubygem-amalgalite SUBDIR += rubygem-arel SUBDIR += rubygem-arel-helpers SUBDIR += rubygem-arel6 SUBDIR += rubygem-arel7 SUBDIR += rubygem-arel8 SUBDIR += rubygem-awesome_nested_set SUBDIR += rubygem-bdb1 SUBDIR += rubygem-bigrecord SUBDIR += rubygem-brpoplpush-redis_script SUBDIR += rubygem-couchrest SUBDIR += rubygem-dalli SUBDIR += rubygem-data_objects SUBDIR += rubygem-datamapper SUBDIR += rubygem-dbd-mysql SUBDIR += rubygem-dbd-pg SUBDIR += rubygem-dbd-sqlite3 SUBDIR += rubygem-dbf SUBDIR += rubygem-dbi SUBDIR += rubygem-dbm SUBDIR += rubygem-dm-aggregates SUBDIR += rubygem-dm-chunked_query SUBDIR += rubygem-dm-constraints SUBDIR += rubygem-dm-core SUBDIR += rubygem-dm-do-adapter SUBDIR += rubygem-dm-migrations SUBDIR += rubygem-dm-mysql-adapter SUBDIR += rubygem-dm-observer SUBDIR += rubygem-dm-pager SUBDIR += rubygem-dm-paperclip SUBDIR += rubygem-dm-postgres-adapter SUBDIR += rubygem-dm-serializer SUBDIR += rubygem-dm-timestamps SUBDIR += rubygem-dm-transactions SUBDIR += rubygem-dm-types SUBDIR += rubygem-dm-validations SUBDIR += rubygem-do_mysql SUBDIR += rubygem-do_postgres SUBDIR += rubygem-do_sqlite3 SUBDIR += rubygem-em-redis-unified SUBDIR += rubygem-familia SUBDIR += rubygem-flipper-active_record SUBDIR += rubygem-flipper-active_record-rails61 SUBDIR += rubygem-gdbm SUBDIR += rubygem-globalid SUBDIR += rubygem-globalid-rails5 SUBDIR += rubygem-globalid-rails50 SUBDIR += rubygem-globalid-rails52 SUBDIR += rubygem-globalid-rails60 SUBDIR += rubygem-globalid-rails61 SUBDIR += rubygem-globalid-rails70 SUBDIR += rubygem-her SUBDIR += rubygem-hiredis SUBDIR += rubygem-influxdb SUBDIR += rubygem-jdbc-mysql SUBDIR += rubygem-leo_manager_client SUBDIR += rubygem-marginalia SUBDIR += rubygem-mario-redis-lock SUBDIR += rubygem-memcache SUBDIR += rubygem-memcache-client SUBDIR += rubygem-mysql SUBDIR += rubygem-mysql2 SUBDIR += rubygem-openid-redis-store SUBDIR += rubygem-paranoia SUBDIR += rubygem-pg SUBDIR += rubygem-pg_array_parser SUBDIR += rubygem-pg_query SUBDIR += rubygem-pghero SUBDIR += rubygem-pghero-rails5 SUBDIR += rubygem-pghero-rails50 SUBDIR += rubygem-pl-puppetdb-ruby SUBDIR += rubygem-postgres_ext SUBDIR += rubygem-puppetdb_cli SUBDIR += rubygem-rbase SUBDIR += rubygem-redis SUBDIR += rubygem-redis-actionpack SUBDIR += rubygem-redis-actionpack-rails5 SUBDIR += rubygem-redis-actionpack-rails50 SUBDIR += rubygem-redis-actionpack-rails52 SUBDIR += rubygem-redis-actionpack-rails60 SUBDIR += rubygem-redis-actionpack-rails61 SUBDIR += rubygem-redis-actionpack52-rails61 SUBDIR += rubygem-redis-namespace SUBDIR += rubygem-redis44 SUBDIR += rubygem-sdbm SUBDIR += rubygem-seed-fu SUBDIR += rubygem-sqlite3 SUBDIR += rubygem-sqlite3-ruby SUBDIR += rubygem-state_machines-activemodel SUBDIR += rubygem-state_machines-activerecord SUBDIR += rubygem-tarantool SUBDIR += sequeler SUBDIR += sfcgal SUBDIR += sharedance SUBDIR += slony1v2 SUBDIR += soci SUBDIR += spatialite SUBDIR += spatialite-tools SUBDIR += spatialite_gui SUBDIR += speedtables SUBDIR += sql-workbench SUBDIR += sqlcached SUBDIR += sqlcipher SUBDIR += sqlclient SUBDIR += sqldeveloper SUBDIR += sqlite-ext-miscfuncs SUBDIR += sqlite-ext-pcre SUBDIR += sqlite-ext-regexp SUBDIR += sqlite-ext-spellfix SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlitebrowser SUBDIR += sqliteconvert SUBDIR += sqlitecpp SUBDIR += sqlitemanager SUBDIR += sqliteodbc SUBDIR += sqlitestudio SUBDIR += sqlrelay SUBDIR += sqsh SUBDIR += squirrel-sql SUBDIR += symphytum SUBDIR += tarantool SUBDIR += tarantool-c SUBDIR += tcl-Mysql SUBDIR += tcl-lmdb SUBDIR += tcl-sqlite3 SUBDIR += tdb SUBDIR += tdbc SUBDIR += tile38 SUBDIR += tiledb SUBDIR += timescaledb SUBDIR += timescaledb-backup SUBDIR += timescaledb-tune SUBDIR += tinycdb SUBDIR += tokyocabinet SUBDIR += tokyotyrant SUBDIR += tsearch_extras SUBDIR += tuning-primer SUBDIR += twemproxy SUBDIR += unixODBC SUBDIR += usql SUBDIR += vfront SUBDIR += virtualpg SUBDIR += virtuoso SUBDIR += vsqlite SUBDIR += webdis SUBDIR += wfb2sql SUBDIR += xapian-bindings SUBDIR += xapian-bindings12 SUBDIR += xapian-core SUBDIR += xapian-core12 SUBDIR += xls2txt SUBDIR += xrootd SUBDIR += xtrabackup SUBDIR += xtrabackup8 SUBDIR += zodb .include diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile new file mode 100644 index 000000000000..3ee3bcd3f74c --- /dev/null +++ b/databases/redis62/Makefile @@ -0,0 +1,126 @@ +# Created by: Sergey Skvortsov + +PORTNAME= redis62 +PORTVERSION= 6.2.6 +CATEGORIES= databases +MASTER_SITES= https://download.redis.io/releases/ +DISTNAME= redis-${PORTVERSION} + +MAINTAINER= yasu@FreeBSD.org +COMMENT= Persistent key-value database with built-in net interface + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + +USES+= compiler:c11 cpe gmake + +CPE_VENDOR= redislabs + +OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_RADIO= EXTLUA +OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR +OPTIONS_SUB= yes +JEMALLOC_DESC= Use jemalloc +LUA_DESC= Use lang/lua instead of builtin lua +LUAJIT_DESC= Use lang/luajit instead of builtin lua +LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua +TLS_DESC= Use TLS (openssl req.) +TESTS_DESC= Install lang/tcl for redis unit tests +TRIB_DESC= Install redis-trib.rb (lang/ruby req.) + +MAKE_ENV= V=yo OPTIMIZATION= + +JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes + +LUA_USES= lua:51 +LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua +LUA_VARS= _addflags=true + +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit +LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +LUAJIT_VARS= _addflags=true + +LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty +LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +LUAJITOR_VARS= _addflags=true + +TESTS_USES= tcl:build + +TLS_USES= ssl +TLS_MAKE_ENV= BUILD_TLS=yes + +TRIB_CATEGORIES= ruby +TRIB_USE= ruby=yes +TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis + +.include + +.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} +# Needed for __atomic_fetch_add_8 +USE_GCC= yes +CFLAGS+= -march=i586 +.endif + +.if defined(_ADDFLAGS) +CFLAGS= -fPIC +LDFLAGS= -Wl,-E +.endif + +LDFLAGS+= -lpthread -lm -lexecinfo + +CONFLICTS?= redis6-6.* redis-devel-6.* + +USE_RC_SUBR= redis sentinel +BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ + redis-cli redis-sentinel redis-server + +USERS= redis +GROUPS= redis + +REDIS_DBDIR?= /var/db/redis +REDIS_RUNDIR?= /var/run/redis +REDIS_LOGDIR?= /var/log/redis + +SUB_FILES= pkg-message +SUB_LIST+= PORTNAME=${PORTNAME} \ + REDIS_USER=${USERS} \ + REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} + +PLIST_SUB+= REDIS_USER=${USERS} \ + REDIS_GROUP=${GROUPS} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} + +post-patch-JEMALLOC-on: + @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile + +post-patch-LUA-on: + @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ +post-patch-LUAJIT-on: post-patch-LUA-on +post-patch-LUAJITOR-on: post-patch-LUA-on + +post-build: + ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf + +do-install: + ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample + ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample + ${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \ + ${STAGEDIR}${REDIS_DBDIR} \ + ${STAGEDIR}${REDIS_RUNDIR} + +do-install-TRIB-on: + ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/ + +do-test: + @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl + +.include diff --git a/databases/redis62/distinfo b/databases/redis62/distinfo new file mode 100644 index 000000000000..d335fe124752 --- /dev/null +++ b/databases/redis62/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1633405476 +SHA256 (redis-6.2.6.tar.gz) = 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab +SIZE (redis-6.2.6.tar.gz) = 2476542 diff --git a/databases/redis62/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis62/files/extra-patch-deps_lua_src_lua__cjson.c new file mode 100644 index 000000000000..847b70d25dea --- /dev/null +++ b/databases/redis62/files/extra-patch-deps_lua_src_lua__cjson.c @@ -0,0 +1,11 @@ +--- deps/lua/src/lua_cjson.c.orig 2019-12-08 07:56:31.419672000 -0500 ++++ deps/lua/src/lua_cjson.c 2019-12-08 07:56:52.389362000 -0500 +@@ -1299,7 +1299,7 @@ + * + * luaL_setfuncs() is used to create a module table where the functions have + * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */ +-static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) ++void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) + { + int i; + diff --git a/databases/redis62/files/extra-patch-src-Makefile.lua b/databases/redis62/files/extra-patch-src-Makefile.lua new file mode 100644 index 000000000000..937eeac680a2 --- /dev/null +++ b/databases/redis62/files/extra-patch-src-Makefile.lua @@ -0,0 +1,58 @@ +--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ src/Makefile 2021-01-13 11:52:33.070529000 -0500 +@@ -16,7 +16,7 @@ + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') + OPTIMIZATION?=-O2 +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram + NODEPS:=clean distclean + + # Default settings +@@ -83,8 +83,8 @@ + # Override default settings if possible + -include .make-settings + +-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) +-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) ++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm + DEBUG=-g -ggdb + +@@ -188,7 +188,7 @@ + endif + endif + # Include paths to dependencies +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram + + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -251,6 +251,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) + endif + ++FINAL_CFLAGS+=-I${PREFIX}/include/lua51 ++FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1 ++ + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) + REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -271,6 +274,7 @@ + REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) + REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o ++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o + REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) + REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o + REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) +@@ -324,7 +328,7 @@ + + # redis-server + $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + + # redis-sentinel + $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis62/files/extra-patch-src-Makefile.luajit b/databases/redis62/files/extra-patch-src-Makefile.luajit new file mode 100644 index 000000000000..3e40ea4a77a0 --- /dev/null +++ b/databases/redis62/files/extra-patch-src-Makefile.luajit @@ -0,0 +1,58 @@ +--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ src/Makefile 2021-01-13 12:25:07.823451000 -0500 +@@ -16,7 +16,7 @@ + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') + OPTIMIZATION?=-O2 +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram + NODEPS:=clean distclean + + # Default settings +@@ -83,8 +83,8 @@ + # Override default settings if possible + -include .make-settings + +-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) +-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) ++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm + DEBUG=-g -ggdb + +@@ -188,7 +188,7 @@ + endif + endif + # Include paths to dependencies +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram + + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -251,6 +251,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) + endif + ++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 ++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 ++ + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) + REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -271,6 +274,7 @@ + REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) + REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o ++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o + REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) + REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o + REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) +@@ -324,7 +328,7 @@ + + # redis-server + $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + + # redis-sentinel + $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis62/files/extra-patch-src-Makefile.luajit-or b/databases/redis62/files/extra-patch-src-Makefile.luajit-or new file mode 100644 index 000000000000..3926e8169300 --- /dev/null +++ b/databases/redis62/files/extra-patch-src-Makefile.luajit-or @@ -0,0 +1,58 @@ +--- src/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ src/Makefile 2021-01-13 12:27:19.444193000 -0500 +@@ -16,7 +16,7 @@ + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') + OPTIMIZATION?=-O2 +-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram ++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram + NODEPS:=clean distclean + + # Default settings +@@ -83,8 +83,8 @@ + # Override default settings if possible + -include .make-settings + +-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) +-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) ++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm + DEBUG=-g -ggdb + +@@ -188,7 +188,7 @@ + endif + endif + # Include paths to dependencies +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram + + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -251,6 +251,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) + endif + ++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 ++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 ++ + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) + REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -271,6 +274,7 @@ + REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) + REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o ++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o + REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) + REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o + REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) +@@ -324,7 +328,7 @@ + + # redis-server + $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + + # redis-sentinel + $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis62/files/patch-deps-Makefile b/databases/redis62/files/patch-deps-Makefile new file mode 100644 index 000000000000..c2a757c59b33 --- /dev/null +++ b/databases/redis62/files/patch-deps-Makefile @@ -0,0 +1,20 @@ +--- deps/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ deps/Makefile 2021-01-13 11:37:45.979445000 -0500 +@@ -69,7 +69,7 @@ + LUA_CFLAGS= -D__C99FEATURES__=1 + endif + +-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS) ++LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS) + LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier +@@ -79,7 +79,7 @@ + + lua: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" ++ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" + + .PHONY: lua + diff --git a/databases/redis62/files/patch-deps-hiredis-Makefile b/databases/redis62/files/patch-deps-hiredis-Makefile new file mode 100644 index 000000000000..9422ba8d3245 --- /dev/null +++ b/databases/redis62/files/patch-deps-hiredis-Makefile @@ -0,0 +1,41 @@ +--- deps/hiredis/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 ++++ deps/hiredis/Makefile 2021-01-13 11:40:26.109827000 -0500 +@@ -21,7 +21,7 @@ + HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') + + # Installation related variables and target +-PREFIX?=/usr/local ++PREFIX?=${PREFIX} + INCLUDE_PATH?=include/hiredis + LIBRARY_PATH?=lib + PKGCONF_PATH?=pkgconfig +@@ -44,10 +44,8 @@ + # Fallback to gcc when $CC is not in $PATH. + CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') + CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') +-OPTIMIZATION?=-O3 + WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers +-DEBUG_FLAGS?= -g -ggdb +-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) ++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) + REAL_LDFLAGS=$(LDFLAGS) + + DYLIBSUFFIX=so +@@ -83,7 +81,16 @@ + CFLAGS+=-I$(OPENSSL_PREFIX)/include + SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto + endif +- ++ifeq ($(uname_S),FreeBSD) ++ CFLAGS?=$(CFLAGS) ++ CCLINK?=pthread ++ LDFLAGS?=-L. -Wl,-rpath,. ++ DYLIBNAME?=libhiredis.so ++ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} ++ STLIBNAME?=libhiredis.a ++ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} ++ SSL_LDFLAGS+=${OPENSSL_LDFLAGS} ++endif + ifeq ($(uname_S),SunOS) + IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"') + ifeq ($(IS_SUN_CC),1) diff --git a/databases/redis62/files/patch-deps-hiredis-net.c b/databases/redis62/files/patch-deps-hiredis-net.c new file mode 100644 index 000000000000..3fd2b5996f97 --- /dev/null +++ b/databases/redis62/files/patch-deps-hiredis-net.c @@ -0,0 +1,39 @@ +--- deps/hiredis/net.c.orig 2019-11-28 14:32:05.942453000 -0500 ++++ deps/hiredis/net.c 2019-11-28 14:39:08.326408000 -0500 +@@ -178,14 +178,34 @@ + __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); + return REDIS_ERR; + } +-#else +-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) ++#elif defined(__GLIBC__) + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { + __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); + return REDIS_ERR; + } + + val = interval/3; ++ if (val == 0) val = 1; ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) { ++ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); ++ return REDIS_ERR; ++ } ++ ++ val = 3; ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) { ++ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); ++ return REDIS_ERR; ++ } ++#else ++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \ ++ defined(TCP_KEEPCNT) ++ val = interval; ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { ++ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); ++ return REDIS_ERR; ++ } ++ ++ val = internal/3; + if (val == 0) val = 1; + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) { + __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); diff --git a/databases/redis62/files/patch-deps-linenoise-Makefile b/databases/redis62/files/patch-deps-linenoise-Makefile new file mode 100644 index 000000000000..aef0f10966af --- /dev/null +++ b/databases/redis62/files/patch-deps-linenoise-Makefile @@ -0,0 +1,15 @@ +--- deps/linenoise/Makefile.orig 2019-09-25 10:40:18 UTC ++++ deps/linenoise/Makefile +@@ -1,10 +1,10 @@ + STD= + WARN= -Wall +-OPT= -Os ++#OPT= -Os + + R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) + R_LDFLAGS= $(LDFLAGS) +-DEBUG= -g ++#DEBUG= -g + + R_CC=$(CC) $(R_CFLAGS) + R_LD=$(CC) $(R_LDFLAGS) diff --git a/databases/redis62/files/patch-deps_Makefile b/databases/redis62/files/patch-deps_Makefile new file mode 100644 index 000000000000..39dadb06b822 --- /dev/null +++ b/databases/redis62/files/patch-deps_Makefile @@ -0,0 +1,18 @@ +--- deps/Makefile.orig 2021-01-13 11:43:05.174197000 -0500 ++++ deps/Makefile 2021-01-13 11:44:13.744658000 -0500 +@@ -83,12 +83,12 @@ + + .PHONY: lua + +-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) ++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS) + JEMALLOC_LDFLAGS= $(LDFLAGS) + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" +- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a ++ cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc diff --git a/databases/redis62/files/patch-deps_lua_src_lua__cjson.c b/databases/redis62/files/patch-deps_lua_src_lua__cjson.c new file mode 100644 index 000000000000..0bb150504c67 --- /dev/null +++ b/databases/redis62/files/patch-deps_lua_src_lua__cjson.c @@ -0,0 +1,12 @@ +--- deps/lua/src/lua_cjson.c.orig 2019-09-25 10:40:18 UTC ++++ deps/lua/src/lua_cjson.c +@@ -46,7 +46,9 @@ + #include "strbuf.h" + #include "fpconv.h" + ++#if defined(__sun) + #include "../../../src/solarisfixes.h" ++#endif + + #ifndef CJSON_MODNAME + #define CJSON_MODNAME "cjson" diff --git a/databases/redis62/files/patch-redis.conf b/databases/redis62/files/patch-redis.conf new file mode 100644 index 000000000000..f71797d9555e --- /dev/null +++ b/databases/redis62/files/patch-redis.conf @@ -0,0 +1,38 @@ +--- redis.conf.orig 2021-01-12 09:21:03.000000000 -0500 ++++ redis.conf 2021-01-13 11:46:40.445746000 -0500 +@@ -244,7 +244,7 @@ + # By default Redis does not run as a daemon. Use 'yes' if you need it. + # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. + # When Redis is supervised by upstart or systemd, this parameter has no impact. +-daemonize no ++daemonize yes + + # If you run Redis from upstart or systemd, Redis can interact with your + # supervision tree. Options: +@@ -276,7 +276,7 @@ + # + # Note that on modern Linux systems "/run/redis.pid" is more conforming + # and should be used instead. +-pidfile /var/run/redis_6379.pid ++pidfile %%REDIS_RUNDIR%%/redis.pid + + # Specify the server verbosity level. + # This can be one of: +@@ -289,7 +289,7 @@ + # Specify the log file name. Also the empty string can be used to force + # Redis to log on the standard output. Note that if you use standard + # output for logging but daemonize, logs will be sent to /dev/null +-logfile "" ++logfile %%REDIS_LOGDIR%%/redis.log + + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. +@@ -420,7 +420,7 @@ + # The Append Only File will also be created inside this directory. + # + # Note that you must specify a directory here, not a file name. +-dir ./ ++dir %%REDIS_DBDIR%%/ + + ################################# REPLICATION ################################# + diff --git a/databases/redis62/files/patch-src-Makefile b/databases/redis62/files/patch-src-Makefile new file mode 100644 index 000000000000..6b3ed47b68be --- /dev/null +++ b/databases/redis62/files/patch-src-Makefile @@ -0,0 +1,39 @@ +--- src/Makefile.orig 2019-11-29 16:35:59 UTC ++++ src/Makefile +@@ -29,7 +29,7 @@ endif + WARN=-Wall -W -Wno-missing-field-initializers + OPT=$(OPTIMIZATION) + +-PREFIX?=/usr/local ++PREFIX:=$(PREFIX) + INSTALL_BIN=$(PREFIX)/bin + INSTALL=install + +@@ -75,7 +75,6 @@ endif + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm +-DEBUG=-g -ggdb + + # Linux ARM needs -latomic at linking time + ifneq (,$(filter aarch64 armv,$(uname_M))) +@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) + OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include + OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib + else ++ifeq ($(uname_S),FreeBSD) ++ # FreeBSD ++ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include ++ FINAL_LDFLAGS= $(LDFLAGS) -pthread ++else + ifeq ($(uname_S),AIX) + # AIX + FINAL_LDFLAGS+= -Wl,-bexpall +@@ -131,6 +135,7 @@ else + # All the other OSes (notably Linux) + FINAL_LDFLAGS+= -rdynamic + FINAL_LIBS+=-ldl -pthread -lrt ++endif + endif + endif + endif diff --git a/databases/redis62/files/patch-src-mkreleasehdr.sh b/databases/redis62/files/patch-src-mkreleasehdr.sh new file mode 100644 index 000000000000..e48b3174d315 --- /dev/null +++ b/databases/redis62/files/patch-src-mkreleasehdr.sh @@ -0,0 +1,11 @@ +--- src/mkreleasehdr.sh.orig 2019-11-22 16:54:22 UTC ++++ src/mkreleasehdr.sh +@@ -1,6 +1,6 @@ + #!/bin/sh +-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` +-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` ++GIT_SHA1="00000000" ++GIT_DIRTY="0" + BUILD_ID=`uname -n`"-"`date +%s` + if [ -n "$SOURCE_DATE_EPOCH" ]; then + BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s) diff --git a/databases/redis62/files/pkg-message.in b/databases/redis62/files/pkg-message.in new file mode 100644 index 000000000000..85a89529262a --- /dev/null +++ b/databases/redis62/files/pkg-message.in @@ -0,0 +1,11 @@ +[ +{ type: install + message: <