From e6ae1d09a2118af5aa1ab96c94691aba1f2a7d99 Mon Sep 17 00:00:00 2001 From: yangchenguang Date: Tue, 31 Jan 2023 15:27:57 +0800 Subject: [PATCH] delete support enable-raw (cherry picked from commit 465d3f8424d3777a14700554b5421ee4c8e18421) --- util-linux.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/util-linux.spec b/util-linux.spec index 30453d5..7d259e0 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.37.2 -Release: 13 +Release: 14 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -190,6 +190,7 @@ This package contains some doc and man help files for %{name}. %define _build_arg1__ SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" DAEMON_CFLAGS="$SUID_CFLAGS" DAEMON_LDFLAGS="$SUID_LDFLAGS" unset LINGUAS || : +# del support enable-raw https://github.com/torvalds/linux/commit/603e4922f1c81fc2ed3a87b4f91a8d3aafc7e093 %configure \ --with-systemdsystemunitdir=%{_unitdir} \ --disable-silent-rules \ @@ -198,7 +199,7 @@ unset LINGUAS || : --enable-chfn-chsh \ --enable-usrdir-path \ --enable-write \ - --enable-raw \ + --disable-raw \ --enable-hardlink \ --with-python=3 \ --with-systemd \ @@ -220,7 +221,6 @@ make check install -d %{buildroot}%{_sysconfdir}/pam.d install -d %{buildroot}{/run/uuidd,/var/lib/libuuid,/var/log} -mv %{buildroot}%{_sbindir}/raw %{buildroot}%{_bindir}/raw install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/login install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/remote install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/chsh @@ -238,7 +238,6 @@ ln -sf ../proc/self/mounts %{buildroot}/etc/mtab touch %{buildroot}/var/log/lastlog chmod 0644 %{buildroot}/var/log/lastlog -echo ".so man8/raw.8" > %{buildroot}%{_mandir}/man8/rawdevices.8 echo ".so man8/hwclock.8" > %{buildroot}%{_mandir}/man8/clock.8 %find_lang %name @@ -342,7 +341,7 @@ fi %{_bindir}/{cal,chrt,col,colcrt,colrm,column,chmem,dmesg,eject,fallocate,fincore,findmnt,choom,uclampset} %{_bindir}/{flock,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,kill,last,lastb,logger,hardlink} %{_bindir}/{look,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns,mcookie,mesg,more,mountpoint} -%{_bindir}/{namei,nsenter,prlimit,raw,rename,renice,rev,script,scriptreplay,setarch,setpriv} +%{_bindir}/{namei,nsenter,prlimit,rename,renice,rev,script,scriptreplay,setarch,setpriv} %{_bindir}/{setsid,setterm,taskset,ul,unshare,utmpdump,uuidgen,uuidparse,wdctl,whereis,scriptlive,irqtop,lsirq} %{_sbindir}/{addpart,agetty,blkdiscard,blkid,blkzone,blockdev,chcpu,ctrlaltdel,delpart,fdisk} %{_sbindir}/{findfs,fsck,fsck.cramfs,fsck.minix,fsfreeze,fstrim,ldattach,losetup,mkfs,mkfs.cramfs} @@ -355,7 +354,7 @@ fi %{compldir}/{fstrim,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,last,ldattach} %{compldir}/{logger,look,losetup,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns} %{compldir}/{mcookie,mesg,mkfs,mkfs.cramfs,mkfs.minix,mkswap,more,mountpoint} -%{compldir}/{namei,nsenter,partx,pivot_root,prlimit,raw,readprofile,rename,renice} +%{compldir}/{namei,nsenter,partx,pivot_root,prlimit,readprofile,rename,renice} %{compldir}/{resizepart,rev,rfkill,rtcwake,runuser,script,scriptreplay,setarch} %{compldir}/{setpriv,setsid,setterm,su,swaplabel,swapoff,swapon,taskset,ul,unshare} %{compldir}/{utmpdump,uuidgen,uuidparse,wall,wdctl,whereis,wipefs,write,zramctl} @@ -425,11 +424,17 @@ fi %{_mandir}/man8/{blkdiscard.8*,blkid.8*,blkzone.8*,blockdev.8*,chcpu.8*,chmem.8*,ctrlaltdel.8*,delpart.8*} %{_mandir}/man8/{fdisk.8*,findfs.8*,findmnt.8*,fsck.8*,fsck.cramfs.8*,fsck.minix.8*,fsfreeze.8*,fstrim.8*} %{_mandir}/man8/{isosize.8*,ldattach.8*,losetup.8*,lsblk.8*,lslocks.8*,lsns.8*,mkfs.8*,mkfs.cramfs.8*} -%{_mandir}/man8/{mkfs.minix.8*,mkswap.8*,mount.8*,nologin.8*,partx.8*,pivot_root.8*,raw.8*,rawdevices.8*} +%{_mandir}/man8/{mkfs.minix.8*,mkswap.8*,mount.8*,nologin.8*,partx.8*,pivot_root.8*} %{_mandir}/man8/{readprofile.8*,resizepart.8*,rfkill.8*,rtcwake.8*,setarch.8*,sulogin.8.gz,swaplabel.8*} %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Tue Jan 31 2023 yangchenguang - 2.37.2-14 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: delete support enable-raw + * Sat Sep 17 2022 zhangyao - 2.37.2-13 - Type:bugfix - CVE:NA -- Gitee