michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to drop not really used --product-type for now

Browse Source
This commit is contained in:
iliajie
2023-05-23 19:05:04 +03:00
parent 79be97bbe4
commit 9d382df56d
3 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
makedebian.pl
View File

@@ -7,14 +7,6 @@ if ($ARGV[0] eq "--webmail" || $ARGV[0] eq "-webmail") {
$webmail = 1;
shift(@ARGV);
}
if ($ARGV[0] =~ /^--product-type/) {
$product_type = $ARGV[0];
$product_type =~ s/--product-type=//;
if ($product_type =~ /^(minimal|essential)$/) {
$product_suff = "-$product_type";
}
shift(@ARGV);
}
if ($0 =~ /useradmin|usermin/ || `pwd` =~ /useradmin|usermin/) {
if ($webmail) {
$product = "usermin-webmail";
@@ -53,15 +45,15 @@ $conffiles_file = "$debian_dir/conffiles";
-r "/etc/debian_version" || die "makedebian.pl must be run on Debian";
chop($webmin_dir = `pwd`);
@ARGV == 1 || @ARGV == 2 ||
die "usage: makedebian.pl [--product-type] [--webmail] <version> [release]";
@ARGV == 1 || die "usage: makedebian.pl [--webmail] <version> [release]";
$ver = $ARGV[0];
if ($ARGV[1]) {
$rel = "-".$ARGV[1];
}
$tarfile = "tarballs/$product$product_suff-$ver$rel.tar.gz";
$tarfile = "tarballs/$product-$ver$rel.tar.gz";
if (!-r $tarfile) {
$tarfile = "tarballs/$product$product_suff-$ver.tar.gz";
$tarfile = "tarballs/$product-$ver.tar.gz";
}
-r $tarfile || die "$tarfile not found";
@@ -79,8 +71,8 @@ system("mkdir -p $bin_dir");
# Un-tar the package to the correct locations
system("gunzip -c $tarfile | (cd $tmp_dir ; tar xf -)") &&
die "un-tar failed!";
system("mv $tmp_dir/$product$product_suff-$ver/* $usr_dir");
rmdir("$tmp_dir/$product$product_suff-$ver");
system("mv $tmp_dir/$product-$ver/* $usr_dir");
rmdir("$tmp_dir/$product-$ver");
system("mv $usr_dir/$baseproduct-debian-pam $pam_file");
system("cd $usr_dir && (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -");
system("cd $usr_dir && rm -f mount/freebsd-mounts*");
@@ -472,12 +464,12 @@ $md5 =~ s/\s+.*\n//g;
@st = stat($tarfile);
# Create the .diff file, which just contains the debian directory
$diff_orig_dir = "$tmp_dir/$product$product_suff-$ver-orig";
$diff_new_dir = "$tmp_dir/$product$product_suff-$ver";
$diff_orig_dir = "$tmp_dir/$product-$ver-orig";
$diff_new_dir = "$tmp_dir/$product-$ver";
mkdir($diff_orig_dir, 0755);
mkdir($diff_new_dir, 0755);
system("cp -r $debian_dir $diff_new_dir");
system("cd $tmp_dir && diff -r -N -u $product$product_suff-$ver-orig $product$product_suff-$ver >$webmin_dir/deb/${product}_${ver}${rel}.diff");
system("cd $tmp_dir && diff -r -N -u $product-$ver-orig $product-$ver >$webmin_dir/deb/${product}_${ver}${rel}.diff");
$diffmd5 = `md5sum deb/${product}_${ver}${rel}.diff`;
$diffmd5 =~ s/\s+.*\n//g;
@diffst = stat("deb/${product}_${ver}${rel}.diff");

2
makedist.pl
View File

@@ -277,6 +277,6 @@ close(ARFILE);
sub usage
{
die "usage: makedist.pl [-minimal] [--exclude-modules] [--product-type] <version>";
die "usage: makedist.pl [-minimal] [--exclude-modules] <version>";
}

34
makerpm.pl
View File

@@ -20,15 +20,7 @@ if ($ARGV[0] eq "--nosign" || $ARGV[0] eq "-nosign") {
$nosign = 1;
shift(@ARGV);
}
if ($ARGV[0] =~ /^--product-type/) {
$product_type = $ARGV[0];
$product_type =~ s/--product-type=//;
if ($product_type =~ /^(minimal|essential)$/) {
$product_suff = "-$product_type";
}
shift(@ARGV);
}
$ver = $ARGV[0] || die "usage: makerpm.pl [--nosign] [--product-type] <version> [release]";
$ver = $ARGV[0] || die "usage: makerpm.pl [--nosign] <version> [release]";
$rel = $ARGV[1] || "1";
$oscheck = <<EOF;
@@ -75,15 +67,15 @@ else {
$makerel = "rm -f %{buildroot}/usr/libexec/webmin/release";
}
if ($rel > 1 && -r "tarballs/webmin$product_suff-$ver-$rel.tar.gz") {
$tarfile = "webmin$product_suff-$ver-$rel.tar.gz";
if ($rel > 1 && -r "tarballs/webmin-$ver-$rel.tar.gz") {
$tarfile = "webmin-$ver-$rel.tar.gz";
}
else {
$tarfile = "webmin$product_suff-$ver.tar.gz";
$tarfile = "webmin-$ver.tar.gz";
}
system("cp tarballs/$tarfile $source_dir");
open(SPEC, ">$spec_dir/webmin$product_suff-$ver.spec");
open(SPEC, ">$spec_dir/webmin-$ver.spec");
print SPEC <<EOF;
%global __perl_provides %{nil}
%define __spec_install_post %{nil}
@@ -340,21 +332,21 @@ EOF
close(SPEC);
$cmd = -x "/usr/bin/rpmbuild" ? "rpmbuild" : "rpm";
system("$cmd -ba --target=noarch $spec_dir/webmin$product_suff-$ver.spec") && exit;
system("$cmd -ba --target=noarch $spec_dir/webmin-$ver.spec") && exit;
if (-d "rpm") {
system("mv $rpms_dir/webmin$product_suff-$ver-$rel.noarch.rpm rpm/webmin$product_suff-$ver-$rel.noarch.rpm");
print "Moved to rpm/webmin$product_suff-$ver-$rel.noarch.rpm\n";
system("mv $srpms_dir/webmin$product_suff-$ver-$rel.src.rpm rpm/webmin$product_suff-$ver-$rel.src.rpm");
print "Moved to rpm/webmin$product_suff-$ver-$rel.src.rpm\n";
system("chown jcameron: rpm/webmin$product_suff-$ver-$rel.noarch.rpm rpm/webmin$product_suff-$ver-$rel.src.rpm");
system("mv $rpms_dir/webmin-$ver-$rel.noarch.rpm rpm/webmin-$ver-$rel.noarch.rpm");
print "Moved to rpm/webmin-$ver-$rel.noarch.rpm\n";
system("mv $srpms_dir/webmin-$ver-$rel.src.rpm rpm/webmin-$ver-$rel.src.rpm");
print "Moved to rpm/webmin-$ver-$rel.src.rpm\n";
system("chown jcameron: rpm/webmin-$ver-$rel.noarch.rpm rpm/webmin-$ver-$rel.src.rpm");
if (!$nosign) {
system("rpm --resign rpm/webmin$product_suff-$ver-$rel.noarch.rpm rpm/webmin$product_suff-$ver-$rel.src.rpm");
system("rpm --resign rpm/webmin-$ver-$rel.noarch.rpm rpm/webmin-$ver-$rel.src.rpm");
}
}
if (!$webmail && -d "/usr/local/webadmin/rpm/yum") {
# Add to our repository
system("cp rpm/webmin$product_suff-$ver-$rel.noarch.rpm /usr/local/webadmin/rpm/yum");
system("cp rpm/webmin-$ver-$rel.noarch.rpm /usr/local/webadmin/rpm/yum");
}