Skip to content

Commit 6ffde33

Browse files
maxhqmaxhq
committed
Remove old dependency Data::Password
1 parent d695dd4 commit 6ffde33

File tree

10 files changed

+25
-167
lines changed

10 files changed

+25
-167
lines changed

‎core/server/Makefile.PL

-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ WriteMakefile(
304304
'Crypt::Cipher::AES' => 0, # replacement to support keysize > 128
305305
'Crypt::PKCS10' => '2.000',
306306
'Crypt::X509' => '0.53',
307-
'Data::Password' => '1.07',
308307
'Data::Serializer' => '0.44',
309308
'Data::UUID' => 0, # for OpenXPKI::Template::Plugin::Utils and CPAN
310309
'Date::Parse' => '0',

‎package/debian/Makefile

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ PACKAGES= \
2121

2222
DEBIAN_VERSION = $(shell cat /etc/debian_version)
2323

24-
# Data::Password Data::Serializer DateTime::Format::DateParse IPC::ShareLite
25-
# Locale::TextDomain Proc::ProcessTable Sys::SigAction Workflow
24+
# Data::Serializer DateTime::Format::DateParse IPC::ShareLite
25+
# Locale::TextDomain Proc::ProcessTable Sys::SigAction Workflow
2626
# XML::Filter::XInclude XML::SAX::PurePerl XML::Validator::Schema
27-
# Exception::Class 1.22 Added Exception::Class::Base->caught()
27+
# Exception::Class 1.22 Added Exception::Class::Base->caught()
2828

2929
ifeq "$(DEBIAN_VERSION)" "buster/sid"
3030
EXTERNAL= \
@@ -60,10 +60,10 @@ EXTERNAL= \
6060
JSON__MaybeXS \
6161
YAML__Tiny
6262
endif
63-
63+
6464
EXTERNAL2= \
6565
Connector \
66-
Workflow
66+
Workflow
6767

6868
CORE = \
6969
CGI \
@@ -75,11 +75,11 @@ Data__SpreadPagination_BUILDOPTS = --version 0.1.2
7575

7676
.PHONY : $(PACKAGES) $(EXTERNAL) $(EXTERNAL2) CGI DateTime__Format__DateParse
7777

78-
openxpki: $(PACKAGES)
78+
openxpki: $(PACKAGES)
7979

80-
cpan_dependency: $(EXTERNAL)
80+
cpan_dependency: $(EXTERNAL)
8181

82-
cpan_dependency2: $(EXTERNAL2)
82+
cpan_dependency2: $(EXTERNAL2)
8383

8484
trusty: CGI Module__Build__Tiny Module__Load
8585

@@ -108,12 +108,12 @@ $(CORE):
108108

109109
DateTime__Format__DateParse:
110110
test -d deb || mkdir deb
111-
test -d deb/cpan || mkdir deb/cpan/
111+
test -d deb/cpan || mkdir deb/cpan/
112112
cd deb/cpan/ && dh-make-perl --build --notest --depends 'libdatetime-timezone-perl, libdatetime-perl, libtimedate-perl' --cpan $(subst __,::,$@)
113113

114114

115115
$(PACKAGES): info
116-
test -d deb || mkdir deb
116+
test -d deb || mkdir deb
117117
cd $@ && PATH=$(PATH):/usr/sbin $(MAKE) $(SUBTARGET)
118118

119119
resultlocal:

‎package/debian/README.outdated

+8-9
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ INSTALL THE BUILD PREREQS AND GET OpenXPKI SOURCE
6262
- Obtain the SVN sources
6363

6464
To get the latest sources, depending on your preference, you can use either
65-
subversion or git.
65+
subversion or git.
6666

6767
--- using Git
6868

@@ -90,7 +90,7 @@ subversion or git.
9090

9191
sudo addgroup openxpki
9292
sudo adduser --ingroup openxpki --disabled-password --gecos 'OpenXPKI User' openxpki
93-
93+
9494
- Install OpenXPKI prerequisites from debian
9595

9696
cd ~/openxpki/trunk/package/debian
@@ -105,7 +105,7 @@ CREATE PACKAGES
105105

106106
cd ~/openxpki/trunk/package/debian
107107
make cpan_dependency
108-
sudo dpkg -i deb/cpan/*.deb
108+
sudo dpkg -i deb/cpan/*.deb
109109

110110
make Workflow
111111
sudo dpkg -i deb/cpan/libworkflow-perl*.deb
@@ -119,7 +119,7 @@ CREATE PACKAGES
119119
make perl-client-api
120120
sudo dpkg -i deb/client_api/*.deb
121121
make i18n && make deployment && make scep-client && make mason-html-client
122-
122+
123123
------------------------------------------------------------
124124
CREATING APT REPOSITORY
125125
------------------------------------------------------------
@@ -148,7 +148,7 @@ CREATING APT REPOSITORY
148148
if [ -f /etc/lsb-release ]; then
149149
. /etc/lsb-release
150150
dist="$DISTRIB_CODENAME"
151-
else
151+
else
152152
dist=squeeze
153153
fi
154154
mkdir -p ~/openxpki/dpkg/${dist}/binary/cpan
@@ -164,7 +164,7 @@ CREATING APT REPOSITORY
164164
- Copy the freshly-build packages to your Apache directory
165165

166166
cd ~/openxpki/trunk/package/debian
167-
167+
168168
cp deb/cpan/*.deb ~/openxpki/dpkg/${dist}/binary/cpan/
169169
cp deb/core/*.deb ~/openxpki/dpkg/${dist}/binary/core/
170170
cp deb/client_api/*.deb ~/openxpki/dpkg/${dist}/binary/client_api/
@@ -214,7 +214,7 @@ INSTALLING ON PRISTINE OS INSTALLATION
214214
libtest-pod-coverage-perl libtext-csv-perl libxml-parser-perl \
215215
libxml-sax-perl libxml-sax-writer-perl libxml-simple-perl \
216216
libipc-sharelite-perl libintl-perl libfilter-perl \
217-
libdata-password-perl libdata-serializer-perl \
217+
libdata-serializer-perl \
218218
libdatetime-format-dateparse-perl libproc-processtable-perl \
219219
libsys-sigaction-perl libtemplate-perl libworkflow-perl \
220220
libxml-filter-xinclude-perl libxml-validator-schema-perl libdbi-perl \
@@ -226,7 +226,7 @@ INSTALLING ON PRISTINE OS INSTALLATION
226226
apache2 libhtml-mason-perl libapache2-mod-perl2 libapache2-request-perl \
227227
graphviz libhttp-server-simple-perl libdata-page-perl \
228228
libdatetime-format-strptime-perl libdata-spreadpagination-perl \
229-
libmath-round-perl libversion-perl libversion-perl libclass-std-perl
229+
libmath-round-perl libversion-perl libversion-perl libclass-std-perl
230230

231231
sudo shutdown now
232232

@@ -283,4 +283,3 @@ dh-make-perl --build --cpan XML::Validator::Schema
283283
dh-make-perl --build --cpan Data::Password
284284
dpkg -i libxml-filter-xinclude-perl_1.0-1_all.deb
285285
dpkg -i libxml-validator-schema-perl_1.08-1_all.deb
286-
dpkg -i libdata-password-perl_1.07-1_all.deb

‎package/debian/core/control.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Architecture: any
88
Recommends: libdbd-pg-perl | libdbd-mysql-perl
99
Section: perl
1010
Priority: optional
11-
Depends: ${perl:Depends}, ${shlibs:Depends}, make, openssl (>= 0.9.8), libauthen-sasl-perl, libcgi-session-perl, libdatetime-perl, libdigest-sha-perl, libexception-class-perl (>=1.22), libio-prompt-perl, liblog-log4perl-perl, libmail-rfc822-address-perl, libnet-ip-perl, libnet-ldap-perl, libnet-server-perl, libparams-validate-perl, libregexp-common-perl, libtemplate-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtext-csv-xs-perl, libxml-parser-perl, libxml-sax-perl, libxml-sax-writer-perl, libxml-simple-perl, libipc-sharelite-perl, libintl-perl, libfilter-perl, libdata-password-perl, libdata-serializer-perl, libdatetime-format-dateparse-perl, libproc-processtable-perl, libsys-sigaction-perl, libtemplate-perl, libworkflow-perl, libxml-filter-xinclude-perl, libxml-validator-schema-perl, libdbi-perl, libdevel-stacktrace-perl, libclass-accessor-perl, libcrypt-openssl-aes-perl, libcrypt-cbc-perl, libtree-dagnode-perl, libclass-observable-perl, libclass-factory-perl, libconfig-std-perl, libtimedate-perl, libconfig-merge-perl, libproc-safeexec-perl, libconfig-versioned-perl (>= 0.5), libgit-pureperl-perl, libconfig-any-perl, libconfig-gitlike-perl, libmoose-perl, libmoosex-strictconstructor-perl, libmoosex-types-path-class-perl, libdata-stream-bulk-perl, libfile-find-rule-perl, libio-digest-perl, libnamespace-autoclean-perl, libconnector-perl, libdatetime-format-strptime-perl, libnetaddr-ip-perl, apache2, libswitch-perl, libclass-isa-perl, libcgi-fast-perl, libcgi-session-perl, libjson-perl, libyaml-perl, libyaml-libyaml-perl, libnet-dns-perl, libcrypt-pkcs10-perl, libhtml-parser-perl, libsoap-lite-perl, libossp-uuid-perl, libmoosex-params-validate-perl, libdbix-handler-perl, libsql-abstract-more-perl, libdbix-transactionmanager-perl, libarchive-zip-perl, libcrypt-smime-perl, libcrypt-x509-perl, libcryptx-perl, libcrypt-argon2-perl, libpod-pom-perl
11+
Depends: ${perl:Depends}, ${shlibs:Depends}, make, openssl (>= 0.9.8), libauthen-sasl-perl, libcgi-session-perl, libdatetime-perl, libdigest-sha-perl, libexception-class-perl (>=1.22), libio-prompt-perl, liblog-log4perl-perl, libmail-rfc822-address-perl, libnet-ip-perl, libnet-ldap-perl, libnet-server-perl, libparams-validate-perl, libregexp-common-perl, libtemplate-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtext-csv-xs-perl, libxml-parser-perl, libxml-sax-perl, libxml-sax-writer-perl, libxml-simple-perl, libipc-sharelite-perl, libintl-perl, libfilter-perl, libdata-serializer-perl, libdatetime-format-dateparse-perl, libproc-processtable-perl, libsys-sigaction-perl, libtemplate-perl, libworkflow-perl, libxml-filter-xinclude-perl, libxml-validator-schema-perl, libdbi-perl, libdevel-stacktrace-perl, libclass-accessor-perl, libcrypt-openssl-aes-perl, libcrypt-cbc-perl, libtree-dagnode-perl, libclass-observable-perl, libclass-factory-perl, libconfig-std-perl, libtimedate-perl, libconfig-merge-perl, libproc-safeexec-perl, libconfig-versioned-perl (>= 0.5), libgit-pureperl-perl, libconfig-any-perl, libconfig-gitlike-perl, libmoose-perl, libmoosex-strictconstructor-perl, libmoosex-types-path-class-perl, libdata-stream-bulk-perl, libfile-find-rule-perl, libio-digest-perl, libnamespace-autoclean-perl, libconnector-perl, libdatetime-format-strptime-perl, libnetaddr-ip-perl, apache2, libswitch-perl, libclass-isa-perl, libcgi-fast-perl, libcgi-session-perl, libjson-perl, libyaml-perl, libyaml-libyaml-perl, libnet-dns-perl, libcrypt-pkcs10-perl, libhtml-parser-perl, libsoap-lite-perl, libossp-uuid-perl, libmoosex-params-validate-perl, libdbix-handler-perl, libsql-abstract-more-perl, libdbix-transactionmanager-perl, libarchive-zip-perl, libcrypt-smime-perl, libcrypt-x509-perl, libcryptx-perl, libcrypt-argon2-perl, libpod-pom-perl
1212
Description: OpenXPKI Perl core modules
1313
OpenXPKI is an Open Source PKI project.
1414
.

‎package/debian/debian-deps.lst

-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ libclass-accessor-chained-perl
2020
libclass-factory-perl
2121
libcrypt-cbc-perl
2222
libdata-page-perl
23-
libdata-password-perl
2423
libdata-serializer-perl
2524
libdbd-mock-perl
2625
libnet-ip-perl
2726
libnetaddr-ip-perl
2827
libparams-validate-perl
29-
libdata-password-perl
3028
libdatetime-locale-perl
3129
libdatetime-timezone-perl
3230
libdatetime-format-strptime-perl

‎package/debian/myperl-openxpki-core/control.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Architecture: any
88
Recommends: openca-tools, apache2, libdbd-pg-myperl | libdbd-mysql-myperl
99
Section: perl
1010
Priority: optional
11-
Depends: ${perl:Depends}, ${shlibs:Depends}, make, openssl (>= 0.9.8), libauthen-sasl-perl, libcgi-session-perl, libdatetime-perl, libdigest-sha-perl, libexception-class-perl (>=1.22), libio-prompt-perl, liblog-log4perl-perl, libmail-rfc822-address-perl, libnet-ip-perl, libnet-ldap-perl, libnet-server-perl, libparams-validate-perl, libregexp-common-perl, libtemplate-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtext-csv-perl, libxml-parser-perl, libxml-sax-perl, libxml-sax-writer-perl, libxml-simple-perl, libipc-sharelite-perl, libintl-perl, libfilter-perl, libdata-password-perl, libdata-serializer-perl, libdatetime-format-dateparse-perl, libproc-processtable-perl, libsys-sigaction-perl, libtemplate-perl, libworkflow-perl, libxml-filter-xinclude-perl, libxml-validator-schema-perl, libdbi-perl, libdevel-stacktrace-perl, libclass-accessor-perl, libcrypt-openssl-aes-perl, libcrypt-cbc-perl, libtree-dagnode-perl, libclass-observable-perl, libclass-factory-perl, libconfig-std-perl, libtimedate-perl, libconfig-merge-perl, libproc-safeexec-perl, libconfig-versioned-perl (>= 0.5), libgit-pureperl-perl, libconfig-any-perl, libconfig-gitlike-perl, libmoose-perl, libmoosex-strictconstructor-perl, libmoosex-types-path-class-perl, libdata-stream-bulk-perl, libfile-find-rule-perl, libio-digest-perl, libnamespace-autoclean-perl, libconnector-perl, libdatetime-format-strptime-perl, libnetaddr-ip-perl, apache2, libswitch-perl, libclass-isa-perl, libcgi-fast-perl, libcgi-session-perl, libjson-perl, libyaml-perl, libyaml-libyaml-perl, libcryptx-perl
11+
Depends: ${perl:Depends}, ${shlibs:Depends}, make, openssl (>= 0.9.8), libauthen-sasl-perl, libcgi-session-perl, libdatetime-perl, libdigest-sha-perl, libexception-class-perl (>=1.22), libio-prompt-perl, liblog-log4perl-perl, libmail-rfc822-address-perl, libnet-ip-perl, libnet-ldap-perl, libnet-server-perl, libparams-validate-perl, libregexp-common-perl, libtemplate-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtext-csv-perl, libxml-parser-perl, libxml-sax-perl, libxml-sax-writer-perl, libxml-simple-perl, libipc-sharelite-perl, libintl-perl, libfilter-perl, libdata-serializer-perl, libdatetime-format-dateparse-perl, libproc-processtable-perl, libsys-sigaction-perl, libtemplate-perl, libworkflow-perl, libxml-filter-xinclude-perl, libxml-validator-schema-perl, libdbi-perl, libdevel-stacktrace-perl, libclass-accessor-perl, libcrypt-openssl-aes-perl, libcrypt-cbc-perl, libtree-dagnode-perl, libclass-observable-perl, libclass-factory-perl, libconfig-std-perl, libtimedate-perl, libconfig-merge-perl, libproc-safeexec-perl, libconfig-versioned-perl (>= 0.5), libgit-pureperl-perl, libconfig-any-perl, libconfig-gitlike-perl, libmoose-perl, libmoosex-strictconstructor-perl, libmoosex-types-path-class-perl, libdata-stream-bulk-perl, libfile-find-rule-perl, libio-digest-perl, libnamespace-autoclean-perl, libconnector-perl, libdatetime-format-strptime-perl, libnetaddr-ip-perl, apache2, libswitch-perl, libclass-isa-perl, libcgi-fast-perl, libcgi-session-perl, libjson-perl, libyaml-perl, libyaml-libyaml-perl, libcryptx-perl
1212
Description: OpenXPKI Perl core modules
1313
OpenXPKI is an Open Source PKI project.
1414
.

‎package/suse/Makefile

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ PACKAGES=\
99
openxpki-perldeps-core \
1010
perl-openxpki-core \
1111
perl-openxpki-client-html-mason \
12-
openxpki-i18n
12+
openxpki-i18n
1313

1414
OPT_PACKAGES=\
1515
openxpki-perldeps-enrollment
1616

17-
# CPAN dependencies that we'd like packaged for the target
17+
# CPAN dependencies that we'd like packaged for the target
1818
# distribution
1919

2020
EXTERNAL= \
@@ -24,7 +24,6 @@ EXTERNAL= \
2424
CPAN__Meta__YAML \
2525
Crypt__OpenSSL__AES \
2626
DBD__Mock \
27-
Data__Password \
2827
Params__Validate \
2928
List__MoreUtils \
3029
DateTime__Locale \
@@ -93,7 +92,7 @@ EXTERNAL= \
9392
LWP__UserAgent \
9493
LWP \
9594
WWW__Mechanize
96-
95+
9796

9897

9998

@@ -110,7 +109,7 @@ endif
110109
# Makefile.inc contains common settings for all packages (checked in)
111110
include Makefile.inc
112111

113-
# optional: Makefile.local may be used locally to override
112+
# optional: Makefile.local may be used locally to override
114113
# settings (should not be checked in)
115114
-include Makefile.local
116115

@@ -126,7 +125,7 @@ all:
126125

127126
# builddep basically gets any CPAN stuff needed for the build process. First,
128127
# it tries to use zypper to install those provided by SuSE. Then, it fetches
129-
# the cpan2dist stuff to automate the process of installing the remaining
128+
# the cpan2dist stuff to automate the process of installing the remaining
130129
# packages. (we'll use cpan2dist later when packaging the openxpki prereqs
131130
# from cpan.
132131

‎package/suse/cpan/SLES-10-2-cpan-build.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ $modlist = {
5050
'CPAN::Meta::YAML' => {},
5151
'DBD::Mock' => {},
5252
'Data::OptList' => {},
53-
'Data::Password' => {},
5453
'Data::Serializer' => {
5554
norequire => [
5655
qw(

‎package/suse/external-dependencies/Data-Password.spec

-135
This file was deleted.

‎tools/docker-test/cpanfile

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ requires 'DBD::Mock' => '1.45';
1818
requires 'DBD::SQLite' => '1.52';
1919
requires 'DBI' => '1';
2020
requires 'DBIx::Handler' => '0.14';
21-
requires 'Data::Password' => '1.07';
2221
requires 'Data::Serializer' => '0.44';
2322
requires 'Data::UUID' => '0';
2423
requires 'Date::Parse' => '0';

0 commit comments

Comments
 (0)