From d4c7e5d5f376de41120f3a9652d3770b830c57b6 Mon Sep 17 00:00:00 2001 From: "mahlon@martini.nu" Date: Mon, 2 Dec 2019 23:48:55 +0000 Subject: [PATCH 1/4] Revert an old LCS edge case fix in favor of a better one. FossilOrigin-Name: 646a3154f00651907a13fb5823ed00e3e6ca509c7457c8bb3e533fa00a6aa583 --- shelldap | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shelldap b/shelldap index 92afdfc..60ce23a 100755 --- a/shelldap +++ b/shelldap @@ -1485,6 +1485,7 @@ sub diff { # if ( $cur_valcount == 1 ) { $e->replace( $attr => $val ); + $seen_attr{ $attr }++; } else { @@ -1509,10 +1510,6 @@ sub diff { # foreach ( $diff->Items(1) ) { my ( $attr, $val ) = $parse->( $_ ) or next; - my $cur_vals = $e->get_value( $attr, asref => 1 ) || []; - my $cur_valcount = scalar @$cur_vals; - - next if $cur_valcount == 1; next if $seen_attr{ $attr }; $self->debug("DELETE: $_"); $e->delete( $attr => [ $val ] ); From fb26545a004c638efd92c2ccfaf7782118671b57 Mon Sep 17 00:00:00 2001 From: mahlon Date: Sun, 3 Apr 2022 23:04:09 +0000 Subject: [PATCH 2/4] Update docs for Fossil. FossilOrigin-Name: 434f0df7417ff94cc8cae33b1a8fcab9de5904b1b05175be5d924bc207fe57d5 --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c26117a..b7de268 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,8 @@ ou=People,~ > Downloads --------- -You can download the latest script [here](http://code.martini.nu/shelldap/archive/tip.zip). +You can download the latest script +[here](https://code.martini.nu/fossil/shelldap/tarball/tip/shelldap-tip.tar.gz). It is also available via the [FreeBSD ports](http://www.freebsd.org/cgi/cvsweb.cgi/ports/net/shelldap/) system, OS X via @@ -85,9 +86,9 @@ Development ----------- -You can also check out the source via [Mercurial](http://mercurial.selenic.com/wiki/) from the following uri: +You can also check out the source via [Fossil](http://fossil-scm.org/) from the following uri: - % hg clone http://code.martini.nu/shelldap/ + % fossil clone https://code.martini.nu/fossil/shelldap or via its [GitHub](https://github.com/) mirror at: @@ -98,3 +99,4 @@ Documentation ------------- Once installed, Shelldap is fully documented via perldoc, and has a built-in `help` command as well. + From 416a458607993822579ebe25b474a83cc402c0ae Mon Sep 17 00:00:00 2001 From: mahlon Date: Mon, 30 Dec 2024 06:48:59 +0000 Subject: [PATCH 3/4] Update package links, bump to 1.5.2. FossilOrigin-Name: 6e85cfd34f81b729d25e3c6b869e08160288857f60bcf1e44ef8acd312ac9b90 --- CHANGELOG | 10 ++++++++-- LICENSE | 2 +- README.md | 25 +++++++++++++++---------- shelldap | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2ff1bab..567e200 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,10 @@ +2024-12-29 v1.5.2 + + * Revert an LCS deletion edge case, allowing final attribute + in a list of changes to be properly removed. + + 2019-10-13 v1.5.1 * Repair SASL authentications, add a 'sasluser' option @@ -66,7 +72,7 @@ 2014-06-21 v.1.1.0 * Add CONTRIBUTORS file. - + * Add simple (optional) SASL support. * Fix the DN regexp to include dashes. @@ -85,7 +91,7 @@ 2013-04-18 v1.0.1 - * Fix for edge case Diff::LCS traversals. + * Fix for edge case Diff::LCS traversals. * Ensure re-edit state is cleared in between attempts. diff --git a/LICENSE b/LICENSE index 42d1a4d..8bb2d12 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2006-2019, Mahlon E. Smith +Copyright (c) 2006-2024, Mahlon E. Smith All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index b7de268..118ae3a 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ Witness! ``` -% shelldap +% shelldap ~ > [ tab ] -~ > -cat clear cp delete env grep id ls move passwd read search touch whoami -cd copy create edit exit help list mkdir mv pwd rm setenv vi +~ > +cat clear cp delete env grep id ls move passwd read search touch whoami +cd copy create edit exit help list mkdir mv pwd rm setenv vi ~ > cd ou=People ou=People,~ > cat uid=ma[ tab ] ou=People,~ > cat uid=mahlon @@ -44,7 +44,7 @@ uid: mahlon uidNumber: 20933 userPassword: * -ou=People,~ > +ou=People,~ > ``` @@ -54,10 +54,15 @@ Downloads You can download the latest script [here](https://code.martini.nu/fossil/shelldap/tarball/tip/shelldap-tip.tar.gz). -It is also available via the -[FreeBSD ports](http://www.freebsd.org/cgi/cvsweb.cgi/ports/net/shelldap/) system, OS X via -[macports](https://trac.macports.org/browser/trunk/dports/net/shelldap/Portfile), Debian/Ubuntu via [apt](https://packages.debian.org/shelldap), -NetBSD's [pkgsrc](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/sysutils/shelldap/README.html), OpenBSD [ports](http://openports.se/sysutils/shelldap), openSUSE's [build service](http://software.opensuse.org/search?q=shelldap&baseproject=openSUSE%3AFactory&lang=en), and as a Fedora [RPM](https://src.fedoraproject.org/rpms/shelldap). +It is also available via the +[FreeBSD ports](https://ports.freebsd.org/cgi/ports.cgi?query=shelldap&stype=all&sektion=all) system, +OS X via [macports](https://trac.macports.org/browser/trunk/dports/net/shelldap/Portfile), +Debian/Ubuntu via [apt](https://packages.debian.org/shelldap), +NetBSD's [pkgsrc](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/sysutils/shelldap/index.html), +OpenBSD [ports](https://openports.pl/path/sysutils/shelldap), +openSUSE's [build service](https://software.opensuse.org/package/shelldap?search_term=shelldap), +Arch's User Repository [AUR](https://aur.archlinux.org/packages/shelldap), +and as a Fedora [RPM](https://src.fedoraproject.org/rpms/shelldap). Many thanks to the maintainers of these packages. @@ -71,7 +76,7 @@ Shelldap requires the following perl modules to function properly: * YAML::Syck * Term::Shell -* Digest::MD5 +* Digest::MD5 * Net::LDAP * Algorithm::Diff diff --git a/shelldap b/shelldap index 60ce23a..898ccd9 100755 --- a/shelldap +++ b/shelldap @@ -2703,7 +2703,7 @@ use warnings; use Fatal qw/open/; $0 = 'shelldap'; -my $VERSION = '1.5.1'; +my $VERSION = '1.5.2'; use Getopt::Long qw(:config no_ignore_case); use YAML::Syck qw//; From 7cbbfe3de8b8cce37f8546cdb79cedf3f096de9c Mon Sep 17 00:00:00 2001 From: mahlon Date: Mon, 30 Dec 2024 06:57:44 +0000 Subject: [PATCH 4/4] Remove Mercurial specific files. FossilOrigin-Name: 8469b029cf09b01edfdfc475a73e2ed11c5a891433e5e79a0569cf249a3a1fa6 --- .hgsigs | 4 ---- .hgtags | 6 ------ 2 files changed, 10 deletions(-) delete mode 100644 .hgsigs delete mode 100644 .hgtags diff --git a/.hgsigs b/.hgsigs deleted file mode 100644 index 507d88e..0000000 --- a/.hgsigs +++ /dev/null @@ -1,4 +0,0 @@ -5de7014b0e608e3e95ce8d48125b18d8d8ef3b2c 0 iD8DBQBRSPZ01bsjBDapbeMRAhQLAKCNbDa6gxBJTz2AsyV6A8trw+BrrQCcDUrEWbabfbuYBX3U3cLltIZGsys= -b220dc77493703900627d6cb556728217fe40fe1 0 iD8DBQBT6Qk91bsjBDapbeMRAmXLAKCgAyR+SeXy1q91mAnyv3P0OM6rBwCfaVuVRsGEFd2e7uJiNpUvyIFqm2g= -ceb8bd75e05b98d61db8e37c2778995ecb377dab 0 iD8DBQBUgNz51bsjBDapbeMRAm+UAJ4xM+eF77Lter5brh156c13yObYJACgl6tCkqgGpwCvtC9vv4VR5elzfYo= -ac3c6d1057d5fd99bee1081741ed5247c3a29e80 0 iD8DBQBU91sZ1bsjBDapbeMRAoPWAJ9qrdy8Kn7RuOo2HftFTG2SBXZDgACfSEWBxLYJWGaNY2DI22JC0IF9h2c= diff --git a/.hgtags b/.hgtags deleted file mode 100644 index d3ab45a..0000000 --- a/.hgtags +++ /dev/null @@ -1,6 +0,0 @@ -27bbe75233a3da1482fededd7f67215bc716b2d5 v1.0.0 -e1728adb2561a87a3ab10e57ae4b3140abf4b5cf v1.1.0 -1a480ba231b6ef7714a08151434b7773a1851936 v1.2.0 -b3b840a4b56c534501ee930a8ca0b2e08ecb43bb v1.3.0 -e8af5aa8bd1541bd7d06f5f08c27d0c16b176df4 v1.4.0 -d6a75d14db1261943924f265119c1812736aabd1 v1.5.0