Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
giterlizzi committed Aug 19, 2018
2 parents caea363 + 9e0b7e1 commit e90ef2e
Show file tree
Hide file tree
Showing 66 changed files with 1,646 additions and 616 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ perl:
- "5.22"
- "5.24"
- "5.26"
# - "5.28"

before_install:
- sudo apt-get -qq update
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ You can also look for information at:

## LICENSE AND COPYRIGHT

Copyright (C) 2016-2017 Giuseppe Di Terlizzi
Copyright (C) 2016-2018 Giuseppe Di Terlizzi

This program is free software; you can redistribute it and/or modify it
under the terms of the the Artistic License (2.0). You may obtain a
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2016-2017 Giuseppe Di Terlizzi
Copyright (C) 2016-2018 Giuseppe Di Terlizzi

This program is free software; you can redistribute it and/or modify it
under the terms of the the Artistic License (2.0). You may obtain a
Expand Down
6 changes: 3 additions & 3 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ etc/repos.d/extra/csb.repo
etc/repos.d/extra/ktown.repo
etc/repos.d/extra/microlinux.repo
etc/repos.d/extra/msb.repo
etc/repos.d/extra/README.md
etc/repos.d/extra/ponce.repo
etc/repos.d/extra/repo.sample
etc/repos.d/extra/rlworkman.repo
etc/repos.d/extra/salix.repo
etc/repos.d/extra/slacke18.repo
etc/repos.d/extra/slackers.repo
etc/repos.d/extra/slackonly.repo
etc/repos.d/extra/slacky.repo
etc/repos.d/extra/slint.repo
etc/repos.d/extra/studioware.repo
etc/repos.d/slackware.repo
etc/slackman-cron.conf
Expand All @@ -39,9 +40,7 @@ etc/slackman.cron
etc/slackman.logrotate
INSTALL.md
lib/Slackware/SlackMan.pm
lib/Slackware/SlackMan/Base.pm
lib/Slackware/SlackMan/Command.pm
lib/Slackware/SlackMan/Command/About.pm
lib/Slackware/SlackMan/Command/Clean.pm
lib/Slackware/SlackMan/Command/Config.pm
lib/Slackware/SlackMan/Command/DB.pm
Expand Down Expand Up @@ -82,6 +81,7 @@ t/00-load.t
t/01-package-info.t
t/02-variables.t
t/03-config.t
t/10-slackman.t
t/99-fake-root.t
t/manifest.t
t/pod-coverage.t
Expand Down
3 changes: 2 additions & 1 deletion Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use strict;
use warnings;
use ExtUtils::MakeMaker;

use lib qw(/usr/share/slackman/lib);
use lib qw(/usr/share/slackman/lib/perl5);

