parent
bf63b0bdb6
commit
0c961347fc
Binary file not shown.
Binary file not shown.
@ -1,4 +1 @@
|
||||
DIST sshguard-1.7.1.tar.gz 832220 BLAKE2B 1aca38b571ee3bf98b659a1a378de8d2dfd46453c9caacc868606f6ad9baf97892d6dcf852ed028f265c67029f59c3c19a48f1c369abeb406eae7e2c5ad54f2b SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1
|
||||
DIST sshguard-2.0.0.tar.gz 886995 BLAKE2B 35fe8008aa55ab07a3a500a5676483b79d4693aa22e762e846d3c4f5a95b8c3851e16a5c746a818455c66621f3c7da9d713979f2fef737f87ca5feb81ff048e8 SHA512 c9f7ef4b8d4b1ecbcee33b95e013c51f37b4a05226c6cd1f3c85006c83a32cf555644069d529a7317dcf6616f86a399d7338a5a414238de05bd41dc3005488e4
|
||||
DIST sshguard-2.0.99.tar.gz 1110725 BLAKE2B b3c2ccf389b08c3d35700b3bc46a6df820bf51c940e418def4ea66b4d2d8cd8aca5b3f284fc49a93b73e69adcffdc845c0988750e714fbe8e5a5bd50fc3d11aa SHA512 776a241b7af9a4afb048c99791202c0bf0f5130e265116a0f049853f8eb3d108e056c75f9dc009cf93a0dffe8d34b18b6fddc63febd54cc35bb6e71d6d2e77bb
|
||||
DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
|
||||
|
@ -1,14 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>netmon@gentoo.org</email>
|
||||
<name>Gentoo network monitoring and analysis project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="ipfilter">Enable ipfilter firewall support (only for *bsd)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">sshguard</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="project">
|
||||
<email>netmon@gentoo.org</email>
|
||||
<name>Gentoo network monitoring and analysis project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">sshguard</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="protects hosts from brute force attacks against ssh"
|
||||
HOMEPAGE="http://sshguard.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86 ~x86-fbsd"
|
||||
IUSE="ipfilter kernel_FreeBSD kernel_linux"
|
||||
|
||||
CDEPEND="
|
||||
kernel_linux? ( net-firewall/iptables )
|
||||
kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
|
||||
"
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
sys-devel/flex
|
||||
"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
virtual/logger
|
||||
"
|
||||
|
||||
DOCS=(
|
||||
CHANGELOG.rst
|
||||
README.rst
|
||||
examples/sshguard.service
|
||||
examples/whitelistfile.example
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e '/OPTIMIZER_CFLAGS=/d' configure || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c
|
||||
append-cppflags -D_DEFAULT_SOURCE
|
||||
|
||||
local myconf
|
||||
if use kernel_linux; then
|
||||
myconf="--with-firewall=iptables"
|
||||
elif use kernel_FreeBSD; then
|
||||
if use ipfilter; then
|
||||
myconf="--with-firewall=ipfw"
|
||||
else
|
||||
myconf="--with-firewall=pf"
|
||||
fi
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
}
|
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="protects hosts from brute force attacks against ssh"
|
||||
HOMEPAGE="http://sshguard.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
|
||||
IUSE="ipfilter kernel_FreeBSD kernel_linux"
|
||||
|
||||
CDEPEND="
|
||||
kernel_linux? ( net-firewall/iptables )
|
||||
kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
|
||||
"
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
sys-devel/flex
|
||||
"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
virtual/logger
|
||||
"
|
||||
|
||||
DOCS=(
|
||||
CHANGELOG.rst
|
||||
CONTRIBUTING.rst
|
||||
README.rst
|
||||
examples/net.sshguard.plist
|
||||
examples/sshguard.service
|
||||
examples/whitelistfile.example
|
||||
)
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
|
||||
insinto /etc
|
||||
newins examples/sshguard.conf.sample sshguard.conf
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="protects hosts from brute force attacks against ssh"
|
||||
HOMEPAGE="http://sshguard.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
"
|
||||
RDEPEND="
|
||||
virtual/logger
|
||||
"
|
||||
DOCS=(
|
||||
CHANGELOG.rst
|
||||
CONTRIBUTING.rst
|
||||
README.rst
|
||||
examples/net.sshguard.plist
|
||||
examples/sshguard.service
|
||||
examples/whitelistfile.example
|
||||
)
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
|
||||
insinto /etc
|
||||
newins examples/sshguard.conf.sample sshguard.conf
|
||||
}
|
Binary file not shown.
@ -0,0 +1,297 @@
|
||||
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
|
||||
index 2420f2c2be..a59a65e8f6 100644
|
||||
--- a/src/lib/kadm5/srv/svr_principal.c
|
||||
+++ b/src/lib/kadm5/srv/svr_principal.c
|
||||
@@ -330,6 +330,13 @@ kadm5_create_principal_3(void *server_handle,
|
||||
return KADM5_BAD_MASK;
|
||||
if((mask & ~ALL_PRINC_MASK))
|
||||
return KADM5_BAD_MASK;
|
||||
+ if (mask & KADM5_TL_DATA) {
|
||||
+ for (tl_data_tail = entry->tl_data; tl_data_tail != NULL;
|
||||
+ tl_data_tail = tl_data_tail->tl_data_next) {
|
||||
+ if (tl_data_tail->tl_data_type < 256)
|
||||
+ return KADM5_BAD_TL_TYPE;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/*
|
||||
* Check to see if the principal exists
|
||||
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
|
||||
index 535a1f309e..8b8420faa9 100644
|
||||
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
|
||||
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
|
||||
@@ -141,7 +141,7 @@ extern int set_ldap_error (krb5_context ctx, int st, int op);
|
||||
#define UNSTORE16_INT(ptr, val) (val = load_16_be(ptr))
|
||||
#define UNSTORE32_INT(ptr, val) (val = load_32_be(ptr))
|
||||
|
||||
-#define KDB_TL_USER_INFO 0x7ffe
|
||||
+#define KDB_TL_USER_INFO 0xff
|
||||
|
||||
#define KDB_TL_PRINCTYPE 0x01
|
||||
#define KDB_TL_PRINCCOUNT 0x02
|
||||
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
|
||||
index 88a1704950..b7c9212cb2 100644
|
||||
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
|
||||
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
|
||||
@@ -651,6 +651,107 @@ update_ldap_mod_auth_ind(krb5_context context, krb5_db_entry *entry,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static krb5_error_code
|
||||
+check_dn_in_container(krb5_context context, const char *dn,
|
||||
+ char *const *subtrees, unsigned int ntrees)
|
||||
+{
|
||||
+ unsigned int i;
|
||||
+ size_t dnlen = strlen(dn), stlen;
|
||||
+
|
||||
+ for (i = 0; i < ntrees; i++) {
|
||||
+ if (subtrees[i] == NULL || *subtrees[i] == '\0')
|
||||
+ return 0;
|
||||
+ stlen = strlen(subtrees[i]);
|
||||
+ if (dnlen >= stlen &&
|
||||
+ strcasecmp(dn + dnlen - stlen, subtrees[i]) == 0 &&
|
||||
+ (dnlen == stlen || dn[dnlen - stlen - 1] == ','))
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ k5_setmsg(context, EINVAL, _("DN is out of the realm subtree"));
|
||||
+ return EINVAL;
|
||||
+}
|
||||
+
|
||||
+static krb5_error_code
|
||||
+check_dn_exists(krb5_context context,
|
||||
+ krb5_ldap_server_handle *ldap_server_handle,
|
||||
+ const char *dn, krb5_boolean nonkrb_only)
|
||||
+{
|
||||
+ krb5_error_code st = 0, tempst;
|
||||
+ krb5_ldap_context *ldap_context = context->dal_handle->db_context;
|
||||
+ LDAP *ld = ldap_server_handle->ldap_handle;
|
||||
+ LDAPMessage *result = NULL, *ent;
|
||||
+ char *attrs[] = { "krbticketpolicyreference", "krbprincipalname", NULL };
|
||||
+ char **values;
|
||||
+
|
||||
+ LDAP_SEARCH_1(dn, LDAP_SCOPE_BASE, 0, attrs, IGNORE_STATUS);
|
||||
+ if (st != LDAP_SUCCESS)
|
||||
+ return set_ldap_error(context, st, OP_SEARCH);
|
||||
+
|
||||
+ ent = ldap_first_entry(ld, result);
|
||||
+ CHECK_NULL(ent);
|
||||
+
|
||||
+ values = ldap_get_values(ld, ent, "krbticketpolicyreference");
|
||||
+ if (values != NULL)
|
||||
+ ldap_value_free(values);
|
||||
+
|
||||
+ values = ldap_get_values(ld, ent, "krbprincipalname");
|
||||
+ if (values != NULL) {
|
||||
+ ldap_value_free(values);
|
||||
+ if (nonkrb_only) {
|
||||
+ st = EINVAL;
|
||||
+ k5_setmsg(context, st, _("ldap object is already kerberized"));
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+cleanup:
|
||||
+ ldap_msgfree(result);
|
||||
+ return st;
|
||||
+}
|
||||
+
|
||||
+static krb5_error_code
|
||||
+validate_xargs(krb5_context context,
|
||||
+ krb5_ldap_server_handle *ldap_server_handle,
|
||||
+ const xargs_t *xargs, const char *standalone_dn,
|
||||
+ char *const *subtrees, unsigned int ntrees)
|
||||
+{
|
||||
+ krb5_error_code st;
|
||||
+
|
||||
+ if (xargs->dn != NULL) {
|
||||
+ /* The supplied dn must be within a realm container. */
|
||||
+ st = check_dn_in_container(context, xargs->dn, subtrees, ntrees);
|
||||
+ if (st)
|
||||
+ return st;
|
||||
+ /* The supplied dn must exist without Kerberos attributes. */
|
||||
+ st = check_dn_exists(context, ldap_server_handle, xargs->dn, TRUE);
|
||||
+ if (st)
|
||||
+ return st;
|
||||
+ }
|
||||
+
|
||||
+ if (xargs->linkdn != NULL) {
|
||||
+ /* The supplied linkdn must be within a realm container. */
|
||||
+ st = check_dn_in_container(context, xargs->linkdn, subtrees, ntrees);
|
||||
+ if (st)
|
||||
+ return st;
|
||||
+ /* The supplied linkdn must exist. */
|
||||
+ st = check_dn_exists(context, ldap_server_handle, xargs->linkdn,
|
||||
+ FALSE);
|
||||
+ if (st)
|
||||
+ return st;
|
||||
+ }
|
||||
+
|
||||
+ if (xargs->containerdn != NULL && standalone_dn != NULL) {
|
||||
+ /* standalone_dn (likely composed using containerdn) must be within a
|
||||
+ * container. */
|
||||
+ st = check_dn_in_container(context, standalone_dn, subtrees, ntrees);
|
||||
+ if (st)
|
||||
+ return st;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
krb5_error_code
|
||||
krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
|
||||
char **db_args)
|
||||
@@ -662,12 +763,12 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
|
||||
LDAPMessage *result=NULL, *ent=NULL;
|
||||
char **subtreelist = NULL;
|
||||
char *user=NULL, *subtree=NULL, *principal_dn=NULL;
|
||||
- char **values=NULL, *strval[10]={NULL}, errbuf[1024];
|
||||
+ char *strval[10]={NULL}, errbuf[1024];
|
||||
char *filtuser=NULL;
|
||||
struct berval **bersecretkey=NULL;
|
||||
LDAPMod **mods=NULL;
|
||||
krb5_boolean create_standalone=FALSE;
|
||||
- krb5_boolean krb_identity_exists=FALSE, establish_links=FALSE;
|
||||
+ krb5_boolean establish_links=FALSE;
|
||||
char *standalone_principal_dn=NULL;
|
||||
krb5_tl_data *tl_data=NULL;
|
||||
krb5_key_data **keys=NULL;
|
||||
@@ -860,24 +961,6 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
|
||||
* any of the subtrees
|
||||
*/
|
||||
if (xargs.dn_from_kbd == TRUE) {
|
||||
- /* make sure the DN falls in the subtree */
|
||||
- int dnlen=0, subtreelen=0;
|
||||
- char *dn=NULL;
|
||||
- krb5_boolean outofsubtree=TRUE;
|
||||
-
|
||||
- if (xargs.dn != NULL) {
|
||||
- dn = xargs.dn;
|
||||
- } else if (xargs.linkdn != NULL) {
|
||||
- dn = xargs.linkdn;
|
||||
- } else if (standalone_principal_dn != NULL) {
|
||||
- /*
|
||||
- * Even though the standalone_principal_dn is constructed
|
||||
- * within this function, there is the containerdn input
|
||||
- * from the user that can become part of the it.
|
||||
- */
|
||||
- dn = standalone_principal_dn;
|
||||
- }
|
||||
-
|
||||
/* Get the current subtree list if we haven't already done so. */
|
||||
if (subtreelist == NULL) {
|
||||
st = krb5_get_subtree_info(ldap_context, &subtreelist, &ntrees);
|
||||
@@ -885,81 +968,10 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
- for (tre=0; tre<ntrees; ++tre) {
|
||||
- if (subtreelist[tre] == NULL || strlen(subtreelist[tre]) == 0) {
|
||||
- outofsubtree = FALSE;
|
||||
- break;
|
||||
- } else {
|
||||
- dnlen = strlen (dn);
|
||||
- subtreelen = strlen(subtreelist[tre]);
|
||||
- if ((dnlen >= subtreelen) && (strcasecmp((dn + dnlen - subtreelen), subtreelist[tre]) == 0)) {
|
||||
- outofsubtree = FALSE;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (outofsubtree == TRUE) {
|
||||
- st = EINVAL;
|
||||
- k5_setmsg(context, st, _("DN is out of the realm subtree"));
|
||||
+ st = validate_xargs(context, ldap_server_handle, &xargs,
|
||||
+ standalone_principal_dn, subtreelist, ntrees);
|
||||
+ if (st)
|
||||
goto cleanup;
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * dn value will be set either by dn, linkdn or the standalone_principal_dn
|
||||
- * In the first 2 cases, the dn should be existing and in the last case we
|
||||
- * are supposed to create the ldap object. so the below should not be
|
||||
- * executed for the last case.
|
||||
- */
|
||||
-
|
||||
- if (standalone_principal_dn == NULL) {
|
||||
- /*
|
||||
- * If the ldap object is missing, this results in an error.
|
||||
- */
|
||||
-
|
||||
- /*
|
||||
- * Search for krbprincipalname attribute here.
|
||||
- * This is to find if a kerberos identity is already present
|
||||
- * on the ldap object, in which case adding a kerberos identity
|
||||
- * on the ldap object should result in an error.
|
||||
- */
|
||||
- char *attributes[]={"krbticketpolicyreference", "krbprincipalname", NULL};
|
||||
-
|
||||
- ldap_msgfree(result);
|
||||
- result = NULL;
|
||||
- LDAP_SEARCH_1(dn, LDAP_SCOPE_BASE, 0, attributes, IGNORE_STATUS);
|
||||
- if (st == LDAP_SUCCESS) {
|
||||
- ent = ldap_first_entry(ld, result);
|
||||
- if (ent != NULL) {
|
||||
- if ((values=ldap_get_values(ld, ent, "krbticketpolicyreference")) != NULL) {
|
||||
- ldap_value_free(values);
|
||||
- }
|
||||
-
|
||||
- if ((values=ldap_get_values(ld, ent, "krbprincipalname")) != NULL) {
|
||||
- krb_identity_exists = TRUE;
|
||||
- ldap_value_free(values);
|
||||
- }
|
||||
- }
|
||||
- } else {
|
||||
- st = set_ldap_error(context, st, OP_SEARCH);
|
||||
- goto cleanup;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * If xargs.dn is set then the request is to add a
|
||||
- * kerberos principal on a ldap object, but if
|
||||
- * there is one already on the ldap object this
|
||||
- * should result in an error.
|
||||
- */
|
||||
-
|
||||
- if (xargs.dn != NULL && krb_identity_exists == TRUE) {
|
||||
- st = EINVAL;
|
||||
- snprintf(errbuf, sizeof(errbuf),
|
||||
- _("ldap object is already kerberized"));
|
||||
- k5_setmsg(context, st, "%s", errbuf);
|
||||
- goto cleanup;
|
||||
}
|
||||
|
||||
if (xargs.linkdn != NULL) {
|
||||
diff --git a/src/tests/t_kdb.py b/src/tests/t_kdb.py
|
||||
index 217f2cdc3b..6e563b1032 100755
|
||||
--- a/src/tests/t_kdb.py
|
||||
+++ b/src/tests/t_kdb.py
|
||||
@@ -203,6 +203,12 @@ def ldap_add(dn, objectclass, attrs=[]):
|
||||
# in the test LDAP server.
|
||||
realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=krb5', 'princ1'],
|
||||
expected_code=1, expected_msg='DN is out of the realm subtree')
|
||||
+# Check that the DN container check is a hierarchy test, not a simple
|
||||
+# suffix match (CVE-2018-5730). We expect this operation to fail
|
||||
+# either way (because "xcn" isn't a valid DN tag) but the container
|
||||
+# check should happen before the DN is parsed.
|
||||
+realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=xcn=t1,cn=krb5', 'princ1'],
|
||||
+ expected_code=1, expected_msg='DN is out of the realm subtree')
|
||||
realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=t2,cn=krb5', 'princ1'])
|
||||
realm.run([kadminl, 'getprinc', 'princ1'], expected_msg='Principal: princ1')
|
||||
realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=t2,cn=krb5', 'again'],
|
||||
@@ -226,6 +232,11 @@ def ldap_add(dn, objectclass, attrs=[]):
|
||||
'princ3'])
|
||||
realm.run([kadminl, 'modprinc', '-x', 'containerdn=cn=t2,cn=krb5', 'princ3'],
|
||||
expected_code=1, expected_msg='containerdn option not supported')
|
||||
+# Verify that containerdn is checked when linkdn is also supplied
|
||||
+# (CVE-2018-5730).
|
||||
+realm.run([kadminl, 'ank', '-randkey', '-x', 'containerdn=cn=krb5',
|
||||
+ '-x', 'linkdn=cn=t2,cn=krb5', 'princ4'], expected_code=1,
|
||||
+ expected_msg='DN is out of the realm subtree')
|
||||
|
||||
# Create and modify a ticket policy.
|
||||
kldaputil(['create_policy', '-maxtktlife', '3hour', '-maxrenewlife', '6hour',
|
@ -0,0 +1,158 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
|
||||
|
||||
MY_P="${P/mit-}"
|
||||
P_DIR=$(get_version_component_range 1-2)
|
||||
DESCRIPTION="MIT Kerberos V"
|
||||
HOMEPAGE="https://web.mit.edu/kerberos/www/"
|
||||
SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
|
||||
|
||||
# Test suite require network access
|
||||
RESTRICT="test"
|
||||
|
||||
CDEPEND="
|
||||
!!app-crypt/heimdal
|
||||
>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
|
||||
|| (
|
||||
>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
|
||||
)
|
||||
keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
|
||||
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
|
||||
openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
|
||||
pkinit? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
|
||||
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
xinetd? ( sys-apps/xinetd )
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
DEPEND="${CDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
virtual/yacc
|
||||
doc? ( virtual/latex-base )
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
dev-lang/tcl:0
|
||||
dev-util/dejagnu
|
||||
)"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-kerberos )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}/src
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/krb5-config
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
eapply -p2 "${FILESDIR}/CVE-2018-5729-5730.patch"
|
||||
eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
|
||||
eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
|
||||
eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
|
||||
|
||||
# Make sure we always use the system copies.
|
||||
rm -rf util/{et,ss,verto}
|
||||
sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
|
||||
|
||||
eapply_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# QA
|
||||
append-flags -fno-strict-aliasing
|
||||
append-flags -fno-strict-overflow
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
use keyutils || export ac_cv_header_keyutils_h=no
|
||||
ECONF_SOURCE=${S} \
|
||||
WARN_CFLAGS="set" \
|
||||
econf \
|
||||
$(use_with openldap ldap) \
|
||||
"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
|
||||
$(use_enable nls) \
|
||||
$(use_enable pkinit) \
|
||||
$(use_enable threads thread-support) \
|
||||
--without-hesiod \
|
||||
--enable-shared \
|
||||
--with-system-et \
|
||||
--with-system-ss \
|
||||
--enable-dns-for-realm \
|
||||
--enable-kdc-lookaside-cache \
|
||||
--with-system-verto \
|
||||
--disable-rpath
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake -j1
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
multilib_is_native_abi && emake -j1 check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
|
||||
install
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
# default database dir
|
||||
keepdir /var/lib/krb5kdc
|
||||
|
||||
cd ..
|
||||
dodoc README
|
||||
|
||||
if use doc; then
|
||||
dodoc -r doc/html
|
||||
docinto pdf
|
||||
dodoc doc/pdf/*.pdf
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
|
||||
newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
|
||||
newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
|
||||
newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
|
||||
newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
|
||||
newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
|
||||
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
|
||||
|
||||
insinto /etc
|
||||
newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
|
||||
insinto /var/lib/krb5kdc
|
||||
newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
|
||||
|
||||
if use openldap ; then
|
||||
insinto /etc/openldap/schema
|
||||
doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}/kpropd.xinetd" kpropd
|
||||
fi
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST eselect-php-0.9.2.tar.xz 48356 BLAKE2B 9ad886b78c0a0ca71c1082d9265f28b1f9ea46dddfd52ad1a1ebb1a4d008954a59baf4cf69705e9b527fff64e8dfa3b25a2d522e2455e2e9ce550e917112ee58 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf
|
||||
DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
|
||||
DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119
|
||||
|
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit systemd
|
||||
|
||||
DESCRIPTION="PHP eselect module"
|
||||
HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
|
||||
SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="fpm apache2"
|
||||
|
||||
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
|
||||
RDEPEND="app-admin/eselect
|
||||
apache2? ( www-servers/apache[apache2_modules_dir] )"
|
||||
|
||||
src_configure(){
|
||||
# We expect localstatedir to be "var"ish, not "var/lib"ish, because
|
||||
# that's what PHP upstream expects. See for example the FPM
|
||||
# configuration where they put logs in @localstatedir@/log.
|
||||
#
|
||||
# The libdir is passed explicitly in case the /usr/lib symlink
|
||||
# is not present (bug 624528).
|
||||
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
--localstatedir="${EPREFIX}/var" \
|
||||
--with-piddir="${EPREFIX}/run" \
|
||||
$(use_enable apache2) \
|
||||
$(use_enable fpm)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use fpm ; then
|
||||
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
|
||||
sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
|
||||
exeinto /usr/libexec
|
||||
doexe "${T}"/php-fpm-launcher
|
||||
fi
|
||||
}
|
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
|
||||
DIST geoclue-2.4.7.tar.xz 368472 BLAKE2B c083f0694a90292b7b0834075e4fe15d29f07cc04157ad339bb2c93e0ca17a04916713c9284bf35e9dccbd8b3d66de1d0d88fb378aa5f33dd59ab57bfc72f570 SHA512 472cf923abfd40dee296eee2e6888c47f273ad709e1bdcce534bd794cf9f7073ceabd6addf918277e10498e094af5a6e9539b5cf24171577e78bc3b0b2d17b72
|
||||
DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
|
||||
|
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit gnome2 systemd user versionator
|
||||
|
||||
MY_PV=$(get_version_component_range 1-2)
|
||||
DESCRIPTION="A geoinformation D-Bus service"
|
||||
HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
|
||||
SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2.0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
|
||||
IUSE="+introspection +modemmanager zeroconf"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.34:2
|
||||
>=dev-libs/json-glib-0.14
|
||||
>=net-libs/libsoup-2.42:2.4
|
||||
sys-apps/dbus
|
||||
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
|
||||
modemmanager? ( >=net-misc/modemmanager-1.6 )
|
||||
zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
|
||||
!<sci-geosciences/geocode-glib-3.10.0
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/gdbus-codegen
|
||||
>=dev-util/gtk-doc-am-1
|
||||
>=dev-util/intltool-0.40
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
|
||||
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# debug only affects CFLAGS
|
||||
gnome2_src_configure \
|
||||
--enable-backend \
|
||||
--with-dbus-service-user=geoclue \
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable modemmanager 3g-source) \
|
||||
$(use_enable modemmanager cdma-source) \
|
||||
$(use_enable modemmanager modem-gps-source) \
|
||||
$(use_enable zeroconf nmea-source)
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
enewgroup geoclue
|
||||
enewuser geoclue -1 -1 /var/lib/geoclue geoclue
|
||||
gnome2_pkg_preinst
|
||||
}
|
@ -0,0 +1 @@
|
||||
DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3
|
@ -0,0 +1,2 @@
|
||||
# arguments for notary server
|
||||
command_args="-config=/var/lib/notary/fixtures/server-config-local.json"
|
@ -0,0 +1,19 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 2016-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Notary server"
|
||||
pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
|
||||
user=${user:-notary}
|
||||
group=${group:-notary}
|
||||
|
||||
command="/usr/bin/notary-server"
|
||||
command_args="${command_args:--config=/var/lib/notary/fixtures/server-config-local.json}"
|
||||
command_background="true"
|
||||
start_stop_daemon_args="--user ${user} --group ${group} \
|
||||
--stdout /var/log/notary/${RC_SVCNAME}.log \
|
||||
--stderr /var/log/notary/${RC_SVCNAME}.log"
|
||||
|
||||
depend() {
|
||||
after net
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
# arguments for notary signer
|
||||
command_args="-config=/var/lib/notary/fixtures/signer-config-local.json"
|
@ -0,0 +1,19 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 2016-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Notary signer"
|
||||
pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
|
||||
user=${user:-notary}
|
||||
group=${group:-notary}
|
||||
|
||||
command="/usr/bin/notary-signer"
|
||||
command_args="${command_args:--config=/var/lib/notary/fixtures/signer-config-local.json}"
|
||||
command_background="true"
|
||||
start_stop_daemon_args="--user ${user} --group ${group} \
|
||||
--stdout /var/log/notary/${RC_SVCNAME}.log \
|
||||
--stderr /var/log/notary/${RC_SVCNAME}.log"
|
||||
|
||||
depend() {
|
||||
after net
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>mrueg@gentoo.org</email>
|
||||
<name>Manuel Rüger</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">theupdateframework/notary</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit golang-vcs-snapshot golang-build user
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
DESCRIPTION="A project that allows anyone to have trust over arbitrary collections of data"
|
||||
EGO_PN="github.com/theupdateframework/notary"
|
||||
GIT_COMMIT="d6e1431feb32348e0650bf7551ac5cffd01d857b"
|
||||
|
||||
HOMEPAGE="https://github.com/theupdateframework/notary"
|
||||
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 -1 ${PN}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd src/${EGO_PN} || die
|
||||
GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
|
||||
${EGO_PN}/cmd/notary-server || die
|
||||
GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
|
||||
${EGO_PN}/cmd/notary-signer || die
|
||||
GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
|
||||
${EGO_PN}/cmd/notary || die
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}{,-server,-signer}
|
||||
pushd src/${EGO_PN} || die
|
||||
insinto /var/lib/notary
|
||||
doins -r migrations fixtures
|
||||
fowners -R ${PN}:${PN} /var/lib/notary
|
||||
fperms -R 0600 /var/lib/notary/fixtures/database/
|
||||
}
|
@ -1,6 +1,4 @@
|
||||
DIST tmux-2.2.tar.gz 466852 BLAKE2B 78bc503955686a1b8aa80c0686aa2b05c32bb54078c0dd5c3bcf0c3e2ac8ff0383ceb63218974b2da688506bd44e8ebfd48a05a66ba9322b446cc44c11952932 SHA512 4d4fc316c78aab0d13f7f15098d952f01d7da7d74d46251ae2dd90440522f07c785afe984d82de2b4518fb67ea441f5a5a46c357c87ddc6ddbfba4b7f08be7bf
|
||||
DIST tmux-2.3.tar.gz 473944 BLAKE2B 348bb0492332d2c52d11be2aa128552ca374feb8ac2cf91d395fe5896d1fd791e62c3a526df7c744ef888eaaa1aa91ffa110dcc5626b72169aac7dc7f7293dd2 SHA512 521e3734104be43837cba95d8b3d050d033708fa7469f7e7db66ae6993b002c4d9f6bafec41f3c9446eda91a4499e571019534dfa2e5a0563085b2d16e1b94af
|
||||
DIST tmux-2.5.tar.gz 475717 BLAKE2B c702949c7490b637ca99dc6b98d92af917e437374159153c6b955821d056fcbe676441974f42cb271db4dc69746765bb83e5a86a7d51e35d900a1a4f77e60ead SHA512 c0e8365a553d034e347f2f7a0d64f04e2be4307a75a9f72c8218fc56b72e531f3f37fe4a8f0e8d70801f5f62ee250ab7e9978abd6d101d273f76b4a1a92b08e0
|
||||
DIST tmux-2.6.tar.gz 481000 BLAKE2B adbd276261f3f4be9d67c6c0fbad28a90eabbecfa68ebbc104fe56acaa9b7bd005060b854ce0a0e669fdf41dd058bfa8450a85a78f71f7248a44d25458f7d3bc SHA512 20a1ae8b8494c5b42757902322f3877731c2cc330c9c00f097a317785d25252b7ebaa8bbab9fc17843299e80cb2914aaac0a664715a85c50f7ea489d23753832
|
||||
DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
|
||||
DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
|
||||
DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
|
||||
|
@ -1,18 +0,0 @@
|
||||
Makefile.am | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 63e20b1..a2fec1e 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -25,9 +25,8 @@ endif
|
||||
# Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
|
||||
# different flags.
|
||||
if IS_GCC
|
||||
-CFLAGS += -std=gnu99 -O2
|
||||
+CFLAGS += -std=gnu99
|
||||
if IS_DEBUG
|
||||
-CFLAGS += -g
|
||||
CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
|
||||
CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
|
||||
CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
|
@ -1,15 +0,0 @@
|
||||
Makefile.am | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
--- tmux-2.3/Makefile.am
|
||||
+++ tmux-2.3/Makefile.am
|
||||
@@ -23,9 +23,8 @@
|
||||
|
||||
# Set flags for gcc.
|
||||
if IS_GCC
|
||||
-CFLAGS += -std=gnu99 -O2
|
||||
+CFLAGS += -std=gnu99
|
||||
if IS_DEBUG
|
||||
-CFLAGS += -g
|
||||
CFLAGS += -Wno-long-long -Wall -W -Wformat=2
|
||||
CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
|
||||
CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
|
@ -1,9 +0,0 @@
|
||||
--- a/window.c 2016-09-29 05:31:24.000000000 +0800
|
||||
+++ b/window.c 2017-12-22 09:38:43.709617000 +0800
|
||||
@@ -981,7 +981,7 @@
|
||||
|
||||
input_parse(wp);
|
||||
|
||||
- wp->pipe_off = size;
|
||||
+ wp->pipe_off = EVBUFFER_LENGTH(evb);
|
||||
}
|
@ -1,63 +0,0 @@
|
||||
From 30086e504c8a5389b96b72b81ac8dbefe19e0cf1 Mon Sep 17 00:00:00 2001
|
||||
From: nicm <nicm>
|
||||
Date: Wed, 5 Oct 2016 22:00:29 +0000
|
||||
Subject: [PATCH] screen_write_copy tried to be clever and clear the line if it
|
||||
reached the end of the source, but it was wrong and causes problems that are
|
||||
only showing up now we are more aggressive about skipping redundant screen
|
||||
updates. Remove the optimization entirely as more trouble than it is worth to
|
||||
fix (and it'll have to go when BCE is done anyway).
|
||||
|
||||
---
|
||||
screen-write.c | 34 +++++++---------------------------
|
||||
1 file changed, 7 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/screen-write.c b/screen-write.c
|
||||
index 3977517..3a1fc8c 100644
|
||||
--- a/screen-write.c
|
||||
+++ b/screen-write.c
|
||||
@@ -394,38 +394,18 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
|
||||
{
|
||||
struct screen *s = ctx->s;
|
||||
struct grid *gd = src->grid;
|
||||
- struct grid_line *gl;
|
||||
struct grid_cell gc;
|
||||
- u_int xx, yy, cx, cy, ax, bx;
|
||||
+ u_int xx, yy, cx, cy;
|
||||
|
||||
cx = s->cx;
|
||||
cy = s->cy;
|
||||
+
|
||||
for (yy = py; yy < py + ny; yy++) {
|
||||
- gl = &gd->linedata[yy];
|
||||
- if (yy < gd->hsize + gd->sy) {
|
||||
- /*
|
||||
- * Find start and end position and copy between
|
||||
- * them. Limit to the real end of the line then use a
|
||||
- * clear EOL only if copying to the end, otherwise
|
||||
- * could overwrite whatever is there already.
|
||||
- */
|
||||
- if (px > gl->cellsize)
|
||||
- ax = gl->cellsize;
|
||||
- else
|
||||
- ax = px;
|
||||
- if (px + nx == gd->sx && px + nx > gl->cellsize)
|
||||
- bx = gl->cellsize;
|
||||
- else
|
||||
- bx = px + nx;
|
||||
-
|
||||
- for (xx = ax; xx < bx; xx++) {
|
||||
- grid_get_cell(gd, xx, yy, &gc);
|
||||
- screen_write_cell(ctx, &gc);
|
||||
- }
|
||||
- if (px + nx == gd->sx && px + nx > gl->cellsize)
|
||||
- screen_write_clearendofline(ctx);
|
||||
- } else
|
||||
- screen_write_clearline(ctx);
|
||||
+ for (xx = px; xx < px + nx; xx++) {
|
||||
+ grid_get_cell(gd, xx, yy, &gc);
|
||||
+ screen_write_cell(ctx, &gc);
|
||||
+ }
|
||||
+
|
||||
cy++;
|
||||
screen_write_cursormove(ctx, cx, cy);
|
||||
}
|
@ -1 +0,0 @@
|
||||
au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
|
@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic versionator
|
||||
|
||||
DESCRIPTION="Terminal multiplexer"
|
||||
HOMEPAGE="http://tmux.github.io/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
|
||||
|
||||
CDEPEND="
|
||||
>=dev-libs/libevent-2.1.5-r4:=
|
||||
utempter? (
|
||||
kernel_linux? ( sys-libs/libutempter )
|
||||
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
|
||||
)
|
||||
sys-libs/ncurses:0="
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-screen )
|
||||
vim-syntax? (
|
||||
|| (
|
||||
app-editors/vim
|
||||
app-editors/gvim
|
||||
)
|
||||
)"
|
||||
|
||||
DOCS=( CHANGES FAQ README TODO )
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch )
|
||||
|
||||
src_prepare() {
|
||||
# bug 438558
|
||||
# 1.7 segfaults when entering copy mode if compiled with -Os
|
||||
replace-flags -Os -O2
|
||||
|
||||
# regenerate aclocal.m4 to support earlier automake versions
|
||||
rm aclocal.m4 || die
|
||||
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--sysconfdir="${EPREFIX}"/etc \
|
||||
$(use_enable debug) \
|
||||
$(use_enable utempter)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
einstalldocs
|
||||
|
||||
dodoc example_tmux.conf
|
||||
docompress -x /usr/share/doc/${PF}/example_tmux.conf
|
||||
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}"/tmux.vim
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
|
||||
echo
|
||||
ewarn "Some configuration options changed in this release."
|
||||
ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
|
||||
ewarn
|
||||
ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
|
||||
ewarn "older, running tmux server instances. You'll have to use an existing client to"
|
||||
ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
|
||||
ewarn "to temporarily downgrade to access them."
|
||||
echo
|
||||
fi
|
||||
}
|
@ -1,90 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic versionator
|
||||
|
||||
DESCRIPTION="Terminal multiplexer"
|
||||
HOMEPAGE="http://tmux.github.io/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
|
||||
|
||||
CDEPEND="
|
||||
>=dev-libs/libevent-2.1.5-r4:=
|
||||
utempter? (
|
||||
kernel_linux? ( sys-libs/libutempter )
|
||||
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
|
||||
)
|
||||
sys-libs/ncurses:0="
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-screen )
|
||||
vim-syntax? (
|
||||
|| (
|
||||
app-editors/vim
|
||||
app-editors/gvim
|
||||
)
|
||||
)"
|
||||
|
||||
DOCS=( CHANGES FAQ README TODO )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.3-flags.patch
|
||||
|
||||
# usptream fixes (can be removed with next version bump)
|
||||
"${FILESDIR}"/${P}-screen_write_copy-fix.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# bug 438558
|
||||
# 1.7 segfaults when entering copy mode if compiled with -Os
|
||||
replace-flags -Os -O2
|
||||
|
||||
# regenerate aclocal.m4 to support earlier automake versions
|
||||
rm aclocal.m4 || die
|
||||
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--sysconfdir="${EPREFIX}"/etc \
|
||||
$(use_enable debug) \
|
||||
$(use_enable utempter)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
einstalldocs
|
||||
|
||||
dodoc example_tmux.conf
|
||||
docompress -x /usr/share/doc/${PF}/example_tmux.conf
|
||||
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}"/tmux.vim
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
|
||||
echo
|
||||
ewarn "Some configuration options changed in this release."
|
||||
ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
|
||||
ewarn
|
||||
ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
|
||||
ewarn "older, running tmux server instances. You'll have to use an existing client to"
|
||||
ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
|
||||
ewarn "to temporarily downgrade to access them."
|
||||
echo
|
||||
fi
|
||||
}
|
@ -1,91 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic versionator
|
||||
|
||||
DESCRIPTION="Terminal multiplexer"
|
||||
HOMEPAGE="http://tmux.github.io/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
|
||||
|
||||
CDEPEND="
|
||||
>=dev-libs/libevent-2.1.5-r4:=
|
||||
utempter? (
|
||||
kernel_linux? ( sys-libs/libutempter )
|
||||
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
|
||||
)
|
||||
sys-libs/ncurses:0="
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-screen )
|
||||
vim-syntax? (
|
||||
|| (
|
||||
app-editors/vim
|
||||
app-editors/gvim
|
||||
)
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.3-flags.patch
|
||||
|
||||
# usptream fixes (can be removed with next version bump)
|
||||
"${FILESDIR}"/${P}-screen_write_copy-fix.patch
|
||||
"${FILESDIR}"/${P}-pipe_pane-fix.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# regenerate aclocal.m4 to support earlier automake versions
|
||||
rm aclocal.m4 || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bug 438558
|
||||
# 1.7 segfaults when entering copy mode if compiled with -Os
|
||||
replace-flags -Os -O2
|
||||
|
||||
econf \
|
||||
--sysconfdir="${EPREFIX}"/etc \
|
||||
$(use_enable debug) \
|
||||
$(use_enable utempter)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
dodoc example_tmux.conf
|
||||
docompress -x /usr/share/doc/${PF}/example_tmux.conf
|
||||
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}"/tmux.vim
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
|
||||
ewarn
|
||||
ewarn "Some configuration options changed in this release."
|
||||
ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
|
||||
ewarn
|
||||
ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
|
||||
ewarn "older, running tmux server instances. You'll have to use an existing client to"
|
||||
ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
|
||||
ewarn "to temporarily downgrade to access them."
|
||||
ewarn
|
||||
fi
|
||||
}
|
@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic versionator
|
||||
|
||||
DESCRIPTION="Terminal multiplexer"
|
||||
HOMEPAGE="http://tmux.github.io/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
|
||||
|
||||
CDEPEND="
|
||||
dev-libs/libevent:0=
|
||||
sys-libs/ncurses:0=
|
||||
utempter? (
|
||||
kernel_linux? ( sys-libs/libutempter )
|
||||
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
|
||||
)"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-screen )
|
||||
vim-syntax? (
|
||||
|| (
|
||||
app-editors/vim
|
||||
app-editors/gvim
|
||||
)
|
||||
app-vim/vim-tmux
|
||||
)"
|
||||
|
||||
DOCS=( CHANGES FAQ README TODO example_tmux.conf )
|
||||
|
||||
PATCHES=(
|
||||
# usptream fixes (can be removed with next version bump)
|
||||
"${FILESDIR}/${PN}-2.4-flags.patch"
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${P/_/-}"
|
||||
|
||||
src_prepare() {
|
||||
# bug 438558
|
||||
# 1.7 segfaults when entering copy mode if compiled with -Os
|
||||
replace-flags -Os -O2
|
||||
|
||||
# regenerate aclocal.m4 to support earlier automake versions
|
||||
rm -v aclocal.m4 || die
|
||||
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--sysconfdir="${EPREFIX}"/etc
|
||||
$(use_enable debug)
|
||||
$(use_enable utempter)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
|
||||
echo
|
||||
ewarn "Some configuration options changed in this release."
|
||||
ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
|
||||
ewarn
|
||||
ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
|
||||
ewarn "older, running tmux server instances. You'll have to use an existing client to"
|
||||
ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
|
||||
ewarn "to temporarily downgrade to access them."
|
||||
echo
|
||||
fi
|
||||
}
|
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST gemato-12.1.tar.gz 66807 BLAKE2B 7a6155f337d382bdea7fb4f0bbcb0982e8d4237502dfa7fd8006754bc15e2bfe1f58f133f8cc24ee39eaf947e0770f9ff0672769daa0f03d790ef88958877417 SHA512 7d6287b335121d38859e43ce0818ebb86c51105ed836594f0540fda5ff683a6e58ce09b7dad9cea0667e6379cca6902225b095a3d0922a12cd8c62a36b11386c
|
||||
DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
|
||||
DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
|
||||
|
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
# pyblake2 & pysha3 are broken with pypy3
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
|
||||
PYTHON_REQ_USE='threads(+)'
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Stand-alone Manifest generation & verification tool"
|
||||
HOMEPAGE="https://github.com/mgorny/gemato"
|
||||
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
|
||||
IUSE="+blake2 bzip2 +gpg lzma sha3 test"
|
||||
|
||||
MODULE_RDEPEND="
|
||||
blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
|
||||
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
|
||||
gpg? ( app-crypt/gnupg )
|
||||
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
|
||||
sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
|
||||
|
||||
RDEPEND="${MODULE_RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( ${MODULE_RDEPEND} )"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="2"
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 eutils java-ant-2
|
||||
|
||||
DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support"
|
||||
HOMEPAGE="http://henplus.sf.net"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND="dev-java/commons-cli:1
|
||||
dev-java/libreadline-java:0"
|
||||
RDEPEND=">=virtual/jre-1.4
|
||||
${COMMON_DEPEND}"
|
||||
DEPEND=">=virtual/jdk-1.4
|
||||
${COMMON_DEPEND}"
|
||||
|
||||
java_prepare() {
|
||||
epatch "${FILESDIR}/0.9.8-build.xml.patch"
|
||||
rm -v lib/*.jar lib/*/*.jar || die
|
||||
}
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
EANT_GENTOO_CLASSPATH="commons-cli-1,libreadline-java"
|
||||
|
||||
src_install () {
|
||||
java-pkg_dojar "build/${PN}.jar"
|
||||
|
||||
java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \
|
||||
--main henplus.HenPlus
|
||||
|
||||
dodoc README || die
|
||||
dohtml doc/HenPlus.html || die
|
||||
use doc && java-pkg_dojavadoc javadoc/api
|
||||
|
||||
use source && java-pkg_dosrc "src/${PN}"
|
||||
}
|
@ -1,2 +1 @@
|
||||
DIST qt5-sqlcipher-0.1.1_pre20171202.tar.xz 24340 BLAKE2B de40988c9ca13de0ebafebd4078f9da1c21ad4d8d78a9931497048859617d34f4de8ba630d438024dbb034bb817703e1e456619c3897b3c7dc6dbfa2a719e307 SHA512 e95eb1e73ff944d24f785129cb3e6ebc297abf457d14a2c6466d64230003932eb99b83dc3b216b27fe40565213e67d62b45d43fa538f6f693626283c788ca562
|
||||
DIST qt5-sqlcipher-1.0.1.tar.gz 56994 BLAKE2B 9de780126bc7ba99e23b529e6e45d629e9b20d52dfb4d91fcb7c8a6b77b8a8bc17bedaa40a288c4af32e40cc563631e164428be0f8c5a81ffa6143acc58b2e55 SHA512 ba83ba1d98b7764c7ad4bf776b1f39baff44ff6189e51cbc2131150e5a4c2962a21134d21d5ed41f171629395c721fce11ee911d080d304566033d53c552642a
|
||||
|
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Qt SQL driver plugin for SQLCipher"
|
||||
HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
|
||||
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1" # version 2.1 only
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND=">=dev-db/sqlcipher-3.4.1
|
||||
>=dev-qt/qtcore-5.7.1:5=
|
||||
>=dev-qt/qtsql-5.7.1:5=[sqlite] <dev-qt/qtsql-5.9.5:5=[sqlite]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
DOCS=(README.md)
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/${PN}-install-path.patch
|
||||
sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
|
||||
# workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
|
||||
cp -R qt-file-cache/5.9.{3,4} || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${BUILD_DIR}" || die
|
||||
./qsqlcipher-test || die
|
||||
}
|
@ -1,4 +1 @@
|
||||
DIST sqldeveloper-4.0.2.15.21-no-jre.zip 235443867 BLAKE2B 41982f06998653c6dc67ea368fc244646b93ba83f7b02e58a4f172b5b2fd613873f1eb4a5f9f01f0a6b2c412f558fc9cb1e4efb2de75bfc3b7a43816a247d1f8 SHA512 e67b0f3d127adbc6cb77b3eb822834a6c41be7039c54eceb85e8c882704684a02dd036f078408192ad2cbcb963dfb0ba583e99a9f7b7db36b1e9a1f96e555880
|
||||
DIST sqldeveloper-4.1.3.20.78-no-jre.zip 331401110 BLAKE2B e4bd3e660bcc0a131d9c2cc0bc4b49c8b4e6051b7162e38e86105d30931d2207767ec1ea38eaa61dad31804802c2a010f70f752700f9eb52a5e9bbf936b957f6 SHA512 828a751bc9df7bdc59f9b89b317189826e328671d081df24d39a102aeefaf5a0a56e01e066802da1ee92617bf1fdb77ad598b448043dd7f4239f2103efb4427b
|
||||
DIST sqldeveloper-4.1.5.21.78-no-jre.zip 349775471 BLAKE2B 87a4288b493306971f9aee490223843d76ed2c19c5353a3021295ddf13de6b552e3a8c03f4fd48d8150583982942f205ae261c0f4b41ba146de3c785560d039a SHA512 06535a2d60ce140fa08cf937e9bb38d0a8ecefcb1b68675b547d4682c2e514ba62121e4363cf655c10de149e39a5e7d1d4a61c8cf79d7388b2998bf9b0098601
|
||||
DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
|
||||
|
@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils java-pkg-2
|
||||
|
||||
DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
|
||||
SRC_URI="${P}-no-jre.zip"
|
||||
RESTRICT="fetch"
|
||||
|
||||
LICENSE="OTN"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="mssql mysql sybase"
|
||||
|
||||
DEPEND="mssql? ( dev-java/jtds:1.2 )
|
||||
mysql? ( dev-java/jdbc-mysql:0 )
|
||||
sybase? ( dev-java/jtds:1.2 )"
|
||||
RDEPEND=">=virtual/jdk-1.7.0
|
||||
dev-java/java-config:2
|
||||
${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
pkg_nofetch() {
|
||||
eerror "Please go to"
|
||||
eerror " ${HOMEPAGE}"
|
||||
eerror "and download"
|
||||
eerror " Oracle SQL Developer for other platforms"
|
||||
eerror " ${SRC_URI}"
|
||||
eerror "and move it to ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# we don't need these, do we?
|
||||
find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} +
|
||||
|
||||
# they both use jtds, enabling one of them also enables the other one
|
||||
if use mssql && ! use sybase; then
|
||||
einfo "You requested MSSQL support, this also enables Sybase support."
|
||||
fi
|
||||
if use sybase && ! use mssql; then
|
||||
einfo "You requested Sybase support, this also enables MSSQL support."
|
||||
fi
|
||||
|
||||
if use mssql || use sybase; then
|
||||
echo "AddJavaLibFile $(java-pkg_getjars jtds-1.2)" >> sqldeveloper/bin/sqldeveloper.conf
|
||||
fi
|
||||
|
||||
if use mysql; then
|
||||
echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /opt/${PN}
|
||||
# NOTE For future version to get that line (what to copy) go to the unpacked sources dir
|
||||
# using `bash` and press Meta+_ (i.e. Meta+Shift+-) -- that is a builtin bash feature ;-)
|
||||
cp -r {configuration,d{ataminer,ropins,vt},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,r{dbms,eadme.html},s{leepycat,ql{cli,developer,j},vnkit}} \
|
||||
"${D}"/opt/${PN}/ || die "Install failed"
|
||||
|
||||
dobin "${FILESDIR}"/${PN} || die "Install failed"
|
||||
|
||||
mv icon.png ${PN}-32x32.png || die
|
||||
doicon ${PN}-32x32.png || die
|
||||
make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32 || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# this temporary fixes FileNotFoundException with datamodeler
|
||||
# this is more like a workaround than permanent fix
|
||||
test -d /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log \
|
||||
|| mkdir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
|
||||
touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
|
||||
chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
|
||||
|
||||
# this fixes another datamodeler FileNotFoundException
|
||||
# also more like a workaround than permanent fix
|
||||
chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml
|
||||
|
||||
echo
|
||||
einfo "If you want to use the TNS connection type you need to set up the"
|
||||
einfo "TNS_ADMIN environment variable to point to the directory your"
|
||||
einfo "tnsnames.ora resides in."
|
||||
echo
|
||||
}
|
@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils java-pkg-2
|
||||
|
||||
DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
|
||||
SRC_URI="${P}-no-jre.zip"
|
||||
|
||||
RESTRICT="fetch"
|
||||
|
||||
LICENSE="OTN"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="mssql mysql sybase"
|
||||
|
||||
DEPEND="mssql? ( dev-java/jtds:1.3 )
|
||||
mysql? ( dev-java/jdbc-mysql:0 )
|
||||
sybase? ( dev-java/jtds:1.3 )"
|
||||
RDEPEND=">=virtual/jdk-1.8
|
||||
${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
QA_PREBUILT="
|
||||
opt/${PN}/netbeans/platform/modules/lib/amd64/linux/*.so
|
||||
opt/${PN}/netbeans/platform/modules/lib/i386/linux/*.so
|
||||
"
|
||||
|
||||
pkg_nofetch() {
|
||||
eerror "Please go to"
|
||||
eerror " ${HOMEPAGE}"
|
||||
eerror "and download"
|
||||
eerror " Oracle SQL Developer for other platforms"
|
||||
eerror " ${SRC_URI}"
|
||||
eerror "and move it to ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# we don't need these, do we?
|
||||
find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} +
|
||||
|
||||
# they both use jtds, enabling one of them also enables the other one
|
||||
if use mssql && ! use sybase; then
|
||||
einfo "You requested MSSQL support, this also enables Sybase support."
|
||||
fi
|
||||
if use sybase && ! use mssql; then
|
||||
einfo "You requested Sybase support, this also enables MSSQL support."
|
||||
fi
|
||||
|
||||
if use mssql || use sybase; then
|
||||
echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die
|
||||
fi
|
||||
|
||||
if use mysql; then
|
||||
echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /opt/${PN}
|
||||
# NOTE For future version to get that line (what to copy) go to the unpacked sources dir
|
||||
# using `bash` and press Meta+_ (i.e. Meta+Shift+-) -- that is a builtin bash feature ;-)
|
||||
cp -r {configuration,d{ataminer,ropins,vt},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,ords,rdbms,s{leepycat,ql{developer,j},vnkit}} \
|
||||
"${D}"/opt/${PN}/ || die "Install failed"
|
||||
|
||||
newbin "${FILESDIR}"/${PN}-r1 ${PN}
|
||||
|
||||
newicon icon.png ${PN}-32x32.png
|
||||
make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32
|
||||
|
||||
# This is normally called automatically by java-pkg_dojar, which
|
||||
# hasn't been used above. We need to create package.env to help the
|
||||
# launcher select the correct VM.
|
||||
java-pkg_do_write_
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# this temporary fixes FileNotFoundException with datamodeler
|
||||
# this is more like a workaround than permanent fix
|
||||
mkdir -p /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log || die
|
||||
touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log || die
|
||||
chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log || die
|
||||
|
||||
# this fixes another datamodeler FileNotFoundException
|
||||
# also more like a workaround than permanent fix
|
||||
chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml || die
|
||||
|
||||
echo
|
||||
einfo "If you want to use the TNS connection type you need to set up the"
|
||||
einfo "TNS_ADMIN environment variable to point to the directory your"
|
||||
einfo "tnsnames.ora resides in."
|
||||
echo
|
||||
}
|
@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils java-pkg-2
|
||||
|
||||
DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
|
||||
SRC_URI="${P}-no-jre.zip"
|
||||
|
||||
RESTRICT="fetch"
|
||||
|
||||
LICENSE="OTN"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="mssql mysql sybase"
|
||||
|
||||
DEPEND="mssql? ( dev-java/jtds:1.3 )
|
||||
mysql? ( dev-java/jdbc-mysql:0 )
|
||||
sybase? ( dev-java/jtds:1.3 )"
|
||||
RDEPEND=">=virtual/jdk-1.8
|
||||
${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
QA_PREBUILT="
|
||||
opt/${PN}/netbeans/platform/modules/lib/amd64/linux/*.so
|
||||
opt/${PN}/netbeans/platform/modules/lib/i386/linux/*.so
|
||||
"
|
||||
|
||||
pkg_nofetch() {
|
||||
eerror "Please go to"
|
||||
eerror " ${HOMEPAGE}"
|
||||
eerror "and download"
|
||||
eerror " Oracle SQL Developer for other platforms"
|
||||
eerror " ${SRC_URI}"
|
||||
eerror "and move it to ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# we don't need these, do we?
|
||||
find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} +
|
||||
|
||||
# they both use jtds, enabling one of them also enables the other one
|
||||
if use mssql && ! use sybase; then
|
||||
einfo "You requested MSSQL support, this also enables Sybase support."
|
||||
fi
|
||||
if use sybase && ! use mssql; then
|
||||
einfo "You requested Sybase support, this also enables MSSQL support."
|
||||
fi
|
||||
|
||||
if use mssql || use sybase; then
|
||||
echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die
|
||||
fi
|
||||
|
||||
if use mysql; then
|
||||
echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /opt/${PN}
|
||||
# NOTE For future version to get that line (what to copy) go to the unpacked sources dir
|
||||
# using `bash` and press Meta+_ (i.e. Meta+Shift+-) -- that is a builtin bash feature ;-)
|
||||
cp -r {configuration,d{ataminer,ropins,vt},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,ords,rdbms,s{leepycat,ql{developer,j},vnkit}} \
|
||||
"${D}"/opt/${PN}/ || die "Install failed"
|
||||
|
||||
newbin "${FILESDIR}"/${PN}-r1 ${PN}
|
||||
|
||||
newicon icon.png ${PN}-32x32.png
|
||||
make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32
|
||||
|
||||
# This is normally called automatically by java-pkg_dojar, which
|
||||
# hasn't been used above. We need to create package.env to help the
|
||||
# launcher select the correct VM.
|
||||
java-pkg_do_write_
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# this temporary fixes FileNotFoundException with datamodeler
|
||||
# this is more like a workaround than permanent fix
|
||||
mkdir -p /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log || die
|
||||
touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log || die
|
||||
chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log || die
|
||||
|
||||
# this fixes another datamodeler FileNotFoundException
|
||||
# also more like a workaround than permanent fix
|
||||
chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml || die
|
||||
|
||||
echo
|
||||
einfo "If you want to use the TNS connection type you need to set up the"
|
||||
einfo "TNS_ADMIN environment variable to point to the directory your"
|
||||
einfo "tnsnames.ora resides in."
|
||||
echo
|
||||
}
|
Binary file not shown.
@ -0,0 +1,52 @@
|
||||
Bug: https://bugs.gentoo.org/646538
|
||||
Upstream commit: https://bitbucket.org/odedevs/ode/commits/6f44023660dc830147a56314ea0627a23f11ad86
|
||||
|
||||
# HG changeset patch
|
||||
# User oleh_derevenko <>
|
||||
# Date 1521993135 -10800
|
||||
# Node ID 6f44023660dc830147a56314ea0627a23f11ad86
|
||||
# Parent 6a68227619feebf85513331d7320b5a89eadf44f
|
||||
Fixed: Command line parameter validation errors have been fixed in some demos (reported by Peter Levine)
|
||||
|
||||
diff --git a/ode/demo/demo_jointPR.cpp b/ode/demo/demo_jointPR.cpp
|
||||
--- a/ode/demo/demo_jointPR.cpp
|
||||
+++ b/ode/demo/demo_jointPR.cpp
|
||||
@@ -328,8 +328,8 @@
|
||||
if (0 == strcmp("-t", argv[i]) || 0 == strcmp("--texture-path", argv[i]))
|
||||
{
|
||||
int j = i+1;
|
||||
- if ( j+1 > argc || // Check if we have enough arguments
|
||||
- argv[j] == '\0' || // We should have a path here
|
||||
+ if ( j >= argc || // Check if we have enough arguments
|
||||
+ argv[j][0] == '\0' || // We should have a path here
|
||||
argv[j][0] == '-' ) // We should have a path not a command line
|
||||
Help(argv);
|
||||
else
|
||||
diff --git a/ode/demo/demo_jointPU.cpp b/ode/demo/demo_jointPU.cpp
|
||||
--- a/ode/demo/demo_jointPU.cpp
|
||||
+++ b/ode/demo/demo_jointPU.cpp
|
||||
@@ -575,8 +575,8 @@
|
||||
|
||||
if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) {
|
||||
int j = i+1;
|
||||
- if ( j+1 > argc || // Check if we have enough arguments
|
||||
- argv[j] == '\0' || // We should have a path here
|
||||
+ if ( j >= argc || // Check if we have enough arguments
|
||||
+ argv[j][0] == '\0' || // We should have a path here
|
||||
argv[j][0] == '-' ) // We should have a path not a command line
|
||||
Help (argv);
|
||||
else
|
||||
diff --git a/ode/demo/demo_piston.cpp b/ode/demo/demo_piston.cpp
|
||||
--- a/ode/demo/demo_piston.cpp
|
||||
+++ b/ode/demo/demo_piston.cpp
|
||||
@@ -658,8 +658,8 @@
|
||||
if ( 0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) )
|
||||
{
|
||||
int j = i+1;
|
||||
- if ( j+1 > argc || // Check if we have enough arguments
|
||||
- argv[j] == '\0' || // We should have a path here
|
||||
+ if ( j >= argc || // Check if we have enough arguments
|
||||
+ argv[j][0] == '\0' || // We should have a path here
|
||||
argv[j][0] == '-' ) // We should have a path not a command line
|
||||
Help (argv);
|
||||
else
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue