mlot/alien
1
0
Fork 0
mirror of https://github.com/Project-OSS-Revival/alien.git synced 2026-04-24 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Implement slack-desc handling for Slackware packages This commit introduces the following changes:

Browse Source 
1.  **Modified `scan` method in `Alien/Package/Tgz.pm`:**
    - The method now attempts to read and parse `install/slack-desc` from input .tgz packages.
    - If found, the package's description and summary are populated from `slack-desc`.
    - Fallback to existing behavior if `slack-desc` is not present.

2.  **Modified `prep` method in `Alien/Package/Tgz.pm`:**
    - When creating a .tgz package, an `install/slack-desc` file is now generated.
    - This file is populated using the package's summary and description, formatted according to Slackware standards.
    - A helper function `_format_slack_desc` was added to handle the formatting logic.

3.  **Modified `build` method in `Alien/Package/Tgz.pm`:**
    - When creating a .tgz package, `makepkg` is now used.
	- Package is now named according to Slackware standard naming scheme.
This commit is contained in:
Armando
2025-05-27 17:47:09 -06:00
committed by Syed-Shahrukh-OSSRevival
parent ab603a11e0
commit 32f04aed12
2 changed files with 297 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Alien/Package/Rpm.pm
View File

@@ -8,7 +8,9 @@ Alien::Package::Rpm - an object that represents a rpm package
package Alien::Package::Rpm;
use strict;
use base qw(Alien::Package);
use Exporter qw(import);
our @EXPORT_OK = qw(arch);
use base qw(Alien::Package Exporter);
=head1 DESCRIPTION

305
Alien/Package/Tgz.pm
View File