WriteMakefile(
NAME => 'Slackware::SlackMan',
Expand All @@ -23,6 +23,7 @@ WriteMakefile(
PREREQ_PM => {
'DBD::SQLite' => '0',
'Net::DBus' => '0',
'HTTP::Tiny' => '0',
},
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'Slackware-Slackman-*' },
Expand Down
29 changes: 29 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
# SlackMan - Slackware Package Manager ChangeLog

## [v1.4.0]

This release introduce the automatic detection of Slackware `-current` release using the new `/etc/slackware-version` format (eg. `14.2+`). Added parsing of Slackware Announce in ChangeLog. General optimizations and reduced the `slackman` command startup by ~0.3 second. Improved download information (added speed, ETA, etc). Added information of supported arch in all `.repo` config file.

## Added

* Added `--terse` option for display only a single description line when install or upgrade package
* Added `slackman clean removed` command for delete removed packages and scripts file in pkgtools directory (`/var/log/removed_{packages,scripts}`)
* Added new entry for `00-default.renames` file
* Added `--format` option for `slackman list` commands
* Added support for Slint repository (`slint.repo`)
* Added supported arch in `.repo` files
* Accept multiple `--exclude` option for `slackman install` and `slackman upgrade` commands
* #11 - Added automatic detection of Slackware-current (since **14.2+** release)
* #12 - Added `org.LotarProject.SlackMan.Announces` D-Bus method to retrieve ChangeLog announces
* #12 - Added `slackman changelog --announces` option to retrieve Slackware ChangeLog announces
* #13 - Added `arch` config option in `.repo` files with supported repository arch

## Changed

* Re-added `HTTP::Tiny` support with check of SSL Perl modules (`IO::Socket::SSL` and `Net::SSLeay`)
* Optimization for `slackman.bash` completion file
* Changed location of required Perl module in `@INC`
* Load `Net::DBus` module when necessary (this reduce `slackman` command startup by ~0.3 second)
* slackman-libsupport.SlackBuild` file now use `cpanm` for download and build the required Perl modules


## [v1.3.0]

This release introduce new options (`--local` for install or upgrade from local package) and new feature (`.renames` configuration file). Now SlackMan use cURL command for download th packages and repository metadata. Added new D-Bus methods and signals and improved `slackman-notifier` client.
Expand Down Expand Up @@ -141,9 +168,11 @@ This release introduce new features, new commands & params and new DBus service
* [v1.0.0]

[Develop]: https://github.com/LotarProject/slackman/compare/master...develop
[v1.4.0]: https://github.com/LotarProject/slackman/compare/v1.3.0...v1.4.0
[v1.3.0]: https://github.com/LotarProject/slackman/compare/v1.2.1...v1.3.0
[v1.2.1]: https://github.com/LotarProject/slackman/compare/v1.2.0...v1.2.1
[v1.2.0]: https://github.com/LotarProject/slackman/compare/v1.1.1...v1.2.0
[v1.1.2]: https://github.com/LotarProject/slackman/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/LotarProject/slackman/compare/v1.1.0...v1.1.1
[v1.1.0]: https://github.com/LotarProject/slackman/compare/v1.0.4...v1.1.0
[v1.0.4]: https://github.com/LotarProject/slackman/compare/v1.0.3...v1.0.4
Expand Down
16 changes: 14 additions & 2 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# SlackMan TODO

- [ ] Check dependencies command (eg. `slackman check-deps PACKAGE`)
- [ ] Add rule in `.repo` file for 32-bit or ARM directory variant (i386, i486, i586, i686, x86, armv5, armv7, armel, etc.)
- [ ] Add rule in `.repo` file to allow the repository only for particular arch (eg. `slackware:multilib` is only for `x86_64` arch)
- [ ] Remove package and all "directed" dependencies (`slackman remove routersploit --remove-dependencies`)
- [ ] Display installed date in `slackman history` for packages installed and removed (never upgraded). Now dsplay only the removed date
- [ ] Add option `--append` (or `-A`) for `slackman config` and `slackman repo config` for append a text in config file
- [ ] Notify the user of changed or installed `/etc/rc.d`
- [ ] Follow logger category for logging
- [ ] Plugin system (via hooks / events)


## SlackMan 1.1

Expand Down Expand Up @@ -45,3 +46,14 @@
- [x] Add local package install/upgrade using `--local FILE` option (eg. `slackman install --local /tmp/foo-1.2-noarch-1`)
- [x] Add option `d` in answer when using `slackman install` & `slackman upgrade` commands for download the packages (eg. `Perform upgrade of selected packages? [Y/N/d]`)
- [x] Increase SlackMan bootstrap and module loading


## SlackMan 1.4

- [x] #11 - Use `/etc/slackware-version` to automatically detect Slackware -current (post 14.2)
- [x] #11 - Add `--terse` options for `slackman` command
- [x] #12 - Parse announces in ChangeLog
- [x] #12 - Add option for display the announces (eg. `slackman changelog --announces`) or create new command (eg. `slackman announces`)
- [x] #12 - Expose a new D-Bus methods to retrieve the announces (eg. `org.LotarProject.SlackMan.Announces`)
- [x] #13 - Add `arch` config option in `.repo` file with supported repository arch

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.3.0
v1.4.0
4 changes: 2 additions & 2 deletions bin/slackman
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ unless ($< == 0) {
exit(1);
}

use lib qw(/usr/share/slackman/lib);
use lib qw(/usr/share/slackman/lib/perl5);

require Slackware::SlackMan::Command;

Expand Down Expand Up @@ -138,7 +138,7 @@ Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
=head1 COPYRIGHT AND LICENSE
Copyright 2016-2017 Giuseppe Di Terlizzi.
Copyright 2016-2018 Giuseppe Di Terlizzi.
This program is free software; you can redistribute it and/or modify it
under the terms of the the Artistic License (2.0). You may obtain a
Expand Down
2 changes: 1 addition & 1 deletion dbus/dbus-pkgtools
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use strict;
use warnings;

use lib qw(/usr/share/slackman-libsupport/lib);
use lib qw(/usr/share/slackman/lib/perl5);

use Net::DBus;

Expand Down
16 changes: 13 additions & 3 deletions dbus/org.lotarproject.SlackMan.7.pod
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ B<org.lotarproject.SlackMan> - D-Bus interface for L<slackman(8)> Package Manage

=head1 DESCRIPTION

The SlackMan service is accessed through the D-Bus object at /org/lotarproject/SlackMan.
Which provides the following interface.
The SlackMan service is accessed through the D-Bus object at C</org/lotarproject/SlackMan>
which provides the following interface.

=head1 METHODS

=head2 ChangeLog

ChangeLog ( in: 's' I<repo_id>, out 'a{saa{ss}}' )

=head2 Announce

Announce ( in: 's' I<repo_id>, out 'a{saa{ss}}' )

=head2 CheckUpgrade

CheckUpgrade ( out 'a{sa{ss}}' )
Expand Down Expand Up @@ -75,6 +79,12 @@ slackware (out 's')

Return the Slackware version (eg. I<14.2> or I<current>)

=head2 isCurrent

isCurrent (out 'b')

Return I<true> if this is I<Slackware-current>

=head1 SIGNALS

=head2 PackageInstalled
Expand Down Expand Up @@ -116,7 +126,7 @@ Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>

=head1 COPYRIGHT AND LICENSE

Copyright 2016-2017 Giuseppe Di Terlizzi.
Copyright 2016-2018 Giuseppe Di Terlizzi.

This program is free software; you can redistribute it and/or modify it
under the terms of the the Artistic License (2.0). You may obtain a
Expand Down
Loading

0 comments on commit e90ef2e

Please sign in to comment.