add jfsutils upg dialog libusb links

This commit is contained in:
joborun linux 2022-04-16 14:41:56 +03:00
parent 6522cafdc9
commit 5bf3df66bc
20 changed files with 317 additions and 47 deletions

View File

@ -1,11 +1,12 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=dialog
pkgver=1.3_20220117
pkgver=1.3_20220414
pkgrel=01
epoch=1
pkgdesc="A tool to display dialog boxes from shell scripts"
@ -37,5 +38,5 @@ license=('LGPL2.1')
validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas E. Dickey (self-signed w/o SHA1) <dickey@invisible-island.net>
sha256sums=(754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f # dialog-1.3-20220117.tgz
7779e01727b063d143dd59c408dd07683c8284196911bc139c5afd9083de5390) # dialog-1.3-20220117.tgz.asc
sha256sums=(493781718642cdd58bdba1cdf2a26776ca855908710d813bd2e93810dc49ece2 # dialog-1.3-20220414.tgz
bce64cf5701cf346397e855300b41653f79b1fd72d1a09c382eae815126ce32e) # dialog-1.3-20220414.tgz.asc

View File

@ -4,7 +4,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=dialog
pkgver=1.3_20220117
pkgver=1.3_20220414
pkgrel=1
epoch=1
pkgdesc="A tool to display dialog boxes from shell scripts"
@ -14,7 +14,7 @@ license=('LGPL2.1')
depends=('sh' 'ncurses')
provides=('libdialog.so')
source=(https://invisible-mirror.net/archives/$pkgname/$pkgname-${pkgver/_/-}.tgz{,.asc})
sha256sums=('754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f'
sha256sums=('493781718642cdd58bdba1cdf2a26776ca855908710d813bd2e93810dc49ece2'
'SKIP')
validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas E. Dickey (self-signed w/o SHA1) <dickey@invisible-island.net>

View File

@ -1 +1,2 @@

53
jfsutils/PKGBUILD Normal file
View File

@ -0,0 +1,53 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=jfsutils
pkgver=1.1.15
pkgrel=08
pkgdesc='JFS filesystem utilities'
url='http://jfs.sourceforge.net'
arch=('x86_64')
depends=('util-linux')
source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
'jfsutils-1.1.15-missing-includes.patch'
'jfsutils-1.1.15-sysmacros.patch'
'jfsutils-1.1.15-gcc10.patch'
'jfsutils-1.1.15-format-security-errors.patch')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../jfsutils-1.1.15-missing-includes.patch
patch -p1 -i ../jfsutils-1.1.15-sysmacros.patch
patch -p1 -i ../jfsutils-1.1.15-gcc10.patch
patch -p1 -i ../jfsutils-1.1.15-format-security-errors.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sbindir=/usr/bin
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
make check
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
#---- license gpg-key sha256sums ----
license=('GPL')
sha256sums=(244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d # jfsutils-1.1.15.tar.gz
467f43ad5be91f57c01b3171b71d3c079f45d150290b02b06ebd32c6b22f5e2c # jfsutils-1.1.15-missing-includes.patch
fd1a4e794a3bf2ebdb4b81f582e147655d70aadd59689aacea0ccc32c6381a28 # jfsutils-1.1.15-sysmacros.patch
491c8e4b4d95cc296e4b87b730e252ce37dafbabaae48aa653ae002df26266f2 # jfsutils-1.1.15-gcc10.patch
40e3ee196b139fec46b2df6047c2f052e7630d9c9e6669d4f70ca478165bc054) # jfsutils-1.1.15-format-security-errors.patch

45
jfsutils/PKGBUILD-arch Normal file
View File

@ -0,0 +1,45 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=jfsutils
pkgver=1.1.15
pkgrel=8
pkgdesc='JFS filesystem utilities'
url='http://jfs.sourceforge.net'
arch=('x86_64')
license=('GPL')
depends=('util-linux')
source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
'jfsutils-1.1.15-missing-includes.patch'
'jfsutils-1.1.15-sysmacros.patch'
'jfsutils-1.1.15-gcc10.patch'
'jfsutils-1.1.15-format-security-errors.patch')
sha256sums=('244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d'
'467f43ad5be91f57c01b3171b71d3c079f45d150290b02b06ebd32c6b22f5e2c'
'fd1a4e794a3bf2ebdb4b81f582e147655d70aadd59689aacea0ccc32c6381a28'
'491c8e4b4d95cc296e4b87b730e252ce37dafbabaae48aa653ae002df26266f2'
'40e3ee196b139fec46b2df6047c2f052e7630d9c9e6669d4f70ca478165bc054')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../jfsutils-1.1.15-missing-includes.patch
patch -p1 -i ../jfsutils-1.1.15-sysmacros.patch
patch -p1 -i ../jfsutils-1.1.15-gcc10.patch
patch -p1 -i ../jfsutils-1.1.15-format-security-errors.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sbindir=/usr/bin
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
make check
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}