@@ -10,6 +10,7 @@ package Alien::Package::Tgz;
use strict;
use base qw(Alien::Package);
use Cwd qw(abs_path);
use Alien::Package::Rpm qw(arch);
my $tarext=qr/\.(?:tgz|tar(?:\.(?:gz|Z|z|bz|bz2))?|taz)$/;
@@ -110,8 +111,92 @@ sub scan {
$this->arch('all');
$this->summary("Converted tgz package");
$this->description($this->summary);
# Attempt to extract slack-desc
my $slack_desc_content = $this->runpipe(1, "tar Oxf '$file' install/slack-desc 2>/dev/null");
my $pkg_name = $this->name(); # Get package name early
if ($slack_desc_content && $slack_desc_content =~ /\S/) {
my @slack_lines = split /\n/, $slack_desc_content;
# Default values if parsing fails or parts are missing
my $default_summary_text = "Package from tgz file (slack-desc found)";
my $default_description_text = "Package from tgz file (slack-desc found)";
$this->summary($default_summary_text);
$this->description($default_description_text);
my $summary_parsed_successfully = 0;
if (@slack_lines) {
my $first_line = $slack_lines[0]; # Peek at first line
# Try to parse summary from the first line using the strict format
if ($first_line =~ /^\Q$pkg_name\E: \Q$pkg_name\E \((.+)\)\s*$/) {
my $summary_candidate = $1;
if ($summary_candidate =~ /\S/) { # Check if captured summary is not just whitespace
$this->summary($summary_candidate);
$this->description($summary_candidate); # Initial guess for description
shift @slack_lines; # Consume the line as it was successfully parsed
$summary_parsed_successfully = 1;
}
}
}
# Description Parsing from remaining lines (or all lines if summary parse failed)
my @description_parts;
my $expected_prefix_regex = qr/^\Q$pkg_name\E: /; # $pkg_name: <text>
my $paragraph_break_regex = qr/^\Q$pkg_name\E:$/; # $pkg_name:
foreach my $line (@slack_lines) {
if ($line =~ $paragraph_break_regex) {
push @description_parts, ""; # Paragraph break
} elsif ((my $desc_content = $line) =~ s/$expected_prefix_regex//) {
# Prefix was stripped, $desc_content now holds the rest
push @description_parts, $desc_content;
} else {
# Line does not match strict format, ignore it for description.
# This handles cases where the first line was not a valid summary
# and is now being re-evaluated here but doesn't fit description format either.
}
}
if (@description_parts) {
my $parsed_description = join("\n", @description_parts);
# Remove leading/trailing empty lines from the final description block
$parsed_description =~ s/^\n+//;
$parsed_description =~ s/\n+$/\n/; # Keep single trailing newline if content, or make it one if many
$parsed_description =~ s/\s+$//; # Trim trailing whitespace overall, including last newline if it was just that
if ($parsed_description =~ /\S/) {
$this->description($parsed_description);
# If summary is still the generic default, but we have a description,
# try to set summary from the first line of this description.
if ($this->summary() eq $default_summary_text) {
my ($first_desc_line) = split /\n/, $parsed_description;
if ($first_desc_line && length($first_desc_line) < 100 && $first_desc_line =~ /\S/) {
$this->summary($first_desc_line);
}
}
} else {
# Description parts were found but resulted in an empty string (e.g. only paragraph markers)
# Revert to summary if summary was good, or default if summary was also default.
if ($summary_parsed_successfully) {
$this->description($this->summary());
} else {
$this->description($default_description_text); # Keep default
}
}
} elsif (!$summary_parsed_successfully) {
# No description parts AND summary was not parsed successfully means slack-desc was
# present but entirely unparsable or empty after the first line (if any).
# Summary and Description remain $default_summary_text.
}
# If summary was parsed but no description lines, description is already set to summary.
} else {
# Original behavior if slack-desc is not found or empty
$this->summary("Converted tgz package");
$this->description($this->summary);
}
$this->copyright('unknown');
$this->release(1);
$this->distribution("Slackware/tarball");
@@ -177,6 +262,172 @@ sub unpack {
return 1;
}
sub arch {
my $self = shift;
# $self is the Alien::Package::Tgz object instance.
# Call the imported 'arch' function from Alien::Package::Rpm.
# Pass $self as the first argument, so the Rpm.pm 'arch' function
# (which is written as a method) receives it as its own $this/$self.
# Pass any other arguments received by Tgz::arch using @_.
return Alien::Package::Rpm::arch($self, @_);
}
# Helper function for _format_slack_desc
sub _format_slack_desc_section {
my ($pkgname, $text_content, $num_target_lines, $max_total_line_length) = @_;
my $line_prefix_with_space = "$pkgname: ";
my $line_prefix_no_space = "$pkgname:";
# Max length for the actual content, after the prefix
my $max_content_len = $max_total_line_length - length($line_prefix_with_space);
# Ensure max_content_len is somewhat reasonable if pkgname is very long
$max_content_len = 10 if $max_content_len < 10;
my @formatted_lines;
$text_content = "" if !defined $text_content; # Ensure defined
my @segments = split /\n/, $text_content;
# If text_content was empty, split results in one empty segment.
# If text_content ended with \n, split might produce an extra empty segment.
# We want to preserve intentional paragraph breaks (empty segments from \n\n).
# Special case: if text_content is completely empty, segments will be [""]
# and num_target_lines is 1, it should produce one "$pkgname:" line.
# If text_content is non-empty but results in no words (e.g. " \n "),
# it should also be handled gracefully.
SEGMENT: foreach my $segment (@segments) {
last SEGMENT if scalar(@formatted_lines) >= $num_target_lines;
# Trim whitespace from segment. If it becomes empty, it's a paragraph break.
$segment =~ s/^\s+|\s+$//g;
if ($segment eq "") {
push @formatted_lines, $line_prefix_no_space;
next SEGMENT;
}
my @words = split /\s+/, $segment;
next SEGMENT if !@words; # Should not happen if segment was non-empty after trim
my $current_line_buffer = ""; # Holds content part of the line
WORD: foreach my $word (@words) {
if (scalar(@formatted_lines) >= $num_target_lines && $current_line_buffer eq "") {
# Already filled target lines and current buffer for this segment is empty
last SEGMENT;
}
# Check if a single word itself is too long
if (length($word) > $max_content_len) {
# If buffer has content, push it first
if ($current_line_buffer ne "") {
last SEGMENT if scalar(@formatted_lines) >= $num_target_lines;
push @formatted_lines, $line_prefix_with_space . $current_line_buffer;
$current_line_buffer = "";
}
# Push the long word, truncated, on its own line
last SEGMENT if scalar(@formatted_lines) >= $num_target_lines;
push @formatted_lines, $line_prefix_with_space . substr($word, 0, $max_content_len);
# The rest of the word is lost, as per typical shell script behavior (often implicit)
# Or, decide if $word should become the remainder: $word = substr($word, $max_content_len); and re-evaluate
# For now, simply truncating and moving to next word in input.
# Given the spec, it's more about fitting, so a very long word will just fill one line.
next WORD; # Move to next word, current long word handled.
}
if ($current_line_buffer eq "") {
$current_line_buffer = $word;
} else {
my $potential_line = $current_line_buffer . " " . $word;
if (length($potential_line) <= $max_content_len) {
$current_line_buffer = $potential_line;
} else {
last SEGMENT if scalar(@formatted_lines) >= $num_target_lines;
push @formatted_lines, $line_prefix_with_space . $current_line_buffer;
$current_line_buffer = $word;
}
}
}# end WORD loop
# Push any remaining content in buffer for the current segment
if ($current_line_buffer ne "") {
last SEGMENT if scalar(@formatted_lines) >= $num_target_lines;
push @formatted_lines, $line_prefix_with_space . $current_line_buffer;
}
} # end SEGMENT loop
# Pad with "$pkgname:" or truncate to meet exactly $num_target_lines
while (scalar(@formatted_lines) < $num_target_lines) {
push @formatted_lines, $line_prefix_no_space;
}
if (scalar(@formatted_lines) > $num_target_lines) {
@formatted_lines = @formatted_lines[0 .. $num_target_lines - 1];
}
return @formatted_lines;
}
sub _format_slack_desc {
my $this = shift;
my $pkgname = $this->name() || "unknown"; # Should usually be defined
my $summary = $this->summary();
my $description = $this->description();
my $homepage_url = ""; # Fixed as per requirement
# Ensure summary is a single, trimmed line
$summary = "" if !defined $summary;
$summary =~ s/\n.*//s; # Keep only the first line
$summary =~ s/^\s+|\s+$//g; # Trim whitespace
$summary = "No summary" if $summary eq "";
$description = "" if !defined $description;
# Newlines in description are paragraph separators, handled by _format_slack_desc_section
my $screen_width = 72 + length($pkgname);
my $ruler_header = "# HOW TO EDIT THIS FILE:\n# The \"handy ruler\" below makes it easier to edit a package description.\n# Line up the first '|' above the ':' following the base package name, and\n# the '|' on the right side marks the last column you can put a character in.\n# You must make exactly 11 lines for the formatting to be correct. It's also\n# customary to leave one space after the ':' except on otherwise blank lines.\n\n";
my $ruler_gap = ' ' x length($pkgname);
my $ruler_base = $ruler_gap . "|-----handy-ruler--";
# Screen width is total, ruler includes the final '|', so -1 from screen_width for filling
my $ruler_fill_count = $screen_width - 1 - length($ruler_base);
$ruler_fill_count = 0 if $ruler_fill_count < 0; # Ensure not negative
my $ruler_line = $ruler_base . ('-' x $ruler_fill_count) . '|';
my $complete_ruler_block = $ruler_header . $ruler_line . "\n";
# Section 1: Summary (1 line)
# The format "$pkgname ($summary)" is part of the text_content for this section
my $summary_content_for_section = "$pkgname ($summary)";
my @summary_section = _format_slack_desc_section($pkgname, $summary_content_for_section, 1, $screen_width);
# Section 2: Empty line (1 line)
# This is effectively an empty paragraph
my @empty_section = _format_slack_desc_section($pkgname, "", 1, $screen_width);
# Ensure it's just "$pkgname:" as per spec for empty lines
$empty_section[0] = "$pkgname:" if @empty_section;
# Section 3: Description (8 lines)
my @description_section = _format_slack_desc_section($pkgname, $description, 8, $screen_width);
# Section 4: Homepage (1 line)
my @homepage_section = _format_slack_desc_section($pkgname, $homepage_url, 1, $screen_width);
# Ensure it's just "$pkgname:" if homepage_url is empty
if ($homepage_url eq "" && @homepage_section) {
$homepage_section[0] = "$pkgname:";
}
my $all_content_lines = join("\n", @summary_section, @empty_section, @description_section, @homepage_section);
return $complete_ruler_block . $all_content_lines . "\n";
}
=item prep
Adds a populated install directory to the build tree.
@@ -186,16 +437,41 @@ Adds a populated install directory to the build tree.
sub prep {
my $this=shift;
my $dir=$this->unpacked_tree || die "The package must be unpacked first!";
my $install_dir = $dir."/install";
my $install_made=0;
# Check if install directory already exists (e.g. from unpacking)
if (-d $install_dir) {
$install_made = 1;
}
# Generate and write slack-desc if description is meaningful
my $description = $this->description();
my $summary = $this->summary();
if (defined $description && $description =~ /\S/ && $description ne "Converted tgz package" && $description ne $summary) {
my $slack_desc_content = $this->_format_slack_desc();
if ($slack_desc_content && $slack_desc_content =~ /\S/) {
if (!$install_made) {
mkdir($install_dir, 0755)
|| die "unable to mkdir $install_dir: $!";
$install_made=1;
}
my $slack_desc_path = $install_dir."/slack-desc";
open (SLACKDESC, ">$slack_desc_path") || die "Unable to open $slack_desc_path for writing: $!";
print SLACKDESC $slack_desc_content;
close SLACKDESC;
chmod(0644, $slack_desc_path) || $this->warn("Could not chmod $slack_desc_path: $!");
}
}
if ($this->usescripts) {
foreach my $script (keys %{scripttrans()}) {
my $data=$this->$script();
my $out=$this->unpacked_tree."/install/".${scripttrans()}{$script};
my $out=$install_dir."/".${scripttrans()}{$script};
next if ! defined $data || $data =~ m/^\s*$/;
if (!$install_made) {
mkdir($this->unpacked_tree."/install", 0755)
|| die "unable to mkdir ".$this->unpacked_tree."/install: $!";
mkdir($install_dir, 0755)
|| die "unable to mkdir $install_dir: $!";
$install_made=1;
}
open (OUT, ">$out") || die "$out: $!";
@@ -214,11 +490,18 @@ Build a tgz.
sub build {
my $this=shift;
my $tgz=$this->name."-".$this->version.".tgz";
$this->do("cd ".$this->unpacked_tree."; tar czf ../$tgz .")
or die "Package build failed";
my $arch = $this->arch();
my $tgz=$this->name."-".$this->version."-".$arch."-1_alien.tgz";
if (-x "/sbin/makepkg") {
my $v=$Alien::Package::verbose;
$Alien::Package::verbose=2;
$this->do("cd ".$this->unpacked_tree."; makepkg -l y -c n ../$tgz .")
or die "Unable to make pkg";
$Alien::Package::verbose=$v;
}
else {
die "Sorry, I cannot generate the .tgz file because /sbin/makepkg is not present.\n"
}
return $tgz;
}