Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chntpw for openSUSE:Factory checked in at 2024-09-02 13:14:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chntpw (Old) and /work/SRC/openSUSE:Factory/.chntpw.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chntpw" Mon Sep 2 13:14:58 2024 rev:3 rq:1198152 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/chntpw/chntpw.changes 2024-02-26 19:47:37.374750243 +0100 +++ /work/SRC/openSUSE:Factory/.chntpw.new.2698/chntpw.changes 2024-09-02 13:15:06.179981261 +0200 @@ -1,0 +2,6 @@ +Sun Sep 1 08:18:08 UTC 2024 - Sebastian Wagner <se...@sebix.at> + +- add libsam_hexdump_type.patch to fix type conversion, fixing build on tumbleweed +- extract chntpw_1.0-1.1.diff.gz to chntpw_1.0-1.1.diff, remove the hacky patch application + +------------------------------------------------------------------- @@ -18 +24 @@ -Sun Dec 31 09:44:57 UTC 2017 - sebix+novell....@sebix.at +Sun Dec 31 09:44:57 UTC 2017 - se...@sebix.at Old: ---- chntpw_1.0-1.1.diff.gz New: ---- chntpw_1.0-1.1.diff libsam_hexdump_type.patch BETA DEBUG BEGIN: New:- add libsam_hexdump_type.patch to fix type conversion, fixing build on tumbleweed - extract chntpw_1.0-1.1.diff.gz to chntpw_1.0-1.1.diff, remove the hacky patch application New: - add libsam_hexdump_type.patch to fix type conversion, fixing build on tumbleweed - extract chntpw_1.0-1.1.diff.gz to chntpw_1.0-1.1.diff, remove the hacky patch application BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chntpw.spec ++++++ --- /var/tmp/diff_new_pack.KQnJjN/_old 2024-09-02 13:15:06.724004415 +0200 +++ /var/tmp/diff_new_pack.KQnJjN/_new 2024-09-02 13:15:06.724004415 +0200 @@ -24,8 +24,10 @@ License: GPL-2.0-only AND LGPL-2.1-only URL: http://pogostick.net/~pnh/ntpasswd/ Source: http://pogostick.net/~pnh/ntpasswd/chntpw-source-%{dateversion}.zip -# PATCH-FIX-UPSTREAM chntpw_1.0-1.diff.gz -- use all patches from debian, fixes build and runtime bugs -Patch0: http://http.debian.net/debian/pool/main/c/chntpw/chntpw_%{version}-1.1.diff.gz +# PATCH-FIX-UPSTREAM chntpw_1.0-1.diff.gz -- use all patches from debian, fixes build and runtime bugs, from http://http.debian.net/debian/pool/main/c/chntpw/chntpw_1.0-1.1.diff.gz +Patch0: chntpw_1.0-1.1.diff +# PATCH-FIX-UPSTREAM libsam_hexdump_type.patch -- add explicit type conversion for the hexdump character array, which failed by default with -Wincompatible-pointer-types +Patch1: libsam_hexdump_type.patch BuildRequires: libgcrypt-devel BuildRequires: unzip @@ -40,10 +42,6 @@ %prep %autosetup -p1 -n %{name}-%{dateversion} -while read line; do - [ "${line#\#}"x = "${line}x" ] && echo "Applying patch $line" && /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < "debian/patches/$line" -done < debian/patches/series - %build make %{?_smp_mflags} CFLAGS="-DUSELIBGCRYPT $(shell libgcrypt-config --cflags) -g -I. -Wall $(EXTRA_CFLAGS) %{optflags}" chntpw cpnt reged samusrgrp sampasswd @@ -56,6 +54,9 @@ install -Dm 644 debian/%{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8 +%check +%{buildroot}%{_bindir}/chntpw -h + %files %doc README.txt HISTORY.txt %license COPYING.txt GPL.txt LGPL.txt ++++++ chntpw_1.0-1.1.diff ++++++ +++ empty output from diff against chntpw_1.0-1.1.diff.gz ++++++ libsam_hexdump_type.patch ++++++ --- chntpw-140201/libsam.c.orig 2024-09-01 10:14:45.156331463 +0200 +++ chntpw-140201/libsam.c 2024-09-01 10:15:47.462222739 +0200 @@ -511,7 +511,7 @@ if (gverbose) printf("put_grp_members_sid: ajusted: mofs = %x, mlen = %x (%d)\n", mofs + 0x34 ,mlen,mlen); - if (gverbose) hexdump(&c->data, 0, c->len, 1); + if (gverbose) hexdump((char *) &c->data, 0, c->len, 1); /* Get total size of new SID data */ @@ -539,7 +539,7 @@ cd->members_len = sidlen; /* Update member count in C struct */ cd->grp_members = i; - if (gverbose) hexdump(&c->data, 0, c->len, 1); + if (gverbose) hexdump((char *) &c->data, 0, c->len, 1); if (!put_buf2val(hdesc, c, 0, g, 0, TPF_VK_EXACT)) { fprintf(stderr,"put_grp_members_sid: could not write back group info in value %s\n",g);