1
jfsutils/clean Normal file
View File

@ -0,0 +1 @@
rm -rf {src,pkg,jfsut*.tar.gz}

12
jfsutils/inttypes.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur old/libfs/devices.h new/libfs/devices.h
--- old/libfs/devices.h 2005-11-23 07:43:55.000000000 +1100
+++ new/libfs/devices.h 2013-01-06 11:30:25.381538024 +1100
@@ -40,6 +40,8 @@
#define ERROR_INVALID_PARAMETER 87
#define ERROR_DISK_FULL 112
+#include <inttypes.h>
+
struct stat;
int ujfs_get_dev_size(FILE *, int64_t * size);

View File

@ -0,0 +1,37 @@
--- a/fscklog/display.c
+++ b/fscklog/display.c
@@ -182,7 +182,7 @@ void dump_service_log()
} else {
/* the record looks ok */
msg_txt = &log_entry[log_entry_pos];
- printf(msg_txt);
+ printf("%s", msg_txt);
/*
* set up for the next record
*/
--- a/fscklog/fscklog.c
+++ b/fscklog/fscklog.c
@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int line_number, ...) {
sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
- printf(msg_string);
- printf(debug_detail);
+ printf("%s", msg_string);
+ printf("%s", debug_detail);
return 0;
}
--- a/logdump/helpers.c
+++ b/logdump/helpers.c
@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int line_number, ...) {
sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
- printf(msg_string);
- printf(debug_detail);
+ printf("%s", msg_string);
+ printf("%s", debug_detail);
return 0;
}

View File

@ -0,0 +1,74 @@
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
Date: 2020-05-21
Initial Package Version: 1.1.15
Upstream Status: Unknown (no development since 2011)
Origin: self, adapted from opensuse
Description: Fixes building with GCC 10
--- jfsutils-1.1.15.old/fscklog/display.c 2005-11-22 21:43:54.000000000 +0100
+++ jfsutils-1.1.15.new/fscklog/display.c 2020-05-21 18:15:13.410617620 +0200
@@ -54,7 +54,7 @@
* output: fsck extracted service log I/O buffer
*
*/
-char xchklog_buffer[XCHKLOG_BUFSIZE];
+static char xchklog_buffer[XCHKLOG_BUFSIZE];
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*
diff -ur --exclude '*.o' --exclude '*.a' jfsutils-1.1.15.old/libfs/logredo.c jfsutils-1.1.15.new/libfs/logredo.c
--- jfsutils-1.1.15.old/libfs/logredo.c 2005-11-22 21:43:55.000000000 +0100
+++ jfsutils-1.1.15.new/libfs/logredo.c 2020-05-21 18:19:44.927703271 +0200
@@ -87,9 +87,9 @@
* S T U F F F O R T H E L O G
*
*/
-struct logsuper logsup; /* log super block */
-int32_t numdoblk; /* number of do blocks used */
-int32_t numnodofile; /* number of nodo file blocks used */
+static struct logsuper logsup; /* log super block */
+static int32_t numdoblk; /* number of do blocks used */
+static int32_t numnodofile; /* number of nodo file blocks used */
int32_t numExtDtPg = 0; /* number of extended dtpage blocks used */
/*
@@ -129,7 +129,7 @@
*/
/* buffer header table */
-struct bufhdr {
+static struct bufhdr {
int16_t next; /* 2: next on free/lru list */
int16_t prev; /* 2: previous on free/lru list */
int16_t hnext; /* 2: next on hash chain */
@@ -142,7 +142,7 @@
} bufhdr[NBUFPOOL]; /* (24) */
/* buffer table */
-struct bufpool {
+static struct bufpool {
char bytes[PSIZE];
} buffer[NBUFPOOL - 1];
@@ -151,15 +151,16 @@
*
* log has its own 4 page buffer pool.
*/
-uint8_t afterdata[LOGPSIZE * 2]; /* buffer to read in redopage data */
+static uint8_t afterdata[LOGPSIZE * 2]; /* buffer to read in redopage data */
/*
* Miscellaneous
*/
-caddr_t prog; /* Program name */
-int32_t mntcnt, bufsize;
-char *mntinfo;
-int32_t retcode; /* return code from logredo */
+static caddr_t prog; /* Program name */
+extern int32_t mntcnt;
+static int32_t bufsize;
+static char *mntinfo;
+static int32_t retcode; /* return code from logredo */
int end_of_transaction = 0;
/*

View File

@ -0,0 +1,17 @@
Description: Add missing include to fix FTBFS with eglibc 2.17
Origin: vendor, http://patches.ubuntu.com/j/jfsutils/jfsutils_1.1.15-2ubuntu1.patch
Bug-Debian: http://bugs.debian.org/701433
Last-Update: 2013-07-05
Index: b/fscklog/extract.c
===================================================================
--- a/fscklog/extract.c 2006-06-05 19:31:40.000000000 +0000
+++ b/fscklog/extract.c 2013-04-02 07:13:08.737654963 +0000
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <sys/types.h>
#include "devices.h"
#include "diskmap.h"

View File

@ -0,0 +1,15 @@
https://bugs.gentoo.org/580056
--- a/libfs/devices.c
+++ b/libfs/devices.c
@@ -30,6 +30,10 @@
#include <stdio.h>
#include <stdlib.h>
+#if HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
#ifdef HAVE_SYS_MOUNT_H
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>

5
jfsutils/sums Normal file
View File

@ -0,0 +1,5 @@
jfsutils-1.1.15.tar.gz
jfsutils-1.1.15-missing-includes.patch
jfsutils-1.1.15-sysmacros.patch
jfsutils-1.1.15-gcc10.patch
jfsutils-1.1.15-format-security-errors.patch

15
jfsutils/sysmacros.patch Normal file
View File

@ -0,0 +1,15 @@
https://bugs.gentoo.org/580056
--- a/libfs/devices.c
+++ b/libfs/devices.c
@@ -30,6 +30,10 @@
#include <stdio.h>
#include <stdlib.h>
+#if HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
#ifdef HAVE_SYS_MOUNT_H
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>

5
jfsutils/time Normal file
View File

@ -0,0 +1,5 @@
real 0m8.948s
user 0m15.438s
sys 0m1.291s

View File

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libusb
pkgver=1.0.25
pkgrel=03
pkgver=1.0.26
pkgrel=01
pkgdesc="Library that provides generic access to USB devices w/o systemd"
arch=(x86_64)
url="https://libusb.info/"
@ -15,14 +15,10 @@ depends=('glibc')
makedepends=()
provides=('libusb-1.0.so')
#options=(debug)
source=("https://github.com/${pkgname}/${pkgname}/releases/download/v$pkgver/${pkgname}-$pkgver.tar.bz2"
0001-core-Install-first-context-as-implicit-default.patch)
source=("https://github.com/${pkgname}/${pkgname}/releases/download/v$pkgver/${pkgname}-$pkgver.tar.bz2")
prepare() {
cd "$pkgname-$pkgver"
# patch -Np1 -i ../"${pkgname}-1.0.24-descriptor_parsing.patch"
# FS#74110 / Work around API misuse in gutenprint - patch taken from Fedora
patch -Np1 -i "$srcdir"/0001-core-Install-first-context-as-implicit-default.patch
cd $pkgname-$pkgver
autoreconf -fiv
}
@ -33,20 +29,17 @@ build() {
}
check() {
cd "$pkgname-$pkgver"
make -k check
make -k check -C $pkgname-$pkgver
}
package () {
depends+=(libudev.so)
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -vDm 644 {AUTHORS,ChangeLog,README} -t "${pkgdir}/usr/share/doc/${pkgname}/"
make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
install -vDm 644 $pkgname-$pkgver/{AUTHORS,ChangeLog,README} -t "$pkgdir/usr/share/doc/$pkgname/"
}
#---- license gpg-key sha256sums ----
license=('LGPL2.1')
sha256sums=(8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 # libusb-1.0.25.tar.bz2
8b4f772775767c75a4f68fb182d12064e009c1d3146599463b82ff347ec06a2f) # 0001-core-Install-first-context-as-implicit-default.patch
sha256sums=(12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5) # libusb-1.0.26.tar.bz2

View File

@ -3,8 +3,8 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libusb
pkgver=1.0.25
pkgrel=3
pkgver=1.0.26
pkgrel=1
pkgdesc="Library that provides generic access to USB devices"
arch=(x86_64)
url="https://libusb.info/"
@ -13,35 +13,28 @@ depends=(glibc)
makedepends=(systemd)
provides=(libusb-1.0.so)
options=(debug)
source=("https://github.com/${pkgname}/${pkgname}/releases/download/v$pkgver/${pkgname}-$pkgver.tar.bz2"
0001-core-Install-first-context-as-implicit-default.patch)
sha512sums=('f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d'
'0a8575ca6c155d2fe3c7720ca24b502a93f47ce879235cbf58120396044a7345e049032b9c66258a92b5ba4d8cc8c4afda566f4772cddd8305abdf8742d9e55b')
b2sums=('3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b'
'008b2629c73f7358cb13b93123f94634e410aacaf491074be67c4fac54ecb2aa5cde93d4f0c076148e7ac7cf8530250496d801506d0250dccce89fd57d3cb380')
source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2)
sha512sums=('fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71')
b2sums=('0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081')
prepare() {
cd "$pkgname-$pkgver"
# FS#74110 / Work around API misuse in gutenprint - patch taken from Fedora
patch -Np1 -i "$srcdir"/0001-core-Install-first-context-as-implicit-default.patch
cd $pkgname-$pkgver
autoreconf -fiv
}
build() {
cd "$pkgname-$pkgver"
cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
check() {
cd "$pkgname-$pkgver"
make -k check
make -k check -C $pkgname-$pkgver
}
package () {
depends+=(libudev.so)
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -vDm 644 {AUTHORS,ChangeLog,README} -t "${pkgdir}/usr/share/doc/${pkgname}/"
make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
install -vDm 644 $pkgname-$pkgver/{AUTHORS,ChangeLog,README} -t "$pkgdir/usr/share/doc/$pkgname/"
}

View File

@ -1,11 +1,12 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=links
pkgver=2.25
pkgver=2.26
pkgrel=01
pkgdesc='A text WWW browser, similar to Lynx'
arch=('x86_64')
@ -17,6 +18,7 @@ optdepends=('libx11: for using xlinks'
'libtiff: for using xlinks'
'libpng: for using xlinks'
'librsvg: for using xlinks')
#options=('debug') ## uncomment this line to have the corresponding debug pkg produced
source=("http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2"
'links.desktop')
@ -69,5 +71,5 @@ package() {
license=('GPL')
sha256sums=(2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c # links-2.25.tar.bz2
sha256sums=(f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb # links-2.26.tar.bz2
f96bf2638e9c309bfdb857bd62a732b980231b3a683cd585ec872b249c2c1b19) # links.desktop

View File

@ -2,7 +2,7 @@
# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=links
pkgver=2.25
pkgver=2.26
pkgrel=1
pkgdesc='A text WWW browser, similar to Lynx'
arch=('x86_64')
@ -15,9 +15,10 @@ optdepends=('libx11: for using xlinks'
'libtiff: for using xlinks'
'libpng: for using xlinks'
'librsvg: for using xlinks')
options=('debug')
source=("http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2"
'links.desktop')
sha256sums=('2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c'
sha256sums=('f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb'
'f96bf2638e9c309bfdb857bd62a732b980231b3a683cd585ec872b249c2c1b19')
configure_options=(

View File

@ -4,4 +4,3 @@ libtiff
libpng
libxt
librsvg

View File

@ -1,3 +1,4 @@
real 0m55.146s
user 2m6.969s
sys 0m8.232s
real 1m0.848s
user 1m47.182s
sys 0m8.057s